Changeset 6471 in josm for trunk/src

Timestamp:

2013-12-11T00:51:08+01:00 (10 years ago)

Author:

Don-vip

Message:

Sonar - remove warnings related to the static preferences initialization in instance methods

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• gui/MainApplet.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -18 +18 @@
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -54 +55 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.ServerSidePreferences;
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
@@ -335 +337 @@
 
     /**
+     * Initializes {@code Main.pref} in applet context.
+     * @param serverURL The server URL hosting the user preferences.
+     * @since 6471
+     */
+    public static void initAppletPreferences(URL serverURL) {
+        Main.pref = new ServerSidePreferences(serverURL);
+    }
+
+    /**
+     * Initializes {@code Main.pref} in normal application context.
+     * @since 6471
+     */
+    public static void initApplicationPreferences() {
+        Main.pref = new Preferences();
+    }
+
+    /**
      * Set or clear (if passed <code>null</code>) the map.
      * @param map The map to set {@link Main#map} to. Can be null.

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

@@ -101 +101 @@
         Main.platform.preStartupHook();
 
-        Main.pref = new ServerSidePreferences(getCodeBase());
+        Main.initAppletPreferences(getCodeBase());
 
         String lang = getParameter("language");
@@ -166 +166 @@
         Main.applet = true;
         MainApplet applet = new MainApplet();
-        Main.pref = new ServerSidePreferences(applet.getCodeBase());
+        Main.initAppletPreferences(applet.getCodeBase());
         applet.setStub(new AppletStub() {
             @Override

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

@@ -273 +273 @@
         }
 
-        Main.pref = new Preferences();
+        initApplicationPreferences();
 
         Policy.setPolicy(new Policy() {