[Gzz-commits] fenfire docs/SwampTutorial.rst org/fenfire/modu...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/16 01:36:12

Modified files:
        docs           : SwampTutorial.rst 
        org/fenfire/modules/pp: PPActionsImpl.java PPCanvasCursor.java 
                                PPCanvasNode.java Pp.java 
        org/fenfire/util: RDFUtil.java 
        org/fenfire/view: SpatialPlane.java 
        org/fenfire/view/buoy: PPLinker.java 

Log message:
        fix pplinker, and more

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/SwampTutorial.rst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPLinker.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/docs/SwampTutorial.rst
diff -u fenfire/docs/SwampTutorial.rst:1.1 fenfire/docs/SwampTutorial.rst:1.2
--- fenfire/docs/SwampTutorial.rst:1.1  Tue Apr 15 10:15:12 2003
+++ fenfire/docs/SwampTutorial.rst      Wed Apr 16 01:36:12 2003
@@ -3,8 +3,31 @@
 2003-04-15T15:53:31Z
 
 
-Literal
--------
+How to set up Fen with swamps?
+------------------------------
+
+For example: ::
+
+    fen = new Fen();
+    fen.constgraph = fen.graph = new HashGraph();
+    fen.txt = new SimpleNodeContent(fen);
+
+
+Adding triplet in the Swamp?
+----------------------------
+
+Adding triplet is easy, just: ::
+
+    fen.graph.add(sub, pred, obj)
+
+If you want to add attribute (remove all other 
+possibilities) you can use set1_11X instead: ::
+
+    fen.graph.set1_11X(sub, pred, obj)
+
+
+Literals
+--------
 
 ::
 
@@ -19,12 +42,14 @@
 New node
 --------
 
-Nodes.N()  if URN-5 Namespace
-also N(Namespace..)
+Use shortcut method Nodes.N()  ::
+
+    Nodes.N()  if URN-5 Namespace
+    also N(Namespace..)
 
-or
+or ::
 
-Nodes.get(uri)
+    Nodes.get(uri)
 
 
 How to make a triplet?
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.21 
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.22
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.21      Wed Apr 16 
00:04:30 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java   Wed Apr 16 01:36:12 2003
@@ -10,10 +10,13 @@
 import java.rmi.server.*;
 import java.util.Iterator;
 
+import org.nongnu.alph.impl.*;
+import org.fenfire.impl.*;
+
 /** The implementation of PPActions.
  */
 public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.21 2003/04/16 
04:04:30 tjl Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.22 2003/04/16 
05:36:12 mudyc Exp $";
     public static final boolean dbg = false;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println("PPActionsImpl: 
"+s); }
@@ -44,7 +47,7 @@
        // XXX we need iso 8601 time presentation here
        Literal time = Nodes.getStringLiteral("123");
        fen.graph.set1_11X(paper, PP.creationTime, time);
-       return paper.toString();
+       return Nodes.toString(paper);
     }}
 
 
@@ -79,6 +82,7 @@
        Object paper = Nodes.get(paperURI);
        //fen.constgraph.find1_X11(RDF.type, PP.Paper);
        //   Resource paper = space.getModel().getResource(paperURI);
+       
        if (paper == null) {
            pa("Paper is NULL!!");
            return "";
@@ -86,6 +90,7 @@
        
        // 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( 
));
 
        if(dbg) {
            pa("Before:");
@@ -117,7 +122,7 @@
        alphContent.setText(note, text, true);
 
        // scale etc..  XXX
-       return note.toString();
+       return Nodes.toString(note);
     }}
 
 
@@ -199,7 +204,7 @@
            }
 
            // assoc
-           fen.graph.set1_11X(assoc, PP.association, note);
+           fen.graph.add(assoc, PP.association, note);
        } else {
            // check if already associated
            if (fen.constgraph.contains(note, PP.association, assoc)) {
@@ -208,7 +213,7 @@
            }
 
            // assoc
-           fen.graph.set1_11X(note, PP.association, assoc);
+           fen.graph.add(note, PP.association, assoc);
        }
     }}
 
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.15 
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.16
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.15     Tue Apr 15 
14:09:18 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java  Wed Apr 16 01:36:12 2003
@@ -24,7 +24,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.15 
2003/04/15 18:09:18 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.16 
2003/04/16 05:36:12 mudyc Exp $";  
     public static boolean dbg = false;
     private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { 
System.out.println("PPCanvasCursor::"+s); }
@@ -147,7 +147,7 @@
        Object node = context.getAccursed();
        Object paper = node;
        if (RDFUtil.isNodeType(fen, node, PP.Note)) {
-           paper = fen.constgraph.find1_X11(node, PP.contains);
+           paper = fen.constgraph.find1_X11(PP.contains, node);
 
            // draw "cursor"
            float[] size = new float[2];
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.15 
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.16
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.15       Tue Apr 15 
14:09:18 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java    Wed Apr 16 01:36:12 2003
@@ -17,8 +17,9 @@
 
 
 public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.15 2003/04/15 
18:09:18 mudyc Exp $";  
-    public static boolean dbg = false;
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.16 2003/04/16 
05:36:12 mudyc Exp $";  
+    public static boolean dbg = true;
+    private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("PPCanvasNode::"+s); 
}
 
     private Fen fen;
