AWT/swing support for JSFrame, JSDialog, JSPanel

java2script · BobHanson · Oct 10, 2018 · Sep 19, 2018 · Sep 19, 2018 · Sep 22, 2018
commit 45138ce931bfd9d4278f5cde2f2fea645d0a25ea
diff --git a/sources/net.sf.j2s.java.core/src/java/applet/AppletContext.java b/sources/net.sf.j2s.java.core/src/java/applet/AppletContext.java
@@ -78,7 +78,7 @@ public interface AppletContext {
      * @return  the applet with the given name, or <code>null</code> if
      *          not found.
      */
-    Applet getApplet(String name);
+    JSApplet getApplet(String name);
 
     /**
      * Finds all the applets in the document represented by this applet
@@ -87,7 +87,7 @@ public interface AppletContext {
      * @return  an enumeration of all applets in the document represented by
      *          this applet context.
      */
-    Enumeration<Applet> getApplets();
+    Enumeration<JSApplet> getApplets();
 
     /**
      * Requests that the browser or applet viewer show the Web page

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
@@ -27,7 +27,6 @@
  */
 package java.awt;
 
-import java.applet.Applet;
 import java.awt.dnd.DropTarget;
 import java.awt.event.ActionEvent;
 import java.awt.event.AdjustmentEvent;
@@ -4156,8 +4155,8 @@ boolean dispatchMouseWheelToAncestor(MouseWheelEvent e) {
 
 	boolean checkWindowClosingException() {
 		if (windowClosingException != null) {
-			if (this instanceof Dialog) {
-				((Dialog) this).interruptBlocking();
+			if (this instanceof JSDialog) {
+				((JSDialog) this).interruptBlocking();
 			} else {
 				windowClosingException.fillInStackTrace();
 				windowClosingException.printStackTrace();

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/DefaultKeyboardFocusManager.java b/sources/net.sf.j2s.java.core/src/java/awt/DefaultKeyboardFocusManager.java
@@ -105,8 +105,8 @@ public String toString() {
     }
 
     private Window getOwningFrameDialog(Window window) {
-        while (window != null && !(window instanceof Frame ||
-                                   window instanceof Dialog)) {
+        while (window != null && !(window instanceof JSFrame ||
+                                   window instanceof JSDialog)) {
             window = (Window)window.getParent();
         }
         return window;

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/GraphicsConfiguration.java b/sources/net.sf.j2s.java.core/src/java/awt/GraphicsConfiguration.java
@@ -97,7 +97,7 @@
  *      } </pre>
  *
  * @see Window
- * @see Frame
+ * @see JSFrame
  * @see GraphicsEnvironment
  * @see GraphicsDevice
  * @see swingjs.JSGraphicsConfiguration

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSPanel.java b/sources/net.sf.j2s.java.core/src/java/awt/JSPanel.java
@@ -41,7 +41,7 @@
  * @see     java.awt.FlowLayout
  * @since   JDK1.0
  */
-public class Panel extends Container {
+public class JSPanel extends Container {
     private static final String base = "panel";
     private static int nameCounter = 0;
 
@@ -56,7 +56,7 @@ public class Panel extends Container {
      * <code>FlowLayout</code> class.
      * 
      */
-    public Panel() {
+    public JSPanel() {
     	this(new FlowLayout());
     }
 
@@ -72,7 +72,7 @@ protected boolean canPaint() {
      * @param layout the layout manager for this panel.
      * @since JDK1.1
      */
-    public Panel(LayoutManager layout) {
+    public JSPanel(LayoutManager layout) {
     	setAppContext();
     	setLayout(layout);
     }
@@ -83,9 +83,9 @@ public Panel(LayoutManager layout) {
      */
     @Override
 		String constructComponentName() {
-        synchronized (Panel.class) {
+ //       synchronized (JSPanel.class) {
             return base + nameCounter++;
-        }
+ //       }
     }
 
 	/**
@@ -103,7 +103,7 @@ public void addNotify() {
 
   	@Override
   	protected ComponentPeer getOrCreatePeer() {
-  		return (ui == null ? null : peer == null ? (peer = getToolkit().createPanel(this)) : peer);
+  		return (ui == null ? null : peer == null ? (peer = getToolkit().createPanel((Panel) (Object) this)) : peer);
   	}
 
 

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/KeyboardFocusManager.java b/sources/net.sf.j2s.java.core/src/java/awt/KeyboardFocusManager.java
@@ -98,8 +98,8 @@
  * @author David Mendenhall
  *
  * @see Window
- * @see Frame
- * @see Dialog
+ * @see JSFrame
+ * @see JSDialog
  * @see java.awt.event.FocusEvent
  * @see java.awt.event.WindowEvent
  * @see java.awt.event.KeyEvent
@@ -2555,8 +2555,8 @@ static Window markClearGlobalFocusOwner() {
                 ? SunToolkit.getContainingWindow(hwFocusRequest.heavyweight)
                 : nativeFocusedWindow);
             while (activeWindow != null &&
-                   !((activeWindow instanceof Frame) ||
-                     (activeWindow instanceof Dialog)))
+                   !((activeWindow instanceof JSFrame) ||
+                     (activeWindow instanceof JSDialog)))
             {
                 activeWindow = activeWindow.getParent_NoClientCode();
             }

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/ModalEventFilter.java b/sources/net.sf.j2s.java.core/src/java/awt/ModalEventFilter.java
@@ -107,7 +107,7 @@ int compareTo(ModalEventFilter another) {
             c = c.getParent_NoClientCode();
         }
         // check if one dialog blocks (directly or indirectly) another
-        Dialog blocker = modalDialog.getModalBlocker();
+        Dialog blocker = ((a2s.Dialog) modalDialog).getModalBlocker();
         while (blocker != null) {
             if (blocker == anotherDialog) {
                 return -1;

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Toolkit.java b/sources/net.sf.j2s.java.core/src/java/awt/Toolkit.java
@@ -285,10 +285,10 @@ public abstract class Toolkit {
      * @exception HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
-     * @see       java.awt.Frame
+     * @see       java.awt.JSFrame
      * @see       java.awt.peer.FramePeer
      */
-    protected abstract FramePeer createFrame(Frame target);
+    protected abstract FramePeer createFrame(JSFrame target);
 //
 //    /**
 //     * Creates this toolkit's implementation of <code>Canvas</code> using
@@ -305,7 +305,7 @@ public abstract class Toolkit {
      * the specified peer interface.
      * @param     target the panel to be implemented.
      * @return    this toolkit's implementation of <code>Panel</code>.
-     * @see       java.awt.Panel
+     * @see       java.awt.JSPanel
      * @see       java.awt.peer.PanelPeer
      */
     protected abstract PanelPeer        createPanel(Panel target);
@@ -331,7 +331,7 @@ public abstract class Toolkit {
      * @exception HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
-     * @see       java.awt.Dialog
+     * @see       java.awt.JSDialog
      * @see       java.awt.peer.DialogPeer
      */
     protected abstract java.awt.peer.DialogPeer createDialog(Dialog target)
@@ -1174,7 +1174,7 @@ public abstract Image createImage(byte[] imagedata,
      * @see     java.lang.RuntimePermission
      * @since   JDK1.1
      */
-    public abstract PrintJob getPrintJob(Frame frame, String jobtitle,
+    public abstract PrintJob getPrintJob(JSFrame frame, String jobtitle,
                                          Properties props);
 
     /**
@@ -1226,7 +1226,7 @@ public abstract PrintJob getPrintJob(Frame frame, String jobtitle,
      * @see     java.awt.PageAttributes
      * @since   1.3
      */
-    public PrintJob getPrintJob(Frame frame, String jobtitle,
+    public PrintJob getPrintJob(JSFrame frame, String jobtitle,
                                 JobAttributes jobAttributes,
                                 PageAttributes pageAttributes) {
         // Override to add printing support with new job/page control classes
@@ -1553,13 +1553,13 @@ public Cursor createCustomCursor(Image cursor, Point hotSpot, String name)
      * @exception HeadlessException
      *     if <code>GraphicsEnvironment.isHeadless()</code>
      *     returns <code>true</code>.
-     * @see     java.awt.Frame#setExtendedState
+     * @see     java.awt.JSFrame#setExtendedState
      * @since   1.4
      */
     public boolean isFrameStateSupported(int state)
 
     {
-       return (state == Frame.NORMAL); // others are not guaranteed
+       return (state == JSFrame.NORMAL); // others are not guaranteed
     }
 
     /**
@@ -1825,8 +1825,8 @@ public boolean isAlwaysOnTopSupported() {
      *     type, <code>false</code> otherwise
      *
      * @see java.awt.Dialog.ModalityType
-     * @see java.awt.Dialog#getModalityType
-     * @see java.awt.Dialog#setModalityType
+     * @see java.awt.JSDialog#getModalityType
+     * @see java.awt.JSDialog#setModalityType
      *
      * @since 1.6
      */

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
@@ -27,18 +27,7 @@
  */
 package java.awt;
 
-//import java.lang.ref.WeakReference;
-//import java.lang.reflect.InvocationTargetException;
-//import java.awt.AWTPermission;
-//import java.awt.HeadlessException;
-import java.awt.KeyboardFocusManager;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EventListener;
-import java.util.Set;
-import java.util.Vector;
-
-import java.applet.Applet;
+import java.applet.JSApplet;
 import java.awt.event.ComponentEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseWheelEvent;
@@ -49,8 +38,14 @@
 import java.awt.peer.ComponentPeer;
 import java.awt.peer.WindowPeer;
 import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EventListener;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.Vector;
+
 import javax.swing.JComponent;
 import javax.swing.JLayeredPane;
 import javax.swing.JRootPane;
@@ -62,7 +57,6 @@
 //import java.util.concurrent.atomic.AtomicBoolean;
 //import java.util.logging.Logger;
 import swingjs.JSUtil;
-import swingjs.plaf.JSComponentUI;
 
 /**
  * 
@@ -232,7 +226,7 @@ public class Window extends JComponent {
      *
      * @since 1.6
      */
-    transient Dialog modalBlocker;
+    transient JSDialog modalBlocker;
 
     /**
      * @serial
@@ -924,7 +918,7 @@ public void show() {
 //                // should be raised to front
 //                modalBlocker.toFront_NoClientCode();
 //            }
-            if (this instanceof Frame || this instanceof Dialog) {
+            if (this instanceof JSFrame || this instanceof JSDialog) {
                 updateChildFocusableWindowState(this);
             }
         }
@@ -1369,7 +1363,7 @@ boolean isModalBlocked() {
         return modalBlocker != null;
     }
 
-    void setModalBlocked(Dialog blocker, boolean blocked, boolean peerCall) {
+    void setModalBlocked(JSDialog blocker, boolean blocked, boolean peerCall) {
 //        this.modalBlocker = blocked ? blocker : null;
 //        if (peerCall) {
 //            WindowPeer peer = (WindowPeer)this.peer;
@@ -1379,8 +1373,12 @@ void setModalBlocked(Dialog blocker, boolean blocked, boolean peerCall) {
 //        }
     }
 
-    Dialog getModalBlocker() {
-        return modalBlocker;
+    void setModalBlocked(Dialog blocker, boolean blocked, boolean peerCall) {
+    	setModalBlocked((JSDialog) blocker, blocked, peerCall);
+    }
+
+    public Dialog getModalBlocker() {
+        return (Dialog)(Object) modalBlocker;
     }
 
     /*
@@ -1451,7 +1449,7 @@ private static Window[] getWindows(AppContext appContext) {
      * dialogs such as component positions, <code>LayoutManager</code>s
      * or serialization.
      *
-     * @see Frame#getFrames
+     * @see JSFrame#getFrames
      * @see Window#getOwnerlessWindows
      *
      * @since 1.6
@@ -1473,7 +1471,7 @@ public static Window[] getWindows() {
      * dialogs such as component positions, <code>LayoutManager</code>s
      * or serialization.
      *
-     * @see Frame#getFrames
+     * @see JSFrame#getFrames
      * @see Window#getWindows()
      *
      * @since 1.6
@@ -1499,7 +1497,7 @@ public static Window[] getOwnerlessWindows() {
         return ownerless;
     }
 
-    Window getDocumentRoot() {
+    public Window getDocumentRoot() {
         synchronized (getTreeLock()) {
             Window w = this;
             while (w.getOwner() != null) {
@@ -1521,7 +1519,7 @@ Window getDocumentRoot() {
      * effect until it is hidden and then shown again.
      *
      * @param exclusionType the modal exclusion type for this window; a <code>null</code>
-     *     value is equivivalent to {@link Dialog.ModalExclusionType#NO_EXCLUDE
+     *     value is equivivalent to {@link JSDialog.ModalExclusionType#NO_EXCLUDE
      *     NO_EXCLUDE}
      * @throws SecurityException if the calling thread does not have permission
      *     to set the modal exclusion property to the window with the given
@@ -2344,7 +2342,7 @@ public final boolean isFocusableWindow() {
         }
 
         // All other tests apply only to Windows.
-        if (this instanceof Frame || this instanceof Dialog) {
+        if (this instanceof JSFrame || this instanceof JSDialog) {
             return true;
         }
 
@@ -2359,7 +2357,7 @@ public final boolean isFocusableWindow() {
         for (Window owner = getOwner(); owner != null;
              owner = owner.getOwner())
         {
-            if (owner instanceof Frame || owner instanceof Dialog) {
+            if (owner instanceof JSFrame || owner instanceof JSDialog) {
                 return owner.isShowing();
             }
         }
@@ -2979,12 +2977,12 @@ public void setLocationRelativeTo(Component c) {
         Container root=null;
 
         if (c != null) {
-            if (c instanceof Window || c instanceof Applet) {
+            if (c instanceof Window || c instanceof JSApplet) {
                 root = (Container)c;
             } else {
                 Container parent;
                 for(parent = c.getParent() ; parent != null ; parent = parent.getParent()) {
-                    if (parent instanceof Window || parent instanceof Applet) {
+                    if (parent instanceof Window || parent instanceof JSApplet) {
                         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
@@ -88,7 +88,7 @@ public class WindowEvent extends ComponentEvent {
      * the window has been changed from a normal to a minimized state.
      * For many platforms, a minimized window is displayed as
      * the icon specified in the window's iconImage property.
-     * @see java.awt.Frame#setIconImage
+     * @see java.awt.JSFrame#setIconImage
      */
     public static final int WINDOW_ICONIFIED    = 3 + WINDOW_FIRST; //Event.WINDOW_ICONIFY
 
@@ -325,7 +325,7 @@ public Window getOppositeWindow() {
      * </ul>
      *
      * @return a bitwise mask of the previous window state
-     * @see java.awt.Frame#getExtendedState()
+     * @see java.awt.JSFrame#getExtendedState()
      * @since 1.4
      */
     public int getOldState() {
@@ -348,7 +348,7 @@ public int getOldState() {
      * </ul>
      *
      * @return a bitwise mask of the new window state
-     * @see java.awt.Frame#getExtendedState()
+     * @see java.awt.JSFrame#getExtendedState()
      * @since 1.4
      */
     public int getNewState() {