java2script · BobHanson · Oct 31, 2019 · Oct 29, 2019 · Oct 30, 2019 · Oct 30, 2019
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20191027191514 
+20191031001912 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20191027191514 
+20191031001912 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -20,6 +20,7 @@ public class CorePlugin extends Plugin {
 	 * 
 	 */
 	public static String VERSION = "3.2.4.09";
+	// BH 2019.10.30 -- 3.2.4.09 fixes problem with team...show history...compare having null project.getProject().getLocation()
 	// BH 2019.10.27 -- 3.2.4.09 fixes problem with method of name c() becoming c$() -- constructor
 	// BH 2019.10.25 -- 3.2.4.09 adds j2s.compiler.java.version (default 8)
 	// BH 2019.10.25 -- 3.2.4.09 adds j2s.break.on.error (default false)

diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompilationParticipant.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompilationParticipant.java
@@ -41,8 +41,12 @@ public Java2ScriptCompilationParticipant() {
 	 */
 	@Override
 	public boolean isActive(IJavaProject project) {
+		if (project.getProject().getLocation() == null) {
+			// happens when comparing to team...show history item
+			return false;
+		}
  		boolean isj2s = Java2ScriptCompiler.isActive(project);
- 		String loc = " " + project.getProject().getLocation().toString() + " ";
+ 		String loc = " " + project.getProject().getLocation() + " ";
  		// notify only if changed
  		if (isActiveNotified.indexOf(isj2s + loc) < 0) {
  			System.out.println("J2S isActive " + isj2s + loc);

diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java
@@ -391,7 +391,7 @@ boolean compileToJavaScript(IFile javaSource) {
 				packageName = packageName.substring(0, pt);
 			if (!copyResources.contains(packageName)) {
 				copyResources.add(packageName);
-				String sourceDir = sourceLocation.substring(0, sourceLocation.indexOf("/" + packageName + "/"));
+				String sourceDir = sourceLocation.substring(0, sourceLocation.lastIndexOf("/" + packageName + "/"));
 				File src = new File(sourceDir, packageName);
 				File dest = new File(j2sPath, packageName);
 				copySiteResources(src, dest);

diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -1204,9 +1204,11 @@ private void addMethodInvocation(SimpleName javaQualifier, List<?> arguments, IM
 			}
 		} else {
 			appendFinalMethodQualifier(expression, declaringClass, bname,
-					(isStatic && !isPrivate ? FINAL_ESCAPECACHE : FINAL_CACHE));
+					(isStatic && !isPrivate ? FINAL_ESCAPECACHE : FINAL_CACHE)
+					| (isStatic ? FINAL_STATIC : 0));
 			buffer.append(".");
 		}
+
 		// keep a pointer, because we may rewrite this
 		int ptLog = (doLog ? buffer.length() : 0);
 
@@ -1247,10 +1249,11 @@ private void addMethodInvocation(SimpleName javaQualifier, List<?> arguments, IM
 
 			String j2sName = getFinalDotQualifiedNameForMethod(javaQualifier, mBinding,
 					(expression == null ? METHOD_NULLEXPRESSION : 0) | METHOD_ISQUALIFIED
-							| (lambdaArity >= 0 ? LAMBDA_METHOD : 0));
+							| (lambdaArity >= 0 ? LAMBDA_METHOD : 0) | (isStatic ? FINAL_STATIC : 0));
 
 			String finalMethodNameWith$Params = getFinalMethodNameWith$Params(j2sName, declaringClassJavaClassName,
 					mBinding, null, true, METHOD_NOTSPECIAL);
+
 			if (lambdaArity >= 0) {
 				// The problem here is that we cannot apply a method from an interface
 				// because those methods are not present in JavaScript.
@@ -1323,8 +1326,12 @@ private void appendFinalMethodQualifier(Expression qualifier, ITypeBinding decla
 			}
 		} else if (qualifier instanceof Name && !isVariableBinding(qualifier)) {
 			buffer.append(getFinalJ2SClassNameQualifier((Name) qualifier, declaringClass, null, flags));
+		} else if ((flags & FINAL_STATIC) != 0) {
+			// ensure even if field.method(), as long as method is static, we use Class.method()
+			// otherwise a null value for field will throw an exception.
+			buffer.append(getFinalJ2SClassNameQualifier(null, declaringClass, null, flags));
 		} else {
-			// xxxx.field.foo()
+			// xxxx.field.foo() -- but only if foo is not static
 			// (x ? y : z).foo()
 			// xxx.this.foo()
 			qualifier.accept(this);
@@ -1593,7 +1600,7 @@ public boolean visit(WhileStatement node) {
 	private static final int FIELD_DECL_STATIC_NONDEFAULT = 1;
 	private static final int FIELD_DECL_STATIC_DEFAULTS = 2;
 	private static final int FIELD_DECL_NONSTATIC_ALL = 3;
-
+	
 	private void addAnonymousFunctionWrapper(boolean isOpen) {
 		buffer.append(
 				isOpen ? (buffer.lastIndexOf(")") >= buffer.length() - 3 ? ";" : "") + "\r\n(function(){" : "})()\r\n");
@@ -4543,6 +4550,9 @@ private String getFinalNameForNode(SimpleName node, char lastBufferChar, IVariab
 
 	private static final int FINAL_LAMBDA = 32;
 
+	private static final int FINAL_STATIC = 64;
+
+
 	/**
 	 * Provide access to C$.$clinit$ when a static method is called or a static
 	 * field is accessed.
@@ -4565,9 +4575,9 @@ String getFinalJ2SClassNameQualifier(Name methodQualifier, ITypeBinding declarin
 
 		if (declaringJavaClassName == null)
 			declaringJavaClassName = getJavaClassNameQualified(declaringJavaClass);
-		boolean doEscape = ((flags & FINAL_ESCAPE) == FINAL_ESCAPE);
+		boolean isStatic = ((flags & FINAL_STATIC) == FINAL_STATIC);
+		boolean doEscape = isStatic || ((flags & FINAL_ESCAPE) == FINAL_ESCAPE);
 		boolean doCache = ((flags & FINAL_CACHE) == FINAL_CACHE);
-
 		String name = removeBracketsAndFixNullPackageName(declaringJavaClassName);
 		doEscape &= !NameMapper.isClassKnown(name);
 		if (!doEscape) {
@@ -4585,7 +4595,6 @@ String getFinalJ2SClassNameQualifier(Name methodQualifier, ITypeBinding declarin
 		// lambda classes will always be defined at this point. No need to cache them
 		if (name.indexOf("$lambda") >= 0)
 			return getFinalJ2SClassName(name, FINAL_P);
-
 		return getFinalClazzLoadI$Reference(declaringJavaClass, name, doCache);
 	}
 

diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Container.java b/sources/net.sf.j2s.java.core/src/java/awt/Container.java
@@ -1081,7 +1081,8 @@ protected void addImpl(Component comp, Object constraints, int index) {
 	protected void addImplCont(Component comp, Object constraints, int index) {
 		synchronized (getTreeLock()) {
 
-			if (/** @j2sNative comp.getWrap$  && !this.isWrapper$ || */ false) {
+			// AWT a2s.List alone right now has getWrap
+			if (/** @j2sNative comp.秘getWrap$  && !this.秘isWrapper$ || */ false) {
 				comp = ((A2SWrappedComponent) comp).秘getWrap();
 				comp.background = comp.foreground = null; // this parent should not set the background color				
 			}
@@ -1262,7 +1263,7 @@ public void remove(int index) {
 	public void remove(Component comp) {
 		synchronized (getTreeLock()) {
 
-			if (/** @j2sNative comp.getWrap$ && !this.isWrapper$ || */ false) {
+			if (/** @j2sNative comp.秘getWrap$ && !this.秘isWrapper$ || */ false) {
 				comp = ((A2SWrappedComponent) comp).秘getWrap();
 			}
 

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java
@@ -240,6 +240,8 @@ protected void fillDOM() {
 	 */
 	boolean isLeftToRight = true;
 
+	private boolean awtScrollPaneNeedsLayout;
+
 	/*
 	 * The bits below define JList property changes that affect layout. When one
 	 * of these properties changes we set a bit in updateLayoutStateNeeded. The
@@ -399,7 +401,6 @@ public void paint(Graphics g, JComponent c) {
 	}
 
 	private void paintImpl(Graphics g, JComponent c) {
-
 		// It is the responsibility of the JScrollPane scrollbar will move the JList
 		// to new x,y coordinates.
 
@@ -431,7 +432,6 @@ private void paintImpl(Graphics g, JComponent c) {
 		if ((renderer == null) || (size = dataModel.getSize()) == 0) {
 			return;
 		}
-
 		// Determine how many columns we need to paint
 		Rectangle paintBounds = g.getClipBounds();
 		int startColumn, endColumn;
@@ -477,6 +477,12 @@ private void paintImpl(Graphics g, JComponent c) {
 		rendererPane.removeAll();
 		// no -- this will paint the background over the painted backgrounds
 		// updateDOMNode();
+		if (awtScrollPaneNeedsLayout) {
+			awtScrollPaneNeedsLayout = false;
+			scrollPaneUI.jc.layout();
+		}
+
+
 	}
 
 //	private void paintDropLine(Graphics g) {
@@ -1422,6 +1428,8 @@ int convertModelToColumn(int index) {
 	 */
 	protected void maybeUpdateLayoutState() {
 		if (updateLayoutStateNeeded != 0) {
+			if (isAWT && scrollPaneUI != null)
+				awtScrollPaneNeedsLayout = true;
 			updateLayoutStateNeeded = 0; // SwingJS switch of order here for getting
 																		// actual size
 			updateLayoutState();

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextAreaUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextAreaUI.java
@@ -5,6 +5,7 @@
 import java.beans.PropertyChangeEvent;
 
 import javax.swing.JTextArea;
+import javax.swing.event.CaretEvent;
 import javax.swing.text.Element;
 import javax.swing.text.PlainView;
 import javax.swing.text.View;
@@ -173,4 +174,16 @@ protected boolean handleTab(Object jqEvent) {
 	}
 
 
+	@Override
+	public void caretUpdatedByProgram(CaretEvent e) {
+		if (!jc.isVisible() || !isAWT) // for now, AWT only
+			return;
+		@SuppressWarnings("unused")
+		int pt = e.getDot();
+		// Unfortunately, not MacOS, Edge, or MS Explorer
+		/**
+		 * @j2sNative this.domNode.scrollTo && this.domNode.scrollTo(0, pt);
+		 */
+	}
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Class.java b/sources/net.sf.j2s.java.core/src/test/Test_Class.java
@@ -270,6 +270,11 @@ String hello() {
 
 	}
 
+	public static void testStatic() {
+		// TODO Auto-generated method stub
+
+	}
+
 }
 
 class Test_class1 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -270,6 +270,11 @@ String hello() { @@
     	}
+    	public static void testStatic() {
+    		// TODO Auto-generated method stub
+    	}
     }
     class Test_class1 {
@@ Expand Down @@