moves ArrayToMapAdaptor into common package

Author: brianburton

src/main/java/org/javimmutable/collections/common/AbstractJImmutableArray.java

@@ -43,7 +43,6 @@
 import org.javimmutable.collections.JImmutableMap;
 import org.javimmutable.collections.MapEntry;
 import org.javimmutable.collections.cursors.TransformCursor;
-import org.javimmutable.collections.hash.ArrayToMapAdaptor;
 
 import java.util.Iterator;
 import java.util.Map;

src/main/java/org/javimmutable/collections/hash/ArrayToMapAdaptor.java renamed to src/main/java/org/javimmutable/collections/common/ArrayToMapAdaptor.java

@@ -33,14 +33,13 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package org.javimmutable.collections.hash;
+package org.javimmutable.collections.common;
 
 import org.javimmutable.collections.Func1;
 import org.javimmutable.collections.Holder;
 import org.javimmutable.collections.JImmutableArray;
 import org.javimmutable.collections.JImmutableMap;
 import org.javimmutable.collections.MapEntry;
-import org.javimmutable.collections.common.IteratorAdaptor;
 import org.javimmutable.collections.cursors.TransformCursor;
 
 import java.util.AbstractCollection;
@@ -112,7 +111,7 @@ public boolean containsValue(Object o)
     @Override
     public T get(Object o)
     {
-        return map.find((Integer)o).getValueOrNull();
+        return map.get((Integer)o);
     }
 
     @Override

src/test/java/org/javimmutable/collections/array/trie32/Trie32ArrayTest.java

@@ -46,6 +46,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 public class Trie32ArrayTest
         extends TestCase
@@ -84,15 +86,19 @@ public void testVarious()
     {
         List<Integer> indexes = createBranchIndexes();
         for (int length = indexes.size(); length > 0; --length) {
+            Map<Integer, Integer> map = new TreeMap<Integer, Integer>();
             List<Integer> keys = new ArrayList<Integer>();
             List<Integer> values = new ArrayList<Integer>();
             Trie32Array<Integer> array = Trie32Array.of();
             for (int i = 0; i < length; ++i) {
-                array = array.assign(indexes.get(i), i);
-                keys.add(indexes.get(i));
+                final Integer index = indexes.get(i);
+                array = array.assign(index, i);
+                keys.add(index);
                 values.add(i);
+                map.put(index, i);
                 assertEquals(i + 1, array.size());
             }
+            assertEquals(array.getMap(), map);
             StandardCursorTest.listCursorTest(keys, array.keysCursor());
             StandardCursorTest.listCursorTest(values, array.valuesCursor());
             for (int i = 0; i < length; ++i) {