ensures Applet parameter name is case insensitive

hansonr · hansonr · commit 51ec0b9e8219 · 2019-05-16T07:26:24.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSApp.java b/sources/net.sf.j2s.java.core/src/swingjs/JSApp.java
@@ -2,27 +2,33 @@
 
 import java.util.Hashtable;
 import java.util.Locale;
+import java.util.Map.Entry;
 
 import swingjs.api.js.HTML5Applet;
 
 @SuppressWarnings("rawtypes")
 public class JSApp {
 
 	public JSApp() {
-		// Frame only; not applet
+		// Frame entry point
 	}
 
 	public JSApp(Hashtable<String, Object> params) {
+		// JApplet entry point
 		setAppParams(params);
 	}
-	
+
+	/**
+	 * Only called from setAppParams
+	 * @param name
+	 * @return
+	 */
 	public String getParameter(String name) {
-		String s = (String) params.get(name);
-		System.out.println("get parameter: " + name + " = " + s);
+		String s = (String) params.get(name.toLowerCase());
 		return (s == null ? null : "" + s); // because it may not be a string in JavaScript if inherited from Info
 	}
 	
-	protected Hashtable params;
+	protected Hashtable<String, Object> params;
 
 	public String appletCodeBase;
 	public String appletIdiomaBase;
@@ -52,6 +58,16 @@ public String getParameter(String name) {
 	 */
 	protected void setAppParams(Hashtable<String, Object> params) {
 		this.params = params;
+		// Although we allow params to hold mixed-case keys, 
+		// we need to ensure that it has the lower-case version
+		// It was an early design flaw, unfortunately.
+		// At least for now, this is the solution.
+		for (Entry<String, Object> e: params.entrySet()) {
+			String key = e.getKey();
+			String lckey = key.toLowerCase();
+			if (!key.equals(lckey))
+				params.put(lckey, e.getValue());
+		}
 		String language = getParameter("language");
 		if (language == null)
 			language = JSUtil.J2S.getDefaultLanguage(false);
@@ -63,18 +79,18 @@ protected void setAppParams(Hashtable<String, Object> params) {
 
 		syncId = getParameter("syncId");
 		fullName = htmlName + "__" + syncId + "__";
-		params.put("fullName", fullName);
-		Object o = params.get("codePath");
+		params.put("fullname", fullName);
+		Object o = params.get("codepath");
 		if (o == null)
 			o = "../java/";
 		appletCodeBase = o.toString();
 		appletIdiomaBase = appletCodeBase.substring(0,
 				appletCodeBase.lastIndexOf("/", appletCodeBase.length() - 2) + 1)
 				+ "idioma";
-		o = params.get("documentBase");
+		o = params.get("documentbase");
 		appletDocumentBase = (o == null ? "" : o.toString());
-		if (params.containsKey("maximumSize"))
-			Math.max(((Integer) params.get("maximumSize")).intValue(), 100);
+		if (params.containsKey("maximumsize"))
+			Math.max(((Integer) params.get("maximumsize")).intValue(), 100);
 		async = (testAsync || params.containsKey("async"));
 		HTML5Applet applet = JSUtil.J2S.findApplet(htmlName); 
 		String javaver = JSUtil.J2S.getJavaVersion();
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java b/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java
@@ -262,7 +262,7 @@ public void run() {
 	@Override
 	public URL getDocumentBase() {
 		try {
-			return new URL((String) params.get("documentBase"));
+			return new URL((String) params.get("documentbase"));
 		} catch (MalformedURLException e) {
 			return null;
 		}
@@ -271,18 +271,17 @@ public URL getDocumentBase() {
 	@Override
 	public URL getCodeBase() {
 		try {
-			return new URL((String) params.get("codePath"));
+			return new URL((String) params.get("codepath"));
 		} catch (MalformedURLException e) {
 			return null;
 		}
 	}
 
 	@Override
 	public String getParameter(String name) {
-		String s = (String) params.get(name);
-		System.out.println("get parameter: " + name + " = " + s);
-		return (s == null ? null : "" + s); // because it may not be a string in
-											// JavaScript if inherited from Info
+		String s = super.getParameter(name);
+		System.out.println("JSApp get parameter: " + name + " = " + s);
+		return s;
 	}
 
 	@Override
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -2287,10 +2287,10 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 	};
 
 	J2S._setAppletParams = function(availableParams, params, Info, isHashtable) {
-		for ( var i in Info)
+		for (var i in Info) {
 			if (!availableParams
 					|| availableParams.indexOf(";" + i.toLowerCase() + ";") >= 0) {
-				if (Info[i] == null || i == "language"
+				if (Info[i] == null || lci == "language"
 						&& !J2S.featureDetection.supportsLocalization())
 					continue;
 				// params.put$TK$TV(i, (Info[i] === true ? Boolean.TRUE: Info[i]
@@ -2301,6 +2301,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 				else
 					params[i] = Info[i];
 			}
+		}
 	}
 
 	// The original Jmol "applet" was created as an 
