[Gzz-commits] gzz lava/gzz/potion/Call.java lava/gzz/potion/T...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/11/24 11:02:19

Modified files:
        lava/gzz/potion: Call.java Type.java 
        lava/gzz/storm : StormPool.java 
        lava/gzz/storm/impl: AbstractPool.java 
        test/gzz/control: Gzz.test GzzGl.test 
        test/gzz/view  : MockViewContext.java 
Added files:
        lava/gzz/storm : JobListener.java 

Log message:
        async thinking; make copyrighted

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/Call.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/Type.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/JobListener.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/StormPool.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/AbstractPool.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/control/Gzz.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/control/GzzGl.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/MockViewContext.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/potion/Call.java
diff -u gzz/lava/gzz/potion/Call.java:1.2 gzz/lava/gzz/potion/Call.java:1.3
--- gzz/lava/gzz/potion/Call.java:1.2   Fri Nov 22 12:05:30 2002
+++ gzz/lava/gzz/potion/Call.java       Sun Nov 24 11:02:19 2002
@@ -1,4 +1,25 @@
-//(c):Sarah Stehlig
+/*
+Call.java
+ *    
+ *    Copyright (c) 2002, Sarah Stehlig
+ *    
+ *    You may use and distribute under the terms of either the GNU Lesser
+ *    General Public License, either version 2 of the license or,
+ *    at your choice, any later version. Alternatively, you may use and
+ *    distribute under the terms of the XPL.
+ *    
+ *    See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
+ *    the licenses.
+ *    
+ *    This software is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the README
+ *    file for more details.
+ *    
+ */
+/*
+ * Written by Sarah Stehlig
+ */
 package gzz.potion;
 import java.util.*;
 import gzz.vob.linebreaking.HChain;
Index: gzz/lava/gzz/potion/Type.java
diff -u gzz/lava/gzz/potion/Type.java:1.1 gzz/lava/gzz/potion/Type.java:1.2
--- gzz/lava/gzz/potion/Type.java:1.1   Thu Nov 21 18:51:35 2002
+++ gzz/lava/gzz/potion/Type.java       Sun Nov 24 11:02:19 2002
@@ -1,4 +1,25 @@
-//(c):Sarah Stehlig
+/*
+Type.java
+ *    
+ *    Copyright (c) 2002, Sarah Stehlig
+ *    
+ *    You may use and distribute under the terms of either the GNU Lesser
+ *    General Public License, either version 2 of the license or,
+ *    at your choice, any later version. Alternatively, you may use and
+ *    distribute under the terms of the XPL.
+ *    
+ *    See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
+ *    the licenses.
+ *    
+ *    This software is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the README
+ *    file for more details.
+ *    
+ */
+/*
+ * Written by Sarah Stehlig
+ */
 package gzz.potion;
 import gzz.*;
 import java.util.*;
Index: gzz/lava/gzz/storm/StormPool.java
diff -u gzz/lava/gzz/storm/StormPool.java:1.8 
gzz/lava/gzz/storm/StormPool.java:1.9
--- gzz/lava/gzz/storm/StormPool.java:1.8       Fri Nov 15 20:35:58 2002
+++ gzz/lava/gzz/storm/StormPool.java   Sun Nov 24 11:02:19 2002
@@ -39,6 +39,14 @@
      *  detected until an InputStream retrieved from the Block
      *  is closed.
      *  <p>
+     *  If the block has to be requested from the network,
+     *  <code>null</code> is returned and a new thread is spawned
+     *  that performs the request. When the block becomes available,
+     *  or it becomes known that it cannot be found on the network,
+     *  <code>listener.finished()</code> is called. When this method
+     *  is called again, it will either return a <code>Block</code>
+     *  or throw an exception. [XXX not yet]
+     *  <p>
      *  Calling <code>getPool()</code> on the returned block may return
      *  a different pool than this: If the block is retrieved from
      *  a sub-pool of this pool, <code>getPool()</code> will return
@@ -46,7 +54,8 @@
      *  @throws FileNotFoundException if the block is not found
      *                                in the pool.
      */
-    Block get(BlockId id) throws FileNotFoundException, IOException;
+    Block get(BlockId id/*, JobListener listener*/) 
+       throws FileNotFoundException, IOException;
 
     /** Add a block to this pool.
      *  The data in the block is checked by this class to assure
@@ -83,9 +92,17 @@
      *  that represents a p2p network may not know the set of ids
      *  it is able to load.
      *  <p>
+     *  If this needs to start a network lookup, it returns
+     *  the set of ids known at this point (may be empty)
+     *  and spawns another thread to do the lookup. When new ids
+     *  become known, <code>listener.newDataArrived()</code>
+     *  is called. When all available ids have been retrieved,
+     *  <code>listener.finished()</code> is called.
+     *  [XXX not yet]
+     *  <p>
      *  Never returns <code>null</code>.
      */
