Changeset 9147 in josm for trunk

Timestamp:

2015-12-25T14:16:49+01:00 (9 years ago)

Author:

simon04

Message:

Use HTTPS for some wiki requests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1108 +1108 @@
         public void actionPerformed(ActionEvent e) {
             try {
-                String base = Main.pref.get("url.openstreetmap-wiki", "http://wiki.openstreetmap.org/wiki/");
+                String base = Main.pref.get("url.openstreetmap-wiki", "https://wiki.openstreetmap.org/wiki/");
                 String lang = LanguageInfo.getWikiLanguagePrefix();
                 final List<URI> uris = new ArrayList<>();

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

@@ -888 +888 @@
     private static ImageResource getIfAvailableWiki(String name, ImageType type) {
         final Collection<String> defaultBaseUrls = Arrays.asList(
-                "http://wiki.openstreetmap.org/w/images/",
-                "http://upload.wikimedia.org/wikipedia/commons/",
-                "http://wiki.openstreetmap.org/wiki/File:"
+                "https://wiki.openstreetmap.org/w/images/",
+                "https://upload.wikimedia.org/wikipedia/commons/",
+                "https://wiki.openstreetmap.org/wiki/File:"
                 );
         final Collection<String> baseUrls = Main.pref.getCollection("image-provider.wiki.urls", defaultBaseUrls);

trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java

@@ -10 +10 @@
 import java.io.IOException;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
 
@@ -17 +19 @@
  */
 public class ImageProviderTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
 
     /**
@@ -41 +51 @@
         assertNotNull(img);
     }
+
+    @Test
+    public void testWikiProtocol() throws Exception {
+        // https://commons.wikimedia.org/wiki/File:OpenJDK_logo.svg
+        assertNotNull(ImageProvider.get("wiki://OpenJDK_logo.svg"));
+    }
 }