[Gzz-commits] gzz ./Makefile lava/gzz/storm/BlockOutputStream...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/08/31 10:01:29

Modified files:
        .              : Makefile 
        lava/gzz/storm : BlockOutputStream.java 
        lava/gzz/util  : Header822.java 
Added files:
        lava/gzz/storm/impl: TransientPool.java 
        lava/gzz/util  : AbstractHeader822.java SortedHeader822.java 
                         UniqueHeader822.java 

Log message:
        More Storm pondering

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.151&tr2=1.152&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/BlockOutputStream.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/TransientPool.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/util/AbstractHeader822.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/util/SortedHeader822.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/util/UniqueHeader822.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/util/Header822.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.151 gzz/Makefile:1.152
*** gzz/Makefile:1.151  Fri Aug 30 04:39:05 2002
--- gzz/Makefile        Sat Aug 31 10:01:29 2002
***************
*** 176,182 ****
  SRC0:=$(GENERATED) $(wildcard gzz/*.java gzz/errors/*.java gzz/diff/*.java 
gzz/impl/*.java gzz/impl/mirror/*.java gzz/media/*.java gzz/fuzzy/*.java 
gzz/control/*.java lava/gzz/media/*.java gzz/media/impl/*.java 
gzz/zzutil/*.java gzz/impl/clasm/*.java gzz/util/*.java gzz/vob/*.java 
gzz/vob/buoy/*.java gzz/gfx/gl/*.java gzz/mediaserver/*.java 
lava/gzz/mediaserver/*.java gzz/mediaserver/*/*.java 
lava/gzz/mediaserver/*/*.java gzz/mediaserver/http/*/*.java 
lava/gzz/mediaserver/*/*/*.java gzz/ideas/*.java gzz/client/*.java 
gzz/view/*.java gzz/client/awt/*.java gzz/client/gl/*.java $(PP) 
gzz/modules/contraints/*.java gzz/modules/mm/*.java lava/gzz/media/*.java 
lava/gzz/media/impl/*.java gzz/slices/*.java gzz/storm/*.java) $(TESTS)
  # gzz/impl/zob/*.java 
  
! LAVASRC:= $(wildcard lava/gzz/*.java lava/gzz/impl/*.java 
lava/gzz/impl/errors/*.java lava/gzz/impl/mirror/*.java lava/gzz/storm/*.java 
lava/gzz/util/*.java)
  
  BASALTSRC:= $(wildcard basalt/gzz/*.java basalt/gzz/impl/*.java)
  
--- 176,182 ----
  SRC0:=$(GENERATED) $(wildcard gzz/*.java gzz/errors/*.java gzz/diff/*.java 
gzz/impl/*.java gzz/impl/mirror/*.java gzz/media/*.java gzz/fuzzy/*.java 
gzz/control/*.java lava/gzz/media/*.java gzz/media/impl/*.java 
gzz/zzutil/*.java gzz/impl/clasm/*.java gzz/util/*.java gzz/vob/*.java 
gzz/vob/buoy/*.java gzz/gfx/gl/*.java gzz/mediaserver/*.java 
lava/gzz/mediaserver/*.java gzz/mediaserver/*/*.java 
lava/gzz/mediaserver/*/*.java gzz/mediaserver/http/*/*.java 
lava/gzz/mediaserver/*/*/*.java gzz/ideas/*.java gzz/client/*.java 
gzz/view/*.java gzz/client/awt/*.java gzz/client/gl/*.java $(PP) 
gzz/modules/contraints/*.java gzz/modules/mm/*.java lava/gzz/media/*.java 
lava/gzz/media/impl/*.java gzz/slices/*.java gzz/storm/*.java) $(TESTS)
  # gzz/impl/zob/*.java 
  
! LAVASRC:= $(wildcard lava/gzz/*.java lava/gzz/impl/*.java 
lava/gzz/impl/errors/*.java lava/gzz/impl/mirror/*.java lava/gzz/storm/*.java 
lava/gzz/util/*.java lava/gzz/storm/impl/*.java)
  
  BASALTSRC:= $(wildcard basalt/gzz/*.java basalt/gzz/impl/*.java)
  
Index: gzz/lava/gzz/storm/BlockOutputStream.java
diff -c gzz/lava/gzz/storm/BlockOutputStream.java:1.2 
gzz/lava/gzz/storm/BlockOutputStream.java:1.3
*** gzz/lava/gzz/storm/BlockOutputStream.java:1.2       Thu Aug 29 13:50:37 2002
--- gzz/lava/gzz/storm/BlockOutputStream.java   Sat Aug 31 10:01:29 2002
***************
*** 31,37 ****
   *  <code>getBlock()</code> and <code>getBlockId</code> methods.
   */
  public abstract class BlockOutputStream extends FilterOutputStream {
!     protected BlockOutputStream(OutputStream out, Header822 header) {
          super(out);
      }
  
--- 31,37 ----
   *  <code>getBlock()</code> and <code>getBlockId</code> methods.
   */
  public abstract class BlockOutputStream extends FilterOutputStream {
!     protected BlockOutputStream(OutputStream out) {
          super(out);
      }
  
***************
*** 41,47 ****
       *  retrieved from this stream through the <code>getBlock()</code>
       *  and <code>getBlockId()</code> methods.
       */
!     public abstract void close() throws IOException;
  
      /** Get the <code>Block</code> created by this stream.
       *  This may only be called after the stream has been closed.
--- 41,47 ----
       *  retrieved from this stream through the <code>getBlock()</code>
       *  and <code>getBlockId()</code> methods.
       */
!     public void close() throws IOException { super.close(); };
  
      /** Get the <code>Block</code> created by this stream.
       *  This may only be called after the stream has been closed.
Index: gzz/lava/gzz/util/Header822.java
diff -c gzz/lava/gzz/util/Header822.java:1.3 
gzz/lava/gzz/util/Header822.java:1.4
*** gzz/lava/gzz/util/Header822.java:1.3        Thu Aug 29 17:34:56 2002
--- gzz/lava/gzz/util/Header822.java    Sat Aug 31 10:01:29 2002
***************
*** 28,33 ****
--- 28,43 ----
   *  Currently mostly a placeholder to get the storm interfaces
   *  to compile-- NEEDS THINKING.
   *  <p>
+  *  Subclasses will often provide:
+  *  <ul>
+  *  <li>An empty constructor for creating an empty header.</li>
+  *  <li>A constructor taking another <code>Header822</code>,
+  *      for creating a header initialized with the data
+  *      from another header.</li>
+  *  <li>A constructor taking a String, for creating a header
+  *      initialized with a given <code>Content-Type</code> value.</li>
+  *  </ul>
+  *  <p>
   *  (Note: This isn't called <code>Header2822</code> because
   *  that would be clumsier to type, especially in subclasses--
   *  <code>UniqueHeader2822</code> and so on. Then again,
***************
*** 35,44 ****
   *  makes it not RFC822-compliant...)
   */
  public interface Header822 {
      String getOne(String field) throws IOException;
      Collection getAll(String field) throws IOException;
      Collection getLines() throws IOException;
!     void write(OutputStream out) throws IOException;
  
      // XXX think, document...
  }
--- 45,70 ----
   *  makes it not RFC822-compliant...)
   */
  public interface Header822 {
+     // get single String, just value, no folding inside
      String getOne(String field) throws IOException;
+ 
+     // get collection of Strings, just values, no folding inside
      Collection getAll(String field) throws IOException;
+ 
+     // get collection of Strings, whole fields, i.e. field name
+     // plus field value, folded
      Collection getLines() throws IOException;
! 
!     // add field
!     void add(String fieldName, String fieldValue)
!             throws IOException, UnsupportedOperationException;
! 
!     // add field raw (as a single String containing field name
!     // *and* field value, possibly folded)
!     void add(String field) throws IOException, UnsupportedOperationException;
! 
!     // write to an output stream
!     void writeTo(OutputStream out) throws IOException;
  
      // XXX think, document...
  }