Changeset 14119 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2018-08-11T16:10:32+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods returning an URL

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (2 diffs)
• gpx/GpxConstants.java (modified) (2 diffs)
• imagery/ImageryLayerInfo.java (modified) (3 diffs)
• oauth/OAuthParameters.java (modified) (3 diffs)
• osm/DataSet.java (modified) (2 diffs)
• preferences/JosmUrls.java (added)
• preferences/PreferencesWriter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -715 +715 @@
      */
     public Collection<String> getPluginSites() {
-        return getList("pluginmanager.sites", Collections.singletonList(Main.getJOSMWebsite()+"/pluginicons%<?plugins=>"));
+        return getList("pluginmanager.sites", Collections.singletonList(Config.getUrls().getJOSMWebsite()+"/pluginicons%<?plugins=>"));
     }
 
@@ -727 +727 @@
         for (Iterator<String> it = pluginSites.iterator(); it.hasNext();) {
             try {
-                OnlineResource.JOSM_WEBSITE.checkOfflineAccess(it.next(), Main.getJOSMWebsite());
+                OnlineResource.JOSM_WEBSITE.checkOfflineAccess(it.next(), Config.getUrls().getJOSMWebsite());
             } catch (OfflineAccessException ex) {
                 Logging.log(Logging.LEVEL_WARN, ex);

trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java

@@ -7 +7 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -103 +103 @@
      * A namespace for josm GPX extensions
      */
-    String JOSM_EXTENSIONS_NAMESPACE_URI = Main.getXMLBase() + "/gpx-extensions-1.0";
+    String JOSM_EXTENSIONS_NAMESPACE_URI = Config.getUrls().getXMLBase() + "/gpx-extensions-1.0";
 
     /** Elevation (in meters) of the point. */

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -18 +18 @@
 import java.util.concurrent.ExecutorService;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
@@ -50 +49 @@
 
     private static final String[] DEFAULT_LAYER_SITES = {
-        Main.getJOSMWebsite()+"/maps%<?ids=>"
+            Config.getUrls().getJOSMWebsite()+"/maps%<?ids=>"
     };
 
@@ -162 +161 @@
             boolean online = true;
             try {
-                OnlineResource.JOSM_WEBSITE.checkOfflineAccess(source, Main.getJOSMWebsite());
+                OnlineResource.JOSM_WEBSITE.checkOfflineAccess(source, Config.getUrls().getJOSMWebsite());
             } catch (OfflineAccessException e) {
                 Logging.log(Logging.LEVEL_WARN, e);

trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

@@ -4 +4 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -56 +55 @@
         }
 
-        if (apiUrl != null && !OsmApi.DEFAULT_API_URL.equals(apiUrl)) {
+        if (apiUrl != null && !Config.getUrls().getDefaultOsmApiUrl().equals(apiUrl)) {
             consumerKey = ""; // a custom consumer key is required
             consumerSecret = ""; // a custom consumer secret is requireds
@@ -63 +62 @@
             consumerKey = DEFAULT_JOSM_CONSUMER_KEY;
             consumerSecret = DEFAULT_JOSM_CONSUMER_SECRET;
-            serverUrl = Main.getOSMWebsite();
+            serverUrl = Config.getUrls().getOSMWebsite();
         }
 

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -55 +55 @@
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
@@ -772 +773 @@
                     "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. Please report this "
                             + "at {2}. This is not a critical error, it should be safe to continue in your work.",
-                    primitiveId.getType(), Long.toString(primitiveId.getUniqueId()), Main.getJOSMWebsite()));
+                    primitiveId.getType(), Long.toString(primitiveId.getUniqueId()), Config.getUrls().getJOSMWebsite()));
             Logging.error(new Exception());
         }

trunk/src/org/openstreetmap/josm/data/preferences/PreferencesWriter.java

@@ -9 +9 @@
 import java.util.stream.Stream;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.io.XmlWriter;
-import org.openstreetmap.josm.spi.preferences.Setting;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.ListListSetting;
-import org.openstreetmap.josm.spi.preferences.SettingVisitor;
 import org.openstreetmap.josm.spi.preferences.ListSetting;
 import org.openstreetmap.josm.spi.preferences.MapListSetting;
+import org.openstreetmap.josm.spi.preferences.Setting;
+import org.openstreetmap.josm.spi.preferences.SettingVisitor;
 import org.openstreetmap.josm.spi.preferences.StringSetting;
 
@@ -57 +57 @@
         out.write(String.format("<?xml version=\"1.0\" encoding=\"UTF-8\"?>%n"));
         String rootElement = defaults ? "preferences-defaults" : "preferences";
-        out.write(String.format("<%s xmlns='%s/preferences-1.0'", rootElement, Main.getXMLBase()));
+        out.write(String.format("<%s xmlns='%s/preferences-1.0'", rootElement, Config.getUrls().getXMLBase()));
         if (defaults) {
             out.write(" xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'");