[Gzz-commits] fenfire/org/fenfire impl/SimpleNodeContent.java...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/15 23:53:08

Modified files:
        org/fenfire/impl: SimpleNodeContent.java 
        org/fenfire/modules/pp: PPActionsImpl.java 
        org/fenfire/util: AlphContent.java 

Log message:
        Debug... it seems to be creating new notes and forgetting the old\?\!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/SimpleNodeContent.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/AlphContent.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/impl/SimpleNodeContent.java
diff -u fenfire/org/fenfire/impl/SimpleNodeContent.java:1.4 
fenfire/org/fenfire/impl/SimpleNodeContent.java:1.5
--- fenfire/org/fenfire/impl/SimpleNodeContent.java:1.4 Tue Apr 15 23:29:22 2003
+++ fenfire/org/fenfire/impl/SimpleNodeContent.java     Tue Apr 15 23:53:08 2003
@@ -20,7 +20,7 @@
 
 public class SimpleNodeContent implements NodeContent {
     public static boolean dbg = true;
-public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.4 
2003/04/16 03:29:22 tjl Exp $";
+public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.5 
2003/04/16 03:53:08 tjl Exp $";
     private static void pa(String s) { System.out.println("AlphContent: "+s); }
     SpanReader spanReader = new SpanReader();
 
@@ -72,6 +72,7 @@
     }
     public Literal literalFromEnfilade(org.nongnu.alph.Enfilade1D enf) {
        String ser = SpanSerializer.serialize(enf);
+       if(dbg) pa("LiteralFromEnfilade: "+ser);
        return Nodes.getRawXMLLiteral(ser);
     }
 
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.17 
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.18
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.17      Tue Apr 15 
15:10:09 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java   Tue Apr 15 23:53:08 2003
@@ -12,8 +12,8 @@
 /** The implementation of PPActions.
  */
 public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.17 2003/04/15 
19:10:09 tjl Exp $";
-    public static final boolean dbg = false;
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.18 2003/04/16 
03:53:08 tjl 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("PPActionsImpl: 
"+s); }
 
@@ -49,6 +49,7 @@
 
     public void deletePaper(String paperURI) throws RemoteException 
     { synchronized(fen) {
+       if(dbg) pa("DeletePaper [NOT IMPLEMENTED]: "+paperURI);
        /*
        // must delete all notes first
        Cell paper = space.getCell(paperId).h(d.contains, -1);
@@ -71,6 +72,7 @@
     public String newNote(String paperURI, int x, int y, String text)  
        throws RemoteException 
     { synchronized(fen) {
+       if(dbg) pa("New note: "+paperURI+" "+x+" "+y+" "+text);
 
        // find the paper
        Object paper = Nodes.get(paperURI);
@@ -105,6 +107,7 @@
     public void deleteNote(String noteURI)
                    throws RemoteException 
     { synchronized(fen) {
+       if(dbg) pa("Delete note [NOT IMPLEMENTED]: "+noteURI);
        /*
        // MUST DELETE ALL ASSOCS FIRST
 
@@ -145,7 +148,7 @@
     public void moveNote(String noteURI, int x, int y)
        throws RemoteException 
     { synchronized(fen) {
-
+       if(dbg) pa("Move note: "+noteURI+" "+x+" "+y);
        Object note = Nodes.get(noteURI);
        if (note == null) return;
 
@@ -162,6 +165,7 @@
     public void assocNotes(String noteURI, int side, String assocURI)
        throws RemoteException 
     { synchronized(fen) {
+       if(dbg) pa("Assoc notes: "+noteURI+" "+side+" "+assocURI);
        Object note = Nodes.get(noteURI);
        Object assoc = Nodes.get(assocURI);
 
@@ -194,6 +198,7 @@
     public void detachNotes(String id1, int side, String id2)
        throws RemoteException 
     { synchronized(fen) { 
+       if(dbg) pa("Detach notes: "+id1+" "+side+" "+id2);
 
            /*
        Cell c1 = space.getCell(id1).h(d.clone);
@@ -223,8 +228,9 @@
     public void insertText(String noteURI, int offs, String text)
        throws RemoteException 
     { synchronized(fen) { 
-           alphContent.insertText(
-                   Nodes.get(noteURI), offs, text, true
+       if(dbg) pa("Insert text: "+noteURI+" "+offs+" "+text);
+       alphContent.insertText(
+               Nodes.get(noteURI), offs, text, true
                    );
     }}
 
@@ -232,7 +238,8 @@
     public void deleteText(String noteURI, int begin, int end)
        throws RemoteException 
     { synchronized(fen) { 
-           alphContent.deleteText(
-                   Nodes.get(noteURI), begin, end);
+       if(dbg) pa("Delete text: "+noteURI+" "+begin+" "+end);
+       alphContent.deleteText(
+               Nodes.get(noteURI), begin, end);
     }}
 }
Index: fenfire/org/fenfire/util/AlphContent.java
diff -u fenfire/org/fenfire/util/AlphContent.java:1.7 
fenfire/org/fenfire/util/AlphContent.java:1.8
--- fenfire/org/fenfire/util/AlphContent.java:1.7       Tue Apr 15 23:29:22 2003
+++ fenfire/org/fenfire/util/AlphContent.java   Tue Apr 15 23:53:08 2003
@@ -13,7 +13,8 @@
 /** Help class to work with Alph
  */
 public class AlphContent {
-public static final String rcsid = "$Id: AlphContent.java,v 1.7 2003/04/16 
03:29:22 tjl Exp $";
+    public static boolean dbg = true;
+public static final String rcsid = "$Id: AlphContent.java,v 1.8 2003/04/16 
03:53:08 tjl Exp $";
     private static void pa(String s) { System.out.println("AlphContent: "+s); }