merged LongInt with IntIntHashMap.

IntIntHashMap is now the single template used for all other maps.

1 files changed, 15 insertions, 7 deletions

diff --git a/make/build.xml b/make/build.xml
index 3301125..09bdd7a 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -427,30 +427,37 @@
 
     <!-- Int*Maps -->
     <antcall target="create-map" inheritrefs="true">
-        <param name="map.src" value="IntIntHashMap"/>
         <param name="map.name" value="IntObjectHashMap"/>
+        <param name="map.key" value="int"/>
         <param name="map.value" value="Object"/>
         <param name="map.null" value="null"/>
     </antcall>
 
     <antcall target="create-map" inheritrefs="true">
-        <param name="map.src" value="IntIntHashMap"/>
         <param name="map.name" value="IntLongHashMap"/>
+        <param name="map.key" value="int"/>
         <param name="map.value" value="long"/>
         <param name="map.null" value="0"/>
     </antcall>
 
     <!-- Long*Maps -->
     <antcall target="create-map" inheritrefs="true">
-        <param name="map.src" value="LongIntHashMap"/>
         <param name="map.name" value="LongObjectHashMap"/>
+        <param name="map.key" value="long"/>
+        <param name="map.value" value="Object"/>
+        <param name="map.null" value="null"/>
+    </antcall>
+
+    <antcall target="create-map" inheritrefs="true">
+        <param name="map.name" value="LongIntHashMap"/>
+        <param name="map.key" value="long"/>
         <param name="map.value" value="Object"/>
         <param name="map.null" value="null"/>
     </antcall>
 
     <antcall target="create-map" inheritrefs="true">
-        <param name="map.src" value="LongIntHashMap"/>
         <param name="map.name" value="LongLongHashMap"/>
+        <param name="map.key" value="long"/>
         <param name="map.value" value="long"/>
         <param name="map.null" value="0"/>
     </antcall>
@@ -459,12 +466,13 @@
 
   <target name="create-map">
     <!-- substitutes certain token in IntIntHashmap to create new primitive HasmMap-->
-    <copy file="${src.java}/com/jogamp/common/util/${map.src}.java"
+    <copy file="${src.java}/com/jogamp/common/util/IntIntHashMap.java"
         tofile="${src.generated.java}/com/jogamp/common/util/${map.name}.java" overwrite="true">
         <filterchain>
-            <replaceregex pattern="${map.src}" replace="${map.name}"/>
-            <replaceregex pattern="@see ${map.name}" replace="@see ${map.src}"/>
+            <replaceregex pattern="IntIntHashMap" replace="${map.name}"/>
+            <replaceregex pattern="@see ${map.name}" replace="@see IntIntHashMap"/>
             <replaceregex pattern="/\*value\*/int/\*value\*/" replace="${map.value}"/>
+            <replaceregex pattern="/\*key\*/int/\*key\*/" replace="${map.key}"/>
             <replaceregex pattern="/\*null\*/0/\*null\*/" replace="${map.null}"/>
         </filterchain>
         <!-- no clue why we have to do this twice... otherwise it will only replace one token per line -->