BobHanson · BobHanson · Mar 8, 2019 · Feb 5, 2019 · Feb 5, 2019 · Feb 6, 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 @@
-20190205134840 
+20190307200127 
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 @@
-20190205134840 
+20190307200127 
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
@@ -3047,6 +3047,7 @@ public boolean visit(InfixExpression node) {
 			return false;
 		String leftName = leftTypeBinding.getName();
 		String rightName = rightTypeBinding.getName();
+
 		boolean leftIsInt = leftTypeBinding.isPrimitive() && isIntegerType(leftName);
 		boolean rightIsInt = rightTypeBinding.isPrimitive() && isIntegerType(rightName);
 		if ("/".equals(operator) && leftIsInt && rightIsInt) {
@@ -4055,13 +4056,13 @@ private boolean addPrimitiveTypedExpression(Expression left, IVariableBinding as
 			}
 			break;
 		case "int":
-			if (op != null && (!isDiv && fromIntType) || fromChar || rightName.equals("short")
-					|| rightName.equals("byte")) {
+			if (!isDiv && (op != null && (!isDiv && fromIntType) || fromChar || rightName.equals("short")
+					|| rightName.equals("byte"))) {
 				left = null;
-				break;
+			} else {
+				more = "|0)";
+				addParens = true;
 			}
-			more = "|0)";
-			addParens = true;
 			break;
 		case "short":
 			if ((rightName.equals("short") || rightName.equals("byte")) && !isDiv) {

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/doc/Differences.txt b/sources/net.sf.j2s.java.core/doc/Differences.txt
@@ -1001,8 +1001,7 @@ Glyph/composite/outline fonts are not supported
 specific AWT components not implemented
 ---------------------------------------
 
-The only AWT components implemented are Dialog, Frame, Panel, and Window
-They are subclassed as JDialog, JFrame, JPanel/JApplet, and JWindow, respectively
+all AWT components are now implemented as subclasses of Swing counterparts. 2019.02.13 BH
 
 
 threads

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
@@ -27,6 +27,8 @@
  */
 package java.applet;
 
+import java.awt.Component;
+import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.HeadlessException;
 import java.awt.Image;
@@ -35,10 +37,21 @@
 import java.net.URL;
 import java.util.Locale;
 
+import javax.swing.JApplet;
+import javax.swing.JComponent;
+import javax.swing.JRootPane;
+import javax.swing.RepaintManager;
+
+import swingjs.plaf.JSComponentUI;
+
 /**
  * SwingJS note: This class is the original java.applet.Applet class. 
  * It is subclassed by JApplet. The replacement java.applet.Applet class
- * subclassed java.applet.Applet, which subclasses JApplet.
+ * subclassed java.applet.Applet, which subclasses JApplet. In addition, 
+ * it includes methods from Window allowing it to be treated as a window
+ * with respect to focus.
+ * 
+ *
  * 
  * An applet is a small program that is intended not to be run on
  * its own, but rather to be embedded inside another application.
@@ -74,6 +87,47 @@ public JSApplet()  {
 //        }
     }
 
+
+    /**
+     * SwingJS -- from Window
+     * 
+     * @return true
+     */
+    public boolean isFocusableWindow() {
+    	// mascarading as Window here
+    	return true;
+    }
+
+    public Dialog getModalBlocker() {
+    	// mascarading as Window here
+        return null; //??
+    }
+
+
+    /**
+     * Holds the reference to the component which last had focus in this window
+     * before it lost focus.
+     */
+    private transient Component temporaryLostComponent;
+
+    Component getTemporaryLostComponent() { 
+        return temporaryLostComponent;
+    }
+    Component setTemporaryLostComponent(Component component) {
+        Component previousComp = temporaryLostComponent;
+        // Check that "component" is an acceptable focus owner and don't store it otherwise
+        // - or later we will have problems with opposite while handling  WINDOW_GAINED_FOCUS
+        if (component == null || component.canBeFocusOwner()) {
+            temporaryLostComponent = component;
+        } else {
+            temporaryLostComponent = null;
+        }
+        return previousComp;
+    }
+
+
+
+
     /**
      * Applets can be serialized but the following conventions MUST be followed:
      *
@@ -218,8 +272,17 @@ public void resize(int width, int height) {
     }
 
 	public void resizeHTML(int width, int height) {
-		if (appletViewer != null)
+		if (appletViewer != null) {
 			appletViewer.html5Applet._resizeApplet(new int[] {width, height});
+			if (stub != null) {
+				// Added 2/23/2019 to force layout prior to Canvas painting in mpFrakta.Applets.Geomet
+				JRootPane root = ((JApplet) this).getRootPane();
+				root.invalidate();
+				((JSComponentUI)root.getUI()).setPainted(null);
+				root._isBackgroundPainted = false;
+				RepaintManager.currentManager(this).addInvalidComponent(root);
+			}
+		}
     }
 
     @SuppressWarnings("deprecation")