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

Timestamp:

2018-08-11T16:10:32+02:00 (16 months ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods returning an URL

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• OsmUrlToBounds.java (modified) (3 diffs)
• WikiReader.java (modified) (2 diffs)
• bugreport/BugReportSender.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -10 +10 @@
 import java.util.function.Supplier;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -17 +16 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -290 +290 @@
         double lon = Math.round(dlon * decimals);
         lon /= decimals;
-        return Main.getOSMWebsite() + "/#map="+zoom+'/'+lat+'/'+lon;
+        return Config.getUrls().getOSMWebsite() + "/#map="+zoom+'/'+lat+'/'+lon;
     }
 }

trunk/src/org/openstreetmap/josm/tools/WikiReader.java

@@ -6 +6 @@
 import java.net.URL;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
@@ -31 +30 @@
      */
     public WikiReader() {
-        this(Config.getPref().get("help.baseurl", Main.getJOSMWebsite()));
+        this(Config.getPref().get("help.baseurl", Config.getUrls().getJOSMWebsite()));
     }
 

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java

@@ -16 +16 @@
 import javax.xml.xpath.XPathFactory;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.HttpClient.Response;
@@ -136 +136 @@
 
     private static String getJOSMTicketURL() {
-        return Main.getJOSMWebsite() + "/josmticket";
+        return Config.getUrls().getJOSMWebsite() + "/josmticket";
     }