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

Timestamp:

2014-03-21T17:31:18+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9778, fix #9806 - access OSM API and JOSM website in HTTPS by default + other HTTPS links where applicable + update CONTRIBUTION

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Geometry.java (modified) (1 diff)
• ImageProvider.java (modified) (1 diff)
• OsmUrlToBounds.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (6 diffs)

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

@@ -695 +695 @@
         BigDecimal east = BigDecimal.ZERO;
 
-        // See http://en.wikipedia.org/w/index.php?title=Centroid&oldid=294224857#Centroid_of_polygon for the equation used here
+        // See https://en.wikipedia.org/wiki/Centroid#Centroid_of_polygon for the equation used here
         for (int i = 0; i < nodes.size(); i++) {
             EastNorth n0 = nodes.get(i).getEastNorth();

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

@@ -417 +417 @@
             ImageType type = name.toLowerCase().endsWith(".svg") ? ImageType.SVG : ImageType.OTHER;
 
-            if (name.startsWith("http://")) {
+            if (name.startsWith("http://") || name.startsWith("https://")) {
                 String url = name;
                 ImageResource ir = cache.get(url);

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

@@ -85 +85 @@
      * Openstreetmap.org changed it's URL scheme in August 2013, which breaks the URL parsing.
      * The following function, called by the old parse function if necessary, provides parsing new URLs
-     * the new URLs follow the scheme http://www.openstreetmap.org/#map=18/51.71873/8.76164&layers=CN
+     * the new URLs follow the scheme https://www.openstreetmap.org/#map=18/51.71873/8.76164&layers=CN
      * @param url string for parsing
      * @return Bounds if hashurl, {@code null} otherwise

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

@@ -72 +72 @@
         Shortcut.registerSystemShortcut("system:resetX", tr("reserved"), KeyEvent.VK_BACK_SPACE, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic();
     }
-    
+
     /**
      * This should work for all platforms. Yeah, should.
@@ -122 +122 @@
         }
     }
-    
+
     /**
      * Get the package name including detailed version.
@@ -137 +137 @@
         }
     }
-    
+
     /**
      * Get the Java package name including detailed version.
@@ -166 +166 @@
         return null;
     }
-    
+
     /**
      * Get the Web Start package name including detailed version.
      *
-     * Debian and Ubuntu OpenJDK packages are shipped with icedtea-web package, 
+     * Debian and Ubuntu OpenJDK packages are shipped with icedtea-web package,
      * but its version does not match main java package version.
-     * 
+     *
      * Only Debian based distributions are covered at the moment.
      * This can be extended to other distributions if needed.
-     * 
+     *
      * Simply return {@code null} if there's no separate package for Java WebStart.
      *
@@ -323 +323 @@
         }
     }
-    
+
     protected void askUpdateJava(String version) {
         try {
@@ -339 +339 @@
                         "<b>"+tr("JOSM will soon stop working with this version; we highly recommend you to update to Java {0}.", "7")+"</b><br><br>"+
                         tr("Would you like to update now ?"));
-   
+
                 if (ed.showDialog().getValue() == 1) {
-                    openUrl("http://www.java.com/download");
+                    openUrl("https://www.java.com/download");
                 }
             }