Remove fixed todos

[yaz4j-moved-to-github.git] / src / main / java / org / yaz4j / ScanSet.java

diff --git a/src/main/java/org/yaz4j/ScanSet.java b/src/main/java/org/yaz4j/ScanSet.java
index 819ac1a..0df08a5 100644 (file)
--- a/src/main/java/org/yaz4j/ScanSet.java
+++ b/src/main/java/org/yaz4j/ScanSet.java
@@ -1,44 +1,71 @@
 package org.yaz4j;
 
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.yaz4j.exception.ZoomException;
 import org.yaz4j.jni.SWIGTYPE_p_ZOOM_scanset_p;
-import org.yaz4j.jni.SWIGTYPE_p_int;
+import org.yaz4j.jni.SWIGTYPE_p_size_t;
 import org.yaz4j.jni.yaz4jlib;
 
-public class ScanSet {
+public class ScanSet implements Iterable<ScanTerm> {
 
-    private SWIGTYPE_p_ZOOM_scanset_p scanSet = null;
-    private Connection connection;
-    private boolean disposed = false;
+  //for GC ref-count
+  private Connection conn;
+  private SWIGTYPE_p_ZOOM_scanset_p scanSet;
+  private boolean disposed = false;
+  private long size = 0;
 
-    ScanSet(SWIGTYPE_p_ZOOM_scanset_p scanSet, Connection connection) {
-        this.connection = connection;
-        this.scanSet = scanSet;
-    }
+  ScanSet(SWIGTYPE_p_ZOOM_scanset_p scanSet, Connection conn) {
+    this.scanSet = scanSet;
+    size = yaz4jlib.ZOOM_scanset_size(scanSet);
+    this.conn = conn;
+  }
 
-    public void finalize() {
-        Dispose();
-    }
+  public void finalize() {
+    _dispose();
+  }
 
-    public ScanTerm get(long index) {
-        SWIGTYPE_p_int occ = yaz4jlib.new_intp();
-        SWIGTYPE_p_int length = yaz4jlib.new_intp();
-        String term = yaz4jlib.ZOOM_scanset_term(scanSet, (long) index, occ, length);
-        int occurences = yaz4jlib.intp_value(occ);
-        yaz4jlib.delete_intp(occ);
-        yaz4jlib.delete_intp(length);
-        return new ScanTerm(term, occurences);
-    }
+  public ScanTerm get(long index) {
+    SWIGTYPE_p_size_t occ = yaz4jlib.new_size_tp();
+    SWIGTYPE_p_size_t length = yaz4jlib.new_size_tp();
+    String term = yaz4jlib.ZOOM_scanset_term(scanSet, (long) index, occ, length);
+    long occurences = yaz4jlib.size_tp_value(occ);
+    yaz4jlib.delete_size_tp(occ);
+    yaz4jlib.delete_size_tp(length);
+    return new ScanTerm(term, occurences);
+  }
 
-    public long getSize() {
-        return yaz4jlib.ZOOM_scanset_size(scanSet);
-    }
+  public long getSize() {
+    return size;
+  }
 
-    public void Dispose() {
-        if (!disposed) {
-            yaz4jlib.ZOOM_scanset_destroy(scanSet);
-            connection = null;
-            scanSet = null;
-            disposed = true;
-        }
+  void _dispose() {
+    if (!disposed) {
+      yaz4jlib.ZOOM_scanset_destroy(scanSet);
+      scanSet = null;
+      conn = null;
+      disposed = true;
     }
+  }
+
+  @Override
+  public Iterator<ScanTerm> iterator() {
+    return new Iterator<ScanTerm>() {
+      private long cur;
+      @Override
+      public boolean hasNext() {
+        return cur < size;
+      }
+
+      @Override
+      public ScanTerm next() {
+        return get(cur++);
+      }
+
+      @Override
+      public void remove() {
+        throw new UnsupportedOperationException("remove operation not supported");
+      }
+    };
+  }
 }