Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 4935) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 4936) @@ -22,5 +22,5 @@ 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,7 +67,7 @@ /** * 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,5 +167,5 @@ styles.clear(); - Collection sourceEntries = MapPaintPrefMigration.INSTANCE.get(); + Collection sourceEntries = MapPaintPrefHelper.INSTANCE.get(); for (SourceEntry entry : sourceEntries) { @@ -305,5 +305,5 @@ } styles.setStyleSources(data); - MapPaintPrefMigration.INSTANCE.put(data); + MapPaintPrefHelper.INSTANCE.put(data); fireMapPaintSylesUpdated(); styles.clearCached(); @@ -331,5 +331,5 @@ s.active = !s.active; } - MapPaintPrefMigration.INSTANCE.put(data); + MapPaintPrefHelper.INSTANCE.put(data); if (sel.length == 1) { fireMapPaintStyleEntryUpdated(sel[0]); @@ -346,5 +346,5 @@ styles.add(source); source.loadStyleSource(); - MapPaintPrefMigration.INSTANCE.put(styles.getStyleSources()); + MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources()); fireMapPaintSylesUpdated(); styles.clearCached(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (revision 4935) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (revision 4936) @@ -81,5 +81,5 @@ @Override public Collection getInitialSourcesList() { - return MapPaintPrefMigration.INSTANCE.get(); + return MapPaintPrefHelper.INSTANCE.get(); } @@ -88,5 +88,5 @@ List activeStyles = activeSourcesModel.getSources(); - boolean changed = MapPaintPrefMigration.INSTANCE.put(activeStyles); + boolean changed = MapPaintPrefHelper.INSTANCE.put(activeStyles); if (tblIconPaths != null) { @@ -106,5 +106,5 @@ @Override public Collection getDefault() { - return MapPaintPrefMigration.INSTANCE.getDefault(); + return MapPaintPrefHelper.INSTANCE.getDefault(); } @@ -170,12 +170,10 @@ } - 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,26 +181,8 @@ public List get() { List 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 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; } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 4935) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 4936) @@ -1417,42 +1417,9 @@ } - - /** - * 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 "=" pairs. The "=" 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,66 +1432,9 @@ public List get() { - List entries = readNewFormatImpl(); - if (entries == null) { - - entries = readOldFormat(); - put(entries); - return entries; - } - return entries; - } - - public boolean put(Collection entries) { - boolean changed = false; - if (entries.isEmpty()) { - changed |= Main.pref.put(pref + "._empty_", true); - changed |= Main.pref.putArray(pref, null); - } else { - Collection> setting = new ArrayList>(); - 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 readOldFormat() { - List result = new ArrayList(); - if (Main.pref.getBoolean(oldPrefEnableDefaults, true)) { - result.addAll(getDefault()); - } - - List lines = new LinkedList(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 readNewFormat() { - List entries = readNewFormatImpl(); - if (entries == null) - return getDefault(); - return entries; - } - - private List readNewFormatImpl() { + Collection> mappaintSrc = Main.pref.getArray(pref, null); + if (mappaintSrc == null) + return new ArrayList(getDefault()); + List entries = new ArrayList(); - Collection> mappaintSrc = Main.pref.getArray(pref, null); - if (mappaintSrc == null || mappaintSrc.isEmpty()) { - if (Main.pref.getBoolean(pref + "._empty_", false)) - return Collections.emptyList(); - return null; - } - for (Collection sourcePref : mappaintSrc) { SourceEntry e = deserialize(new ArrayList(sourcePref)); @@ -1535,4 +1445,12 @@ return entries; } + + public boolean put(Collection entries) { + Collection> setting = new ArrayList>(); + for (SourceEntry e : entries) { + setting.add(serialize(e)); + } + return Main.pref.putArray(pref, setting); + } } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (revision 4935) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (revision 4936) @@ -179,5 +179,5 @@ @Override public Collection getInitialSourcesList() { - return PresetPrefMigration.INSTANCE.get(); + return PresetPrefHelper.INSTANCE.get(); } @@ -186,5 +186,5 @@ List activeStyles = activeSourcesModel.getSources(); - boolean changed = PresetPrefMigration.INSTANCE.put(activeStyles); + boolean changed = PresetPrefHelper.INSTANCE.put(activeStyles); if (tblIconPaths != null) { @@ -204,5 +204,5 @@ @Override public Collection getDefault() { - return PresetPrefMigration.INSTANCE.getDefault(); + return PresetPrefHelper.INSTANCE.getDefault(); } @@ -297,38 +297,10 @@ } - 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 get() { - List ls = new ArrayList(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 ls) { - boolean changed = false; - Iterator 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"); } Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 4935) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 4936) @@ -67,5 +67,5 @@ 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,5 +1240,5 @@ LinkedList sources = new LinkedList(); - for (SourceEntry e : (new PresetPrefMigration()).get()) { + for (SourceEntry e : (new PresetPrefHelper()).get()) { sources.add(e.url); }