[Mulgara-svn] r1577 - trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory

[pag at mulgara.org]

Author: pag
Date: 2009-03-02 23:32:09 -0800 (Mon, 02 Mar 2009)
New Revision: 1577

Modified:
   trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java
Log:
Added generics for use with the new Trove classes

Modified: trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java
===================================================================
--- trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java	2009-03-03 07:31:33 UTC (rev 1576)
+++ trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java	2009-03-03 07:32:09 UTC (rev 1577)
@@ -91,12 +91,12 @@
   /**
    * The hash map containing a long to an object.
    */
-  private TLongObjectHashMap nodeToStringPool;
+  private TLongObjectHashMap<SPObject> nodeToStringPool;
 
   /**
    * The hash map containing an object to a long.
    */
-  private TObjectLongHashMap stringToNodePool;
+  private TObjectLongHashMap<SPObject> stringToNodePool;
 
   /**
    * An index for sorting the SPObjects.
@@ -130,8 +130,8 @@
    */
   public MemoryStringPoolImpl() {
 
-    nodeToStringPool = new TLongObjectHashMap(10);
-    stringToNodePool = new TObjectLongHashMap(10);
+    nodeToStringPool = new TLongObjectHashMap<SPObject>(10);
+    stringToNodePool = new TObjectLongHashMap<SPObject>(10);
     stringIndex = new TreeSet<SPObject>();
 
     // intialise the SPObject arrays
@@ -226,7 +226,7 @@
 
     if (nodeToStringPool.contains(gNode)) {
 
-      SPObject obj = (SPObject)nodeToStringPool.remove(gNode);
+      SPObject obj = nodeToStringPool.remove(gNode);
       long node = stringToNodePool.remove(obj);
       stringIndex.remove(obj);