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

Timestamp:

2013-08-11T23:47:22+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8885 - cleanup in command line arguments and website URL handling

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• BugReportExceptionHandler.java (modified) (4 diffs)
• WikiReader.java (modified) (1 diff)

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

@@ -135 +135 @@
                                     tr("You have encountered an error in JOSM. Before you file a bug report " +
                                             "make sure you have updated to the latest version of JOSM here:")), GBC.eol());
-                            p.add(new UrlLabel("http://josm.openstreetmap.de",2), GBC.eop().insets(8,0,0,0));
+                            p.add(new UrlLabel(Main.JOSM_WEBSITE,2), GBC.eop().insets(8,0,0,0));
                             p.add(new JMultilineLabel(
                                     tr("You should also update your plugins. If neither of those help please " +
@@ -147 +147 @@
                                     tr("Alternatively, if that does not work you can manually fill in the information " +
                                             "below at this URL:")), GBC.eol());
-                            p.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eop().insets(8,0,0,0));
+                            p.add(new UrlLabel(Main.JOSM_WEBSITE+"/newticket",2), GBC.eop().insets(8,0,0,0));
                             if (Utils.copyToClipboard(text)) {
                                 p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop());
@@ -196 +196 @@
             Utils.close(gzip);
 
-            return new URL("http://josm.openstreetmap.de/josmticket?" +
+            return new URL(Main.JOSM_WEBSITE+"/josmticket?" +
                     "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
         } catch (IOException e) {
@@ -213 +213 @@
         URL url = getBugReportUrl(debugText);
         if (url != null) {
-            return new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?...", 2);
+            return new UrlLabel(url.toString(), Main.JOSM_WEBSITE+"/josmticket?...", 2);
         }
         return null;

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

@@ -23 +23 @@
 
     public WikiReader() {
-        this.baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
+        this.baseurl = Main.pref.get("help.baseurl", Main.JOSM_WEBSITE);
     }