Changeset 4936 in josm

Timestamp:

Feb 15, 2012 3:28:58 PM (15 months ago)

Author:

bastiK

Message:

remove old migration code; keep class structure for next migration step Array -> ListOfStructs

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/MapPaintStyles.java (modified) (6 diffs)
• preferences/MapPaintPreference.java (modified) (5 diffs)
• preferences/SourceEditor.java (modified) (3 diffs)
• preferences/TaggingPresetPreference.java (modified) (4 diffs)
• tagging/TaggingPreset.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
-import org.openstreetmap.josm.gui.preferences.MapPaintPreference.MapPaintPrefMigration;
+import org.openstreetmap.josm.gui.preferences.MapPaintPreference.MapPaintPrefHelper;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -67 +67 @@
     /**
      * IconReference is used to remember the associated style source for
-     * each icon URL. 
+     * each icon URL.
      * This is necessary because image URLs can be paths relative
-     * to the source file and we have cascading of properties from different 
+     * to the source file and we have cascading of properties from different
      * source files.
      */
@@ -167 +167 @@
         styles.clear();
 
-        Collection<? extends SourceEntry> sourceEntries = MapPaintPrefMigration.INSTANCE.get();
+        Collection<? extends SourceEntry> sourceEntries = MapPaintPrefHelper.INSTANCE.get();
 
         for (SourceEntry entry : sourceEntries) {
@@ -305 +305 @@
         }
         styles.setStyleSources(data);
-        MapPaintPrefMigration.INSTANCE.put(data);
+        MapPaintPrefHelper.INSTANCE.put(data);
         fireMapPaintSylesUpdated();
         styles.clearCached();
@@ -331 +331 @@
             s.active = !s.active;
         }
