Changeset 17704 in josm for trunk/src/org/openstreetmap

Timestamp:

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

Author:

simon04

Message:

see #19126 - Extract WindowGeometry.PREF_KEY_GUI_GEOMETRY

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (1 diff)
• MainFrame.java (modified) (1 diff)
• SplashScreen.java (modified) (1 diff)
• util/WindowGeometry.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -845 +845 @@
         Handler.install();
 
-        WindowGeometry geometry = WindowGeometry.mainWindow("gui.geometry",
+        WindowGeometry geometry = WindowGeometry.mainWindow(WindowGeometry.PREF_KEY_GUI_GEOMETRY,
                 args.getSingle(Option.GEOMETRY).orElse(null),
                 !args.hasOption(Option.NO_MAXIMIZE) && Config.getPref().getBoolean("gui.maximized", false));

trunk/src/org/openstreetmap/josm/gui/MainFrame.java

@@ -117 +117 @@
     public void storeState() {
         if (geometry != null) {
-            geometry.remember("gui.geometry");
+             geometry.remember(WindowGeometry.PREF_KEY_GUI_GEOMETRY);
         }
         Config.getPref().putBoolean("gui.maximized", (windowState & JFrame.MAXIMIZED_BOTH) != 0);

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -111 +111 @@
         pack();
 
-        WindowGeometry.centerOnScreen(this.getSize(), "gui.geometry").applySafe(this);
+        WindowGeometry.centerOnScreen(this.getSize(), WindowGeometry.PREF_KEY_GUI_GEOMETRY).applySafe(this);
 
         // Add ability to hide splash screen by clicking it

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

@@ -34 +34 @@
 public class WindowGeometry {
 
+    /**
+     * Preference key for the {@code MainFrame} geometry
+     */
+    public static final String PREF_KEY_GUI_GEOMETRY = "gui.geometry";
+
     /** the top left point */
     private Point topLeft;
@@ -107 +112 @@
      */
     public static WindowGeometry centerOnScreen(Dimension extent) {
-        return centerOnScreen(extent, "gui.geometry");
+        return centerOnScreen(extent, PREF_KEY_GUI_GEOMETRY);
     }
 
@@ -233 +238 @@
      */
     public static WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) {
-        Rectangle screenDimension = getScreenInfo("gui.geometry");
+        Rectangle screenDimension = getScreenInfo(PREF_KEY_GUI_GEOMETRY);
         if (arg != null) {
             final Matcher m = Pattern.compile("(\\d+)x(\\d+)(([+-])(\\d+)([+-])(\\d+))?").matcher(arg);