-    Set getIds() throws IOException;
+    Set getIds(/*JobListener listener*/) throws IOException;
 
 
     // CREATING NEW BLOCKS
Index: gzz/lava/gzz/storm/impl/AbstractPool.java
diff -u gzz/lava/gzz/storm/impl/AbstractPool.java:1.3 
gzz/lava/gzz/storm/impl/AbstractPool.java:1.4
--- gzz/lava/gzz/storm/impl/AbstractPool.java:1.3       Fri Nov 15 23:38:04 2002
+++ gzz/lava/gzz/storm/impl/AbstractPool.java   Sun Nov 24 11:02:19 2002
@@ -1,4 +1,25 @@
-//(c):Benja Fallenstein
+/*
+AbstractPool.java
+ *    
+ *    Copyright (c) 2002, Benja Fallenstein
+ *    
+ *    You may use and distribute under the terms of either the GNU Lesser
+ *    General Public License, either version 2 of the license or,
+ *    at your choice, any later version. Alternatively, you may use and
+ *    distribute under the terms of the XPL.
+ *    
+ *    See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
+ *    the licenses.
+ *    
+ *    This software is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the README
+ *    file for more details.
+ *    
+ */
+/*
+ * Written by Benja Fallenstein
+ */
 package gzz.storm.impl;
 import gzz.storm.*;
 import gzz.storm.headers.*;
Index: gzz/test/gzz/control/Gzz.test
diff -u gzz/test/gzz/control/Gzz.test:1.2 gzz/test/gzz/control/Gzz.test:1.3
--- gzz/test/gzz/control/Gzz.test:1.2   Thu Nov 21 09:07:49 2002
+++ gzz/test/gzz/control/Gzz.test       Sun Nov 24 11:02:19 2002
@@ -1,4 +1,20 @@
-#(c):Benja Fallenstein
+# 
+# Copyright (c) 2002, Benja Fallenstein
+# 
+# You may use and distribute under the terms of either the GNU Lesser
+# General Public License, either version 2 of the license or,
+# at your choice, any later version. Alternatively, you may use and
+# distribute under the terms of the XPL.
+# 
+# See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
+# the licenses.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the README
+# file for more details.
+# 
+
 """
 Test that Gzz.py starts
 """
Index: gzz/test/gzz/control/GzzGl.test
diff -u gzz/test/gzz/control/GzzGl.test:1.2 gzz/test/gzz/control/GzzGl.test:1.3
--- gzz/test/gzz/control/GzzGl.test:1.2 Thu Nov 21 09:07:49 2002
+++ gzz/test/gzz/control/GzzGl.test     Sun Nov 24 11:02:19 2002
@@ -1,4 +1,20 @@
-#(c):Benja Fallenstein
+# 
+# Copyright (c) 2002, Benja Fallenstein
+# 
+# You may use and distribute under the terms of either the GNU Lesser
+# General Public License, either version 2 of the license or,
+# at your choice, any later version. Alternatively, you may use and
+# distribute under the terms of the XPL.
+# 
+# See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
+# the licenses.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the README
+# file for more details.
+# 
+
 """
 Test that Gzz.py starts
 """
Index: gzz/test/gzz/view/MockViewContext.java
diff -u gzz/test/gzz/view/MockViewContext.java:1.1 
gzz/test/gzz/view/MockViewContext.java:1.2
--- gzz/test/gzz/view/MockViewContext.java:1.1  Sun Nov 10 18:08:55 2002
+++ gzz/test/gzz/view/MockViewContext.java      Sun Nov 24 11:02:19 2002
@@ -1,4 +1,25 @@
-//(c):Benja Fallenstein
+/*
+MockViewContext.java
+ *    
+ *    Copyright (c) 2002, Benja Fallenstein
+ *    
+ *    You may use and distribute under the terms of either the GNU Lesser
+ *    General Public License, either version 2 of the license or,
+ *    at your choice, any later version. Alternatively, you may use and
+ *    distribute under the terms of the XPL.
+ *    
+ *    See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
+ *    the licenses.
+ *    
+ *    This software is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the README
+ *    file for more details.
+ *    
+ */
+/*
+ * Written by Benja Fallenstein
+ */
 package gzz.view;
 import gzz.*;
 import java.util.*;