-        MapPaintPrefMigration.INSTANCE.put(data);
+        MapPaintPrefHelper.INSTANCE.put(data);
         if (sel.length == 1) {
             fireMapPaintStyleEntryUpdated(sel[0]);
@@ -346 +346 @@
             styles.add(source);
             source.loadStyleSource();
-            MapPaintPrefMigration.INSTANCE.put(styles.getStyleSources());
+            MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
             fireMapPaintSylesUpdated();
             styles.clearCached();

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

@@ -81 +81 @@
         @Override
         public Collection<? extends SourceEntry> getInitialSourcesList() {
-            return MapPaintPrefMigration.INSTANCE.get();
+            return MapPaintPrefHelper.INSTANCE.get();
         }
 
@@ -88 +88 @@
             List<SourceEntry> activeStyles = activeSourcesModel.getSources();
 
-            boolean changed = MapPaintPrefMigration.INSTANCE.put(activeStyles);
+            boolean changed = MapPaintPrefHelper.INSTANCE.put(activeStyles);
 
             if (tblIconPaths != null) {
@@ -106 +106 @@
         @Override
         public Collection<ExtendedSourceEntry> getDefault() {
-            return MapPaintPrefMigration.INSTANCE.getDefault();
+            return MapPaintPrefHelper.INSTANCE.getDefault();
         }
 
@@ -170 +170 @@
     }
 
-    public static class MapPaintPrefMigration extends SourceEditor.SourcePrefMigration {
-
-        public final static MapPaintPrefMigration INSTANCE = new MapPaintPrefMigration();
-
-        public MapPaintPrefMigration() {
-            super("mappaint.style.sources",
-                    "mappaint.style.enable-defaults",
-                    "mappaint.style.sources-list");
+    public static class MapPaintPrefHelper extends SourceEditor.SourcePrefHelper {
+
+        public final static MapPaintPrefHelper INSTANCE = new MapPaintPrefHelper();
+
+        public MapPaintPrefHelper() {
+            super("mappaint.style.sources-list");
         }
 
@@ -183 +181 @@
         public List<SourceEntry> get() {
             List<SourceEntry> ls = super.get();
-            if (adapt_elemstyles_xml(ls)) {
-                put(ls);
-            }
             if (insertNewDefaults(ls)) {
                 put(ls);
             }
             return ls;
-        }
-
-        /**
-         * The internal path of elemstyles.xml has changed, this
-         * can be removed when a few months have passed.
-         */
-        private boolean adapt_elemstyles_xml(List<SourceEntry> ls) {
-            boolean changed = false;
-            for (SourceEntry se : ls) {
-                if (se.url.equals("resource://data/elemstyles.xml")) {
-                    se.url = "resource://styles/standard/elemstyles.xml";
-                    changed = true;
-                }
-            }
-            return changed;
         }
 

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

@@ -1417 +1417 @@
     }
 
-
-    /**
-     * Convert mappaint and preset source preferences from a simple list to
-     * array with one line for each source entry.
-     *
-     * MapPaint:
-     *
-     *    Old format
-     *      key: mappaint.style.sources
-     *      value: list of "<name>=<url>" pairs. The "<name>=" part is optional.
-     *          The style is always active.
-     *      default: empty list
-     *
-     *      key: mappaint.style.enable-defaults
-     *      value: if true, the default style "resource://data/elemstyles.xml" should
-     *          be loaded.
-     *      default: true
-     *
-     *    New format
-     *      key: mappaint.style.sources-list
-     *      value: each line is a list with entries: url, name, shortdescription, active
-     *      default:
-     *          One line: "resource://data/elemstyles.xml", "standard", tr("Internal Style"), true
-     *
-     * Tagging Preset:
-     *
-     *      the same, but "name" and "active" are not needed and omitted
-     *
-     */
-    abstract public static class SourcePrefMigration {
-
-        private final String oldPref;
-        private final String oldPrefEnableDefaults;
+    abstract public static class SourcePrefHelper {
+
         private final String pref;
 
-        public SourcePrefMigration(String oldPref, String oldPrefEnableDefaults, String pref) {
-            this.oldPref = oldPref;
-            this.oldPrefEnableDefaults = oldPrefEnableDefaults;
+        public SourcePrefHelper(String pref) {
             this.pref = pref;
         }
@@ -1465 +1432 @@
 
         public List<SourceEntry> get() {
-            List<SourceEntry> entries = readNewFormatImpl();
-            if (entries == null) {
-
-                entries = readOldFormat();
-                put(entries);
-                return entries;
-            }
-            return entries;
-        }
-
-        public boolean put(Collection<? extends SourceEntry> entries) {
-            boolean changed = false;
-            if (entries.isEmpty()) {
-                changed |= Main.pref.put(pref + "._empty_", true);
-                changed |= Main.pref.putArray(pref, null);
-            } else {
-                Collection<Collection<String>> setting = new ArrayList<Collection<String>>();
-                for (SourceEntry e : entries) {
-                    setting.add(serialize(e));
-                }
-                changed |= Main.pref.put(pref + "._empty_", null);
-                changed |= Main.pref.putArray(pref, setting);
-            }
-            return changed;
-        }
-
-        public List<SourceEntry> readOldFormat() {
-            List<SourceEntry> result = new ArrayList<SourceEntry>();
-            if (Main.pref.getBoolean(oldPrefEnableDefaults, true)) {
-                result.addAll(getDefault());
-            }
-
-            List<String> lines = new LinkedList<String>(Main.pref.getCollection(oldPref));
-            for (String line : lines) {
-                String[] a = null;
-                if (line.indexOf("=") >= 0) {
-                    a = line.split("=", 2);
-                } else {
-                    a = new String[] { null, line };
-                }
-                result.add(new SourceEntry(a[1], a[0], null, true));
-            }
-
-            return result;
-        }
-
-        public Collection<? extends SourceEntry> readNewFormat() {
-            List<SourceEntry> entries = readNewFormatImpl();
-            if (entries == null)
-                return getDefault();
-            return entries;
-        }
-
-        private List<SourceEntry> readNewFormatImpl() {
+            Collection<Collection<String>> mappaintSrc = Main.pref.getArray(pref, null);
+            if (mappaintSrc == null)
+                return new ArrayList<SourceEntry>(getDefault());
+
             List<SourceEntry> entries = new ArrayList<SourceEntry>();
-            Collection<Collection<String>> mappaintSrc = Main.pref.getArray(pref, null);
-            if (mappaintSrc == null || mappaintSrc.isEmpty()) {
-                if (Main.pref.getBoolean(pref + "._empty_", false))
-                    return Collections.<SourceEntry>emptyList();
-                return null;
-            }
-
             for (Collection<String> sourcePref : mappaintSrc) {
                 SourceEntry e = deserialize(new ArrayList<String>(sourcePref));
@@ -1535 +1445 @@
             return entries;
         }
+
+        public boolean put(Collection<? extends SourceEntry> entries) {
+            Collection<Collection<String>> setting = new ArrayList<Collection<String>>();
+            for (SourceEntry e : entries) {
+                setting.add(serialize(e));
+            }
+            return Main.pref.putArray(pref, setting);
+        }
     }
 

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

@@ -179 +179 @@
         @Override
         public Collection<? extends SourceEntry> getInitialSourcesList() {
-            return PresetPrefMigration.INSTANCE.get();
+            return PresetPrefHelper.INSTANCE.get();
         }
 
@@ -186 +186 @@
             List<SourceEntry> activeStyles = activeSourcesModel.getSources();
 
-            boolean changed = PresetPrefMigration.INSTANCE.put(activeStyles);
+            boolean changed = PresetPrefHelper.INSTANCE.put(activeStyles);
 
             if (tblIconPaths != null) {
@@ -204 +204 @@
         @Override
         public Collection<ExtendedSourceEntry> getDefault() {
-            return PresetPrefMigration.INSTANCE.getDefault();
+            return PresetPrefHelper.INSTANCE.getDefault();
         }
 
@@ -297 +297 @@
     }
 
-    public static class PresetPrefMigration extends SourceEditor.SourcePrefMigration {
-
-        public final static PresetPrefMigration INSTANCE = new PresetPrefMigration();
-
-        public PresetPrefMigration() {
-            super("taggingpreset.sources",
-                    "taggingpreset.enable-defaults",
-                    "taggingpreset.sources-list");
-        }
-
-        @Override
-        public List<SourceEntry> get() {
-            List<SourceEntry> ls = new ArrayList<SourceEntry>(super.get());
-            if (removeDeprecated(ls)) {
-                put(ls);
-            }
-            return ls;
-        }
-
-        /**
-         * FIXME: The internal path of elemstyles.xml has changed, this
-         * can be removed in summer 2011.
-         */
-        private boolean removeDeprecated(List<SourceEntry> ls) {
-            boolean changed = false;
-            Iterator<SourceEntry> it = ls.iterator();
-            while (it.hasNext()) {
-                SourceEntry se = it.next();
-                if (se.url.equals("resource://data/elemstyles.xml")) {
-                    it.remove();
-                    changed = true;
-                }
-            }
-            return changed;
+    public static class PresetPrefHelper extends SourceEditor.SourcePrefHelper {
+
+        public final static PresetPrefHelper INSTANCE = new PresetPrefHelper();
+
+        public PresetPrefHelper() {
+            super("taggingpreset.sources-list");
         }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -67 +67 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
-import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference.PresetPrefMigration;
+import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference.PresetPrefHelper;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
@@ -1240 +1240 @@
         LinkedList<String> sources = new LinkedList<String>();
 
-        for (SourceEntry e : (new PresetPrefMigration()).get()) {
+        for (SourceEntry e : (new PresetPrefHelper()).get()) {
             sources.add(e.url);
         }