[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/modules/pp PPActionsImpl.ja...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire/modules/pp PPActionsImpl.ja... |
Date: |
Mon, 12 May 2003 22:59:16 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/05/12 22:59:16
Modified files:
org/fenfire/modules/pp: PPActionsImpl.java RSTActionsImpl.java
Log message:
Start fixing refs to vocab
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/RSTActionsImpl.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.24
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.25
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.24 Thu May 1
20:22:40 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java Mon May 12 22:59:16 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.24 2003/05/02
00:22:40 mudyc Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.25 2003/05/13
02:59:16 tjl Exp $";
public static final boolean dbg = false;
protected static void pa(String s) { System.out.println("PPActionsImpl:
"+s); }
@@ -39,13 +39,13 @@
public String newPaper() throws RemoteException
{ synchronized(fen) {
if(dbg) pa("make a new paper");
- Object paper = RDFUtil.N(fen, PP.Paper);
+ Object paper = RDFUtil.N(fen, CANVAS2D.Canvas);
if(dbg) pa("new paper done.");
// set creation time
// XXX we need iso 8601 time presentation here
- Literal time = Nodes.getStringLiteral("123");
- fen.graph.set1_11X(paper, PP.creationTime, time);
+ // Literal time = Nodes.getStringLiteral("123");
+ // fen.graph.set1_11X(paper, PP.creationTime, time);
return Nodes.toString(paper);
}}
@@ -88,34 +88,32 @@
}
// note doesn't exist so we need to make one
- Object note = RDFUtil.N(fen, PP.Note);
- //fen.txt.set(note, ((SimpleNodeContent)fen.txt).enfMaker.makeEnfilade(
));
+ Object note = Nodes.N();
if(dbg) {
pa("Before:");
- Iterator iter = fen.constgraph.findN_11X_Iter(paper,
PAPER.contains);
+ Iterator iter = fen.constgraph.findN_11X_Iter(paper,
+ CANVAS2D.contains);
while (iter.hasNext()) {
pa(" "+iter.next());
}
}
// and join note to paper
- fen.graph.add(paper, PAPER.contains, note);
+ fen.graph.add(paper, CANVAS2D.contains, note);
if(dbg) {
pa("After:");
- Iterator iter = fen.constgraph.findN_11X_Iter(paper,
PAPER.contains);
+ Iterator iter = fen.constgraph.findN_11X_Iter(paper,
+ CANVAS2D.contains);
while (iter.hasNext()) {
pa(" "+iter.next());
}
}
// set coords
- fen.graph.set1_11X(note, SPATIAL.coordX, Nodes.getStringLiteral(""+x) );
- fen.graph.set1_11X(note, SPATIAL.coordY, Nodes.getStringLiteral(""+y) );
-
- // set depth...
- fen.graph.set1_11X(note, PP.depth, Nodes.getStringLiteral("10") );
+ fen.graph.set1_11X(note, CANVAS2D.x, Nodes.getStringLiteral(""+x) );
+ fen.graph.set1_11X(note, CANVAS2D.y, Nodes.getStringLiteral(""+y) );
// Set text
alphContent.setText(note, text, true);
@@ -174,12 +172,12 @@
if (note == null) return;
// delete all old coords
- fen.graph.rm_11A(note, SPATIAL.coordX);
- fen.graph.rm_11A(note, SPATIAL.coordY);
+ fen.graph.rm_11A(note, CANVAS2D.x);
+ fen.graph.rm_11A(note, CANVAS2D.y);
// set coords
- fen.graph.set1_11X(note, SPATIAL.coordX, Nodes.getStringLiteral(""+x) );
- fen.graph.set1_11X(note, SPATIAL.coordY, Nodes.getStringLiteral(""+y) );
+ fen.graph.set1_11X(note, CANVAS2D.x, Nodes.getStringLiteral(""+x) );
+ fen.graph.set1_11X(note, CANVAS2D.y, Nodes.getStringLiteral(""+y) );
}}
@@ -197,22 +195,23 @@
if (side < 0) {
// check if already associated
- if (fen.constgraph.contains(assoc, PP.association, note)) {
+ if (fen.constgraph.contains(assoc,
+ STRUCTLINK.linkedTo, note)) {
pa("Already associated!");
return;
}
// assoc
- fen.graph.add(assoc, PP.association, note);
+ fen.graph.add(assoc, STRUCTLINK.linkedTo, note);
} else {
// check if already associated
- if (fen.constgraph.contains(note, PP.association, assoc)) {
+ if (fen.constgraph.contains(note, STRUCTLINK.linkedTo, assoc)) {
pa("Already associated!");
return;
}
// assoc
- fen.graph.add(note, PP.association, assoc);
+ fen.graph.add(note, STRUCTLINK.linkedTo, assoc);
}
}}
Index: fenfire/org/fenfire/modules/pp/RSTActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/RSTActionsImpl.java:1.4
fenfire/org/fenfire/modules/pp/RSTActionsImpl.java:1.5
--- fenfire/org/fenfire/modules/pp/RSTActionsImpl.java:1.4 Wed May 7
00:08:04 2003
+++ fenfire/org/fenfire/modules/pp/RSTActionsImpl.java Mon May 12 22:59:16 2003
@@ -16,7 +16,7 @@
/** The implementation of RSTActions.
*/
public class RSTActionsImpl extends UnicastRemoteObject implements RSTActions {
-public static final String rcsid = "$Id: RSTActionsImpl.java,v 1.4 2003/05/07
04:08:04 mudyc Exp $";
+public static final String rcsid = "$Id: RSTActionsImpl.java,v 1.5 2003/05/13
02:59:16 tjl Exp $";
public static final boolean dbg = false;
protected static void p(String s) { System.out.println("RSTActionsImpl:
"+s); }
@@ -43,7 +43,7 @@
{ synchronized(fen) {
if(dbg) p("make a new rst canvas");
Object canvas = RDFUtil.N(fen, RST.Canvas);
- fen.graph.add(canvas, RDF.type, PAPER.Canvas);
+ fen.graph.add(canvas, RDF.type, CANVAS2D.Canvas);
return canvas;
}}
@@ -58,8 +58,8 @@
fen.graph.set1_11X(parag, RST.width, Nodes.getStringLiteral(""+width) );
// set coords
- fen.graph.set1_11X(parag, SPATIAL.coordX, Nodes.getStringLiteral(""+x)
);
- fen.graph.set1_11X(parag, SPATIAL.coordY, Nodes.getStringLiteral(""+y)
);
+ fen.graph.set1_11X(parag, CANVAS2D.x, Nodes.getStringLiteral(""+x) );
+ fen.graph.set1_11X(parag, CANVAS2D.y, Nodes.getStringLiteral(""+y) );
fen.graph.add(canvas, RST.beginParagraph, parag);
return parag;
}}
@@ -156,7 +156,7 @@
Object canvas = util.getCanvas(
util.getParagraph(util.getSentence(node))
);
- fen.graph.add(canvas, PAPER.contains, node);
+ fen.graph.add(canvas, CANVAS2D.contains, node);
}}
public void deleteNode(Object sentence, Object node)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire/modules/pp PPActionsImpl.ja...,
Tuomas J. Lukka <=