isWindowOrJSApplet()

hansonr · hansonr · commit bdc67b11ec09 · 2019-02-28T16:06:01.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Window.java b/sources/net.sf.j2s.java.core/src/java/awt/Window.java
@@ -2976,12 +2976,12 @@ public void setLocationRelativeTo(Component c) {
         Container root=null;
 
         if (c != null) {
-            if (c instanceof Window || c instanceof JSApplet) {
+            if (c.isWindowOrJSApplet()) {
                 root = (Container)c;
             } else {
                 Container parent;
                 for(parent = c.getParent() ; parent != null ; parent = parent.getParent()) {
-                    if (parent instanceof Window || parent instanceof JSApplet) {
+                    if (parent.isWindowOrJSApplet()) {
                         root = parent;
                         break;
                     }
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/event/WindowEvent.java b/sources/net.sf.j2s.java.core/src/java/awt/event/WindowEvent.java
@@ -28,6 +28,8 @@
 
 package java.awt.event;
 
+import java.applet.JSApplet;
+import java.awt.Component;
 import java.awt.Window;
 import sun.awt.AppContext;
 import sun.awt.SunToolkit;
@@ -282,7 +284,8 @@ public WindowEvent(Window source, int id) {
      * @return the Window object that originated the event
      */
     public Window getWindow() {
-        return (source instanceof Window) ? (Window)source : null;
+    	// SwingJS we are saying that embedded applets are windows here
+        return (((Component)source).isWindowOrJSApplet()) ? (Window)source : null;
     }
 
     /**
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/ToolTipManager.java b/sources/net.sf.j2s.java.core/src/javax/swing/ToolTipManager.java
@@ -281,7 +281,7 @@ void showTipWindow() {
 		if (insideComponent == null || !insideComponent.isShowing())
 			return;
 		Component win = insideComponent.getTopLevelAncestor();
-		if (win instanceof Window) {
+		if (win.isWindowOrJSApplet()) {
 			if (((Window) win).getModalBlocker() != null)
 				return;
 		}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Applet.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Applet.java
@@ -10,6 +10,8 @@
 import javax.swing.JApplet;
 import javax.swing.JComponent;
 
+import swingjs.JSUtil;
+
 public class Applet extends JApplet implements A2SContainer {
 	
 
@@ -34,22 +36,17 @@ public Applet() throws HeadlessException {
 	 * 
 	 */
 	static void fixAWTPaint(Component c, Class<?> cl) {
-    	
+		Object f = JSUtil.getJ2SAlias(c, "paint$java_awt_Graphics");
+		if (JSUtil.isOverridden(f, cl)
+				&& f.toString().indexOf("C$.superclazz.prototype.paint$java_awt_Graphics.apply(this") < 0) {
 		/**@j2sNative
 		 * 
-		 * try{
-		 * var f = c.paint$java_awt_Graphics; 
-		 * if (f.exClazz != cl.$clazz$ && f.toString().indexOf("C$.superclazz.prototype.paint$java_awt_Graphics.apply(this") < 0) {
-		 *      var oldPaint = f;
 		 *      c.paint$java_awt_Graphics = function(g) {
 		 *        cl.$clazz$.prototype.paint$java_awt_Graphics.apply(c,[g]);
-		 *        oldPaint.apply(c,[g]);
-		 *      };
-		 * }
-		 * } catch(e) {
-		 * System.out.println("java.applet.Applet.fixAppletPaint() exception: " + e);
-		 * }
+		 *        f.apply(c,[g]);
+		 *      }
 		 */
+		}
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ void showTipWindow() {`
`281`	`281`	`if (insideComponent == null \|\| !insideComponent.isShowing())`
`282`	`282`	`return;`
`283`	`283`	`Component win = insideComponent.getTopLevelAncestor();`
`284`		`- if (win instanceof Window) {`
	`284`	`+ if (win.isWindowOrJSApplet()) {`
`285`	`285`	`if (((Window) win).getModalBlocker() != null)`
`286`	`286`	`return;`
`287`	`287`	`}`