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

Timestamp:

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

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods returning an URL

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AboutAction.java (modified) (2 diffs)
• HistoryInfoWebAction.java (modified) (2 diffs)
• InfoWebAction.java (modified) (3 diffs)
• ShowStatusReportAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -33 +33 @@
 import org.openstreetmap.josm.gui.widgets.UrlLabel;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -100 +101 @@
         info.add(label, GBC.eol().fill(GBC.HORIZONTAL).insets(10, 0, 0, 10));
         info.add(new JLabel(tr("Homepage")), GBC.std().insets(10, 0, 10, 0));
-        info.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eol());
+        info.add(new UrlLabel(Config.getUrls().getJOSMWebsite(), 2), GBC.eol());
         info.add(new JLabel(tr("Translations")), GBC.std().insets(10, 0, 10, 0));
         info.add(new UrlLabel("https://translations.launchpad.net/josm", 2), GBC.eol());

trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -34 +34 @@
         if (infoObject instanceof IPrimitive) {
             IPrimitive primitive = (IPrimitive) infoObject;
-            return Main.getBaseBrowseUrl() + '/' + OsmPrimitiveType.from(primitive).getAPIName() + '/' + primitive.getOsmId() + "/history";
+            return Config.getUrls().getBaseBrowseUrl()
+                    + '/' + OsmPrimitiveType.from(primitive).getAPIName() + '/' + primitive.getOsmId() + "/history";
         } else {
             return null;

trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java

@@ -8 +8 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.IPrimitive;
@@ -14 +13 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -38 +38 @@
         if (infoObject instanceof IPrimitive) {
             IPrimitive primitive = (IPrimitive) infoObject;
-            return Main.getBaseBrowseUrl() + '/' + OsmPrimitiveType.from(primitive).getAPIName() + '/' + primitive.getOsmId();
+            return Config.getUrls().getBaseBrowseUrl() + '/' + OsmPrimitiveType.from(primitive).getAPIName() + '/' + primitive.getOsmId();
         } else if (infoObject instanceof Note) {
             Note note = (Note) infoObject;
-            return Main.getBaseBrowseUrl() + "/note/" + note.getId();
+            return Config.getUrls().getBaseBrowseUrl() + "/note/" + note.getId();
         } else {
             return null;

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -198 +198 @@
 
         String osmApi = OsmApi.getOsmApi().getServerUrl();
-        if (!OsmApi.DEFAULT_API_URL.equals(osmApi.trim())) {
+        if (!Config.getUrls().getDefaultOsmApiUrl().equals(osmApi.trim())) {
             text.append("OSM API: ").append(osmApi).append("\n\n");
         }