[Gzz-commits] gzz gzz/media/impl/TransientTextScroll.java gzz...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/12/07 18:40:32

Modified files:
        gzz/media/impl : TransientTextScroll.java 
        gzz/mediaserver: MediaserverFiler.java 
        test/gzz/impl  : saving.test 

Log message:
        still doesn't work, but tests pass again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/TransientTextScroll.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/mediaserver/MediaserverFiler.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/impl/saving.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gzz/gzz/media/impl/TransientTextScroll.java
diff -u gzz/gzz/media/impl/TransientTextScroll.java:1.6 
gzz/gzz/media/impl/TransientTextScroll.java:1.7
--- gzz/gzz/media/impl/TransientTextScroll.java:1.6     Sat Dec  7 17:59:23 2002
+++ gzz/gzz/media/impl/TransientTextScroll.java Sat Dec  7 18:40:32 2002
@@ -32,7 +32,7 @@
 
 public class TransientTextScroll implements TextScrollBlock,
                   ScrollBlockManager.MediaserverScrollBlock {
-String rcsid = "$Id: TransientTextScroll.java,v 1.6 2002/12/07 22:59:23 benja 
Exp $";
+String rcsid = "$Id: TransientTextScroll.java,v 1.7 2002/12/07 23:40:32 benja 
Exp $";
 
     boolean finalized = false;
     Mediaserver.Id mediaserverId = null;
@@ -104,7 +104,7 @@
        finalized = true;
        mediaserverId = saveTo.addDatum(bytes, content_type); //, assocId);
        //id = mediaserverId.getString();
-       //ScrollBlockManager.msCache.put(mediaserverId, this);
+       ScrollBlockManager.msCache.put(mediaserverId, this);
        return mediaserverId;
     }
 
Index: gzz/gzz/mediaserver/MediaserverFiler.java
diff -u gzz/gzz/mediaserver/MediaserverFiler.java:1.15 
gzz/gzz/mediaserver/MediaserverFiler.java:1.16
--- gzz/gzz/mediaserver/MediaserverFiler.java:1.15      Sat Dec  7 18:08:33 2002
+++ gzz/gzz/mediaserver/MediaserverFiler.java   Sat Dec  7 18:40:32 2002
@@ -216,11 +216,14 @@
             // re-add
             bos = new ByteArrayOutputStream();
            fmt.writeVersion(bos, v);
-           Mediaserver.Id nid = ms.addDatum(bos.toByteArray(),
-                        versionContentType, current);
-            if(!nid.equals(current)) {
-               Mediaserver.Id diffTo = ms.addDatum(currentBytes,
-                                                   versionContentType, 
was_current);
+           byte[] barr = bos.toByteArray();
+           boolean equal = true;
+           if(barr.length == currentBytes.length)
+               for(int i=0; i<barr.length; i++)
+                   equal = equal && barr[i] == currentBytes[i];
+           else
+               equal = false;
+            if(!equal) {
                 pa("============ AAAARGH =============");
                 pa(new String(bos.toByteArray()));
                 pa("============== WAS ===============");
Index: gzz/test/gzz/impl/saving.test
diff -u gzz/test/gzz/impl/saving.test:1.10 gzz/test/gzz/impl/saving.test:1.11
--- gzz/test/gzz/impl/saving.test:1.10  Fri Oct 18 08:52:42 2002
+++ gzz/test/gzz/impl/saving.test       Sat Dec  7 18:40:32 2002
@@ -55,16 +55,19 @@
 
     ids = serv.getIDs()
     save(space)
+    print ids, serv.getIDs()
     assert ids != serv.getIDs()
 
     ids = serv.getIDs()
     save(space)
+    print ids, serv.getIDs()
     assert ids == serv.getIDs()
 
     s2 = load()
 
     ids = serv.getIDs()
     save(s2)
+    print ids, serv.getIDs()
     assert ids == serv.getIDs()
 
     a2, b2, c2 = [s2.getCell(cell.getId()) for cell in (a,b,c)]
@@ -77,6 +80,7 @@
 
     ids = serv.getIDs()
     save(s2)
+    print ids, serv.getIDs()
     assert ids != serv.getIDs()
     s3 = load()
 
@@ -88,6 +92,7 @@
 
     ids = serv.getIDs()
     save(s3)
+    print ids, serv.getIDs()
     assert ids == serv.getIDs()