[Gzz-commits] gzz/lava doc/ui/zaubertrank.rst gzz/storm/impl/...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/31 01:59:34

Modified files:
        lava/doc/ui    : zaubertrank.rst 
        lava/gzz/storm/impl: SimpleSetCollector.java 
        lava/test/gzz/storm/impl: P2PMap.meta 
Added files:
        lava/gzz/modules/gispmap: GispP2PMap.java 
        lava/gzz/storm/impl: AsyncSetCollector.java 
        lava/test/gzz/modules/gispmap: GispP2PMap.test 

Log message:
        Start GISP-based Storm impl

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/doc/ui/zaubertrank.rst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/gispmap/GispP2PMap.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/AsyncSetCollector.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/SimpleSetCollector.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/modules/gispmap/GispP2PMap.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/P2PMap.meta.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/lava/doc/ui/zaubertrank.rst
diff -u gzz/lava/doc/ui/zaubertrank.rst:1.1 gzz/lava/doc/ui/zaubertrank.rst:1.2
--- gzz/lava/doc/ui/zaubertrank.rst:1.1 Tue Jan 28 10:59:02 2003
+++ gzz/lava/doc/ui/zaubertrank.rst     Fri Jan 31 01:59:34 2003
@@ -6,7 +6,7 @@
 ---------------------------------------------------------------
 
 :Author: Benja Fallenstein
-:CVS-Id: $Id: zaubertrank.rst,v 1.1 2003/01/28 15:59:02 benja Exp $
+:CVS:    $Id: zaubertrank.rst,v 1.2 2003/01/31 06:59:34 benja Exp $
 
 
      The dark side of a direct manipulation interface is that
@@ -38,6 +38,15 @@
 
 Gzz is based on a "LEGO philosophy:" small orthogonal tools
 can be combined by the user in versatile ways. In this way,
-Gzz is very similar to Unix. 
+Gzz is very similar to Unix.
+
+Like Unix, we need an interface for accessing these LEGO
+building blocks. In Unix, this is the shell. However, Gzz
+is not a CLI, and we do not want to inherit the 'dark room
+effect' of the command line: that there is no way to look
+at the 
+
+Unix-based PUIs, such as KDE and Gnome, do not follow the LEGO
+philosophy and 
 
 
Index: gzz/lava/gzz/storm/impl/SimpleSetCollector.java
diff -u gzz/lava/gzz/storm/impl/SimpleSetCollector.java:1.2 
gzz/lava/gzz/storm/impl/SimpleSetCollector.java:1.3
--- gzz/lava/gzz/storm/impl/SimpleSetCollector.java:1.2 Mon Dec 30 08:49:48 2002
+++ gzz/lava/gzz/storm/impl/SimpleSetCollector.java     Fri Jan 31 01:59:34 2003
@@ -78,7 +78,7 @@
     }
 
     public boolean isComplete() {
-       return isComplete();
+       return isComplete;
     }
 
     public Collector block() {
@@ -91,7 +91,7 @@
 
     public void addCollectionListener(CollectionListener l) {
        for(Iterator i=set.iterator(); i.hasNext();) {
-           if(l.item(i.next())) return;
+           if(!l.item(i.next())) return;
        }
     }
 
Index: gzz/lava/test/gzz/storm/impl/P2PMap.meta
diff -u gzz/lava/test/gzz/storm/impl/P2PMap.meta:1.1 
gzz/lava/test/gzz/storm/impl/P2PMap.meta:1.2
--- gzz/lava/test/gzz/storm/impl/P2PMap.meta:1.1        Sat Jan 18 22:41:55 2003
+++ gzz/lava/test/gzz/storm/impl/P2PMap.meta    Fri Jan 31 01:59:34 2003
@@ -31,8 +31,13 @@
     map.put(k4, 'wombat')
     map.put(k5, 'flabberghasted')
 
-    assert set(map.get(k1)) == set(map.get(k2)) == set(['foo', 'bar'])
-    assert set(map.get(k3)) == set(map.get(k4)) == set(['baz', 'wombat'])
-    assert set(map.get(k5)) == set(['flabberghasted'])
+    q1, q2, q3, q4, q5 = [map.get(k) for k in [k1, k2, k3, k4, k5]]
+
+    print 'wait'
+    print set(q1.block()), set(q2.block()), set(['foo', 'bar'])
+    print 'ok'
+    assert set(q1.block()) == set(q2.block()) == set(['foo', 'bar'])
+    assert set(q3.block()) == set(q4.block()) == set(['baz', 'wombat'])
+    assert set(q5.block()) == set(['flabberghasted'])