Changeset 13881 in josm for trunk

Timestamp:

2018-06-02T19:25:11+02:00 (6 years ago)

Author:

stoecker

Message:

never add URL extension to preference key

File:

• trunk/src/org/openstreetmap/josm/io/CachedFile.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -399 +399 @@
             url = new URL(name);
             if (!"file".equals(url.getProtocol())) {
-                String prefKey = getPrefKey(url, destDir, null);
+                String prefKey = getPrefKey(url, destDir);
                 List<String> localPath = new ArrayList<>(Config.getPref().getList(prefKey));
                 if (localPath.size() == 2) {
@@ -420 +420 @@
      * @param url URL
      * @param destDir destination directory
-     * @param parameter additional URL parameter (used e.g. for maps)
      * @return Preference key
      */
-    private static String getPrefKey(URL url, String destDir, String parameter) {
+    private static String getPrefKey(URL url, String destDir) {
         StringBuilder prefKey = new StringBuilder("mirror.");
         if (destDir != null) {
             prefKey.append(destDir).append('.');
         }
-        if (parameter != null) {
-            prefKey.append(url.toString().replaceAll("%<(.*)>", ""));
-        } else {
-            prefKey.append(url.toString());
-        }
+        prefKey.append(url.toString().replaceAll("%<(.*)>", ""));
         return prefKey.toString().replaceAll("=", "_");
     }
 
     private File checkLocal(URL url) throws IOException {
-        String prefKey = getPrefKey(url, destDir, parameter);
+        String prefKey = getPrefKey(url, destDir);
         String urlStr = url.toExternalForm();
         if (parameter != null)