[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py modules/pp...

[Matti Katila]

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

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/modules/pp: PPCanvasCursor.java PPCanvasNode.java 
                                Pp.java 
Added files:
        org/fenfire/modules/pp: PpContext.java 

Log message:
        urgh

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PpContext.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.7 
fenfire/org/fenfire/demo/buoyoing.py:1.8
--- fenfire/org/fenfire/demo/buoyoing.py:1.7    Wed Apr 16 04:16:34 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Wed Apr 16 04:45:58 2003
@@ -68,13 +68,10 @@
 
 from org.fenfire.index import XuLink
 
-#from com.hp.hpl.mesa.rdf import jena
-#from com.hp.hpl.mesa.rdf.jena import model, common
+import vob.buoy
+import vob.buoy.buoymanager
 
-import org.nongnu.libvob.buoy
-import org.nongnu.libvob.buoy.buoymanager
-
-vob.buoy.buoymanager.replaceNewScene = vob.putil.demo.replaceNewScene
+vob.buoy.buoymanager.replaceNewScene = vob.putil.demo.replacingScene
 vob.buoy.buoymanager.w = vob.putil.demo.w
 
 # gzz.gfx.gl.PageSpanPaper.paperMill = gzz.gfx.gl.PaperMill.getInstance()
@@ -94,9 +91,35 @@
 #      pagespanNodes.WholePageSpanNodeType(scrollblockLinker)
 #      )
 
+from org.fenfire.vocab import PP
+
+class PpContext(ff.view.NodeView.Context, ff.modules.pp.PpContext):
+    def __init__(self):
+        self.accursed = None
+        self.ppAct = ff.modules.pp.PPActionsImpl(fen)
+    
+    def nodeIsToBePlaced(self, node, nv):
+        print 'view context is not implemented'
+
+    def getAccursed(self):
+        return self.accursed
+
+    def setAccursed(self, node):
+        self.accursed = node
+
+    def getPPActions(self):
+        return self.ppAct
+
+    def getCurrentPaper(self):
+        paper = self.getAccursed();
+        if ff.util.RDFUtil.isNodeType(fen, getAccursed(), PP.Note):
+            paper = fen.constgraph.find1_X11(getAccursed(), PP.contains);
+        return paper.toString();
+
+    
 adaptor = ff.view.buoy.BuoyAdaptor()
-adaptor.nodes = [PPCanvasNode(fen, w, ff.view.DefaultNodeView())] #, 
zzNodes.VanishingNodeType()]
-adaptor.nodeLinkers = [PPLinker(fen), scrollblockLinker]
+adaptor.nodes = [ff.modules.pp.PPCanvasNode(fen, w, 
ff.view.DefaultNodeView(fen), PpContext())] #, zzNodes.VanishingNodeType()]
+adaptor.nodeLinkers = [ff.modules.view.buoy.PPLinker(fen), scrollblockLinker]
 
 scrollblockLinker.cellNodeType = adaptor
 
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.18 
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.19
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.18     Wed Apr 16 
03:46:47 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java  Wed Apr 16 04:45:58 2003
@@ -24,7 +24,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.18 
2003/04/16 07:46:47 tjl Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.19 
2003/04/16 08:45:58 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); }
@@ -102,11 +102,11 @@
     private GraphicsAPI.Window window;
     private Fen fen;
     private NodeView nodeview;
-    private Pp.Context context;
+    private PpContext context;
     public PPCanvasCursor(NodePlacementHook hook, 
                          GraphicsAPI.Window w, 
                          Fen fen, NodeView nv,
-                         Pp.Context context) 
+                         PpContext context) 
     {
        this.hook = hook;
        this.window = w;
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.18 
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.19
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.18       Wed Apr 16 
04:16:34 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java    Wed Apr 16 04:45:58 2003
@@ -17,7 +17,7 @@
 
 
 public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.18 2003/04/16 
08:16:34 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.19 2003/04/16 
08:45:58 mudyc Exp $";  
     public static boolean dbg = true;
     private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("PPCanvasNode::"+s); 
}
@@ -25,9 +25,9 @@
     private Fen fen;
     private GraphicsAPI.Window win;
     private NodeView nodeview;
-    private Pp.Context context;
+    private PpContext context;
     public PPCanvasNode(Fen f, GraphicsAPI.Window w, 
-                       NodeView nodeview, Pp.Context context) {
+                       NodeView nodeview, PpContext context) {
        this.fen = f;
        this.win = w;
        this.nodeview = nodeview;
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.25 
fenfire/org/fenfire/modules/pp/Pp.java:1.26
--- fenfire/org/fenfire/modules/pp/Pp.java:1.25 Wed Apr 16 03:51:05 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Wed Apr 16 04:45:58 2003
@@ -28,7 +28,7 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.25 2003/04/16 07:51:05 
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.26 2003/04/16 08:45:58 
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("Pp::"+s); }
@@ -171,7 +171,7 @@
     // --------------------------------------------------
     // WievContext
 
-    public class Context implements NodeView.Context {
+    public class Context implements NodeView.Context, PpContext {
        public void nodeIsToBePlaced(Object node, NodeView nv) {
            pa("view context is not implemented");
            // do nothing