Changeset 5763 in josm for trunk/src/org

Timestamp:

2013-03-08T19:16:00+01:00 (12 years ago)

Author:

Don-vip

Message:

Remove old code

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/WmsCache.java (modified) (1 diff)
• gui/preferences/SourceEditor.java (modified) (2 diffs)
• gui/preferences/map/MapPaintPreference.java (modified) (1 diff)
• gui/preferences/map/TaggingPresetPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

@@ -101 +101 @@
             cPath = Main.pref.getCacheDirectory() + File.separator + cPath;
         }
-        // Migrate to new cache directory. Remove 2012-06
-        {
-            File oldPath = new File(Main.pref.getPreferencesDirFile(), "wms-cache");
-            File newPath = new File(cPath);
-            if (oldPath.exists() && !newPath.exists()) {
-                oldPath.renameTo(newPath);
-            }
-        }
         return cPath;
     }

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -1503 +1503 @@
         abstract public SourceEntry deserialize(Map<String, String> entryStr);
 
-        // migration can be removed end 2012
-        abstract public Map<String, String> migrate(Collection<String> old);
-
         public List<SourceEntry> get() {
 
-            boolean migration = false;
             Collection<Map<String, String>> src = Main.pref.getListOfStructs(pref, (Collection<Map<String, String>>) null);
-            if (src == null) {
-                Collection<Collection<String>> srcOldPrefFormat = Main.pref.getArray(prefOld, null);
-                if (srcOldPrefFormat != null) {
-                    migration = true;
-                    src = new ArrayList<Map<String, String>>();
-                    for (Collection<String> p : srcOldPrefFormat) {
-                        src.add(migrate(p));
-                    }
-                }
-            }
             if (src == null)
                 return new ArrayList<SourceEntry>(getDefault());
@@ -1530 +1516 @@
                 }
             }
-            if (migration) {
-                put(entries);
-            }
             return entries;
         }

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -268 +268 @@
             return new SourceEntry(s.get("url"), s.get("ptoken"), s.get("title"), Boolean.parseBoolean(s.get("active")));
         }
-
-        @Override
-        public Map<String, String> migrate(Collection<String> old) {
-            List<String> entryStr = new ArrayList<String>(old);
-            if (entryStr.size() < 4)
-                return null;
-            Map<String, String> res = new HashMap<String, String>();
-            res.put("url", entryStr.get(0));
-            res.put("ptoken", entryStr.get(1));
-            res.put("title", entryStr.get(2));
-            res.put("active", entryStr.get(3));
-            return res;
-        }
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -336 +336 @@
             return new SourceEntry(s.get("url"), null, s.get("title"), true);
         }
-
-        @Override
-        public Map<String, String> migrate(Collection<String> old) {
-            List<String> entryStr = new ArrayList<String>(old);
-            if (entryStr.size() < 2)
-                return null;
-            Map<String, String> res = new HashMap<String, String>();
-            res.put("url", entryStr.get(0));
-            res.put("title", entryStr.get(1));
-            return res;
-        }
-
     }