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

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/05/23 18:07:58

Modified files:
        org/fenfire/modules/pp: PPActionsImpl.java 
        org/fenfire/swamp/impl: hashgraph.test 
        org/fenfire/view/lava: FenPDFContext.java 

Log message:
        unetus maximus

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/hashgraph.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FenPDFContext.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.28 
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.29
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.28      Fri May 23 
10:26:07 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java   Fri May 23 18:07:57 2003
@@ -16,20 +16,20 @@
 /** The implementation of PPActions.
  */
 public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.28 2003/05/23 
14:26:07 mudyc Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.29 2003/05/23 
22:07:57 mudyc Exp $";
     public static boolean dbg = false;
     protected static void p(String s) { System.out.println("PPActionsImpl: 
"+s); }
 
     private Fen fen = null;
     private AlphContent alphContent;
-    public void setSwamp(Fen fen) { 
+    public void setFen(Fen fen) { 
        this.fen = fen; 
        this.alphContent = new AlphContent(fen);
     }
 
     public PPActionsImpl(Fen fen)  throws RemoteException {
        super();
-       setSwamp(fen);
+       setFen(fen);
     }
 
 
Index: fenfire/org/fenfire/swamp/impl/hashgraph.test
diff -u fenfire/org/fenfire/swamp/impl/hashgraph.test:1.2 
fenfire/org/fenfire/swamp/impl/hashgraph.test:1.3
--- fenfire/org/fenfire/swamp/impl/hashgraph.test:1.2   Sat Apr 12 06:39:12 2003
+++ fenfire/org/fenfire/swamp/impl/hashgraph.test       Fri May 23 18:07:58 2003
@@ -1,3 +1,4 @@
+#-*-python-*-
 from org.fenfire import swamp
 
 from org.fenfire.swamp.graphtest import *
@@ -8,3 +9,10 @@
     g = swamp.impl.HashGraph()
     setUpGraphtest(g)
     setUpObservableGraphTest(g)
+
+def testWierd():
+    g = swamp.impl.HashGraph()
+    node = 'test.est'
+    g.rm_1AA(node)
+    g.rm_1AA(node)
+    
Index: fenfire/org/fenfire/view/lava/FenPDFContext.java
diff -u fenfire/org/fenfire/view/lava/FenPDFContext.java:1.22 
fenfire/org/fenfire/view/lava/FenPDFContext.java:1.23
--- fenfire/org/fenfire/view/lava/FenPDFContext.java:1.22       Fri May 23 
17:17:43 2003
+++ fenfire/org/fenfire/view/lava/FenPDFContext.java    Fri May 23 18:07:58 2003
@@ -230,8 +230,11 @@
                return new MainNode2D(Nodes.get(paper), ppView, 0,0,1);
            }
            else if (key.equals("SAVE")) {
+               p("going to save");
                 fen.graph.rm_1AA(SAVE.State);
+               p("rm all worked out");
                 for (int i=0; i<accursed.length; i++) {
+                   if (accursed[i] == null) continue;
                     fen.graph.add(SAVE.State, SAVE.point, accursed[i]);
                 }
                Model m = Graphs.toModel(fen.graph);
@@ -239,7 +242,9 @@
                return null;
            } 
            else if (key.equals("LOAD")) {
-                //ppAct.setFen(fen);
+               Model m = new ModelMem();
+               m.read(new FileReader("mygraph.rdf"), "");
+               fen.constgraph = fen.graph = Graphs.toGraph(m);
                 int i = 0;
                 Iterator it = fen.graph.findN_11X_Iter(SAVE.State, SAVE.point);
                 while (it.hasNext() && i<accursed.length) {