[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 13:41:57

Modified files:
        org/fenfire/modules/pp: PPActionsImpl.java PPCanvasNode.java 
        org/fenfire/util: RDFUtil.java RDFUtil.test 

Log message:
        outoa

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.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.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.14 
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.15
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.14      Tue Apr 15 
10:15:12 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java   Tue Apr 15 13:41:57 2003
@@ -12,7 +12,7 @@
 /** The implementation of PPActions.
  */
 public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.14 2003/04/15 
14:15:12 mudyc Exp $";
+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;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println(s); }
@@ -31,7 +31,9 @@
     //
     public String newPaper() throws RemoteException 
     { synchronized(fen) {
+       p("make a new paper");
        Object paper = RDFUtil.N(fen, PP.Paper);
+       p("new paper done.");
 
        // set creation time
        // XXX we need iso 8601 time presentation here
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.13 
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.14
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.13       Tue Apr 15 
13:27:26 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java    Tue Apr 15 13:41:57 2003
@@ -3,7 +3,6 @@
 package org.fenfire.modules.pp;
 import org.fenfire.*;
 import org.fenfire.impl.*;
-//import org.fenfire.vocab.*;
 import org.fenfire.vocab.*;
 import org.fenfire.util.*;
 import org.fenfire.view.*;
@@ -16,12 +15,9 @@
 import org.nongnu.alph.*;
 import org.nongnu.alph.impl.*;
 
-import com.hp.hpl.mesa.rdf.jena.model.*;
-import com.hp.hpl.mesa.rdf.jena.common.*;
-import com.hp.hpl.mesa.rdf.jena.vocabulary.*;
 
 public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.13 2003/04/15 
17:27:26 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.14 2003/04/15 
17:41:57 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode::"+s); 
}
 
Index: fenfire/org/fenfire/util/RDFUtil.java
diff -u fenfire/org/fenfire/util/RDFUtil.java:1.3 
fenfire/org/fenfire/util/RDFUtil.java:1.4
--- fenfire/org/fenfire/util/RDFUtil.java:1.3   Tue Apr 15 13:27:26 2003
+++ fenfire/org/fenfire/util/RDFUtil.java       Tue Apr 15 13:41:57 2003
@@ -12,12 +12,12 @@
     /** Create a new resource with given type.
      */
     static public Object N(Fen fen, Object type) {
-       Object ret = Nodes.N();
-       fen.graph.set1_11X(ret, RDF.type, type);
+       Object obj = Nodes.N();
+       fen.graph.set1_11X(obj, RDF.type, type);
 
-       if (!isNodeType(fen, ret, type)) throw new Error("Impossible!");
+       if (!isNodeType(fen, obj, type)) throw new Error("Impossible!");
 
-       return ret;
+       return obj;
 
     }
 
Index: fenfire/org/fenfire/util/RDFUtil.test
diff -u fenfire/org/fenfire/util/RDFUtil.test:1.1 
fenfire/org/fenfire/util/RDFUtil.test:1.2
--- fenfire/org/fenfire/util/RDFUtil.test:1.1   Tue Apr 15 13:27:26 2003
+++ fenfire/org/fenfire/util/RDFUtil.test       Tue Apr 15 13:41:57 2003
@@ -22,6 +22,7 @@
 
 def testNewObjWithType():
     type = Nodes.get('This is a test type')
+    #type = PP.Paper
 
     obj = RDFUtil.N(fen,type)