Solve ambiguity of delete(int) and delete(Object) for various collect…

…ions in javascript.
Greentube · Apr 2, 2020 · b684888 · b684888
1 parent 19bf4f4
commit b684888
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 9 deletions.
diff --git a/build.xml b/build.xml
@@ -245,7 +245,7 @@
             <fileset dir="${basedir}/build/package"/>
             <manifest>
                  <attribute name="Main-Class" value="com.greentube.javaconverter.JavaConverter"/>
-                 <attribute name="Implementation-Version" value="2.13.2"/>
+                 <attribute name="Implementation-Version" value="2.13.3"/>
                  <attribute name="Version-Date" value="${timestamp}"/>
             </manifest>         
         </jar>          

diff --git a/runtimejs/java/util/AbstractCollection.js b/runtimejs/java/util/AbstractCollection.js
@@ -63,7 +63,14 @@ _defclass(java_util_AbstractCollection, java_lang_Object, [java_util_Collection]
 
     //iterator        abstract - must be implemented by subclass
 
-    remove_1: function(o)
+    // disambiguity 
+	remove_1: function(o)
+	{
+		if (typeof o === 'number') { return this.remove_1I(o); }
+		else { return this.remove_1Ljava_lang_Object$(o); }
+	},
+
+    remove_1Ljava_lang_Object$: function(o)
     {
         var i = this.iterator_0();
         var didremove = false;

diff --git a/runtimejs/java/util/AbstractList.js b/runtimejs/java/util/AbstractList.js
@@ -84,7 +84,7 @@ _defclass(java_util_AbstractList, java_util_AbstractCollection, [java_util_List]
     },
 
     // OPTIMIZATION        
-    remove_1: function(obj)
+    remove_1Ljava_lang_Object$: function(obj)
     {
         var idx = this.indexOf_1(obj);
         if (idx>=0)

diff --git a/runtimejs/java/util/HashSet.js b/runtimejs/java/util/HashSet.js
@@ -55,7 +55,7 @@ _defclass(java_util_HashSet, java_util_AbstractCollection, [java_util_Set],
     },
 
     // OPTIMIZATION
-    remove_1: function(key) 
+    remove_1Ljava_lang_Object$: function(key) 
     {   return this._map.remove_1(key)!==null;
     },
 
@@ -64,7 +64,7 @@ _defclass(java_util_HashSet, java_util_AbstractCollection, [java_util_Set],
     {   var i = collection.iterator_0();
         var didremove = false;
         while (i.hasNext_0()) 
-        {   if (this.remove_1(i.next_0())) 
+        {   if (this.remove_1Ljava_lang_Object$(i.next_0())) 
             {   didremove = true;
             }
         }        

diff --git a/src/com/greentube/javaconverter/LibraryList.java b/src/com/greentube/javaconverter/LibraryList.java
@@ -368,7 +368,7 @@ public class LibraryList
             "boolean isEmpty()",
             "void forEach(java.util.function.Consumer)",
             "java.util.Iterator iterator()",
-            "java.lang.Object remove(java.lang.Object)",
+            "boolean remove(java.lang.Object)",
             "boolean removeAll(java.util.Collection)",
             "boolean retainAll(java.util.Collection)",
             "int size()",

diff --git a/test/src/com/greentube/convertertest/TestJava4.java b/test/src/com/greentube/convertertest/TestJava4.java
@@ -2311,9 +2311,20 @@ public static void vectortest() {
 
         c = (Vector) v.clone();
         c.removeElementAt(2);
-        c.removeElementAt(1);
+        c.remove(1);
         assertO(c.toString(), "[homer, lisa, meggy]");
-
+        c.remove("lisa");
+        assertO(c.toString(), "[homer, meggy]");
+        {	AbstractList al= c; 
+        	al.remove(0);
+        }
+        assertO(c.toString(), "[meggy]");
+        {  
+            AbstractCollection ac= c; 
+        	ac.remove("meggy");
+        }
+        assertO(c.toString(), "[]");
+
         c = (Vector) v.clone();
         c.set(3, "LISA");
         c.setElementAt("MARGE",1);
@@ -2430,6 +2441,21 @@ public static void arraylisttest() {
         assertO(l.toString(),"[alice, bob, corbin, doris, xavier, carl]");
         l.remove(l.indexOf("doris"));
         assertO(l.toString(),"[alice, bob, corbin, xavier, carl]");
+
+        l2 = new ArrayList(Arrays.asList("alice", "bob", "corbin", "xavier", "carl"));
+        assertO(l2.toString(), "[alice, bob, corbin, xavier, carl]");
+        l2.remove("corbin");
+        assertO(l2.toString(), "[alice, bob, xavier, carl]");
+        {	AbstractList al= l2; 
+        	al.remove(0);
+        }
+        assertO(l2.toString(), "[bob, xavier, carl]");
+        {  
+            AbstractCollection ac = l2; 
+        	ac.remove("bob");
+        }
+        assertO(l2.toString(), "[xavier, carl]");
+
 
         l2.clear();
         l2.add("bob");
@@ -2493,6 +2519,7 @@ public static void arraylisttest() {
         assertO(itt.toString(), "[8, 14]");
         itt.remove(Integer.valueOf(8));
         assertO(itt.toString(), "[14]");
+
     }
 
 
@@ -2740,6 +2767,8 @@ public static void hashsettest() {
     	assertB(s.contains(new Integer(44)));
     	assertB(s.contains(Integer.valueOf(43)));
     	assertI(s.hashCode(), 91);
+    	s.remove(Byte.valueOf((byte)4));
+    	assertB(!s.contains(Byte.valueOf((byte)4)));
     }
 
     public static void linkedlisttest() {
@@ -2831,7 +2860,10 @@ public static void linkedlisttest() {
         	Integer e = (Integer) iti.next();
         	if (e.intValue()%2==1) iti.remove();
         }
-        assertO(itt.toString(), "[8, 14]");            	
+        assertO(itt.toString(), "[8, 14]");  
+
+        itt.remove(Integer.valueOf(8));
+        assertO(itt.toString(), "[14]");  
     }
 
     public static void collectionremovaltest()