Changeset 12841 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

Timestamp:

2017-09-13T16:30:27+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - fix deprecations caused by [12840]

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -13 +13 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -159 +158 @@
     protected EditableList sourcesList;
 
-    private static final Set<String> DEFAULT_SOURCES = new HashSet<>(Arrays.asList(/*DATA_FILE, */IGNORE_FILE, SPELL_FILE));
+    private static final List<String> DEFAULT_SOURCES = Arrays.asList(/*DATA_FILE, */IGNORE_FILE, SPELL_FILE);
 
     /**
@@ -191 +190 @@
 
         StringBuilder errorSources = new StringBuilder();
-        for (String source : Main.pref.getCollection(PREF_SOURCES, DEFAULT_SOURCES)) {
+        for (String source : Main.pref.getList(PREF_SOURCES, DEFAULT_SOURCES)) {
             try (
                 CachedFile cf = new CachedFile(source);
@@ -293 +292 @@
             }
             // TODO directionKeys are no longer in OsmPrimitive (search pattern is used instead)
-            for (String a : Main.pref.getCollection(ValidatorPrefHelper.PREFIX + ".knownkeys",
+            for (String a : Main.pref.getList(ValidatorPrefHelper.PREFIX + ".knownkeys",
                     Arrays.asList("is_in", "int_ref", "fixme", "population"))) {
                 additionalPresetsValueData.putVoid(a);
@@ -636 +635 @@
         testPanel.add(prefCheckComplexBeforeUpload, a);
 
-        final Collection<String> sources = Main.pref.getCollection(PREF_SOURCES, DEFAULT_SOURCES);
+        final Collection<String> sources = Main.pref.getList(PREF_SOURCES, DEFAULT_SOURCES);
         sourcesList = new EditableList(tr("TagChecker source"));
         sourcesList.setItems(sources);
@@ -682 +681 @@
                 || prefCheckFixmesBeforeUpload.isSelected() || prefCheckComplexBeforeUpload.isSelected();
 
-        Main.pref.put(PREF_CHECK_VALUES, prefCheckValues.isSelected());
-        Main.pref.put(PREF_CHECK_COMPLEX, prefCheckComplex.isSelected());
-        Main.pref.put(PREF_CHECK_KEYS, prefCheckKeys.isSelected());
-        Main.pref.put(PREF_CHECK_FIXMES, prefCheckFixmes.isSelected());
-        Main.pref.put(PREF_CHECK_VALUES_BEFORE_UPLOAD, prefCheckValuesBeforeUpload.isSelected());
-        Main.pref.put(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, prefCheckComplexBeforeUpload.isSelected());
-        Main.pref.put(PREF_CHECK_KEYS_BEFORE_UPLOAD, prefCheckKeysBeforeUpload.isSelected());
-        Main.pref.put(PREF_CHECK_FIXMES_BEFORE_UPLOAD, prefCheckFixmesBeforeUpload.isSelected());
-        return Main.pref.putCollection(PREF_SOURCES, sourcesList.getItems());
+        Main.pref.putBoolean(PREF_CHECK_VALUES, prefCheckValues.isSelected());
+        Main.pref.putBoolean(PREF_CHECK_COMPLEX, prefCheckComplex.isSelected());
+        Main.pref.putBoolean(PREF_CHECK_KEYS, prefCheckKeys.isSelected());
+        Main.pref.putBoolean(PREF_CHECK_FIXMES, prefCheckFixmes.isSelected());
+        Main.pref.putBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, prefCheckValuesBeforeUpload.isSelected());
+        Main.pref.putBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, prefCheckComplexBeforeUpload.isSelected());
+        Main.pref.putBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, prefCheckKeysBeforeUpload.isSelected());
+        Main.pref.putBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, prefCheckFixmesBeforeUpload.isSelected());
+        return Main.pref.putList(PREF_SOURCES, sourcesList.getItems());
     }