refactoring adapters, adds build_core_applet and Google closure compiler

BobHanson · BobHanson · commit 49b7d60bc43c · 2017-12-17T02:31:03.000-06:00
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTEmptyVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTEmptyVisitor.java
@@ -101,11 +101,11 @@
 import org.eclipse.jdt.core.dom.WhileStatement;
 import org.eclipse.jdt.core.dom.WildcardType;
 
-import net.sf.j2s.core.adapters.AbstractPluginAdapter;
-import net.sf.j2s.core.adapters.FinalVariable;
-import net.sf.j2s.core.adapters.J2SMapAdapter;
-import net.sf.j2s.core.adapters.TypeAdapter;
-import net.sf.j2s.core.adapters.VariableAdapter;
+import net.sf.j2s.core.astvisitors.adapters.AbstractPluginAdapter;
+import net.sf.j2s.core.astvisitors.adapters.FinalVariable;
+import net.sf.j2s.core.astvisitors.adapters.J2SMapAdapter;
+import net.sf.j2s.core.astvisitors.adapters.TypeAdapter;
+import net.sf.j2s.core.astvisitors.adapters.VariableAdapter;
 
 /**
  * This empty visitor just gives a way for debugging. That is to say, in 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTJ2SDocVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTJ2SDocVisitor.java
@@ -31,8 +31,8 @@
 import org.eclipse.jdt.core.dom.TagElement;
 import org.eclipse.jdt.core.dom.TextElement;
 
-import net.sf.j2s.core.adapters.Bindings;
-//import net.sf.j2s.core.adapters.ExtendedAdapter;
+import net.sf.j2s.core.astvisitors.adapters.Bindings;
+//import net.sf.j2s.core.astvisitors.adapters.ExtendedAdapter;
 
 /**
  * This level of Visitor focuses on dealing with 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java
@@ -63,13 +63,13 @@
 import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 
-import net.sf.j2s.core.adapters.Bindings;
-//import net.sf.j2s.core.adapters.ExtendedAdapter;
-import net.sf.j2s.core.adapters.FieldAdapter;
-import net.sf.j2s.core.adapters.FinalVariable;
-import net.sf.j2s.core.adapters.J2SMapAdapter;
-import net.sf.j2s.core.adapters.TypeAdapter;
-import net.sf.j2s.core.adapters.VariableAdapter;
+import net.sf.j2s.core.astvisitors.adapters.Bindings;
+//import net.sf.j2s.core.astvisitors.adapters.ExtendedAdapter;
+import net.sf.j2s.core.astvisitors.adapters.FieldAdapter;
+import net.sf.j2s.core.astvisitors.adapters.FinalVariable;
+import net.sf.j2s.core.astvisitors.adapters.J2SMapAdapter;
+import net.sf.j2s.core.astvisitors.adapters.TypeAdapter;
+import net.sf.j2s.core.astvisitors.adapters.VariableAdapter;
 
 //BH 11/18/2017 -- adds full name-qualified support for generics, including generic methods   
 //BH 9/10/2017 -- adds full byte, short, and int distinction using class-level local fields $b$, $s$, and $i$, which are IntXArray[1].
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -70,11 +70,11 @@
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
 import org.eclipse.jdt.core.dom.WhileStatement;
 
-import net.sf.j2s.core.adapters.FinalVariable;
-import net.sf.j2s.core.adapters.J2SMapAdapter;
-import net.sf.j2s.core.adapters.MethodAdapter;
-import net.sf.j2s.core.adapters.TypeAdapter;
-import net.sf.j2s.core.adapters.VariableAdapter;
+import net.sf.j2s.core.astvisitors.adapters.FinalVariable;
+import net.sf.j2s.core.astvisitors.adapters.J2SMapAdapter;
+import net.sf.j2s.core.astvisitors.adapters.MethodAdapter;
+import net.sf.j2s.core.astvisitors.adapters.TypeAdapter;
+import net.sf.j2s.core.astvisitors.adapters.VariableAdapter;
 
 // TODO: static calls to static methods do not trigger "musts" dependency
 // BH 9/10/2017 -- adds full byte, short, and int distinction using class-level local fields $b$, $s$, and $i$, which are IntXArray[1]. (See ASTKeywordVisitor)
@@ -807,11 +807,11 @@ public boolean visit(SuperMethodInvocation node) {
 		// BH if this is a call to super.clone() and there is no superclass, or
 		// the superclass is Object,
 		// then we need to invoke Clazz.clone(this) directly instead of calling
-		// C$.superClazz.clone()
+		// C$.superclazz.clone()
 		if ("clone".equals(name) && getSuperclassNameQualified(mBinding.getDeclaringClass()) == null) {
 			buffer.append("Clazz.clone(this)");
 		} else {
-			buffer.append("C$.superClazz.prototype." + name + ".apply(this, ");
+			buffer.append("C$.superclazz.prototype." + name + ".apply(this, ");
 			buffer.append("[");
 			addMethodParameterList(node.arguments(), mBinding, false, null, null, false);
 			buffer.append("])");
@@ -1361,7 +1361,7 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 				String buf = buffer.substring(len);
 				buffer.setLength(len);
 				buffer.append("\r\nClazz.newMeth(C$, '$init0$', function () {\r\n");
-				buffer.append("var c;if((c = C$.superClazz) && (c = c.$init0$))c.apply(this);\r\n");
+				buffer.append("var c;if((c = C$.superclazz) && (c = c.$init0$))c.apply(this);\r\n");
 				buffer.append(init0Buffer);
 				buffer.append("}, 1);\r\n");
 				buffer.append(buf);
@@ -1691,7 +1691,7 @@ private void addSuperConstructor(SuperConstructorInvocation node, IMethodBinding
 			buffer.append("Clazz.super(C$, this,1);\r\n");
 			return;
 		} 
-		buffer.append(getJ2SQualifiedName("C$.superClazz.c$", null, node.resolveConstructorBinding(), null, false));
+		buffer.append(getJ2SQualifiedName("C$.superclazz.c$", null, node.resolveConstructorBinding(), null, false));
 		buffer.append(".apply(this");
 		addMethodParameterList(node.arguments(), methodDeclaration, true, ", [", "]", false);
 		buffer.append(");\r\n");
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/AbstractPluginAdapter.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/AbstractPluginAdapter.java
@@ -9,7 +9,7 @@
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
 
-package net.sf.j2s.core.adapters;
+package net.sf.j2s.core.astvisitors.adapters;
 
 import net.sf.j2s.core.astvisitors.ASTEmptyVisitor;
 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/Bindings.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/Bindings.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 net.sf.j2s.core.adapters;
+package net.sf.j2s.core.astvisitors.adapters;
 
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/FieldAdapter.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/FieldAdapter.java
@@ -9,7 +9,7 @@
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
 
-package net.sf.j2s.core.adapters;
+package net.sf.j2s.core.astvisitors.adapters;
 
 import java.util.HashSet;
 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/FinalVariable.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/FinalVariable.java
@@ -1,4 +1,4 @@
-package net.sf.j2s.core.adapters;
+package net.sf.j2s.core.astvisitors.adapters;
 
 /**
  * FinalVariable that is used to record variable state, which will provide
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/J2SMapAdapter.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/J2SMapAdapter.java
@@ -9,7 +9,7 @@
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
 
-package net.sf.j2s.core.adapters;
+package net.sf.j2s.core.astvisitors.adapters;
 
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.IMethodBinding;
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/MethodAdapter.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/MethodAdapter.java
@@ -9,7 +9,7 @@
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
 
-package net.sf.j2s.core.adapters;
+package net.sf.j2s.core.astvisitors.adapters;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/NameConvertItem.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/NameConvertItem.java
@@ -9,7 +9,7 @@
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
 
-package net.sf.j2s.core.adapters;
+package net.sf.j2s.core.astvisitors.adapters;
 
 /**
  * @author zhou renjian
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/TypeAdapter.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/TypeAdapter.java
@@ -9,7 +9,7 @@
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
 
-package net.sf.j2s.core.adapters;
+package net.sf.j2s.core.astvisitors.adapters;
 
 import org.eclipse.jdt.core.dom.ArrayType;
 import org.eclipse.jdt.core.dom.ITypeBinding;
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/VariableAdapter.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/adapters/VariableAdapter.java
@@ -9,7 +9,7 @@
  *     Zhou Renjian - initial API and implementation
  *******************************************************************************/
 
-package net.sf.j2s.core.adapters;
+package net.sf.j2s.core.astvisitors.adapters;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/sources/net.sf.j2s.java.core/build_core_applet.xml b/sources/net.sf.j2s.java.core/build_core_applet.xml
diff --git a/sources/net.sf.j2s.java.core/jars/closure_compiler.jar b/sources/net.sf.j2s.java.core/jars/closure_compiler.jar
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Class.java b/sources/net.sf.j2s.java.core/src/java/lang/Class.java
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/reflect/Proxy.java b/sources/net.sf.j2s.java.core/src/java/lang/reflect/Proxy.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.sf.j2s.core.adapters;`
	`1`	`+package net.sf.j2s.core.astvisitors.adapters;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* FinalVariable that is used to record variable state, which will provide`