final refactoring -- Helpers to inner static classes

BobHanson · BobHanson · commit f5d5b56f3167 · 2023-11-25T17:35:43.000-06:00
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/BindingHelper.java b/sources/net.sf.j2s.core/src/j2s/jmol/BindingHelper.java
@@ -11,7 +11,7 @@
  *       bug "inline method - doesn't handle implicit cast" (see
  *       https://bugs.eclipse.org/bugs/show_bug.cgi?id=24941).
  *******************************************************************************/
-package j2s.jmol.common;
+package j2s.jmol;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/J2SASTVisitor.java b/sources/net.sf.j2s.core/src/j2s/jmol/J2SASTVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
-package j2s.jmol.common;
+package j2s.jmol;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/J2SDependencyVisitor.java b/sources/net.sf.j2s.core/src/j2s/jmol/J2SDependencyVisitor.java
@@ -9,7 +9,7 @@
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
 
-package j2s.jmol.common;
+package j2s.jmol;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/J2SKeywordVisitor.java b/sources/net.sf.j2s.core/src/j2s/jmol/J2SKeywordVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
-package j2s.jmol.common;
+package j2s.jmol;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/Java2ScriptLegacyCompiler.java b/sources/net.sf.j2s.core/src/j2s/jmol/Java2ScriptLegacyCompiler.java
@@ -12,8 +12,6 @@
 
 import j2s.CorePlugin;
 import j2s.core.Java2ScriptCompiler;
-import j2s.jmol.common.Java2ScriptPrimaryVisitor;
-import j2s.jmol.common.J2SDependencyVisitor;
 
 public class Java2ScriptLegacyCompiler extends Java2ScriptCompiler {
 
@@ -119,7 +117,7 @@ public boolean compileToJavaScript(IFile javaSource, String trailer) {
 			return false;
 		}
 
-		Java2ScriptPrimaryVisitor visitor = new Java2ScriptPrimaryVisitor();
+		Java2ScriptLegacyVisitor visitor = new Java2ScriptLegacyVisitor();
 		isDebugging = "debug".equals(props.getProperty("j2s.compiler.mode"));
 		errorOccurs = false;
 		try {
@@ -145,7 +143,7 @@ public boolean compileToJavaScript(IFile javaSource, String trailer) {
 		return false;
 	}
 
-	private void outputJavaScript(Java2ScriptPrimaryVisitor visitor, J2SDependencyVisitor dvisitor, CompilationUnit fRoot,
+	private void outputJavaScript(Java2ScriptLegacyVisitor visitor, J2SDependencyVisitor dvisitor, CompilationUnit fRoot,
 			String outputPath, String trailer, String sourceLocation) {
 		String js = finalFixes(dvisitor.cleanLoadCalls(visitor));
 		String elementName = fRoot.getJavaElement().getElementName();
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/Java2ScriptLegacyVisitor.java b/sources/net.sf.j2s.core/src/j2s/jmol/Java2ScriptLegacyVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
-package j2s.jmol.common;
+package j2s.jmol;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -50,6 +50,11 @@
 import org.eclipse.jdt.core.dom.PrefixExpression;
 import org.eclipse.jdt.core.dom.PrimitiveType;
 import org.eclipse.jdt.core.dom.PrimitiveType.Code;
+
+import j2s.jmol.J2SKeywordVisitor.FinalVariable;
+import j2s.jmol.J2SKeywordVisitor.MethodReferenceASTVisitor;
+import j2s.jmol.J2SKeywordVisitor.VariableHelper;
+
 import org.eclipse.jdt.core.dom.QualifiedName;
 import org.eclipse.jdt.core.dom.QualifiedType;
 import org.eclipse.jdt.core.dom.ReturnStatement;
@@ -99,7 +104,7 @@
  *
  *         2006-12-3
  */
-public class Java2ScriptPrimaryVisitor extends J2SKeywordVisitor {
+public class Java2ScriptLegacyVisitor extends J2SKeywordVisitor {
 
 	// UNFIXED bugs left here because not an issue in Jmol.
 	//
@@ -1029,11 +1034,11 @@ public boolean visit(EnumDeclaration node) {
 		}
 		if ((node != rootTypeNode) && node.getParent() != null && node.getParent() instanceof AbstractTypeDeclaration) {
 			/* inner static class */
-			Java2ScriptPrimaryVisitor visitor = null;
+			Java2ScriptLegacyVisitor visitor = null;
 			try {
 				visitor = this.getClass().newInstance();
 			} catch (@SuppressWarnings("unused") Exception e) {
-				visitor = new Java2ScriptPrimaryVisitor(); // Default visitor
+				visitor = new Java2ScriptLegacyVisitor(); // Default visitor
 			}
 			visitor.rootTypeNode = node;
 			visitor.typeHelper.setClassName(this.typeHelper.getClassName());
@@ -2805,11 +2810,11 @@ public boolean visit(TypeDeclaration node) {
 		if ((node != rootTypeNode) && node.getParent() != null && (node.getParent() instanceof AbstractTypeDeclaration
 				|| node.getParent() instanceof TypeDeclarationStatement)) {
 			/* inner static class */
-			Java2ScriptPrimaryVisitor visitor = null;
+			Java2ScriptLegacyVisitor visitor = null;
 			try {
 				visitor = this.getClass().newInstance();
 			} catch (@SuppressWarnings("unused") Exception e) {
-				visitor = new Java2ScriptPrimaryVisitor(); // Default visitor
+				visitor = new Java2ScriptLegacyVisitor(); // Default visitor
 			}
 			visitor.rootTypeNode = node;
 			String className = typeVisitor.getClassName();
