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

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/bugreport

Files:

• BugReportDialog.java (modified) (3 diffs)
• JosmUpdatePanel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java

@@ -30 +30 @@
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
 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;
@@ -74 +75 @@
                         tr("Opening the bug report failed. Please report manually using this website:")),
                         GBC.eol().fill(GridBagConstraints.HORIZONTAL));
-                errorPanel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
+                errorPanel.add(new UrlLabel(Config.getUrls().getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
                 errorPanel.add(new DebugTextDisplay(statusText));
 
@@ -142 +143 @@
 
         panel.add(new JLabel(tr("Manually report at:")+' '), GBC.std());
-        panel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket"), GBC.std().fill(GBC.HORIZONTAL));
+        panel.add(new UrlLabel(Config.getUrls().getJOSMWebsite() + "/newticket"), GBC.std().fill(GBC.HORIZONTAL));
         JButton copy = new JButton("Copy to clipboard");
         copy.addActionListener(e -> textPanel.copyToClipboard());

trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.widgets.UrlLabel;
 import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -61 +62 @@
 
     private static int getTestedVersion() {
-        try (CachedFile testedVersion = new CachedFile(Main.getJOSMWebsite() + "/tested")) {
+        try (CachedFile testedVersion = new CachedFile(Config.getUrls().getJOSMWebsite() + "/tested")) {
             testedVersion.setMaxAge(60L * 15); // 15 Minutes
             String testedString = new String(testedVersion.getByteContent(), StandardCharsets.ISO_8859_1);
@@ -91 +92 @@
     private void showUpdateButton() {
         add(new JMultilineLabel(tr("Before you file a bug report make sure you have updated to the latest version of JOSM here:")), GBC.eol());
-        add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eop().insets(8, 0, 0, 0));
+        add(new UrlLabel(Config.getUrls().getJOSMWebsite(), 2), GBC.eop().insets(8, 0, 0, 0));
         JButton updateButton = new JButton(tr("Update JOSM"), ImageProvider.getIfAvailable("download"));
         updateButton.addActionListener(e -> openJosmUpdateSite());
@@ -99 +100 @@
     private static void openJosmUpdateSite() {
         try {
-            Main.platform.openUrl(Main.getJOSMWebsite());
+            Main.platform.openUrl(Config.getUrls().getJOSMWebsite());
         } catch (IOException ex) {
             Logging.log(Logging.LEVEL_WARN, "Unable to access JOSM website:", ex);