Changeset 12645 in josm

Timestamp:

2017-08-25T15:26:00+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - remove last non-deprecated dependence of Main on GUI

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (2 diffs)

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

@@ -46 +46 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
-import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.io.FileWatcher;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -710 +709 @@
      */
     public static void preConstructorInit() {
-        ProjectionPreference.setProjection();
-
         // init default coordinate format
         try {

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

@@ -87 +87 @@
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
@@ -777 +778 @@
         toolbar = new ToolbarPreferences();
         Main.toolbar = toolbar;
+        ProjectionPreference.setProjection();
         GuiHelper.translateJavaInternalMessages();
         preConstructorInit();