[Gzz-commits] storm/org/nongnu/storm IndexedPool.meta StormPo...

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/04/07 16:16:28

Modified files:
        org/nongnu/storm: IndexedPool.meta StormPool.meta 
Added files:
        org/nongnu/storm/util: ContentTypeIndexType.java 

Log message:
        ...and more

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/IndexedPool.meta.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/StormPool.meta.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/util/ContentTypeIndexType.java?rev=1.1

Patches:
Index: storm/org/nongnu/storm/IndexedPool.meta
diff -u storm/org/nongnu/storm/IndexedPool.meta:1.1 
storm/org/nongnu/storm/IndexedPool.meta:1.2
--- storm/org/nongnu/storm/IndexedPool.meta:1.1 Mon Apr  7 15:50:37 2003
+++ storm/org/nongnu/storm/IndexedPool.meta     Mon Apr  7 16:16:28 2003
@@ -26,7 +26,7 @@
 # pool(indexTypes) -- a method taking a list of index types
 #                     and returning the appropriate IndexedPool
 
-import gzz, java
+import java, org
 import jarray
 
 def set(list):
@@ -44,8 +44,8 @@
         assert 0
 
 def testContentTypeIndex():
-    p = pool([org.nongnu.storm.ContentTypeIndexType()])
-    i = 
p.getIndex(org.nongnu.storm.ContentTypeIndexType.contentTypeIndexTypeURI)
+    p = pool([org.nongnu.storm.util.ContentTypeIndexType()])
+    i = 
p.getIndex(org.nongnu.storm.util.ContentTypeIndexType.contentTypeIndexTypeURI)
 
     assert i != None
     assert i.getBlocks("text/plain") == set([])
@@ -66,4 +66,4 @@
     assert i.getBlocks("text/html") == set([id3])
     assert i.getBlocks("text/enriched") == set([])
 
-    assert i == 
p.getIndex(org.nongnu.storm.ContentTypeIndexType.contentTypeIndexTypeURI)
+    assert i == 
p.getIndex(org.nongnu.storm.util.ContentTypeIndexType.contentTypeIndexTypeURI)
Index: storm/org/nongnu/storm/StormPool.meta
diff -u storm/org/nongnu/storm/StormPool.meta:1.1 
storm/org/nongnu/storm/StormPool.meta:1.2
--- storm/org/nongnu/storm/StormPool.meta:1.1   Mon Apr  7 15:50:37 2003
+++ storm/org/nongnu/storm/StormPool.meta       Mon Apr  7 16:16:28 2003
@@ -43,8 +43,8 @@
 
     b = pool.get(bos.getBlockId())
     
-    assert bos.getBlock().getPool == b.getPool() == pool
-    b.getId().check(CopyUtil.readBytes(b.getRawInputStream()))
+    assert bos.getBlock().getPool() == b.getPool() == pool
+    b.getId().check(CopyUtil.readBytes(b.getInputStream()))
 
     s = ""
     stream = b.getInputStream()