@@ -110,9 +111,11 @@
 
            Object paper = node;
            if (RDFUtil.isNodeType(fen, node, PP.Note)) {
-               paper = fen.constgraph.find1_X11(node, PP.contains);
+               paper = fen.constgraph.find1_X11(PP.contains, node);
            }
-           
+
+           p("vs:"+vs+" paper:"+paper+" into:"+into+" geometry:"+geometry);
+
            vs.map.put(new UniquePaperVob(paper.toString()), into, geometry);
            (new SpatialPlane(PP.Note, PP.contains)).renderAWT(vs, into, 
geometry,
                                                                   node, 
nodeview, fen, null);
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.16 
fenfire/org/fenfire/modules/pp/Pp.java:1.17
--- fenfire/org/fenfire/modules/pp/Pp.java:1.16 Tue Apr 15 23:35:37 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Wed Apr 16 01:36:12 2003
@@ -27,7 +27,7 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.16 2003/04/16 03:35:37 
tjl Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.17 2003/04/16 05:36:12 
mudyc Exp $";
     public static final boolean dbg = true;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -227,6 +227,7 @@
 
     public void link(int dir, int anchorCS, BuoyViewNodeType otherNode, 
                     Object linkId, Object otherAnchor) {
+       pa("link!");
 
        OrthoCoorder c = (OrthoCoorder)curVs.coords;
        int anchorUnit = curVs.unitSqCS(anchorCS, "UN");
Index: fenfire/org/fenfire/util/RDFUtil.java
diff -u fenfire/org/fenfire/util/RDFUtil.java:1.6 
fenfire/org/fenfire/util/RDFUtil.java:1.7
--- fenfire/org/fenfire/util/RDFUtil.java:1.6   Tue Apr 15 14:09:18 2003
+++ fenfire/org/fenfire/util/RDFUtil.java       Wed Apr 16 01:36:12 2003
@@ -15,7 +15,7 @@
      */
     static public Object N(Fen fen, Object type) {
        Object obj = Nodes.N();
-       fen.graph.set1_11X(obj, RDF.type, type);
+       fen.graph.add(obj, RDF.type, type);
 
        p("N: "+fen+" "+fen.graph+" "+fen.constgraph+
          " "+obj+" "+type);
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.15 
fenfire/org/fenfire/view/SpatialPlane.java:1.16
--- fenfire/org/fenfire/view/SpatialPlane.java:1.15     Tue Apr 15 23:59:26 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Wed Apr 16 01:36:12 2003
@@ -25,7 +25,7 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.15 2003/04/16 
03:59:26 tjl Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.16 2003/04/16 
05:36:12 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
 
@@ -93,6 +93,7 @@
            nodeview.place(n, vs, box);
            
            if (hook != null) hook.placed(n, vs, box);
+           else throw new Error("null hook!");
 
            // XXX?
            //vs.activate(box);
Index: fenfire/org/fenfire/view/buoy/PPLinker.java
diff -u fenfire/org/fenfire/view/buoy/PPLinker.java:1.4 
fenfire/org/fenfire/view/buoy/PPLinker.java:1.5
--- fenfire/org/fenfire/view/buoy/PPLinker.java:1.4     Tue Apr 15 08:14:59 2003
+++ fenfire/org/fenfire/view/buoy/PPLinker.java Wed Apr 16 01:36:12 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.4 2003/04/15 
12:14:59 mudyc Exp $";
+public static final String rcsid = "$Id: PPLinker.java,v 1.5 2003/04/16 
05:36:12 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPLinker:"+s); }
 
@@ -29,6 +29,8 @@
     {
        if (node == null) 
            throw new Error("PPLinker error: node is null!");
+
+       if (dbg) pa("node:"+node);
        
        /* check all associations */
 
@@ -40,7 +42,7 @@
        }
 
        // Left links!
-       iter = fen.constgraph.findN_X11_Iter(node, PP.association);
+       iter = fen.constgraph.findN_X11_Iter(PP.association, node);
        while (iter.hasNext()) {
            Object sub = iter.next();
            l.link(-1,cs,nodeType, new Pair(sub, node), sub);