[Gzz-commits] fenfire/org/fenfire modules/pp/PPActionsImpl.ja...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/15 14:09:18

Modified files:
        org/fenfire/modules/pp: PPActionsImpl.java PPCanvasCursor.java 
                                PPCanvasNode.java Pp.java 
        org/fenfire/util: RDFUtil.java 
        org/fenfire/view/buoy: BuoyAdaptor.java 

Log message:
        starts to be in order I hope.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.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/PPCanvasCursor.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/BuoyAdaptor.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.15 
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.16
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.15      Tue Apr 15 
13:41:57 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java   Tue Apr 15 14:09:18 2003
@@ -12,10 +12,10 @@
 /** The implementation of PPActions.
  */
 public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.15 2003/04/15 
17:41:57 mudyc Exp $";
-    public static final boolean dbg = true;
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.16 2003/04/15 
18:09:18 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(s); }
+    protected static void pa(String s) { System.out.println("PPActionsImpl: 
"+s); }
 
     private Fen fen = null;
     public void setSwamp(Fen fen) { this.fen = fen; }
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.14 
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.15
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.14     Tue Apr 15 
10:43:42 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java  Tue Apr 15 14:09:18 2003
@@ -24,8 +24,9 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.14 
2003/04/15 14:43:42 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.15 
2003/04/15 18:09:18 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); }
 
     // Geometry
@@ -142,9 +143,10 @@
 
     private int c2fCS = -1;
     public void renderMain(VobScene vs, int into) {
+       p("con: "+ context);
        Object node = context.getAccursed();
        Object paper = node;
-       if (RDFUtil.isNodeType(fen, node, PP.Paper)) {
+       if (RDFUtil.isNodeType(fen, node, PP.Note)) {
            paper = fen.constgraph.find1_X11(node, PP.contains);
 
            // draw "cursor"
@@ -159,7 +161,7 @@
                                       size[0]/10,
                                       size[1]/10);
            //vs.put(new LineVob(0,0,0,1, java.awt.Color.white), cursor);
-           pa("Cursor");
+           p("Cursor");
        }
        
        if (GraphicsAPI.getInstance() instanceof GLAPI) {
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.14 
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.15
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.14       Tue Apr 15 
13:41:57 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java    Tue Apr 15 14:09:18 2003
@@ -17,7 +17,7 @@
 
 
 public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.14 2003/04/15 
17:41:57 mudyc Exp $";  
+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 void pa(String s) { System.out.println("PPCanvasNode::"+s); 
}
 
@@ -45,7 +45,6 @@
      */
     public boolean ownsNode(Object node) 
     {
-       pa("foo: "+node);
        // check if node is a note
        if (RDFUtil.isNodeType(fen, node, PP.Note)) return true;
        
@@ -110,7 +109,7 @@
            int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1, 
pan[0], pan[1]);  
 
            Object paper = node;
-           if (RDFUtil.isNodeType(fen, node, PP.Paper)) {
+           if (RDFUtil.isNodeType(fen, node, PP.Note)) {
                paper = fen.constgraph.find1_X11(node, PP.contains);
            }
            
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.14 
fenfire/org/fenfire/modules/pp/Pp.java:1.15
--- fenfire/org/fenfire/modules/pp/Pp.java:1.14 Tue Apr 15 13:27:26 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Tue Apr 15 14:09:18 2003
@@ -27,7 +27,7 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.14 2003/04/15 17:27:26 
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.15 2003/04/15 18:09:18 
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); }
@@ -49,8 +49,7 @@
 
     public Pp() throws RemoteException {
        fen = new Fen();
-       fen.constgraph = new HashGraph();
-       fen.graph = new HashGraph();
+       fen.constgraph = fen.graph = new HashGraph();
        //fen.enfiladeOverlap = new XXX
        fen.txt = new SimpleNodeContent(fen);
 
Index: fenfire/org/fenfire/util/RDFUtil.java
diff -u fenfire/org/fenfire/util/RDFUtil.java:1.5 
fenfire/org/fenfire/util/RDFUtil.java:1.6
--- fenfire/org/fenfire/util/RDFUtil.java:1.5   Tue Apr 15 13:53:33 2003
+++ fenfire/org/fenfire/util/RDFUtil.java       Tue Apr 15 14:09:18 2003
@@ -7,7 +7,8 @@
 import java.util.Iterator;
 
 public class RDFUtil {
-    public static boolean dbg = true;
+    public static boolean dbg = false;
+    static private void p(String s) { if (dbg) pa(s); }
     static private void pa(String s) { System.out.println("RDFUtil: "+s); }
 
     /** Create a new resource with given type.
@@ -16,8 +17,8 @@
        Object obj = Nodes.N();
        fen.graph.set1_11X(obj, RDF.type, type);
 
-       if(dbg) pa("N: "+fen+" "+fen.graph+" "+fen.constgraph+
-                   " "+obj+" "+type);
+       p("N: "+fen+" "+fen.graph+" "+fen.constgraph+
+         " "+obj+" "+type);
 
        if (!isNodeType(fen, obj, type)) throw new Error("Impossible!");
 
@@ -28,14 +29,14 @@
     /** Check if node is the type which is asked.
      */
     static public boolean isNodeType(Fen fen, Object node, Object type) {
-       if(dbg) pa("Isnodetype: "+node+" "+type);
+       p("Isnodetype: "+node+" "+type);
        Iterator it = fen.constgraph.findN_11X_Iter(node, RDF.type);
        while(it.hasNext()) {
            Object obj = it.next();
-           pa(" entry: "+ obj);
+           p(" entry: "+ obj);
            if ( obj.equals(type) ) return true;
        }
-       pa("None matched");
+       p("None matched");
        return false;
     }
 
Index: fenfire/org/fenfire/view/buoy/BuoyAdaptor.java
diff -u fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.5 
fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.6
--- fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.5  Tue Apr 15 13:27:26 2003
+++ fenfire/org/fenfire/view/buoy/BuoyAdaptor.java      Tue Apr 15 14:09:18 2003
@@ -55,7 +55,6 @@
      */
     private NodeBuoyViewNodeType getNode(Object node) {
        for(int i=0; i<nodes.length; i++) {
-           pa("ba");
            if(nodes[i].ownsNode(node)) {
                return nodes[i];
            }