adds .j2s param j2s.class.replacements

BobHanson · BobHanson · commit ba50f7e273b8 · 2018-06-19T16:52:26.000+01:00
j2s.class.replacements=org.apache.log4j.-&gt;jalview.javascript.;
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java
@@ -1452,7 +1452,7 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 			buffer.append("var $vals=[];\r\n");
 			// implicit Enum methods added as trailer
 			buffer.append("Clazz.newMeth(C$, 'values', function() { return $vals }, 1);\r\n");			
-			buffer.append("Clazz.newMeth(C$, 'valueOf$S, '$valueOf$S', function(name) { for (var val in $vals){ if ($vals[val].$name == name) return $vals[val]} return null }, 1);\r\n");
+			buffer.append("Clazz.newMeth(C$, '$valueOf$S', function(name) { for (var val in $vals){ if ($vals[val].$name == name) return $vals[val]} return null }, 1);\r\n");
 		} else {
 			buffer.append(trailingBuffer); // also writes the assert string
 			if (isAnonymous) {
@@ -4655,6 +4655,53 @@ public void setDebugging(boolean isDebugging) {
 	}
 
 	
+
+	private static Map<String, String> htClassReplacements;
+	private static List<String> lstPackageReplacements;
+	
+	// j2s.class.replacements=org.apache.log4j.*:jalview.jslogger.;
+	public void setClassReplacements(String keyValues) {
+		if (keyValues == null || htClassReplacements != null)
+			return;
+		htClassReplacements = new Hashtable<String, String>();
+		lstPackageReplacements = new ArrayList<String>();
+		String[] pairs = keyValues.split(";");
+		for (int i = pairs.length; --i >= 0;) {
+			pairs[i] = pairs[i].trim();
+			if (pairs[i].length() == 0)
+				continue;
+			String[] kv = pairs[i].split("->");
+			htClassReplacements.put(kv[0], kv[1]);
+			if (kv[0].endsWith("."))
+				lstPackageReplacements.add(kv[0]);
+			System.err.println("class replacement " + kv[0] + " --> " + kv[1]);
+		}
+	}
+
+	
+	private String checkClassReplacement(String className) {
+		if (htClassReplacements != null) {
+			String rep = htClassReplacements.get(className);
+			if (rep == null && lstPackageReplacements != null) {
+				for (int i = lstPackageReplacements.size(); --i >= 0;) {
+					rep = lstPackageReplacements.get(i);
+					if (className.startsWith(rep)) {
+						rep = htClassReplacements.get(rep) + className.substring(rep.length());
+						break;
+					}
+					if (i == 0)
+						rep = null;
+				}
+				
+			}
+			if (rep != null) {
+				System.out.println(className + " -> " + rep);
+				return rep;
+			}
+		}
+		return className;
+	}
+
 	/**
 	 * tracks file byte pointers for @j2sNative, @j2sIgnore
 	 */
@@ -4716,7 +4763,7 @@ private String getNestedClazzLoads(String className, boolean doCache) {
 		// loop through packages and outer Class
 		while (i < parts.length && (i == 1 || !Character.isUpperCase(parts[i - 1].charAt(0))))
 			s += "." + parts[i++];
-		s = "'" + s + "'";
+		s = "'" + checkClassReplacement(s) + "'";
 		// int nlast = parts.length;
 		if (i < parts.length) {
 			s = "[" + s;
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java
@@ -128,6 +128,7 @@ public void process(ICompilationUnit sourceUnit, IContainer binaryFolder) {
 		Java2ScriptVisitor.setNoQualifiedNamePackages(getProperty("j2s.compiler.nonqualified.classes"));
 		boolean isDebugging = "debug".equals(getProperty("j2s.compiler.mode"));
 		visitor.setDebugging(isDebugging);
+		visitor.setClassReplacements(getProperty("j2s.class.replacements"));
 		String j2sPath = siteFolder + "/swingjs/j2s";
 		try {
 
diff --git a/sources/net.sf.j2s.java.core/src/java/security/AccessController.java b/sources/net.sf.j2s.java.core/src/java/security/AccessController.java
@@ -8,6 +8,13 @@ public static <T> T doPrivileged(PrivilegedAction<T> action) {
 		return action.run();
 	}
 
+	public static void doPrivileged(PrivilegedExceptionAction<Void> privilegedExceptionAction) {
+		try {
+			privilegedExceptionAction.run();
+		} catch (Exception e) {
+		}		
+	}
+
 	public static AccessControlContext getContext() {
 		return new AccessController();
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,13 @@ public static <T> T doPrivileged(PrivilegedAction<T> action) {`
`8`	`8`	`return action.run();`
`9`	`9`	`}`
`10`	`10`
	`11`	`+ public static void doPrivileged(PrivilegedExceptionAction<Void> privilegedExceptionAction) {`
	`12`	`+ try {`
	`13`	`+ privilegedExceptionAction.run();`
	`14`	`+ } catch (Exception e) {`
	`15`	`+ }`
	`16`	`+ }`
	`17`	`+`
`11`	`18`	`public static AccessControlContext getContext() {`
`12`	`19`	`return new AccessController();`
`13`	`20`	`}`