Changeset 12649 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java

Timestamp:

2017-08-25T21:51:00+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - code refactoring to avoid dependence on GUI packages from Preferences

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java

@@ -8 +8 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
+import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
+import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
+import org.openstreetmap.josm.data.preferences.sources.SourceProvider;
+import org.openstreetmap.josm.data.preferences.sources.SourceType;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
@@ -19 +22 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.preferences.SourceEditor;
-import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
-import org.openstreetmap.josm.gui.preferences.SourceEntry;
-import org.openstreetmap.josm.gui.preferences.SourceProvider;
-import org.openstreetmap.josm.gui.preferences.SourceType;
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
@@ -64 +63 @@
         @Override
         public Collection<? extends SourceEntry> getInitialSourcesList() {
-            return RulePrefHelper.INSTANCE.get();
+            return ValidatorPrefHelper.INSTANCE.get();
         }
 
         @Override
         public boolean finish() {
-            return RulePrefHelper.INSTANCE.put(activeSourcesModel.getSources());
+            return ValidatorPrefHelper.INSTANCE.put(activeSourcesModel.getSources());
         }
 
         @Override
         public Collection<ExtendedSourceEntry> getDefault() {
-            return RulePrefHelper.INSTANCE.getDefault();
+            return ValidatorPrefHelper.INSTANCE.getDefault();
         }
 
@@ -123 +122 @@
     }
 
-    /**
-     * Helper class for validator tag checker rules preferences.
-     */
-    public static class RulePrefHelper extends SourceEditor.SourcePrefHelper {
-
-        /**
-         * The unique instance.
-         */
-        public static final RulePrefHelper INSTANCE = new RulePrefHelper();
-
-        /**
-         * Constructs a new {@code PresetPrefHelper}.
-         */
-        public RulePrefHelper() {
-            super(MapCSSTagChecker.ENTRIES_PREF_KEY);
-        }
-
-        @Override
-        public Collection<ExtendedSourceEntry> getDefault() {
-            List<ExtendedSourceEntry> def = new ArrayList<>();
-
-            // CHECKSTYLE.OFF: SingleSpaceSeparator
-            addDefault(def, "addresses",    tr("Addresses"),           tr("Checks for errors on addresses"));
-            addDefault(def, "combinations", tr("Tag combinations"),    tr("Checks for missing tag or suspicious combinations"));
-            addDefault(def, "deprecated",   tr("Deprecated features"), tr("Checks for deprecated features"));
-            addDefault(def, "geometry",     tr("Geometry"),            tr("Checks for geometry errors"));
-            addDefault(def, "highway",      tr("Highways"),            tr("Checks for errors on highways"));
-            addDefault(def, "multiple",     tr("Multiple values"),     tr("Checks for wrong multiple values"));
-            addDefault(def, "numeric",      tr("Numeric values"),      tr("Checks for wrong numeric values"));
-            addDefault(def, "religion",     tr("Religion"),            tr("Checks for errors on religious objects"));
-            addDefault(def, "relation",     tr("Relations"),           tr("Checks for errors on relations"));
-            addDefault(def, "territories",  tr("Territories"),         tr("Checks for territories-specific features"));
-            addDefault(def, "unnecessary",  tr("Unnecessary tags"),    tr("Checks for unnecessary tags"));
-            addDefault(def, "wikipedia",    tr("Wikipedia"),           tr("Checks for wrong wikipedia tags"));
-            // CHECKSTYLE.ON: SingleSpaceSeparator
-
-            return def;
-        }
-
-        private static void addDefault(List<ExtendedSourceEntry> defaults, String filename, String title, String description) {
-            ExtendedSourceEntry i = new ExtendedSourceEntry(filename+".mapcss", "resource://data/validator/"+filename+".mapcss");
-            i.title = title;
-            i.description = description;
-            defaults.add(i);
-        }
-
-        @Override
-        public Map<String, String> serialize(SourceEntry entry) {
-            Map<String, String> res = new HashMap<>();
-            res.put("url", entry.url);
-            res.put("title", entry.title == null ? "" : entry.title);
-            res.put("active", Boolean.toString(entry.active));
-            return res;
-        }
-
-        @Override
-        public SourceEntry deserialize(Map<String, String> s) {
-            return new SourceEntry(s.get("url"), null, s.get("title"), Boolean.parseBoolean(s.get("active")));
-        }
-    }
-
     private SourceEditor sources;