adjustments

BobHanson · BobHanson · commit 6fe508cd8c10 · 2023-11-12T14:27:55.000-06:00
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/Java2ScriptLegacyCompiler.java b/sources/net.sf.j2s.core/src/j2s/jmol/Java2ScriptLegacyCompiler.java
@@ -105,13 +105,10 @@ public boolean compileToJavaScript(IFile javaSource, String trailer) {
 		}
 
 		ASTScriptVisitor visitor = new ASTScriptVisitor();
-		
-		System.out.println("J2SL109 " + visitor.supportsObjectStaticFields);
-
-		
 		isDebugging = "debug".equals(props.getProperty("j2s.compiler.mode"));
  		visitor.setDebugging(isDebugging);
 		dvisitor.setDebugging(isDebugging);
+		dvisitor.setToCompileVariableName(false); // no compression
 		errorOccurs = false;
 		try {
 			root.accept(visitor);
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/common/DependencyASTVisitor.java b/sources/net.sf.j2s.core/src/j2s/jmol/common/DependencyASTVisitor.java
@@ -87,7 +87,7 @@ public class DependencyASTVisitor extends ASTEmptyVisitor {
 	
 	private ASTNode javadocRoot = null;
 
-	protected boolean toCompileVariableName = true;
+	protected boolean toCompileVariableName = false; // BH 2023.11.12
 	
 	public String discardGenericType(String name) {
 		return ((ASTTypeVisitor) getAdaptable(ASTTypeVisitor.class)).discardGenericType(name);
@@ -1046,9 +1046,9 @@ public boolean isToCompileVariableName() {
 		return toCompileVariableName;
 	}
 
-//	public void setToCompileVariableName(boolean toCompileVariableName) {
-//		this.toCompileVariableName = toCompileVariableName;
-//	}
+	public void setToCompileVariableName(boolean toCompileVariableName) {
+		this.toCompileVariableName = toCompileVariableName;
+	}
 	
 	public boolean visit(MethodDeclaration node) {
 		IMethodBinding mBinding = node.resolveBinding();
diff --git a/sources/net.sf.j2s.java.core/build-core-applet_jmol.xml b/sources/net.sf.j2s.java.core/build-core-applet_jmol.xml
@@ -24,7 +24,7 @@
 
    	<echo>creating dist/Jmol-j2s-site.zip </echo>
    	<zip destfile="dist/Jmol-j2s-site.zip" basedir="site_jmol" >
-   		<exclude name="swingjs/j2s/test/**"/>
+   		<exclude name="jsmol/j2s/test/**"/>
    		<exclude name="*.html"/>
    	</zip>
    	
