java2script · BobHanson · Nov 17, 2018 · Nov 15, 2018 · Nov 15, 2018 · Nov 15, 2018
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/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20181114074826 
+20181117145755 
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/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20181114074826 
+20181117145755 
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
@@ -1450,9 +1450,11 @@ public void doLayout() {
 		@Deprecated
     public void layout() {
     	// called by Component and Container
-        if (this.layoutMgr != null && this.width > 0 && this.height > 0) {
-        	this.layoutMgr.layoutContainer(this);
-        }
+    	// The reason we don't care about w&h is that 
+    	// we can be working just with preferences here. 
+    	// This is when getPreferredSize() is copied to getSize()
+        if (layoutMgr != null)//BH out 11/16/18 && this.width > 0 && this.height > 0) {
+        	layoutMgr.layoutContainer(this);
     }
 
     /**

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSDialog.java b/sources/net.sf.j2s.java.core/src/java/awt/JSDialog.java
@@ -229,6 +229,9 @@ public class JSDialog extends Window {
      public JSDialog(JSFrame owner) {
          this(owner, "", false);
      }
+     public JSDialog(Frame owner) {
+         this(owner, "", false);
+     }
 
     /**
      * Constructs an initially invisible <code>Dialog</code> with the specified
@@ -256,6 +259,10 @@ public JSDialog(JSFrame owner, boolean modal) {
          this(owner, "", modal);
      }
 
+     public JSDialog(Frame owner, boolean modal) {
+         this(owner, "", modal);
+     }
+
     /**
      * Constructs an initially invisible, modeless <code>Dialog</code> with
      * the specified owner <code>Frame</code> and title.
@@ -277,6 +284,10 @@ public JSDialog(JSFrame owner, String title) {
          this(owner, title, false);
      }
 
+     public JSDialog(Frame owner, String title) {
+         this(owner, title, false);
+     }
+
     /**
      * Constructs an initially invisible <code>Dialog</code> with the
      * specified owner <code>Frame</code>, title and modality.
@@ -307,6 +318,10 @@ public JSDialog(JSFrame owner, String title, boolean modal) {
          this(owner, title, modal ? Dialog.DEFAULT_MODALITY_TYPE : Dialog.ModalityType.MODELESS);
      }
 
+     public JSDialog(Frame owner, String title, boolean modal) {
+         this(owner, title, modal ? Dialog.DEFAULT_MODALITY_TYPE : Dialog.ModalityType.MODELESS);
+     }
+
     /**
      * Constructs an initially invisible <code>Dialog</code> with the specified owner
      * <code>Frame</code>, title, modality, and <code>GraphicsConfiguration</code>.
@@ -341,6 +356,11 @@ public JSDialog(JSFrame owner, String title, boolean modal,
          this(owner, title, modal ? Dialog.DEFAULT_MODALITY_TYPE : Dialog.ModalityType.MODELESS, gc);
      }
 
+     public JSDialog(Frame owner, String title, boolean modal,
+             GraphicsConfiguration gc) {
+    	 this(owner, title, modal ? Dialog.DEFAULT_MODALITY_TYPE : Dialog.ModalityType.MODELESS, gc);
+}
+
     /**
      * Constructs an initially invisible, modeless <code>Dialog</code> with
      * the specified owner <code>Dialog</code> and an empty title.
@@ -358,6 +378,10 @@ public JSDialog(JSDialog owner) {
          this(owner, "", false);
      }
 
+     public JSDialog(Dialog owner) {
+         this(owner, "", false);
+     }
+
     /**
      * Constructs an initially invisible, modeless <code>Dialog</code>
      * with the specified owner <code>Dialog</code> and title.
@@ -378,6 +402,10 @@ public JSDialog(JSDialog owner, String title) {
          this(owner, title, false);
      }
 
+     public JSDialog(Dialog owner, String title) {
+         this(owner, title, false);
+     }
+
     /**
      * Constructs an initially invisible <code>Dialog</code> with the
      * specified owner <code>Dialog</code>, title, and modality.
@@ -408,6 +436,10 @@ public JSDialog(JSDialog owner, String title, boolean modal) {
          this(owner, title, modal ? Dialog.DEFAULT_MODALITY_TYPE : Dialog.ModalityType.MODELESS);
      }
 
+     public JSDialog(Dialog owner, String title, boolean modal) {
+         this(owner, title, modal ? Dialog.DEFAULT_MODALITY_TYPE : Dialog.ModalityType.MODELESS);
+     }
+
     /**
      * Constructs an initially invisible <code>Dialog</code> with the
      * specified owner <code>Dialog</code>, title, modality and
@@ -445,6 +477,10 @@ public JSDialog(JSDialog owner, String title, boolean modal,
          this(owner, title, modal ? Dialog.DEFAULT_MODALITY_TYPE : Dialog.ModalityType.MODELESS, gc);
      }
 
+	public JSDialog(Dialog owner, String title, boolean modal, GraphicsConfiguration gc) {
+		this(owner, title, modal ? Dialog.DEFAULT_MODALITY_TYPE : Dialog.ModalityType.MODELESS, gc);
+	}
+
     /**
      * Constructs an initially invisible, modeless <code>Dialog</code> with the
      * specified owner <code>Window</code> and an empty title.

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
@@ -289,6 +289,7 @@ public abstract class Toolkit {
      * @see       java.awt.peer.FramePeer
      */
     protected abstract FramePeer createFrame(JSFrame target);
+    protected abstract FramePeer createFrame(Frame target);
 //
 //    /**
 //     * Creates this toolkit's implementation of <code>Canvas</code> using
@@ -1177,6 +1178,9 @@ public abstract Image createImage(byte[] imagedata,
     public abstract PrintJob getPrintJob(JSFrame frame, String jobtitle,
                                          Properties props);
 
+    public abstract PrintJob getPrintJob(Frame frame, String jobtitle,
+            Properties props);
+
     /**
      * Gets a <code>PrintJob</code> object which is the result of initiating
      * a print operation on the toolkit's platform.
@@ -1240,6 +1244,18 @@ public PrintJob getPrintJob(JSFrame frame, String jobtitle,
         }
     }
 
+    public PrintJob getPrintJob(Frame frame, String jobtitle,
+            JobAttributes jobAttributes,
+            PageAttributes pageAttributes) {
+        if (this != Toolkit.getDefaultToolkit()) {
+            return Toolkit.getDefaultToolkit().getPrintJob(frame, jobtitle,
+                                                           jobAttributes,
+                                                           pageAttributes);
+        } else {
+            return getPrintJob(frame, jobtitle, null);
+        }
+    }
+
 //
 //    /**
 //     * Emits an audio beep.

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
@@ -1364,13 +1364,13 @@ boolean isModalBlocked() {
     }
 
     void setModalBlocked(JSDialog blocker, boolean blocked, boolean peerCall) {
-//        this.modalBlocker = blocked ? blocker : null;
-//        if (peerCall) {
-//            WindowPeer peer = (WindowPeer)this.peer;
-//            if (peer != null) {
-//                peer.setModalBlocked(blocker, blocked);
-//            }
-//        }
+        this.modalBlocker = blocked ? blocker : null;
+        if (peerCall) {
+            WindowPeer peer = (WindowPeer)this.peer;
+            if (peer != null) {
+                peer.setModalBlocked(blocker, blocked);
+            }
+        }
     }
 
     void setModalBlocked(Dialog blocker, boolean blocked, boolean peerCall) {

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/peer/WindowPeer.java b/sources/net.sf.j2s.java.core/src/java/awt/peer/WindowPeer.java
@@ -35,52 +35,60 @@
 import java.awt.image.BufferedImage;
 
 /**
- * The peer interfaces are intended only for use in porting
- * the AWT. They are not intended for use by application
- * developers, and developers should not implement peers
- * nor invoke any of the peer methods directly on the peer
+ * The peer interfaces are intended only for use in porting the AWT. They are
+ * not intended for use by application developers, and developers should not
+ * implement peers nor invoke any of the peer methods directly on the peer
  * instances.
  * 
  * Not a LightWeightPeer
  * 
  */
 public interface WindowPeer extends ContainerPeer {
-    void toFront();
-    void toBack();
-    void updateAlwaysOnTopState();
-    void updateFocusableWindowState();
-    boolean requestWindowFocus();
-    void setModalBlocked(Dialog blocker, boolean blocked);
-    void updateMinimumSize();
-    void updateIconImages();
-
-    /**
-     * Sets the level of opacity for the window.
-     *
-     * @see Window#setOpacity(float)
-     */
-    void setOpacity(float opacity);
-
-    /**
-     * Enables the per-pixel alpha support for the window.
-     *
-     * @see Window#setBackground(Color)
-     */
-    void setOpaque(boolean isOpaque);
-
-    /**
-     * Updates the native part of non-opaque window using
-     * the given image with color+alpha values for each pixel.
-     *
-     * @see Window#setBackground(Color)
-     */
-    void updateWindow(BufferedImage backBuffer);
-
-    /**
-     * Instructs the peer to update the position of the security warning.
-     */
-    void repositionSecurityWarning();
-
-		WindowPeer setFrame(Window target, boolean b);
-
+	void toFront();
+
+	void toBack();
+
+	void updateAlwaysOnTopState();
+
+	void updateFocusableWindowState();
+
+	boolean requestWindowFocus();
+
+	void setModalBlocked(Dialog blocker, boolean blocked);
+
+	void setModalBlocked(JSDialog blocker, boolean blocked);
+
+	void updateMinimumSize();
+
+	void updateIconImages();
+
+	/**
+	 * Sets the level of opacity for the window.
+	 *
+	 * @see Window#setOpacity(float)
+	 */
+	void setOpacity(float opacity);
+
+	/**
+	 * Enables the per-pixel alpha support for the window.
+	 *
+	 * @see Window#setBackground(Color)
+	 */
+	void setOpaque(boolean isOpaque);
+
+	/**
+	 * Updates the native part of non-opaque window using the given image with
+	 * color+alpha values for each pixel.
+	 *
+	 * @see Window#setBackground(Color)
+	 */
+	void updateWindow(BufferedImage backBuffer);
+
+	/**
+	 * Instructs the peer to update the position of the security warning.
+	 */
+	void repositionSecurityWarning();
+
+	WindowPeer setFrame(Window target, boolean b);
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JColorChooser.java b/sources/net.sf.j2s.java.core/src/javax/swing/JColorChooser.java
@@ -35,6 +35,7 @@
 import java.awt.Dialog;
 import java.awt.JSDialog;
 import java.awt.FlowLayout;
+import java.awt.Frame;
 import java.awt.JSFrame;
 
 //import java.io.IOException;
@@ -623,13 +624,27 @@ public ColorChooserDialog(JSFrame owner, String title, boolean modal, Component
 		initColorChooserDialog(c, chooserPane, okListener, cancelListener);
 	}
 
+	public ColorChooserDialog(Frame owner, String title, boolean modal, Component c, JColorChooser chooserPane,
+			ActionListener okListener, ActionListener cancelListener) {
+		super(owner, title, modal);
+		this.disposeOnHide  = false;
+		initColorChooserDialog(c, chooserPane, okListener, cancelListener);
+	}
+
 	ColorChooserDialog(JSFrame owner, String title, boolean modal, Component c, JColorChooser chooserPane,
 			ActionListener okListener, ActionListener cancelListener, boolean disposeOnHide) {
 		super(owner, title, modal);
 		this.disposeOnHide  = disposeOnHide;
 		initColorChooserDialog(c, chooserPane, okListener, cancelListener);
 	}
 
+	ColorChooserDialog(Frame owner, String title, boolean modal, Component c, JColorChooser chooserPane,
+			ActionListener okListener, ActionListener cancelListener, boolean disposeOnHide) {
+		super(owner, title, modal);
+		this.disposeOnHide  = disposeOnHide;
+		initColorChooserDialog(c, chooserPane, okListener, cancelListener);
+	}
+
 	private boolean haveActionListener;
 
 

diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JDialog.java b/sources/net.sf.j2s.java.core/src/javax/swing/JDialog.java
@@ -32,6 +32,7 @@
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dialog;
+import java.awt.Frame;
 import java.awt.JSDialog;
 import java.awt.JSFrame;
 import java.awt.Graphics;
@@ -220,6 +221,10 @@ public JDialog(JSFrame owner) {
         this(owner, false);
     }
 
+    public JDialog(Frame owner) {
+        this(owner, false);
+    }
+
     /**
      * Creates a dialog with the specified owner <code>Frame</code>, modality
      * and an empty title. If <code>owner</code> is <code>null</code>,
@@ -247,6 +252,10 @@ public JDialog(JSFrame owner, boolean modal) {
         this(owner, null, modal);
     }
 
+    public JDialog(Frame owner, boolean modal) {
+        this(owner, null, modal);
+    }
+
     /**
      * Creates a modeless dialog with the specified title and
      * with the specified owner frame.  If <code>owner</code>
@@ -274,6 +283,10 @@ public JDialog(JSFrame owner, String title) {
         this(owner, title, false);
     }
 
+    public JDialog(Frame owner, String title) {
+        this(owner, title, false);
+    }
+
     /**
      * Creates a dialog with the specified title, owner <code>Frame</code>
      * and modality. If <code>owner</code> is <code>null</code>,
@@ -320,6 +333,17 @@ public JDialog(JSFrame owner, String title, boolean modal) {
         dialogInit();
     }
 
+    public JDialog(Frame owner, String title, boolean modal) {
+        super(owner == null? SwingUtilities.getSharedOwnerFrame() : owner,
+              title, modal);
+        if (owner == null) {
+            WindowListener ownerShutdownListener =
+                (WindowListener)SwingUtilities.getSharedOwnerFrameShutdownListener();
+            addWindowListener(ownerShutdownListener);
+        }
+        dialogInit();
+    }
+
     /**
      * Creates a dialog with the specified title,
      * owner <code>Frame</code>, modality and <code>GraphicsConfiguration</code>.
@@ -372,6 +396,16 @@ public JDialog(JSFrame owner, String title, boolean modal,
         dialogInit();
     }
 
+	public JDialog(Frame owner, String title, boolean modal, GraphicsConfiguration gc) {
+		super(owner == null ? SwingUtilities.getSharedOwnerFrame() : owner, title, modal, gc);
+		if (owner == null) {
+			WindowListener ownerShutdownListener = (WindowListener) SwingUtilities
+					.getSharedOwnerFrameShutdownListener();
+			addWindowListener(ownerShutdownListener);
+		}
+		dialogInit();
+	}
+
     /**
      * Creates a modeless dialog without a title with the
      * specified <code>Dialog</code> as its owner.