java2script
diff --git a/‎sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar‎
-7 Bytes b/‎sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar‎
-7 Bytes
diff --git a/‎sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar‎
-7 Bytes b/‎sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar‎
-7 Bytes
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java‎
Lines changed: 9 additions & 6 deletions b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java‎
Lines changed: 9 additions & 6 deletions
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java‎
Lines changed: 1 addition & 1 deletion b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java‎
Lines changed: 1 addition & 1 deletion
@@ -122,6 +122,7 @@
 import org.eclipse.jdt.core.dom.WhileStatement;
 import org.eclipse.jdt.core.dom.WildcardType;
 
+// BH 6/19/2018 -- adds .j2s j2s.class.replacements=org.apache.log4j.->jalview.javascript.log4j.;
 // BH 5/15/2018 -- fix for a[pt++] |= 3  incrementing pt twice and disregarding a[][] (see test/Test_Or.java)
 // BH 3/27/2018 -- fix for anonymous inner classes of inner classes not having this.this$0
 // BH 1/5/2018 --  @j2sKeep removed; refactored into one class
@@ -4361,9 +4362,10 @@ private static String j2sGetParamCode(ITypeBinding binding, boolean addAAA, bool
 			name = "S";
 			break;
 		default:
-			if (prefix != null)
+			if (prefix == null)
+				name = checkClassReplacement(name);
+			else
 				name = (asGenericObject ? "O" : prefix + name); // "O";//
-
 			name = name.replace("java.lang.", "").replace('.', '_');
 			break;
 		}
@@ -4659,9 +4661,10 @@ 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)
+	public static void setClassReplacements(String keyValues) {
+		// j2s.class.replacements=org.apache.log4j.*:jalview.jslogger.;
+		htClassReplacements = null;
+		if (keyValues == null)
 			return;
 		htClassReplacements = new Hashtable<String, String>();
 		lstPackageReplacements = new ArrayList<String>();
@@ -4679,7 +4682,7 @@ public void setClassReplacements(String keyValues) {
 	}
 
 
-	private String checkClassReplacement(String className) {
+	private static String checkClassReplacement(String className) {
 		if (htClassReplacements != null) {
 			String rep = htClassReplacements.get(className);
 			if (rep == null && lstPackageReplacements != null) {
 
@@ -128,7 +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"));
+		Java2ScriptVisitor.setClassReplacements(getProperty("j2s.class.replacements"));
 		String j2sPath = siteFolder + "/swingjs/j2s";
 		try {