BobHanson · BobHanson · Jul 14, 2020 · Jun 26, 2020 · Jun 26, 2020 · Jun 26, 2020
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 @@
-20200625205024 
+20200713172416 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200625205024 
+20200713172416 
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
@@ -31,6 +31,7 @@ public class CorePlugin extends Plugin {
 	// j2sApplet.js and also (Bob only) update.bat, update-clean.bat
 
 
+	// BH 2020.07.04 -- 3.2.9.v1m fix for X.super.y() in anonymous class
 	// BH 2020.06.22 -- 3.2.9.v1k fix for varargs not proper qualified arrays
 	// BH 2020.06.17 -- 3.2.9-v1j fix for functional interface this::privateMethod
 	// BH 2020.05.01 -- 3.2.9-v1i fix for nested lambda methods

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
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/jars/notused/README-SWINGJS b/sources/net.sf.j2s.java.core/jars/notused/README-SWINGJS
@@ -0,0 +1,24 @@
+We are using the 2015 closure compiler because it does not completely mangle 
+FOR loops and does not have the 10K $jscomp header. For example:
+
+for (; start < hi; start++) {
+let pivot=a[start];
+let left=lo;
+let right=start;
+...
+
+in the newer compiler is converted to:
+
+for(var n={};a<b;
+n={$jscomp$loop$prop$left$287:n.$jscomp$loop$prop$left$287,
+$jscomp$loop$prop$right$288:n.$jscomp$loop$prop$right$288},a++){
+ var e=c[a];
+ n.$jscomp$loop$prop$left$287=d;
+ n.$jscomp$loop$prop$right$288=a;
+...
+
+so every time through the loop n is recreated? 
+
+I don't get it. 
+
+
diff --git a/....core/jars/closure-compiler-v20190819.jar → ...rs/notused/closure-compiler-v20190819.jar b/....core/jars/closure-compiler-v20190819.jar → ...rs/notused/closure-compiler-v20190819.jar
diff --git a/sources/net.sf.j2s.java.core/jars/notused/closure-compiler-v20200614.jar b/sources/net.sf.j2s.java.core/jars/notused/closure-compiler-v20200614.jar
diff --git a/sources/net.sf.j2s.java.core/jars/ok/closure_compiler.jar b/sources/net.sf.j2s.java.core/jars/ok/closure_compiler.jar
diff --git a/sources/net.sf.j2s.java.core/jars/ok/closure_compiler_03_2015.jar b/sources/net.sf.j2s.java.core/jars/ok/closure_compiler_03_2015.jar
diff --git a/sources/net.sf.j2s.java.core/src/java/applet/JSApplet.java b/sources/net.sf.j2s.java.core/src/java/applet/JSApplet.java
@@ -82,8 +82,9 @@ public class JSApplet extends JSPanel {
      * @since 1.4
      */
     public JSApplet()  {
+    	秘winOrApplet = true;
 
-//        if (GraphicsEnvironment.isHeadless()) {
+    	//        if (GraphicsEnvironment.isHeadless()) {
 //            throw new HeadlessException();
 //        }
     }

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -972,8 +972,6 @@ public synchronized DropTarget getDropTarget() {
 
 	public GraphicsConfiguration graphicsConfig;
 
-	protected boolean isWindow;
-
 	/**
 	 * Gets the <code>GraphicsConfiguration</code> associated with this
 	 * <code>Component</code>. If the <code>Component</code> has not been assigned a
@@ -1546,7 +1544,7 @@ public void hide() {
 			}
 		}
 		Container parent = this.parent;
-		if (!isWindow && parent != null) {
+		if (parent != null && !((JSComponent) this).秘winOrApplet) {
 			parent.invalidate();
 		}
 		// }
@@ -2129,12 +2127,7 @@ public void reshape(int x, int y, int width, int height) {
 	}
 
 	private void repaintParentIfNeeded(int oldX, int oldY, int oldWidth, int oldHeight) {
-		if (parent != null && peer instanceof LightweightPeer && isShowing()) {
-			// Have the parent redraw the area this component occupied.
-			parent.repaint(oldX, oldY, oldWidth, oldHeight);
-			// Have the parent redraw the area this component *now* occupies.
-			((JSComponent)this).秘repaint();
-		}
+		((JSComponent)this).秘repaintParentIfNeeded(oldX, oldY, oldWidth, oldHeight);
 	}
 
 	/**
@@ -6704,8 +6697,9 @@ final boolean requestFocusHelper(boolean temporary, boolean focusedWindowChangeA
 	}
 
 	public boolean isWindowOrJSApplet() {
-		// SwingJS treating embedded applet as window here
-		return this instanceof Window || this instanceof JSApplet;
+		return ((JSComponent) this).秘winOrApplet;
+//		// SwingJS treating embedded applet as window here
+//		return this instanceof Window || this instanceof JSApplet;
 	}
 
 	public boolean isJ2SWindowButNotJInternalFrame() {

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
@@ -51,7 +51,6 @@
 import sun.awt.SunGraphicsCallback;
 import swingjs.JSFrameViewer;
 import swingjs.JSMouse;
-import swingjs.plaf.JSComponentUI;
 
 
 /**
@@ -364,16 +363,9 @@ final Component[] getComponents_NoClientCode() {
      * @see       LayoutManager
      * @since     JDK1.1
      */
-    public Insets getInsets() {
-    	// Panel, ScrollPane, and Window only
-    	return (peer instanceof ContainerPeer ? this.秘getInsetsC() : NULL_INSETS);
-    }
-
-    public Insets 秘getInsetsC() {
-    	// in SwingJS, we do not clone. Everything is a ContainerPeer.
-    	// it is inconsistent with other classes that this would need cloning.
-    	Insets i = (peer == null ? null : ((ContainerPeer) peer).getInsets());
-    	return  (i == null ? NULL_INSETS : i);
+    @Override
+	public Insets getInsets() {
+    	return super.getInsets();
     }
 
     @Deprecated
@@ -765,15 +757,15 @@ public void setComponentZOrder(Component comp, int index) {
          }
     }
 
-	/**
-     * Traverses the tree of components and reparents children heavyweight component
-     * to new heavyweight parent.
-     * @since 1.5
-     */
-    @SuppressWarnings("deprecation")
-	private void reparentTraverse(ContainerPeer parentPeer, Container child) {
-    	// JSComponentUI.reparent is not implemented. It just gets tainted.
-    }
+//	/**
+//     * Traverses the tree of components and reparents children heavyweight component
+//     * to new heavyweight parent.
+//     * @since 1.5
+//     */
+//    @SuppressWarnings("deprecation")
+//	private void reparentTraverse(ContainerPeer parentPeer, Container child) {
+//    	// JSComponentUI.reparent is not implemented. It just gets tainted.
+//    }
 //        checkTreeLock();
 //
 //        for (int i = 0; i < child.getComponentCount(); i++) {

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java b/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java
@@ -112,6 +112,8 @@ public interface A2SWrappedComponent {
 
 	public String 秘htmlName;
 
+	protected boolean 秘winOrApplet;
+
 	protected int 秘num;
 	private static int 秘incr;
 	private Insets 秘tempInsets;
@@ -242,7 +244,15 @@ public Graphics getGraphics() {
 		if (width == 0 || height == 0 || !isVisible())
 			return null;
 		Graphics g;
-		if (秘frameViewer != null) {
+		// this was 秘frameViewer != null, but that
+		// fails for paintImmediately, because all components
+		// have a reference to FrameViewer now, and so the 
+		// offset was not being applied. The special case for
+		// ContentPane adds its insets. parent == null is a 
+		// proxy for Applet or Window since only they can be
+		// here and not have a parent.
+		if (秘isRootPane || 秘winOrApplet || 秘isContentPane) {
+			// this next call adds the necessary transform.
 			g = 秘frameViewer.getGraphics().create();
 			if (秘isContentPane) {
 				if (秘tempInsets == null)
@@ -824,4 +834,29 @@ public static enum ModalExclusionType {
 	    TOOLKIT_EXCLUDE
 	}
 
+
+
+    public Insets getInsets() {
+    	// Panel, ScrollPane, and Window only
+    	return 秘getInsets();
+    }
+
+    public Insets 秘getInsets() {
+    	// in SwingJS, we do not clone. Everything is a ContainerPeer.
+    	// it is inconsistent with other classes that this would need cloning.
+    	Insets i =  (ui == null ? null :  秘getUI().getInsets());
+    	return (i == null ? Container.NULL_INSETS : i);
+    }
+
+	public void 秘repaintParentIfNeeded(int oldX, int oldY, int oldWidth, int oldHeight) {
+		if (parent != null && peer instanceof LightweightPeer && isShowing()) {
+			// Have the parent redraw the area this component occupied.
+			// Have the parent redraw the area this component *now* occupies.
+			if (秘getUI().allowPaintedBackground && 秘paintsSelf()) {
+				parent.repaint(oldX, oldY, oldWidth, oldHeight);
+				秘repaint();
+			}
+		}
+	}
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSFrame.java b/sources/net.sf.j2s.java.core/src/java/awt/JSFrame.java
@@ -383,7 +383,7 @@ public class JSFrame extends Window {
      * 
      */
     public JSFrame() {
-    	initTitleGC(null, null);
+    	this(null, null);
     }
 
     /**
@@ -404,7 +404,7 @@ public JSFrame() {
      * 
      */
     public JSFrame(GraphicsConfiguration gc) {
-    	initTitleGC(null, gc);
+    	this(null, gc);
     }
 
     /**
@@ -420,7 +420,7 @@ public JSFrame(GraphicsConfiguration gc) {
      * 
      */
     public JSFrame(String title) {
-    	initTitleGC(title, null);
+    	this(title, null);
     }
 
     /**
@@ -449,14 +449,10 @@ public JSFrame(String title) {
      * 
      */
     public JSFrame(String title, GraphicsConfiguration gc) {
-    	initTitleGC(title, gc);
+    	super(gc);
+        this.title = (title == null  ? "" : title);
     }
 
-    protected void initTitleGC(String title, GraphicsConfiguration gc) {
-      this.title = (title == null  ? "" : title);
-  	  initWinGC(null, gc);   // Window
-		}
-
 		/**
      * Construct a name for this component.  Called by getName() when the
      * name is null.