[Gzz-commits] gzz/lava gzz/storm/util/DiffBlock.java gzz/stor...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/18 12:37:26

Modified files:
        lava/gzz/storm/util: DiffBlock.java StormFilerBlock.java 
                             VersionBlock.java 
Added files:
        lava/test/gzz/storm/util: StormFilerBlock.test 
Removed files:
        lava/test/gzz/storm/util: VersionBlock.test 

Log message:
        Some uniittested components for use with diff saving

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/util/DiffBlock.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/util/StormFilerBlock.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/util/VersionBlock.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/util/StormFilerBlock.test?rev=1.1

Patches:
Index: gzz/lava/gzz/storm/util/DiffBlock.java
diff -u gzz/lava/gzz/storm/util/DiffBlock.java:1.1 
gzz/lava/gzz/storm/util/DiffBlock.java:1.2
--- gzz/lava/gzz/storm/util/DiffBlock.java:1.1  Fri Jan 17 18:35:52 2003
+++ gzz/lava/gzz/storm/util/DiffBlock.java      Sat Jan 18 12:37:25 2003
@@ -8,5 +8,24 @@
 
 public class DiffBlock extends StormFilerBlock {
 
-    public DiffBlock() { super(null, null); }
+    public final Version.Diff diff;
+    public final Header822 headerFrom;
+    public final Header822 headerTo;
+
+    public DiffBlock(Header822 header, Version.Diff diff, 
+                    Header822 headerFrom, Header822 headerTo,
+                    VersionFormat format) { 
+       super(header, format); 
+
+       this.diff = diff;
+       this.headerFrom = headerFrom;
+       this.headerTo = headerTo;
+    }
+
+    public void writeTo(OutputStream out) throws IOException {
+       header.writeTo(out);
+       headerFrom.writeTo(out);
+       headerTo.writeTo(out);
+       format.writeDiff(out, diff);
+    }
 }
Index: gzz/lava/gzz/storm/util/StormFilerBlock.java
diff -u gzz/lava/gzz/storm/util/StormFilerBlock.java:1.1 
gzz/lava/gzz/storm/util/StormFilerBlock.java:1.2
--- gzz/lava/gzz/storm/util/StormFilerBlock.java:1.1    Fri Jan 17 18:35:52 2003
+++ gzz/lava/gzz/storm/util/StormFilerBlock.java        Sat Jan 18 12:37:25 2003
@@ -16,7 +16,15 @@
        this.format = format;
     }
 
+    /** Check whether this block matches the given id.
+     */
+    public void checkId(BlockId id) throws IOException, 
BlockId.WrongIdException {
+       ByteArrayOutputStream out = new ByteArrayOutputStream();
+       writeTo(out);
+       id.check(out.toByteArray());
+    }
+
     /** Write the whole block (header and body) to an output stream.
      */
-    //public abstract void writeTo(OutputStream out);
+    public abstract void writeTo(OutputStream out) throws IOException;
 }
Index: gzz/lava/gzz/storm/util/VersionBlock.java
diff -u gzz/lava/gzz/storm/util/VersionBlock.java:1.1 
gzz/lava/gzz/storm/util/VersionBlock.java:1.2
--- gzz/lava/gzz/storm/util/VersionBlock.java:1.1       Fri Jan 17 18:35:52 2003
+++ gzz/lava/gzz/storm/util/VersionBlock.java   Sat Jan 18 12:37:25 2003
@@ -10,9 +10,14 @@
 
     public final Version version;
 
-    public VersionBlock(Version version, Header822 header,
+    public VersionBlock(Header822 header, Version version, 
                        VersionFormat format) {
        super(header, format);
        this.version = version;
+    }
+
+    public void writeTo(OutputStream out) throws IOException {
+       header.writeTo(out);
+       format.writeVersion(out, version);
     }
 }