Mercurial > hg > jdk9-shenandoah > jdk
changeset 2770:8936ad6b154e
Merge
author | lana |
---|---|
date | Tue, 28 Sep 2010 11:43:45 -0700 |
parents | a601a6711ef8 (current diff) 6994facc6a8b (diff) |
children | 3caf15616f46 |
files | |
diffstat | 3 files changed, 5 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/awt/Dialog.java Tue Sep 28 00:20:15 2010 -0700 +++ b/src/share/classes/java/awt/Dialog.java Tue Sep 28 11:43:45 2010 -0700 @@ -1068,7 +1068,7 @@ modalityPushed(); try { EventQueue eventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue(); - secondaryLoop = eventQueue.createSecondaryLoop(cond, modalFilter, 5000); + secondaryLoop = eventQueue.createSecondaryLoop(cond, modalFilter, 0); if (!secondaryLoop.enter()) { secondaryLoop = null; }
--- a/src/solaris/classes/sun/awt/X11/XBaseWindow.java Tue Sep 28 00:20:15 2010 -0700 +++ b/src/solaris/classes/sun/awt/X11/XBaseWindow.java Tue Sep 28 11:43:45 2010 -0700 @@ -705,12 +705,8 @@ throw new IllegalStateException("Attempt to resize uncreated window"); } insLog.fine("Setting bounds on " + this + " to (" + x + ", " + y + "), " + width + "x" + height); - if (width <= 0) { - width = 1; - } - if (height <= 0) { - height = 1; - } + width = Math.max(MIN_SIZE, width); + height = Math.max(MIN_SIZE, height); XToolkit.awtLock(); try { XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(), getWindow(), x,y,width,height);
--- a/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Tue Sep 28 00:20:15 2010 -0700 +++ b/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Tue Sep 28 11:43:45 2010 -0700 @@ -763,12 +763,8 @@ } private void checkShellRectSize(Rectangle shellRect) { - if (shellRect.width < 0) { - shellRect.width = 1; - } - if (shellRect.height < 0) { - shellRect.height = 1; - } + shellRect.width = Math.max(MIN_SIZE, shellRect.width); + shellRect.height = Math.max(MIN_SIZE, shellRect.height); } private void checkShellRectPos(Rectangle shellRect) {