Ignore:
Timestamp:
2014-03-21T17:31:18+01:00 (9 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/Geometry.java

    r6869 r6920  
    695695        BigDecimal east = BigDecimal.ZERO;
    696696
    697         // See http://en.wikipedia.org/w/index.php?title=Centroid&oldid=294224857#Centroid_of_polygon for the equation used here
     697        // See https://en.wikipedia.org/wiki/Centroid#Centroid_of_polygon for the equation used here
    698698        for (int i = 0; i < nodes.size(); i++) {
    699699            EastNorth n0 = nodes.get(i).getEastNorth();
  • trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

    r6889 r6920  
    417417            ImageType type = name.toLowerCase().endsWith(".svg") ? ImageType.SVG : ImageType.OTHER;
    418418
    419             if (name.startsWith("http://")) {
     419            if (name.startsWith("http://") || name.startsWith("https://")) {
    420420                String url = name;
    421421                ImageResource ir = cache.get(url);
  • trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

    r6897 r6920  
    8585     * Openstreetmap.org changed it's URL scheme in August 2013, which breaks the URL parsing.
    8686     * The following function, called by the old parse function if necessary, provides parsing new URLs
    87      * the new URLs follow the scheme http://www.openstreetmap.org/#map=18/51.71873/8.76164&amp;layers=CN
     87     * the new URLs follow the scheme https://www.openstreetmap.org/#map=18/51.71873/8.76164&amp;layers=CN
    8888     * @param url string for parsing
    8989     * @return Bounds if hashurl, {@code null} otherwise
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

    r6850 r6920  
    7272        Shortcut.registerSystemShortcut("system:resetX", tr("reserved"), KeyEvent.VK_BACK_SPACE, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic();
    7373    }
    74    
     74
    7575    /**
    7676     * This should work for all platforms. Yeah, should.
     
    122122        }
    123123    }
    124    
     124
    125125    /**
    126126     * Get the package name including detailed version.
     
    137137        }
    138138    }
    139    
     139
    140140    /**
    141141     * Get the Java package name including detailed version.
     
    166166        return null;
    167167    }
    168    
     168
    169169    /**
    170170     * Get the Web Start package name including detailed version.
    171171     *
    172      * Debian and Ubuntu OpenJDK packages are shipped with icedtea-web package, 
     172     * Debian and Ubuntu OpenJDK packages are shipped with icedtea-web package,
    173173     * but its version does not match main java package version.
    174      * 
     174     *
    175175     * Only Debian based distributions are covered at the moment.
    176176     * This can be extended to other distributions if needed.
    177      * 
     177     *
    178178     * Simply return {@code null} if there's no separate package for Java WebStart.
    179179     *
     
    323323        }
    324324    }
    325    
     325
    326326    protected void askUpdateJava(String version) {
    327327        try {
     
    339339                        "<b>"+tr("JOSM will soon stop working with this version; we highly recommend you to update to Java {0}.", "7")+"</b><br><br>"+
    340340                        tr("Would you like to update now ?"));
    341    
     341
    342342                if (ed.showDialog().getValue() == 1) {
    343                     openUrl("http://www.java.com/download");
     343                    openUrl("https://www.java.com/download");
    344344                }
    345345            }
Note: See TracChangeset for help on using the changeset viewer.