Changeset 11171 in josm

Timestamp:

2016-10-26T21:23:24+02:00 (8 years ago)

Author:

simon04

Message:

Fix MOTD image link replacement

Avoids downloading images which are contained in the JOSM distribution.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/GettingStarted.java (modified) (2 diffs)
• test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java (added)

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -71 +71 @@
      * Grabs current MOTD from cache or webpage and parses it.
      */
-    private static class MotdContent extends CacheCustomContent<IOException> {
+    static class MotdContent extends CacheCustomContent<IOException> {
         MotdContent() {
             super("motd.html", CacheCustomContent.INTERVAL_DAILY);
@@ -161 +161 @@
     }
 
-    private String fixImageLinks(String s) {
-        Matcher m = Pattern.compile("src=\""+Main.getJOSMWebsite()+"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s);
+    static String fixImageLinks(String s) {
+        Matcher m = Pattern.compile("src=\"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s);
         StringBuffer sb = new StringBuffer();
         while (m.find()) {
             String im = m.group(1);
-            URL u = getClass().getResource(im);
+            URL u = GettingStarted.class.getResource(im);
             if (u != null) {
                 m.appendReplacement(sb, Matcher.quoteReplacement("src=\"" + u + '\"'));