[Gzz-commits] gzz doc/pegboard/1016/PEG_1016.rst gzz/media/im...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/06 09:16:47

Modified files:
        doc/pegboard/1016: PEG_1016.rst 
        gzz/media/impl : TransientTextScroll.java 
        gzz/slices     : YAMLVersionFormatter.py 
        test/gzz/media : textscrollblock.py 

Log message:
        Implement 1016

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1016/PEG_1016.rst.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/TransientTextScroll.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/slices/YAMLVersionFormatter.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/media/textscrollblock.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/doc/pegboard/1016/PEG_1016.rst
diff -u gzz/doc/pegboard/1016/PEG_1016.rst:1.3 
gzz/doc/pegboard/1016/PEG_1016.rst:1.4
--- gzz/doc/pegboard/1016/PEG_1016.rst:1.3      Thu Nov 14 10:40:07 2002
+++ gzz/doc/pegboard/1016/PEG_1016.rst  Fri Dec  6 09:16:47 2002
@@ -3,9 +3,9 @@
 =============================================================
 
 :Authors:  Tuomas Lukka
-:Last-Modified: $Date: 2002/11/14 15:40:07 $
-:Revision: $Revision: 1.3 $
-:Status:   Accepted
+:Last-Modified: $Date: 2002/12/06 14:16:47 $
+:Revision: $Revision: 1.4 $
+:Status:   Implemented
 
 It was recently noticed that the method::
 
Index: gzz/gzz/media/impl/TransientTextScroll.java
diff -u gzz/gzz/media/impl/TransientTextScroll.java:1.4 
gzz/gzz/media/impl/TransientTextScroll.java:1.5
--- gzz/gzz/media/impl/TransientTextScroll.java:1.4     Fri Aug  9 19:02:26 2002
+++ gzz/gzz/media/impl/TransientTextScroll.java Fri Dec  6 09:16:47 2002
@@ -32,7 +32,7 @@
 
 public class TransientTextScroll implements TextScrollBlock,
                   ScrollBlockManager.MediaserverScrollBlock {
-String rcsid = "$Id: TransientTextScroll.java,v 1.4 2002/08/09 23:02:26 benja 
Exp $";
+String rcsid = "$Id: TransientTextScroll.java,v 1.5 2002/12/06 14:16:47 tjl 
Exp $";
 
     boolean finalized = false;
     Mediaserver.Id mediaserverId = null;
@@ -77,8 +77,9 @@
        return new ScrollBlockManager.SimpleTextSpan(this, 0, current.length());
     }
 
-    public Span getSpan(int offs, int len) {
-       return new ScrollBlockManager.SimpleTextSpan(this, offs, offs+len);
+    public Span getSpan(int offs1, int offs2) {
+       return new ScrollBlockManager.SimpleTextSpan(
+               this, offs1, offs2);
     }
 
     public boolean isFinalized() {
Index: gzz/gzz/slices/YAMLVersionFormatter.py
diff -u gzz/gzz/slices/YAMLVersionFormatter.py:1.10 
gzz/gzz/slices/YAMLVersionFormatter.py:1.11
--- gzz/gzz/slices/YAMLVersionFormatter.py:1.10 Fri Oct 11 10:04:28 2002
+++ gzz/gzz/slices/YAMLVersionFormatter.py      Fri Dec  6 09:16:47 2002
@@ -103,9 +103,11 @@
            id = Mediaserver.Id(id)
            if t == 'TextSpan':
                block = ScrollBlockManager.getTextScrollBlock(ms, id)
-               spans.add(block.getSpan(*spanDef[2:]))
+               spans.add(block.getSpan(spanDef[2], 
+                       spanDef[2] + spanDef[3]))
            elif t == 'ImageSpan' or t == 'PageSpan':
-                spans.add(ScrollBlockManager.getSpan(ms, id, *spanDef[2:]))
+                spans.add(ScrollBlockManager.getSpan(ms, id, 
+                   *spanDef[2:]))
            else:
                raise NotImplementedError("Unknown span type: %s" % (t,))
 
Index: gzz/test/gzz/media/textscrollblock.py
diff -u gzz/test/gzz/media/textscrollblock.py:1.1 
gzz/test/gzz/media/textscrollblock.py:1.2
--- gzz/test/gzz/media/textscrollblock.py:1.1   Fri Dec  6 09:06:43 2002
+++ gzz/test/gzz/media/textscrollblock.py       Fri Dec  6 09:16:47 2002
@@ -32,8 +32,6 @@
 
 def testABCD():
     """Test various things about span handling.
-
-    fail: *
     """
     s1, s2 = scrollblock1, scrollblock2
     sp1_all = s1.getCurrent()
@@ -42,3 +40,14 @@
     failUnlessEqual(sp1_0.getText(), "b")
     failUnlessEqual(sp1_all.subSpan(1,2), sp1_0)
     
+
+def testABCD_transient():
+    """Test various things about span handling for transients.
+    """
+    appendable1.append("abcd")
+    appendable2.append("a")
+    appendable2.append("bc")
+    appendable2.append("d")
+    scrollblock1 = appendable1
+    scrollblock2 = appendable2
+    testABCD()