[Gzz-commits] gzz/lava/gzz/storm IndexedPool.java Pointer.jav...

[Benja Fallenstein]

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

Modified files:
        lava/gzz/storm : IndexedPool.java Pointer.java 
        lava/gzz/storm/impl: AbstractPool.java 
Added files:
        lava/gzz/storm : PointerIndexType.java 

Log message:
        Clean up pointer interface

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/PointerIndexType.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/IndexedPool.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/Pointer.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/AbstractPool.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/storm/IndexedPool.java
diff -u gzz/lava/gzz/storm/IndexedPool.java:1.10 
gzz/lava/gzz/storm/IndexedPool.java:1.11
--- gzz/lava/gzz/storm/IndexedPool.java:1.10    Mon Dec 30 09:19:13 2002
+++ gzz/lava/gzz/storm/IndexedPool.java Mon Dec 30 11:02:02 2002
@@ -98,7 +98,7 @@
         *  so code using this method must be robust
         *  in the face of corrupted data.
         */
-       Collector get(byte[] key);
+       Collector get(byte[] key) throws IOException;
     }
 
     interface IndexType {
@@ -111,7 +111,7 @@
         *          isn't satisfied, an exception will be thrown.
         *          (XXX specify which and where...)
         */
-       Set getMappings(Block b);
+       Set getMappings(Block b) throws IOException;
 
        /** A factory method for the public interface
         *  of this type of index.
@@ -148,8 +148,8 @@
     /** A convenience method to get a <code>Pointer</code> instance
      *  for this pool. This is defined always to return this:
      *  <pre>
-     *  ((PointerIndex)getIndex(Pointer.pointerIndexURI)).getPointer(uri)
+     *  
((PointerIndexType.Index)getIndex(PointerIndexType.indexTypeURI)).getPointer(uri)
      *  </pre>
      */
-    Pointer getPointer(String uri);
+    Pointer getPointer(String uri) throws IOException;
 }
Index: gzz/lava/gzz/storm/Pointer.java
diff -u gzz/lava/gzz/storm/Pointer.java:1.5 gzz/lava/gzz/storm/Pointer.java:1.6
--- gzz/lava/gzz/storm/Pointer.java:1.5 Mon Dec 30 08:26:42 2002
+++ gzz/lava/gzz/storm/Pointer.java     Mon Dec 30 11:02:02 2002
@@ -64,22 +64,4 @@
      */
     void addPointerBlock(BlockId target, Set obsoleteBlocks)
                                                 throws IOException;
-
-
-    /** The URI identifying the pointer application of Storm indexing.
-     */
-    String pointerIndexURI = "urn:urn-5:Y15xnzrC4wWfm-YWnziE8aH3d3pR";
-
-    /** XXX
-     *  You generally don't want to use this interface, even though you can;
-     *  it is much more convenient to call 
<code>IndexedPool.getPointer()</code>.
-     */
-    interface PointerIndex {
-       /**
-        *  Mustn't return null even if there is no pointer block
-        *  corresponding to this pointer yet (otherwise,
-        *  we could not create new pointers in the first place).
-        */
-       Pointer getPointer(String uri);
-    }
 }
Index: gzz/lava/gzz/storm/impl/AbstractPool.java
diff -u gzz/lava/gzz/storm/impl/AbstractPool.java:1.7 
gzz/lava/gzz/storm/impl/AbstractPool.java:1.8
--- gzz/lava/gzz/storm/impl/AbstractPool.java:1.7       Mon Dec 30 09:19:14 2002
+++ gzz/lava/gzz/storm/impl/AbstractPool.java   Mon Dec 30 11:02:02 2002
@@ -63,8 +63,8 @@
     }
 
     public Pointer getPointer(String uri) {
-       Object index = getIndex(Pointer.pointerIndexURI);
-       return ((Pointer.PointerIndex)index).getPointer(uri);
+       Object index = getIndex(PointerIndexType.indexTypeURI);
+       return ((PointerIndexType.Index)index).getPointer(uri);
     }
 
     /**