Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 17703)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 17704)
@@ -845,5 +845,5 @@
         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));
Index: trunk/src/org/openstreetmap/josm/gui/MainFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainFrame.java	(revision 17703)
+++ trunk/src/org/openstreetmap/josm/gui/MainFrame.java	(revision 17704)
@@ -117,5 +117,5 @@
     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);
Index: trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 17703)
+++ trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 17704)
@@ -111,5 +111,5 @@
         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
Index: trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java	(revision 17703)
+++ trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java	(revision 17704)
@@ -34,4 +34,9 @@
 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,5 +112,5 @@
      */
     public static WindowGeometry centerOnScreen(Dimension extent) {
-        return centerOnScreen(extent, "gui.geometry");
+        return centerOnScreen(extent, PREF_KEY_GUI_GEOMETRY);
     }
 
@@ -233,5 +238,5 @@
      */
     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);