[Gzz-commits] fenfire/org/fenfire modules/pp/Pp.java view/Spa...

[Matti Katila]

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

Modified files:
        org/fenfire/modules/pp: Pp.java 
        org/fenfire/view: SpatialPlane.java 

Log message:
        fix spatial plane

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.17 
fenfire/org/fenfire/modules/pp/Pp.java:1.18
--- fenfire/org/fenfire/modules/pp/Pp.java:1.17 Wed Apr 16 01:36:12 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Wed Apr 16 01:45:53 2003
@@ -27,7 +27,7 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.17 2003/04/16 05:36:12 
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.18 2003/04/16 05:45:53 
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); }
@@ -69,6 +69,7 @@
        String n2 = ppAct.newNote(paper, 20,-100, "Foobar");
        String n3 = ppAct.newNote(paper, -30,60, "BarFooo  ugh");
        String n4 = ppAct.newNote(paper, 40,80, "**SIGH**");
+       Object acc = n1;
 
        paper = ppAct.newPaper();
        String note = ppAct.newNote(paper, -50,0, "A test note");
@@ -84,7 +85,7 @@
        ppAct.assocNotes(n4, -1, note);
 
 
-       accursed = Nodes.get(paper);
+       accursed = Nodes.get(Nodes.toString(acc));
 
 
        Screen scr = new Screen(api.createWindow(), binder, shower);
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.16 
fenfire/org/fenfire/view/SpatialPlane.java:1.17
--- fenfire/org/fenfire/view/SpatialPlane.java:1.16     Wed Apr 16 01:36:12 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Wed Apr 16 01:45:53 2003
@@ -25,8 +25,9 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.16 2003/04/16 
05:36:12 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.17 2003/04/16 
05:45:53 mudyc Exp $";
     public static boolean dbg = true;
+    private static void p(String s) { pa(s); }
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
 
     
@@ -56,9 +57,11 @@
        Object container = current;
 
        if (RDFUtil.isNodeType(fen, current, cType)) {
-           container = fen.constgraph.find1_11X(current, cont);
+           container = fen.constgraph.find1_X11(cont, current);
        }
 
+       
+
        // get zoom geometry etc.
        float[] size = new float[2];
        vs.coords.getSqSize(into, size);
@@ -93,7 +96,6 @@
            nodeview.place(n, vs, box);
            
            if (hook != null) hook.placed(n, vs, box);
-           else throw new Error("null hook!");
 
            // XXX?
            //vs.activate(box);
@@ -134,7 +136,7 @@
        Object container = current;
 
        if (RDFUtil.isNodeType(fen, current, cType)) {
-           container = fen.constgraph.find1_11X(current, cont);
+           container = fen.constgraph.find1_X11(cont, current);
        }