[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire index/impl/SpaceXuIndexer.j...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire index/impl/SpaceXuIndexer.j... |
Date: |
Mon, 12 May 2003 23:14:24 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/05/12 23:14:24
Modified files:
org/fenfire/index/impl: SpaceXuIndexer.java
org/fenfire/modules/pp: PPActionsImpl.test RSTActionsImpl.java
RSTActionsImpl.test RSTUtilImpl.java
org/fenfire/util: RDFUtil.test
org/fenfire/view: CanvasView2D.java FenPDFContext.java
papercanvas2d.test
org/fenfire/view/buoy: PPConnector.java PPLinker.java
PPLinker.test TransclusionConnector.java
org/fenfire/vocab/lava: RST.java
Log message:
Finish (bar mudyc's lava task) vocab
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/SpaceXuIndexer.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/RSTActionsImpl.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/RSTActionsImpl.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/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.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/FenPDFContext.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPLinker.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPLinker.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/TransclusionConnector.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/lava/RST.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/index/impl/SpaceXuIndexer.java
diff -u fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.6
fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.7
--- fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.6 Tue Apr 15
12:02:08 2003
+++ fenfire/org/fenfire/index/impl/SpaceXuIndexer.java Mon May 12 23:14:23 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.6 2003/04/15
16:02:08 tjl Exp $";
+public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.7 2003/05/13
03:14:23 tjl Exp $";
public static final boolean dbg = true;
protected static void pa(String s) { System.out.println(s); }
@@ -89,15 +89,15 @@
* '--ALPH:xuLinkTo-> enfilade
*/
public void add(XuLink l) {
- Object idnode = RDFUtil.N(fen, ALPH.xuType);
+ Object idnode = RDFUtil.N(fen, CONTENTLINK.Link);
Literal from = ((org.fenfire.impl.SimpleNodeContent)fen.txt)
.literalFromEnfilade(l.from);
Literal to = ((org.fenfire.impl.SimpleNodeContent)fen.txt)
.literalFromEnfilade(l.to);
- fen.graph.add(idnode, ALPH.xuLinkFrom, from);
- fen.graph.add(idnode, ALPH.xuLinkTo, to);
+ fen.graph.add(idnode, CONTENTLINK.from, from);
+ fen.graph.add(idnode, CONTENTLINK.to, to);
}
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.test
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.8
fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.9
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.8 Thu May 1
20:22:40 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.test Mon May 12 23:14:23 2003
@@ -4,7 +4,7 @@
from org import fenfire
from org.fenfire.modules.pp import *
-from org.fenfire.vocab import PP, RDF
+from org.fenfire.vocab import CANVAS2D, RDF
from org.fenfire.util import URN5Namespace, Pair, RDFUtil
from org.nongnu.libvob.buoy import BuoyViewNodeType,\
BuoyLinkListener
@@ -31,12 +31,12 @@
def testNewPaper():
paper = act.newPaper()
- assert PP.Paper == fen.constgraph.find1_11X(paper, RDF.type)
- assert paper == fen.constgraph.find1_X11(RDF.type, PP.Paper)
+ assert CANVAS2D.Canvas == fen.constgraph.find1_11X(paper, RDF.type)
+ assert paper == fen.constgraph.find1_X11(RDF.type, CANVAS2D.Canvas)
it = fen.constgraph.findN_11X_Iter(paper, RDF.type)
assert 1 == it.hasNext()
- assert PP.Paper == it.next()
+ assert CANVAS2D.Canvas == it.next()
assert 0 == it.hasNext()
- assert 1 == RDFUtil.isNodeType(fen, paper, PP.Paper)
+ assert 1 == RDFUtil.isNodeType(fen, paper, CANVAS2D.Canvas)
Index: fenfire/org/fenfire/modules/pp/RSTActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/RSTActionsImpl.java:1.5
fenfire/org/fenfire/modules/pp/RSTActionsImpl.java:1.6
--- fenfire/org/fenfire/modules/pp/RSTActionsImpl.java:1.5 Mon May 12
22:59:16 2003
+++ fenfire/org/fenfire/modules/pp/RSTActionsImpl.java Mon May 12 23:14:23 2003
@@ -3,6 +3,7 @@
package org.fenfire.modules.pp;
import org.fenfire.*;
import org.fenfire.vocab.*;
+import org.fenfire.vocab.lava.RST;
import org.fenfire.util.*;
import org.fenfire.swamp.*;
import java.io.IOException;
@@ -16,7 +17,7 @@
/** The implementation of RSTActions.
*/
public class RSTActionsImpl extends UnicastRemoteObject implements RSTActions {
-public static final String rcsid = "$Id: RSTActionsImpl.java,v 1.5 2003/05/13
02:59:16 tjl Exp $";
+public static final String rcsid = "$Id: RSTActionsImpl.java,v 1.6 2003/05/13
03:14:23 tjl Exp $";
public static final boolean dbg = false;
protected static void p(String s) { System.out.println("RSTActionsImpl:
"+s); }
Index: fenfire/org/fenfire/modules/pp/RSTActionsImpl.test
diff -u fenfire/org/fenfire/modules/pp/RSTActionsImpl.test:1.2
fenfire/org/fenfire/modules/pp/RSTActionsImpl.test:1.3
--- fenfire/org/fenfire/modules/pp/RSTActionsImpl.test:1.2 Wed May 7
00:08:04 2003
+++ fenfire/org/fenfire/modules/pp/RSTActionsImpl.test Mon May 12 23:14:23 2003
@@ -3,7 +3,8 @@
import org.fenfire as ff
from org.fenfire.modules.pp import RSTActionsImpl
-from org.fenfire.vocab import RST, SPATIAL, PAPER, RDF
+from org.fenfire.vocab import CANVAS2D, RDF
+from org.fenfire.vocab.lava import RST
from org.nongnu import alph
from org.nongnu import storm
import java
@@ -27,9 +28,9 @@
iter = fen.graph.findN_11X_Iter(canv, RDF.type)
obj = iter.next()
- assert obj == RST.Canvas or obj == PAPER.Canvas
+ assert obj == RST.Canvas or obj == CANVAS2D.Canvas
obj = iter.next()
- assert obj == RST.Canvas or obj == PAPER.Canvas
+ assert obj == RST.Canvas or obj == CANVAS2D.Canvas
assert iter.hasNext() == 0
@@ -72,4 +73,4 @@
foo = 'test'
node = act.insertNode(sent, foo, 0)
- assert foo == fen.graph.find1_11X(canv, PAPER.contains)
+ assert foo == fen.graph.find1_11X(canv, CANVAS2D.contains)
Index: fenfire/org/fenfire/modules/pp/RSTUtilImpl.java
diff -u fenfire/org/fenfire/modules/pp/RSTUtilImpl.java:1.1
fenfire/org/fenfire/modules/pp/RSTUtilImpl.java:1.2
--- fenfire/org/fenfire/modules/pp/RSTUtilImpl.java:1.1 Wed May 7 00:08:04 2003
+++ fenfire/org/fenfire/modules/pp/RSTUtilImpl.java Mon May 12 23:14:23 2003
@@ -3,6 +3,7 @@
package org.fenfire.modules.pp;
import org.fenfire.*;
import org.fenfire.vocab.*;
+import org.fenfire.vocab.lava.RST;
import org.fenfire.util.*;
import org.fenfire.swamp.*;
import java.io.IOException;
@@ -19,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/07
04:08:04 mudyc Exp $";
+public static final String rcsid = "$Id: RSTUtilImpl.java,v 1.2 2003/05/13
03:14:23 tjl Exp $";
public static boolean dbg = false;
protected static void p(String s) { System.out.println("RSTUtilImpl: "+s);
}
@@ -96,8 +97,8 @@
while (iter.hasNext() ) {
if (dbg) p("paragraph");
Object parag = iter.next();
- int paragX = RDFUtil.getInt(fen, parag, SPATIAL.coordX);
- int paragY = RDFUtil.getInt(fen, parag, SPATIAL.coordY);
+ int paragX = RDFUtil.getInt(fen, parag, CANVAS2D.x);
+ int paragY = RDFUtil.getInt(fen, parag, CANVAS2D.y);
Object senten = fen.graph.find1_11X(parag, RST.firstSentence);
for (int iy=0; senten != null; iy++) {
if (dbg) p("senten, "+iy);
@@ -108,8 +109,8 @@
int y = paragY + iy*30;
// set coords
- fen.graph.set1_11X(node, SPATIAL.coordX,
Nodes.getStringLiteral(""+x) );
- fen.graph.set1_11X(node, SPATIAL.coordY,
Nodes.getStringLiteral(""+y) );
+ fen.graph.set1_11X(node, CANVAS2D.x,
Nodes.getStringLiteral(""+x) );
+ fen.graph.set1_11X(node, CANVAS2D.y,
Nodes.getStringLiteral(""+y) );
Placeable p = (Placeable)nodef.f(fen.constgraph, node);
p("x before: "+x);
Index: fenfire/org/fenfire/util/RDFUtil.test
diff -u fenfire/org/fenfire/util/RDFUtil.test:1.3
fenfire/org/fenfire/util/RDFUtil.test:1.4
--- fenfire/org/fenfire/util/RDFUtil.test:1.3 Sun Apr 27 16:19:25 2003
+++ fenfire/org/fenfire/util/RDFUtil.test Mon May 12 23:14:23 2003
@@ -2,7 +2,7 @@
from org import fenfire
from org.fenfire.swamp import Nodes
-from org.fenfire.vocab import PP, RDF
+from org.fenfire.vocab import RDF
from org.fenfire.util import URN5Namespace, Pair, RDFUtil
from org.nongnu.libvob.buoy import BuoyViewNodeType,\
BuoyLinkListener
@@ -28,7 +28,6 @@
def testNewObjWithType():
type = Nodes.get('This is a test type')
- #type = PP.Paper
obj = RDFUtil.N(fen,type)
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.12
fenfire/org/fenfire/view/CanvasView2D.java:1.13
--- fenfire/org/fenfire/view/CanvasView2D.java:1.12 Thu May 8 13:30:19 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java Mon May 12 23:14:24 2003
@@ -20,7 +20,7 @@
/** A View2D on a PP-like canvas.
*/
public class CanvasView2D extends View2D {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.12 2003/05/08
17:30:19 mudyc Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.13 2003/05/13
03:14:24 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("CanvasView2D::"+s);
}
@@ -37,23 +37,22 @@
int matchingParent, int box2screen, int box2plane)
{
- if (RDFUtil.isNodeType(fen, container, PP.Paper) ||
- RDFUtil.isNodeType(fen, container, RST.Canvas)) ;
- else throw new Error("plane is NOT a container!");
+ if (!RDFUtil.isNodeType(fen, container, CANVAS2D.Canvas))
+ throw new Error("plane is NOT a container!");
int paper2box = vs.invertCS(box2plane, "canvasview_INv");
int paper2screen = vs.concatCS(box2screen, "canvasview_conc",
paper2box);
Iterator iter = fen.constgraph.findN_11X_Iter(container,
- PAPER.contains);
+ CANVAS2D.contains);
if (dbg) pa("Canvas begin");
while (iter.hasNext()) {
Object n = iter.next();
// get coords
- int x = RDFUtil.getInt(fen, n, SPATIAL.coordX);
- int y = RDFUtil.getInt(fen, n, SPATIAL.coordY);
+ int x = RDFUtil.getInt(fen, n, CANVAS2D.x);
+ int y = RDFUtil.getInt(fen, n, CANVAS2D.y);
Placeable p = (Placeable)nodeView.f(fen.constgraph, n);
Index: fenfire/org/fenfire/view/FenPDFContext.java
diff -u fenfire/org/fenfire/view/FenPDFContext.java:1.3
fenfire/org/fenfire/view/FenPDFContext.java:1.4
--- fenfire/org/fenfire/view/FenPDFContext.java:1.3 Wed May 7 00:08:05 2003
+++ fenfire/org/fenfire/view/FenPDFContext.java Mon May 12 23:14:24 2003
@@ -6,6 +6,7 @@
import org.fenfire.*;
import org.fenfire.util.*;
import org.fenfire.vocab.*;
+import org.fenfire.vocab.lava.RST;
import org.nongnu.alph.*;
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.9
fenfire/org/fenfire/view/buoy/PPConnector.java:1.10
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.9 Sat May 3 06:15:02 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java Mon May 12 23:14:24 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.9 2003/05/03
10:15:02 benja Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.10 2003/05/13
03:14:24 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPConnector::"+s); }
@@ -64,20 +64,21 @@
/* check all associations */
// Right links!
- Iterator iter = fen.constgraph.findN_11X_Iter(node, PP.association);
+ Iterator iter = fen.constgraph.findN_11X_Iter(node,
+ STRUCTLINK.linkedTo);
while (iter.hasNext()) {
Object obj = iter.next();
- Object plane = fen.constgraph.find1_X11(PAPER.contains, obj);
+ Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
Pair anchor = new Pair(plane, getRect(obj));
if (dbg) pa("rect:"+getRect(obj));
l.link(1, cs, nodeType, new Pair(node, obj), anchor);
}
// Left links!
- iter = fen.constgraph.findN_X11_Iter(PP.association, node);
+ iter = fen.constgraph.findN_X11_Iter(STRUCTLINK.linkedTo, node);
while (iter.hasNext()) {
Object obj = iter.next();
- Object plane = fen.constgraph.find1_X11(PAPER.contains, obj);
+ Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
Pair anchor = new Pair(plane, getRect(obj));
if (dbg) pa("rect:"+getRect(obj));
l.link(-1, cs, nodeType, new Pair(obj, node), anchor);
@@ -88,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, SPATIAL.coordX);
- int y = RDFUtil.getInt(fen, node, SPATIAL.coordY);
+ int x = RDFUtil.getInt(fen, node, CANVAS2D.x);
+ int y = RDFUtil.getInt(fen, 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/PPLinker.java
diff -u fenfire/org/fenfire/view/buoy/PPLinker.java:1.6
fenfire/org/fenfire/view/buoy/PPLinker.java:1.7
--- fenfire/org/fenfire/view/buoy/PPLinker.java:1.6 Wed Apr 16 05:18:36 2003
+++ fenfire/org/fenfire/view/buoy/PPLinker.java Mon May 12 23:14:24 2003
@@ -14,7 +14,7 @@
/** Make the kinds of links familiar from PP structure.
*/
public class PPLinker implements BuoyNodeViewLinker {
-public static final String rcsid = "$Id: PPLinker.java,v 1.6 2003/04/16
09:18:36 mudyc Exp $";
+public static final String rcsid = "$Id: PPLinker.java,v 1.7 2003/05/13
03:14:24 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPLinker:"+s); }
@@ -35,14 +35,16 @@
/* check all associations */
// Right links!
- Iterator iter = fen.constgraph.findN_11X_Iter(node, PP.association);
+ Iterator iter = fen.constgraph.findN_11X_Iter(node,
+ STRUCTLINK.linkedTo);
while (iter.hasNext()) {
Object obj = iter.next();
l.link(1,cs,nodeType, new Pair(node, obj), obj);
}
// Left links!
- iter = fen.constgraph.findN_X11_Iter(PP.association, node);
+ iter = fen.constgraph.findN_X11_Iter(
+ STRUCTLINK.linkedTo, node);
while (iter.hasNext()) {
Object sub = iter.next();
l.link(-1,cs,nodeType, new Pair(sub, node), sub);
Index: fenfire/org/fenfire/view/buoy/PPLinker.test
diff -u fenfire/org/fenfire/view/buoy/PPLinker.test:1.8
fenfire/org/fenfire/view/buoy/PPLinker.test:1.9
--- fenfire/org/fenfire/view/buoy/PPLinker.test:1.8 Sun Apr 27 16:19:25 2003
+++ fenfire/org/fenfire/view/buoy/PPLinker.test Mon May 12 23:14:24 2003
@@ -3,7 +3,7 @@
from org import fenfire
from org.fenfire.modules.pp import *
-from org.fenfire.vocab import PP
+from org.fenfire.vocab import STRUCTLINK
import org.fenfire.view.buoy
from org.fenfire.util import URN5Namespace, Pair
from org.nongnu.libvob.buoy import BuoyViewNodeType,\
@@ -35,7 +35,7 @@
nodeB = fenfire.swamp.Nodes.get(uriB)
# assoc
- fen.graph.add(nodeA, PP.association, nodeB)
+ fen.graph.add(nodeA, STRUCTLINK.linkedTo, nodeB)
global ppLinker
ppLinker = org.fenfire.view.buoy.PPLinker(fen)
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.8
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.9
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.8 Sat May
3 09:35:14 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java Mon May 12
23:14:24 2003
@@ -21,7 +21,7 @@
/** Hang transclusion buoys.
*/
public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.8
2003/05/03 13:35:14 benja Exp $";
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.9
2003/05/13 03:14:24 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("TransclusionConnector:: "+s); }
@@ -119,7 +119,8 @@
for(Iterator nodes =
fen.enfiladeOverlap.getMatches(tmpEnf).iterator(); nodes.hasNext(); ) {
Object node = nodes.next();
if(dbg) pa("TRC: overlap "+node);
- Object plane = fen.constgraph.find1_X11(PAPER.contains,
node);
+ Object plane = fen.constgraph.find1_X11(
+ CANVAS2D.contains, node);
if(plane == null) {
if(dbg) pa("No plane!");
continue;
@@ -139,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, SPATIAL.coordX);
- int y = RDFUtil.getInt(fen, node, SPATIAL.coordY);
+ int x = RDFUtil.getInt(fen, node, CANVAS2D.x);
+ int y = RDFUtil.getInt(fen, 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.5
fenfire/org/fenfire/view/papercanvas2d.test:1.6
--- fenfire/org/fenfire/view/papercanvas2d.test:1.5 Mon May 12 11:15:05 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Mon May 12 23:14:24 2003
@@ -5,7 +5,7 @@
from org.nongnu import alph
from org.nongnu import storm
-from org.fenfire.vocab import SPATIAL, PAPER, PP
+from org.fenfire.vocab import CANVAS2D
ff.test.gfx.needGL()
@@ -30,21 +30,21 @@
fen = ff.test.fen.newFen()
con = ff.util.AlphContent(fen)
- nodec = ff.util.RDFUtil.N(fen, PP.Paper)
+ nodec = ff.util.RDFUtil.N(fen, CANVAS2D.Canvas)
node1 = ff.swamp.Nodes.N()
node2 = ff.swamp.Nodes.N()
- fen.graph.add(nodec, PAPER.contains, node1)
- fen.graph.add(nodec, PAPER.contains, node2)
+ fen.graph.add(nodec, CANVAS2D.contains, node1)
+ fen.graph.add(nodec, CANVAS2D.contains, node2)
con.setText(node1, "XXX", 0)
con.setText(node2, "YYY", 0)
- ff.util.RDFUtil.setInt(fen, node1, SPATIAL.coordX, 200)
- ff.util.RDFUtil.setInt(fen, node1, SPATIAL.coordY, 100)
+ ff.util.RDFUtil.setInt(fen, node1, CANVAS2D.x, 200)
+ ff.util.RDFUtil.setInt(fen, node1, CANVAS2D.y, 100)
- ff.util.RDFUtil.setInt(fen, node2, SPATIAL.coordX, 200)
- ff.util.RDFUtil.setInt(fen, node2, SPATIAL.coordY, 500)
+ ff.util.RDFUtil.setInt(fen, node2, CANVAS2D.x, 200)
+ ff.util.RDFUtil.setInt(fen, node2, CANVAS2D.y, 500)
# Create the view structure
Index: fenfire/org/fenfire/vocab/lava/RST.java
diff -u fenfire/org/fenfire/vocab/lava/RST.java:1.1
fenfire/org/fenfire/vocab/lava/RST.java:1.2
--- fenfire/org/fenfire/vocab/lava/RST.java:1.1 Mon May 12 14:27:16 2003
+++ fenfire/org/fenfire/vocab/lava/RST.java Mon May 12 23:14:24 2003
@@ -1,12 +1,12 @@
//(c): Matti J. Katila
-package org.fenfire.vocab;
+package org.fenfire.vocab.lava;
import org.fenfire.swamp.*;
/** Vocabulary for RST text like canvas */
public class RST {
-public static final String rcsid = "$Id: RST.java,v 1.1 2003/05/12 18:27:16
tjl Exp $";
+public static final String rcsid = "$Id: RST.java,v 1.2 2003/05/13 03:14:24
tjl Exp $";
protected static void pa(String s) { System.out.println("RST: "+s); }
// Propertys
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire index/impl/SpaceXuIndexer.j...,
Tuomas J. Lukka <=