Changeset 14119 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

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/gui/dialogs

Files:

• ChangesetDialog.java (modified) (1 diff)
• NotesDialog.java (modified) (2 diffs)
• UserListDialog.java (modified) (3 diffs)
• changeset/query/UrlBasedQueryPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

@@ -429 +429 @@
             if (sel.size() > 10 && !AbstractInfoAction.confirmLaunchMultiple(sel.size()))
                 return;
-            String baseUrl = Main.getBaseBrowseUrl();
+            String baseUrl = Config.getUrls().getBaseBrowseUrl();
             for (Changeset cs: sel) {
                 OpenBrowser.displayUrl(baseUrl + "/changeset/" + cs.getId());

trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.gui.layer.NoteLayer;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
@@ -432 +433 @@
             final Note note = displayList.getSelectedValue();
             if (note.getId() > 0) {
-                final String url = Main.getBaseBrowseUrl() + "/note/" + note.getId();
+                final String url = Config.getUrls().getBaseBrowseUrl() + "/note/" + note.getId();
                 OpenBrowser.displayUrl(url);
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

@@ -31 +31 @@
 import javax.swing.table.DefaultTableModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AbstractInfoAction;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
@@ -48 +47 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -237 +237 @@
             if (infoObject instanceof User) {
                 User user = (User) infoObject;
-                return Main.getBaseUserUrl() + '/' + Utils.encodeUrl(user.getName()).replaceAll("\\+", "%20");
+                return Config.getUrls().getBaseUserUrl() + '/' + Utils.encodeUrl(user.getName()).replaceAll("\\+", "%20");
             } else {
                 return null;

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java

@@ -23 +23 @@
 import javax.swing.event.HyperlinkEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -29 +28 @@
 import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlException;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -80 +80 @@
     protected static List<String> getExamples() {
         return Arrays.asList(
-                Main.getOSMWebsite()+"/history?open=true",
+                Config.getUrls().getOSMWebsite()+"/history?open=true",
                 OsmApi.getOsmApi().getBaseUrl()+"/changesets?open=true");
     }