[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py index/impl...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py index/impl... |
|
Date: |
Fri, 23 May 2003 10:26:08 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/05/23 10:26:08
Modified files:
org/fenfire/demo: buoyoing.py
org/fenfire/index/impl: SpaceXuIndexer.java
org/fenfire/modules/pp: PPActionsImpl.java PPActionsImpl.test
org/fenfire/modules/pp/lava: RSTActionsImpl.java
RSTUtilImpl.java
org/fenfire/util: RDFUtil.java RDFUtil.test
org/fenfire/view: CanvasView2D.java papercanvas2d.test
org/fenfire/view/buoy: PPConnector.java
TransclusionConnector.java
Log message:
s/fen/fen.graph/ to RDFUtil
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/SpaceXuIndexer.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.test.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/lava/RSTActionsImpl.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/lava/RSTUtilImpl.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.54
fenfire/org/fenfire/demo/buoyoing.py:1.55
--- fenfire/org/fenfire/demo/buoyoing.py:1.54 Wed May 21 13:56:04 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Fri May 23 10:26:07 2003
@@ -57,7 +57,10 @@
vob.buoy.buoymanager.replaceNewScene = vob.putil.demo.replacingScene
vob.buoy.buoymanager.w = vob.putil.demo.w
-pool = storm.impl.TransientPool(java.util.HashSet())
+DIR = 'myFenfire'
+os.system('mkdir -p '+DIR)
+# pool = storm.impl.TransientPool(java.util.HashSet())
+pool = storm.impl.DirPool(java.io.File(DIR), java.util.HashSet())
myalph = alph.impl.StormAlph(pool)
sc = myalph.addFile(java.io.File('../alph/testdata/test1.pdf'),
'application/pdf')
enfMaker = alph.impl.Enfilade1DImpl.Enfilade1DImplMaker()
@@ -185,7 +188,7 @@
buoywidth1 = w1 * 1.4
buoyheight1 = h1 * 1.2
- print "SET DOUBLE ", h0, h1, w0, w1, s0, s1, buoywidth0, buoywidth1
+ if (dbg): pa("SET DOUBLE ", h0, h1, w0, w1, s0, s1, buoywidth0,
buoywidth1)
vs.coords.setOrthoBoxParams(self.into1, 0,
ctrx - .5*w0, 40,
Index: fenfire/org/fenfire/index/impl/SpaceXuIndexer.java
diff -u fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.7
fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.8
--- fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.7 Mon May 12
23:14:23 2003
+++ fenfire/org/fenfire/index/impl/SpaceXuIndexer.java Fri May 23 10:26:07 2003
@@ -14,7 +14,7 @@
/** An index of xanadu links stored in a space.
*/
public class SpaceXuIndexer implements XuIndexer {
-public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.7 2003/05/13
03:14:23 tjl Exp $";
+public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.8 2003/05/23
14:26:07 mudyc Exp $";
public static final boolean dbg = true;
protected static void pa(String s) { System.out.println(s); }
@@ -89,7 +89,7 @@
* '--ALPH:xuLinkTo-> enfilade
*/
public void add(XuLink l) {
- Object idnode = RDFUtil.N(fen, CONTENTLINK.Link);
+ Object idnode = RDFUtil.N(fen.graph, CONTENTLINK.Link);
Literal from = ((org.fenfire.impl.SimpleNodeContent)fen.txt)
.literalFromEnfilade(l.from);
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.27
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.28
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.27 Fri May 16
04:52:53 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java Fri May 23 10:26:07 2003
@@ -16,7 +16,7 @@
/** The implementation of PPActions.
*/
public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.27 2003/05/16
08:52:53 mudyc Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.28 2003/05/23
14:26:07 mudyc Exp $";
public static boolean dbg = false;
protected static void p(String s) { System.out.println("PPActionsImpl:
"+s); }
@@ -39,7 +39,7 @@
public String newPaper() throws RemoteException
{ synchronized(fen) {
if(dbg) p("make a new paper");
- Object paper = RDFUtil.N(fen, CANVAS2D.Canvas);
+ Object paper = RDFUtil.N(fen.graph, CANVAS2D.Canvas);
if(dbg) p("new paper done.");
// set creation time
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.test
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.9
fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.10
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.9 Mon May 12
23:14:23 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.test Fri May 23 10:26:07 2003
@@ -39,4 +39,4 @@
assert CANVAS2D.Canvas == it.next()
assert 0 == it.hasNext()
- assert 1 == RDFUtil.isNodeType(fen, paper, CANVAS2D.Canvas)
+ assert 1 == RDFUtil.isNodeType(fen.graph, paper, CANVAS2D.Canvas)
Index: fenfire/org/fenfire/modules/pp/lava/RSTActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/lava/RSTActionsImpl.java:1.1
fenfire/org/fenfire/modules/pp/lava/RSTActionsImpl.java:1.2
--- fenfire/org/fenfire/modules/pp/lava/RSTActionsImpl.java:1.1 Wed May 14
08:32:53 2003
+++ fenfire/org/fenfire/modules/pp/lava/RSTActionsImpl.java Fri May 23
10:26:07 2003
@@ -17,7 +17,7 @@
/** The implementation of RSTActions.
*/
public class RSTActionsImpl extends UnicastRemoteObject implements RSTActions {
-public static final String rcsid = "$Id: RSTActionsImpl.java,v 1.1 2003/05/14
12:32:53 mudyc Exp $";
+public static final String rcsid = "$Id: RSTActionsImpl.java,v 1.2 2003/05/23
14:26:07 mudyc Exp $";
public static final boolean dbg = false;
protected static void p(String s) { System.out.println("RSTActionsImpl:
"+s); }
@@ -43,7 +43,7 @@
public Object newRSTCanvas() throws RemoteException
{ synchronized(fen) {
if(dbg) p("make a new rst canvas");
- Object canvas = RDFUtil.N(fen, RST.Canvas);
+ Object canvas = RDFUtil.N(fen.graph, RST.Canvas);
fen.graph.add(canvas, RDF.type, CANVAS2D.Canvas);
return canvas;
}}
@@ -51,10 +51,10 @@
public Object newParagraph(Object canvas, int width, int x, int y)
throws RemoteException
{ synchronized(fen) {
- if (! RDFUtil.isNodeType(fen, canvas, RST.Canvas))
+ if (! RDFUtil.isNodeType(fen.graph, canvas, RST.Canvas))
throw new Error("canvas is not canvas! "+canvas);
if (canvas == null) throw new Error("canvas is null!");
- Object parag = RDFUtil.N(fen, RST.Paragraph);
+ Object parag = RDFUtil.N(fen.graph, RST.Paragraph);
fen.graph.set1_11X(parag, RST.width, Nodes.getStringLiteral(""+width) );
@@ -73,9 +73,9 @@
public Object newSentence(Object paragraph, int num)
throws RemoteException
{ synchronized(fen) {
- if (! RDFUtil.isNodeType(fen, paragraph, RST.Paragraph))
+ if (! RDFUtil.isNodeType(fen.graph, paragraph, RST.Paragraph))
throw new Error("paragraph is not paragraph! "+paragraph);
- Object senten = RDFUtil.N(fen, RST.Sentence);
+ Object senten = RDFUtil.N(fen.graph, RST.Sentence);
if (num < 0) throw new Error("Num is too small"+num);
else if (num == 0) {
@@ -119,7 +119,7 @@
public void insertNode(Object sentence, Object node, int offset)
throws RemoteException
{ synchronized(fen) {
- if (! RDFUtil.isNodeType(fen, sentence, RST.Sentence))
+ if (! RDFUtil.isNodeType(fen.graph, sentence, RST.Sentence))
throw new Error("sentence is not sentence! "+sentence);
if (offset < 0) throw new Error("Offset is too small"+offset);
@@ -151,7 +151,7 @@
if (next != null)
fen.graph.set1_11X(node, RST.nextNode, next);
}
- if (! RDFUtil.isNodeType(fen, node, RST.Node))
+ if (! RDFUtil.isNodeType(fen.graph, node, RST.Node))
fen.graph.add(node, RDF.type, RST.Node);
Object canvas = util.getCanvas(
Index: fenfire/org/fenfire/modules/pp/lava/RSTUtilImpl.java
diff -u fenfire/org/fenfire/modules/pp/lava/RSTUtilImpl.java:1.1
fenfire/org/fenfire/modules/pp/lava/RSTUtilImpl.java:1.2
--- fenfire/org/fenfire/modules/pp/lava/RSTUtilImpl.java:1.1 Wed May 14
08:32:53 2003
+++ fenfire/org/fenfire/modules/pp/lava/RSTUtilImpl.java Fri May 23
10:26:07 2003
@@ -20,7 +20,7 @@
/** The implementation of RSTActions.
*/
public class RSTUtilImpl extends UnicastRemoteObject implements RSTUtil {
-public static final String rcsid = "$Id: RSTUtilImpl.java,v 1.1 2003/05/14
12:32:53 mudyc Exp $";
+public static final String rcsid = "$Id: RSTUtilImpl.java,v 1.2 2003/05/23
14:26:07 mudyc Exp $";
public static boolean dbg = false;
protected static void p(String s) { System.out.println("RSTUtilImpl: "+s);
}
@@ -38,17 +38,17 @@
public Object getCanvas(Object paragraph)
{ synchronized(fen) {
- if (! RDFUtil.isNodeType(fen, paragraph, RST.Paragraph))
+ if (! RDFUtil.isNodeType(fen.graph, paragraph, RST.Paragraph))
throw new Error("paragraph is not paragraph! "+paragraph);
Object canvas = fen.graph.find1_X11(RST.beginParagraph, paragraph);
- if (RDFUtil.isNodeType(fen, canvas, RST.Canvas))
+ if (RDFUtil.isNodeType(fen.graph, canvas, RST.Canvas))
return canvas;
else throw new Error("Big mistake, canvas isn't canvas!"+ canvas);
}}
public Object getParagraph(Object sentence)
{ synchronized(fen) {
- if (! RDFUtil.isNodeType(fen, sentence, RST.Sentence))
+ if (! RDFUtil.isNodeType(fen.graph, sentence, RST.Sentence))
throw new Error("sentence is not sentence! "+sentence);
Object curr = sentence;
@@ -59,14 +59,14 @@
}
p("curr: "+curr);
Object parag = fen.graph.find1_X11(RST.firstSentence, curr);
- if (RDFUtil.isNodeType(fen, parag, RST.Paragraph))
+ if (RDFUtil.isNodeType(fen.graph, parag, RST.Paragraph))
return parag;
else throw new Error("paragraph is not paragraph! "+parag);
}}
public Object getSentence(Object node)
{ synchronized(fen) {
if (node == null) throw new Error("node is null!"+ node);
- if (! RDFUtil.isNodeType(fen, node, RST.Node))
+ if (! RDFUtil.isNodeType(fen.graph, node, RST.Node))
throw new Error("node is not a node! "+node);
Object sentence = fen.graph.find1_X11(RST.nextNode, node);
@@ -75,7 +75,7 @@
sentence = prev;
prev = fen.graph.find1_X11(RST.nextNode, sentence);
}
- if (RDFUtil.isNodeType(fen, sentence, RST.Sentence))
+ if (RDFUtil.isNodeType(fen.graph, sentence, RST.Sentence))
return sentence;
else throw new Error("sentence is not sentence! "+sentence);
}}
@@ -86,7 +86,7 @@
public void generateBasicSpatialCoords(Object rstCanvas, NodeFunction
nodef)
throws RemoteException
{ synchronized(fen) {
- if (! RDFUtil.isNodeType(fen, rstCanvas, RST.Canvas))
+ if (! RDFUtil.isNodeType(fen.graph, rstCanvas, RST.Canvas))
throw new Error("canvas is not canvas! "+rstCanvas);
dbg = true;
@@ -97,8 +97,8 @@
while (iter.hasNext() ) {
if (dbg) p("paragraph");
Object parag = iter.next();
- int paragX = RDFUtil.getInt(fen, parag, CANVAS2D.x);
- int paragY = RDFUtil.getInt(fen, parag, CANVAS2D.y);
+ int paragX = RDFUtil.getInt(fen.graph, parag, CANVAS2D.x);
+ int paragY = RDFUtil.getInt(fen.graph, parag, CANVAS2D.y);
Object senten = fen.graph.find1_11X(parag, RST.firstSentence);
for (int iy=0; senten != null; iy++) {
if (dbg) p("senten, "+iy);
Index: fenfire/org/fenfire/util/RDFUtil.java
diff -u fenfire/org/fenfire/util/RDFUtil.java:1.11
fenfire/org/fenfire/util/RDFUtil.java:1.12
--- fenfire/org/fenfire/util/RDFUtil.java:1.11 Sun May 11 12:10:21 2003
+++ fenfire/org/fenfire/util/RDFUtil.java Fri May 23 10:26:07 2003
@@ -15,14 +15,13 @@
/** Create a new resource with given type.
*/
- static public Object N(Fen fen, Object type) {
+ static public Object N(Graph graph, Object type) {
Object obj = Nodes.N();
- fen.graph.add(obj, RDF.type, type);
+ graph.add(obj, RDF.type, type);
if(dbg) {
- p("N: "+fen+" "+fen.graph+" "+fen.constgraph+
- " "+obj+" "+type);
- if (!isNodeType(fen, obj, type)) throw new Error("Impossible!");
+ p("N: "+graph+" "+obj+" "+type);
+ if (!isNodeType(graph, obj, type)) throw new Error("Impossible!");
}
return obj;
@@ -31,9 +30,9 @@
/** Check if node is the type which is asked.
*/
- static public boolean isNodeType(Fen fen, Object node, Object type) {
+ static public boolean isNodeType(Graph graph, Object node, Object type) {
if(dbg) p("Isnodetype: "+node+" "+type);
- Iterator it = fen.constgraph.findN_11X_Iter(node, RDF.type);
+ Iterator it = graph.findN_11X_Iter(node, RDF.type);
while(it.hasNext()) {
Object obj = it.next();
if(dbg) p(" entry: "+ obj);
@@ -45,15 +44,15 @@
/** Get int attribute (from a literal).
*/
- static public int getInt(Fen fen, Object node, Object pre) {
- Literal lit = (Literal)fen.constgraph.find1_11X(node, pre);
+ static public int getInt(Graph graph, Object node, Object pre) {
+ Literal lit = (Literal)graph.find1_11X(node, pre);
return Integer.parseInt(lit.getTextString() );
}
/** Set int attribute (literal).
*/
- static public void setInt(Fen fen, Object node, Object pre, int val) {
- fen.graph.set1_11X(node, pre,
+ static public void setInt(Graph graph, Object node, Object pre, int val) {
+ graph.set1_11X(node, pre,
Nodes.getStringLiteral(
Integer.toString(val)));
}
Index: fenfire/org/fenfire/util/RDFUtil.test
diff -u fenfire/org/fenfire/util/RDFUtil.test:1.4
fenfire/org/fenfire/util/RDFUtil.test:1.5
--- fenfire/org/fenfire/util/RDFUtil.test:1.4 Mon May 12 23:14:23 2003
+++ fenfire/org/fenfire/util/RDFUtil.test Fri May 23 10:26:07 2003
@@ -1,3 +1,4 @@
+# -*-python-*-
#(c): Matti J. Katila
from org import fenfire
@@ -29,7 +30,7 @@
def testNewObjWithType():
type = Nodes.get('This is a test type')
- obj = RDFUtil.N(fen,type)
+ obj = RDFUtil.N(fen.graph, type)
assert type == fen.constgraph.find1_11X(obj, RDF.type)
assert obj == fen.constgraph.find1_X11(RDF.type, type)
@@ -39,4 +40,4 @@
assert type == it.next()
assert 0 == it.hasNext()
- assert 1 == RDFUtil.isNodeType(fen, obj, type)
+ assert 1 == RDFUtil.isNodeType(fen.graph, obj, type)
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.15
fenfire/org/fenfire/view/CanvasView2D.java:1.16
--- fenfire/org/fenfire/view/CanvasView2D.java:1.15 Thu May 15 11:12:00 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java Fri May 23 10:26:08 2003
@@ -20,7 +20,7 @@
/** A View2D of a CANVAS2D, with a given node function.
*/
public class CanvasView2D extends View2D implements NodedView2D{
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.15 2003/05/15
15:12:00 mudyc Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.16 2003/05/23
14:26:08 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("CanvasView2D::"+s);
}
@@ -37,7 +37,7 @@
int matchingParent, int box2screen, int box2plane)
{
- if (!RDFUtil.isNodeType(fen, container, CANVAS2D.Canvas))
+ if (!RDFUtil.isNodeType(fen.graph, container, CANVAS2D.Canvas))
throw new Error("plane is NOT a container!");
int paper2box = vs.invertCS(box2plane, "canvasview_INv");
@@ -51,8 +51,8 @@
Object n = iter.next();
// get coords
- int x = RDFUtil.getInt(fen, n, CANVAS2D.x);
- int y = RDFUtil.getInt(fen, n, CANVAS2D.y);
+ int x = RDFUtil.getInt(fen.graph, n, CANVAS2D.x);
+ int y = RDFUtil.getInt(fen.graph, n, CANVAS2D.y);
Placeable p = (Placeable)nodeView.f(fen.constgraph, n);
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.10
fenfire/org/fenfire/view/buoy/PPConnector.java:1.11
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.10 Mon May 12 23:14:24 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java Fri May 23 10:26:08 2003
@@ -17,7 +17,7 @@
/** Make the kinds of links familiar from PP structure.
*/
public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.10 2003/05/13
03:14:24 tjl Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.11 2003/05/23
14:26:08 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPConnector::"+s); }
@@ -89,8 +89,8 @@
public int dx = 30, dy = 30;
protected java.awt.Rectangle getRect(Object node) {
if (node == null) throw new Error("Impossible!");
- int x = RDFUtil.getInt(fen, node, CANVAS2D.x);
- int y = RDFUtil.getInt(fen, node, CANVAS2D.y);
+ int x = RDFUtil.getInt(fen.graph, node, CANVAS2D.x);
+ int y = RDFUtil.getInt(fen.graph, node, CANVAS2D.y);
Placeable p = (Placeable)nodeView.f(fen.constgraph, node);
return new java.awt.Rectangle(x-dx, y-dy,
(int)p.getWidth()+dx+dx,
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.9
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.10
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.9 Mon May
12 23:14:24 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java Fri May 23
10:26:08 2003
@@ -21,7 +21,7 @@
/** Hang transclusion buoys.
*/
public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.9
2003/05/13 03:14:24 tjl Exp $";
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.10
2003/05/23 14:26:08 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("TransclusionConnector:: "+s); }
@@ -140,8 +140,8 @@
public int dx = 30, dy = 30;
protected java.awt.Rectangle getRect(Object node) {
if (node == null) throw new Error("Impossible!");
- int x = RDFUtil.getInt(fen, node, CANVAS2D.x);
- int y = RDFUtil.getInt(fen, node, CANVAS2D.y);
+ int x = RDFUtil.getInt(fen.graph, node, CANVAS2D.x);
+ int y = RDFUtil.getInt(fen.graph, node, CANVAS2D.y);
Placeable p = (Placeable)nodeView.f(fen.constgraph, node);
return new java.awt.Rectangle(x-dx, y-dy,
(int)p.getWidth()+dx+dx,
Index: fenfire/org/fenfire/view/papercanvas2d.test
diff -u fenfire/org/fenfire/view/papercanvas2d.test:1.8
fenfire/org/fenfire/view/papercanvas2d.test:1.9
--- fenfire/org/fenfire/view/papercanvas2d.test:1.8 Tue May 13 15:52:08 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Fri May 23 10:26:08 2003
@@ -29,7 +29,7 @@
fen = ff.test.fen.newFen()
con = ff.util.AlphContent(fen)
- nodec = ff.util.RDFUtil.N(fen, CANVAS2D.Canvas)
+ nodec = ff.util.RDFUtil.N(fen.graph, CANVAS2D.Canvas)
node1 = ff.swamp.Nodes.N()
node2 = ff.swamp.Nodes.N()
@@ -39,11 +39,11 @@
con.setText(node1, "XXX", 0)
con.setText(node2, "YYY", 0)
- ff.util.RDFUtil.setInt(fen, node1, CANVAS2D.x, 200)
- ff.util.RDFUtil.setInt(fen, node1, CANVAS2D.y, 100)
+ ff.util.RDFUtil.setInt(fen.graph, node1, CANVAS2D.x, 200)
+ ff.util.RDFUtil.setInt(fen.graph, node1, CANVAS2D.y, 100)
- ff.util.RDFUtil.setInt(fen, node2, CANVAS2D.x, 200)
- ff.util.RDFUtil.setInt(fen, node2, CANVAS2D.y, 500)
+ ff.util.RDFUtil.setInt(fen.graph, node2, CANVAS2D.x, 200)
+ ff.util.RDFUtil.setInt(fen.graph, node2, CANVAS2D.y, 500)
################ Create the view structure
@@ -55,7 +55,7 @@
1)
- canvasView2D = ff.view.CanvasView2D(fen, textnodeview)
+ canvasView2D = ff.view.CanvasView2D(fen.graph, textnodeview)
paperView2D = ff.view.PaperView2D(None, canvasView2D)
paperView2D.paperMill = DummyMill(
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py index/impl...,
Matti Katila <=