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

Timestamp:

2016-04-07T00:02:22+02:00 (8 years ago)

Author:

Don-vip

Message:

fix coverity 1011666, 1011667, 1011836, 1011837, 1011838

File:

• trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified) (5 diffs)

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

@@ -49 +49 @@
      */
     public static WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) {
-        Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey)
-            : getFullScreenInfo();
+        Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey) : getFullScreenInfo();
         Point topLeft = new Point(
                 size.x + Math.max(0, (size.width - extent.width) /2),
@@ -117 +116 @@
      */
     public WindowGeometry(Rectangle rect) {
-        this.topLeft = rect.getLocation();
-        this.extent = rect.getSize();
+        this(rect.getLocation(), rect.getSize());
     }
 
@@ -426 +424 @@
      */
     private static Rectangle getScreenInfo(Rectangle g) {
-        GraphicsEnvironment ge = GraphicsEnvironment
-                .getLocalGraphicsEnvironment();
-        GraphicsDevice[] gs = ge.getScreenDevices();
+        GraphicsDevice[] gs = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
         int intersect = 0;
         Rectangle bounds = null;
@@ -446 +442 @@
                     is = b.intersection(g);
                     s = is.width * is.height;
-                    if (bounds == null || intersect < s) {
+                    if (intersect < s) {
                         intersect = s;
                         bounds = b;
@@ -460 +456 @@
             }
         }
-        return bounds;
+        return bounds != null ? bounds : g;
     }