[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py swamp/Cach...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/05/14 07:54:45

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/swamp: CachedNodeFunction.java 
        org/fenfire/view/buoy: AbstractMainNode2D.java 
Added files:
        org/fenfire/view/lava: ContextNodeView.java FenPDFContext.java 
                               RSTText.java 
Removed files:
        org/fenfire/view: FenPDFContext.java RSTText.java 

Log message:
        caching works

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/CachedNodeFunction.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/ContextNodeView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FenPDFContext.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/RSTText.java?rev=1.1

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.44 
fenfire/org/fenfire/demo/buoyoing.py:1.45
--- fenfire/org/fenfire/demo/buoyoing.py:1.44   Tue May 13 10:15:04 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Wed May 14 07:54:44 2003
@@ -109,12 +109,13 @@
 
 vob.view.FisheyeState.dbg = 1
 textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
-textnodeview = ff.view.RSTText(fen.txtfunc, textstyle, 1)
+textnodeview = ff.view.lava.RSTText(fen.txtfunc, textstyle, 1)
 pagenodeview = ff.view.PageNodeView(fen.txtfunc)
 dispnodeview = ff.view.DispatchingNodeView(fen.txtfunc,
                                            textnodeview,
                                            pagenodeview)
-nodeview = ff.swamp.CachedNodeFunction(50, fen.constgraph, dispnodeview);
+cached = ff.swamp.CachedNodeFunction(50, fen.constgraph, dispnodeview)
+nodeview = ff.view.lava.ContextNodeView(cached, dispnodeview)
 view = ff.view.CanvasView2D(fen, nodeview)
 view.cull = 1
 paperview = ff.view.PaperView2D(vob.putil.demowindow.w, view)
@@ -123,7 +124,8 @@
 ff.view.buoy.NodeType2D.effigy = 0
 ff.view.buoy.NodeType2DFull.effigy = 0
 
-context = ff.view.FenPDFContext(fen, rst, nodeview)
+context = ff.view.lava.FenPDFContext(fen, rst, nodeview)
+nodeview.setContext(context)
 textnodeview.setContext(context)
 context.setAccursed(note)
 context.setCursorOffset(5)
Index: fenfire/org/fenfire/swamp/CachedNodeFunction.java
diff -u fenfire/org/fenfire/swamp/CachedNodeFunction.java:1.6 
fenfire/org/fenfire/swamp/CachedNodeFunction.java:1.7
--- fenfire/org/fenfire/swamp/CachedNodeFunction.java:1.6       Tue May 13 
18:08:57 2003
+++ fenfire/org/fenfire/swamp/CachedNodeFunction.java   Wed May 14 07:54:45 2003
@@ -77,25 +77,4 @@
            cac.addObs(o);
        return cac.value;
     }
-
-
-    // AAaarrgghh, tried to find a few hours to how to set nodes dirty
-    // mudyc, XXX
-    public void makeAllDirty(Object node) {
-       CacheEntry cac = (CacheEntry)cache.get(node);
-       if(cac == null) {
-           cac = new CacheEntry();
-           cac.node = node;
-           cache.put(node, cac);
-       }
-
-       Iterator it = cache.entrySet().iterator();
-       while(it.hasNext()) {
-           Map.Entry entry = (Map.Entry) it.next();
-           Object o = cache.get(entry.getKey());
-           CacheEntry ce = (CacheEntry)o;
-           ce.value = DIRTY;
-           cache.put(ce.node, ce);
-       }
-    }
 }
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.7 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.8
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.7   Tue May 13 
18:08:57 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Wed May 14 
07:54:45 2003
@@ -51,7 +51,7 @@
 
     /** Ugly hack! Fix fix fix..
      */
-    static public org.fenfire.view.FenPDFContext context = null;
+    static public org.fenfire.view.lava.FenPDFContext context = null;
     public void keystroke(String s) {
        context.handleKeyStroke(s, view2d);
     }