Changeset 6828 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-02-09T14:31:13+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9699 - workaround to java bug in getMaximumWindowBounds() (patch by kendzi)

File:

• trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

@@ -323 +323 @@
         Rectangle maxbounds = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
 
-        deltax = size.width - maxbounds.width;
-        if (deltax > 0) {
-            size.width -= deltax;
-        }
-
-        deltay = size.height - maxbounds.height;
-        if (deltay > 0) {
-            size.height -= deltay;
-        }
-
+        if (!isBugInMaximumWindowBounds(maxbounds)) {
+            deltax = size.width - maxbounds.width;
+            if (deltax > 0) {
+                size.width -= deltax;
+            }
+
+            deltay = size.height - maxbounds.height;
+            if (deltay > 0) {
+                size.height -= deltay;
+            }
+        }
         window.setLocation(p);
         window.setSize(size);
+    }
+
+    /**
+     * Determines if the bug affecting getMaximumWindowBounds() occured.
+     *
+     * @param maxbounds result of getMaximumWindowBounds()
+     * @return {@code true} if the bug happened, {@code false otherwise}
+     *
+     * @see <a href="https://josm.openstreetmap.de/ticket/9699">JOSM-9699</a>
+     * @see <a href="https://bugs.launchpad.net/ubuntu/+source/openjdk-7/+bug/1171563">Ubuntu-1171563</a>
+     * @see <a href="http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1669">IcedTea-1669</a>
+     * @see <a href="https://bugs.openjdk.java.net/browse/JI-9010334">JI-9010334</a>
+     */
+    protected static boolean isBugInMaximumWindowBounds(Rectangle maxbounds) {
+        return maxbounds.width <= 0 || maxbounds.height <= 0;
     }