Merge pull request #159 from BobHanson/hanson1

BobHanson · web-flow · commit c40d4248da2c · 2020-03-21T09:43:57.000-05:00
HashMap options allow switching off JavaScript Map in HashMap/Hashtable
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20200321064259 
+20200321085805 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200321064259 
+20200321085805 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -30,6 +30,9 @@ public class CorePlugin extends Plugin {
 	// if you change the x.x.x number, be sure to also indicate that in 
 	// j2sApplet.js and also (Bob only) update.bat, update-clean.bat
 
+	// BH 2020.03.21 -- 3.2.9-v1e better v1c 
+	// BH 2020.03.20 -- 3.2.9-v1d proper check for new String("x") == "x" (should be false), but new integer(3) == 3 (true) 
+	// BH 2020.03.20 -- 3.2.9-v1c more efficient static call from 3.2.9-v1a 
 	// BH 2020.02.26 -- 3.2.9-v1b allows (byte) = (byte) to not use |0 
 	// BH 2020.02.20 -- 3.2.9-v1a reverses c,args order in new_(c,args,...) when both have expressions
 	// BH 2020.02.18 -- 3.2.8-v2 fixes import static missing $I$ defs.
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/doc/Differences.txt b/sources/net.sf.j2s.java.core/doc/Differences.txt
@@ -556,9 +556,9 @@ new HashSet()
 
 all use the JavaScript Map. But
 
-new Hashtable(11, 0.75)
-new HashMap(16, 0.75)
-new HashSet(16, 0.75)
+new Hashtable(11, 0.75f)
+new HashMap(16, 0.75f)
+new HashSet(16, 0.75f)
 
 do not. 
 
diff --git a/sources/net.sf.j2s.java.core/src/java/util/HashMap.java b/sources/net.sf.j2s.java.core/src/java/util/HashMap.java
@@ -253,6 +253,7 @@ public class HashMap<K, V> extends AbstractMap<K, V> implements Map<K, V>, Clone
 	static final int MIN_TREEIFY_CAPACITY = 64;
 
 	Map<String, Object> 秘m;
+	boolean 秘allowJS = false;
 
 	/**
 	 * Basic hash bin node, used for most entries. (See below for TreeNode subclass,
@@ -421,6 +422,13 @@ static final int tableSizeFor(int cap) {
 	 */
 	final float loadFactor;
 
+	/**
+	 * flag developers can use to switch off all use of simple JavaScript Map objects
+	 * 
+	 * not final, so that it can be managed on the fly in SwingJS
+	 */
+	public static boolean USE_SIMPLE = true;
+
 	/* ---------------- Public operations -------------- */
 
 	/**
@@ -456,6 +464,7 @@ public HashMap(int initialCapacity, float loadFactor) {
 	 */
 	public HashMap(int initialCapacity) {
 		this(initialCapacity, DEFAULT_LOAD_FACTOR);
+		秘allowJS = true;
 		秘setJS();
 	}
 
@@ -466,6 +475,7 @@ public HashMap(int initialCapacity) {
 	 * and the default load factor (0.75).
 	 */
 	public HashMap() {
+		秘allowJS = true;
 		秘setJS();
 		this.loadFactor = DEFAULT_LOAD_FACTOR; // all other fields defaulted
 	}
@@ -480,6 +490,7 @@ public HashMap() {
 	 * @throws NullPointerException if the specified map is null
 	 */
 	public HashMap(Map<? extends K, ? extends V> m) {
+        秘allowJS = (/** @j2sNative m.allowJS ||*/false);
 		秘setJS();
 		this.loadFactor = DEFAULT_LOAD_FACTOR;
 		putMapEntries(m, false);
@@ -3067,7 +3078,7 @@ static <K, V> boolean checkInvariants(TreeNode<K, V> t) {
 
 	protected void 秘setJS() {
 
-		秘m = (Map.USE_SIMPLE ? /** @j2sNative new Map() || */
+		秘m = (秘allowJS && HashMap.USE_SIMPLE ? /** @j2sNative new Map() || */
 				null : null);
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/java/util/Hashtable.java b/sources/net.sf.j2s.java.core/src/java/util/Hashtable.java
@@ -130,6 +130,7 @@ public class Hashtable<K,V>
     implements Map<K,V>, Cloneable, java.io.Serializable {
 
 	Map<String, Object> 秘m;
+	boolean 秘allowJS = false;
 
     /**
      * The hash table data.
@@ -204,6 +205,7 @@ public Hashtable(int initialCapacity, float loadFactor) {
      */
     public Hashtable(int initialCapacity) {
         this(initialCapacity, 0.75f);
+        秘allowJS = true;
 		秘setJS();		
     }
 
@@ -215,6 +217,7 @@ public Hashtable(int initialCapacity) {
      */
     public Hashtable() {
         this(11, 0.75f);
+        秘allowJS = true;
 		秘setJS();		
     }
 
@@ -229,6 +232,7 @@ public Hashtable() {
      */
     public Hashtable(Map<? extends K, ? extends V> t) {
         this(Math.max(2*t.size(), 11), 0.75f);
+        秘allowJS = (/** @j2sNative t.allowJS ||*/false);
         putAll(t);
     }
 
@@ -1946,7 +1950,7 @@ public void remove() {
     }
     
 	protected void 秘setJS() {		
-		秘m = (Map.USE_SIMPLE ? /** @j2sNative new Map() || */
+		秘m = (秘allowJS && HashMap.USE_SIMPLE ? /** @j2sNative new Map() || */
 				null : null);
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/java/util/Map.java b/sources/net.sf.j2s.java.core/src/java/util/Map.java
@@ -1200,11 +1200,6 @@ default V merge(K key, V value,
 			 */
 	}
 
-	/**
-	 * flag developers can use to switch off all use of simple JavaScript Map objects 
-	 */
-	static boolean USE_SIMPLE = true;
-	
 	final static int NOT_SIMPLE = 0;
 	final static int INVALID_KEY = 1;
 	final static int NO_SUCH_KEY = 2;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -921,5 +921,18 @@ public URL getCodeBase() {
 		}
 	}
 
+	  /**
+	   * Switch the flag in SwingJS to use or not use the JavaScript Map object in
+	   * Hashtable, HashMap, and HashSet. Default is enabled.
+	   * 	   * 
+	   */
+	@Override
+	  public void setJavaScriptMapObjectEnabled(boolean enabled)
+	  {
+	    /**
+	     * @j2sNative Clazz.loadClass("java.util.HashMap").USE_SIMPLE = enabled;
+	     */
+	  }
+
 }
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/JSUtilI.java b/sources/net.sf.j2s.java.core/src/swingjs/api/JSUtilI.java
@@ -164,4 +164,11 @@ public interface JSUtilI {
 	 */
 	boolean streamToFile(InputStream is, File outFile);
 
+	  /**
+	   * Switch the flag in SwingJS to use or not use the JavaScript Map object in
+	   * Hashtable, HashMap, and HashSet. Default is enabled.
+	   * 	   * 
+	   */
+	void setJavaScriptMapObjectEnabled(boolean enabled);
+
 }
