use enumerateKeys()

darcs-hash:20060909024542-5007d-b9f4e62867da704113fcf17849b940dd0a842a98.gz

diff --git a/src/org/ibex/util/Basket.java b/src/org/ibex/util/Basket.java
index baee97c..d4348ce 100644 (file)
--- a/src/org/ibex/util/Basket.java
+++ b/src/org/ibex/util/Basket.java
@@ -321,7 +321,6 @@ public interface Basket extends Serializable {
             int dest = orig * indexmultiple;
             int tries = 1;
             boolean plus = true;
-
             while (entries[dest] != null) {
                 if (equals(k, entries[dest])) return dest;
                 dest = Math.abs((orig + (plus ? 1 : -1) * tries * tries) % (entries.length / indexmultiple)) * indexmultiple;

diff --git a/src/org/ibex/util/Hash.java b/src/org/ibex/util/Hash.java
index ae95978..95d636b 100644 (file)
--- a/src/org/ibex/util/Hash.java
+++ b/src/org/ibex/util/Hash.java
@@ -46,6 +46,15 @@ public class Hash implements java.io.Serializable {
     /** the number of entries with a non-null value */
     public int size() { return size; }
 
+    public Object[] dumpkeys() {
+        Object[] ret = new Object[size];
+        int j = 0;
+        for(int i=0; i<keys1.length; i++)
+            if (keys1[i]!=null)
+                ret[j++] = keys1[i];
+        return ret;
+    }
+
     public Object[] vals() {
         Object[] ret = new Object[size()];
         int j = 0;
@@ -67,7 +76,7 @@ public class Hash implements java.io.Serializable {
     }
 
     /** returns all the primary keys in the table */
-    public Enumeration keys() { return new HashEnum(); }
+    public java.util.Enumeration enumerateKeys() { return new HashEnum(); }
 
     public Hash() { this(25, 3); }
     public Hash(int initialcapacity, int loadFactor) {