Changeset 17705 in josm for trunk/src/org

Timestamp:

2021-04-07T20:43:28+02:00 (4 years ago)

Author:

simon04

Message:

see #19126 - Simplify WindowGeometry code

File:

• trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java

@@ -14 +14 @@
 import java.awt.Rectangle;
 import java.awt.Window;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.regex.Matcher;
@@ -279 +280 @@
      */
     public void remember(String preferenceKey) {
-        StringBuilder value = new StringBuilder(32);
-        value.append("x=").append(topLeft.x).append(",y=").append(topLeft.y)
-             .append(",width=").append(extent.width).append(",height=").append(extent.height);
-        Config.getPref().put(preferenceKey, value.toString());
+        String value = String.format(Locale.ROOT, "x=%d,y=%d,width=%d,height=%d", topLeft.x, topLeft.y, extent.width, extent.height);
+        Config.getPref().put(preferenceKey, value);
     }
 
@@ -507 +506 @@
             return false;
         WindowGeometry other = (WindowGeometry) obj;
-        if (extent == null) {
-            if (other.extent != null)
-                return false;
-        } else if (!extent.equals(other.extent))
-            return false;
-        if (topLeft == null) {
-            if (other.topLeft != null)
-                return false;
-        } else if (!topLeft.equals(other.topLeft))
-            return false;
-        return true;
+        return Objects.equals(extent, other.extent) && Objects.equals(topLeft, other.topLeft);
     }