[Gzz-commits] gzz gzz/view/AbstractViewContext.java gzz/view/...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/04 07:38:49

Modified files:
        gzz/view       : AbstractViewContext.java 
                         VobVanishingClient.java 
        gzz/view/buoy  : zzNodes.py 
        test/gzz/view/buoy: buoysys.test 
Added files:
        gzz/util       : Jython.java 

Log message:
        Cloning needs to be explicitly done

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/util/Jython.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/AbstractViewContext.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/VobVanishingClient.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/zzNodes.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/buoy/buoysys.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gzz/gzz/view/AbstractViewContext.java
diff -u gzz/gzz/view/AbstractViewContext.java:1.6 
gzz/gzz/view/AbstractViewContext.java:1.7
--- gzz/gzz/view/AbstractViewContext.java:1.6   Tue Feb  4 05:09:03 2003
+++ gzz/gzz/view/AbstractViewContext.java       Tue Feb  4 07:38:49 2003
@@ -65,4 +65,12 @@
        throw new UnsupportedOperationException();
     }
     public List getCursorColors(Cell c) { return null; }
+
+    public Object clone() {
+       try {
+           return super.clone();
+       } catch(CloneNotSupportedException e) {
+           return null;
+       }
+    }
 }
Index: gzz/gzz/view/VobVanishingClient.java
diff -u gzz/gzz/view/VobVanishingClient.java:1.28 
gzz/gzz/view/VobVanishingClient.java:1.29
--- gzz/gzz/view/VobVanishingClient.java:1.28   Tue Feb  4 06:35:44 2003
+++ gzz/gzz/view/VobVanishingClient.java        Tue Feb  4 07:38:49 2003
@@ -140,4 +140,12 @@
             into.map.put(connections[dx][dy], b1, b2);
     }
 
+    public Object clone() {
+       try {
+           return super.clone();
+       } catch(CloneNotSupportedException e) {
+           return null;
+       }
+    }
+
 }
Index: gzz/gzz/view/buoy/zzNodes.py
diff -u gzz/gzz/view/buoy/zzNodes.py:1.4 gzz/gzz/view/buoy/zzNodes.py:1.5
--- gzz/gzz/view/buoy/zzNodes.py:1.4    Tue Feb  4 07:27:32 2003
+++ gzz/gzz/view/buoy/zzNodes.py        Tue Feb  4 07:38:49 2003
@@ -1,7 +1,9 @@
+import java
 import jarray
 
 import gzz
 from gzz.view.buoy import CellBuoyViewNodeType, BuoyViewMainNode
+from gzz.util import Jython
 
 vanishing = gzz.view.VobVanishingClient()
 viewcontext = gzz.view.AbstractViewContext()
@@ -26,6 +28,7 @@
 class VanishingMainNode(BuoyViewMainNode):
     def __init__(self, cell, hook):
        self.hook = hook
+
        self.viewcontext = viewcontext.clone()
        self.viewcontext.setAccursed(cell)
        self.vanishing = vanishing.clone()
Index: gzz/test/gzz/view/buoy/buoysys.test
diff -u gzz/test/gzz/view/buoy/buoysys.test:1.5 
gzz/test/gzz/view/buoy/buoysys.test:1.6
--- gzz/test/gzz/view/buoy/buoysys.test:1.5     Tue Feb  4 07:27:32 2003
+++ gzz/test/gzz/view/buoy/buoysys.test Tue Feb  4 07:38:49 2003
@@ -9,6 +9,7 @@
 from gzz.view.buoy import zzNodes
 from gzz.view.buoy import pagespanNodes
 from gzz.view.buoy import BuoyLinkListener, ScrollblockCellLinker
+from gzz.view.buoy import BuoyAdaptor
 
 from gzz.zzutil import Ids
 
@@ -48,7 +49,7 @@
 
     # Create the buoy view elements
     scrollblockLinker = ScrollblockCellLinker()
-    scrollblockLinker.pageSpanNodeType = pagespanNodes.pageSpanNodeType()
+    scrollblockLinker.pageSpanNodeType = pagespanNodes.PageSpanNodeType()
     adaptor = BuoyAdaptor()
     adaptor.cellNodes = [zzNodes.VanishingNodeType()]
     adaptor.cellLinkers = [scrollblockLinker]