Changeset 12841 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

bastiK

Message:

see #15229 - fix deprecations caused by [12840]

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ConditionalOptionPaneUtil.java (modified) (2 diffs)
• GettingStarted.java (modified) (2 diffs)
• IconToggleButton.java (modified) (1 diff)
• MainApplication.java (modified) (2 diffs)
• MainFrame.java (modified) (1 diff)
• MapFrame.java (modified) (2 diffs)
• MapStatus.java (modified) (2 diffs)
• NavigatableComponent.java (modified) (2 diffs)
• Notification.java (modified) (2 diffs)
• PleaseWaitDialog.java (modified) (2 diffs)
• bbox/SlippyMapBBoxChooser.java (modified) (1 diff)
• conflict/tags/TagConflictResolver.java (modified) (1 diff)
• dialogs/ChangesetDialog.java (modified) (1 diff)
• dialogs/OsmIdSelectionDialog.java (modified) (5 diffs)
• dialogs/SelectionListDialog.java (modified) (2 diffs)
• dialogs/ToggleDialog.java (modified) (3 diffs)
• dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified) (1 diff)
• dialogs/changeset/query/BasicChangesetQueryPanel.java (modified) (1 diff)
• dialogs/properties/RecentTagCollection.java (modified) (3 diffs)
• dialogs/properties/TagEditHelper.java (modified) (2 diffs)
• download/BookmarkList.java (modified) (2 diffs)
• download/DownloadObjectDialog.java (modified) (1 diff)
• download/OverpassQueryList.java (modified) (3 diffs)
• download/OverpassQueryWizardDialog.java (modified) (2 diffs)
• download/PlaceSelection.java (modified) (2 diffs)
• history/VersionTable.java (modified) (1 diff)
• io/BasicUploadSettingsPanel.java (modified) (3 diffs)
• io/ChangesetManagementPanel.java (modified) (1 diff)
• io/CustomConfigurator.java (modified) (2 diffs)
• io/RecentlyOpenedFilesMenu.java (modified) (2 diffs)
• io/UploadDialog.java (modified) (1 diff)
• io/UploadStrategySelectionPanel.java (modified) (2 diffs)
• io/importexport/GpxExporter.java (modified) (1 diff)
• layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• layer/gpx/ConvertToDataLayerAction.java (modified) (1 diff)
• layer/gpx/DateFilterPanel.java (modified) (1 diff)
• layer/gpx/DownloadAlongPanel.java (modified) (2 diffs)
• layer/gpx/GpxDrawHelper.java (modified) (2 diffs)
• layer/imagery/ReprojectionTile.java (modified) (1 diff)
• layer/markerlayer/PlayHeadMarker.java (modified) (1 diff)
• mappaint/MapPaintStyles.java (modified) (1 diff)
• mappaint/StyleSetting.java (modified) (1 diff)
• mappaint/styleelement/AreaElement.java (modified) (1 diff)
• mappaint/styleelement/LabelCompositionStrategy.java (modified) (1 diff)
• mappaint/styleelement/NodeElement.java (modified) (2 diffs)
• mappaint/styleelement/StyleElement.java (modified) (1 diff)
• oauth/AdvancedOAuthPropertiesPanel.java (modified) (1 diff)
• preferences/SourceEditor.java (modified) (1 diff)
• preferences/ToolbarPreferences.java (modified) (7 diffs)
• preferences/audio/AudioPreference.java (modified) (1 diff)
• preferences/display/DrawingPreference.java (modified) (3 diffs)
• preferences/display/GPXSettingsPanel.java (modified) (3 diffs)
• preferences/display/LafPreference.java (modified) (1 diff)
• preferences/map/MapPaintPreference.java (modified) (2 diffs)
• preferences/map/TaggingPresetPreference.java (modified) (2 diffs)
• preferences/plugin/PluginPreference.java (modified) (2 diffs)
• preferences/plugin/PluginPreferencesModel.java (modified) (3 diffs)
• preferences/plugin/PluginUpdatePolicyPanel.java (modified) (2 diffs)
• preferences/projection/CustomProjectionChoice.java (modified) (2 diffs)
• preferences/projection/ProjectionPreference.java (modified) (4 diffs)
• preferences/remotecontrol/RemoteControlPreference.java (modified) (1 diff)
• preferences/server/OsmApiUrlInputPanel.java (modified) (2 diffs)
• preferences/validator/ValidatorTestsPreference.java (modified) (2 diffs)
• tagging/presets/TaggingPreset.java (modified) (1 diff)
• tagging/presets/TaggingPresetItem.java (modified) (1 diff)
• tagging/presets/TaggingPresets.java (modified) (1 diff)
• widgets/HistoryComboBox.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

@@ -60 +60 @@
                 immediateChoices.get(prefKey),
                 sessionChoices.get(prefKey),
-                !Main.pref.getBoolean("message." + prefKey, true) ? Main.pref.getInteger("message." + prefKey + ".value", -1) : -1
+                !Main.pref.getBoolean("message." + prefKey, true) ? Main.pref.getInt("message." + prefKey + ".value", -1) : -1
         );
     }
@@ -239 +239 @@
                     break;
                 case PERMANENT:
-                    Main.pref.put("message." + prefKey, false);
-                    Main.pref.putInteger("message." + prefKey + ".value", value);
+                    Main.pref.putBoolean("message." + prefKey, false);
+                    Main.pref.putInt("message." + prefKey + ".value", value);
                     break;
             }

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -95 +95 @@
             String motd = new WikiReader().readLang("StartupPage");
             // Save this to prefs in case JOSM is updated so MOTD can be refreshed
-            Main.pref.putInteger("cache.motd.html.version", myVersion);
+            Main.pref.putInt("cache.motd.html.version", myVersion);
             Main.pref.put("cache.motd.html.java", myJava);
             Main.pref.put("cache.motd.html.lang", myLang);
@@ -115 +115 @@
             // 2. Cannot be written (e.g. while developing). Obviously we don't want to update
             // everytime because of something we can't read.
-            return (Main.pref.getInteger("cache.motd.html.version", -999) == myVersion)
+            return (Main.pref.getInt("cache.motd.html.version", -999) == myVersion)
             && Main.pref.get("cache.motd.html.java").equals(myJava)
             && Main.pref.get("cache.motd.html.lang").equals(myLang);

trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java

@@ -120 +120 @@
             Main.pref.put(getPreferenceKey(), null);
         } else {
-            Main.pref.put(getPreferenceKey(), b);
+            Main.pref.putBoolean(getPreferenceKey(), b);
         }
     }

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -1252 +1252 @@
                 if (wasv6 && !hasv6) {
                     Logging.info(tr("Detected no useable IPv6 network, prefering IPv4 over IPv6 after next restart."));
-                    Main.pref.put("validated.ipv6", hasv6); // be sure it is stored before the restart!
+                    Main.pref.putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart!
                     try {
                         RestartAction.restartJOSM();
@@ -1259 +1259 @@
                     }
                 }
-                Main.pref.put("validated.ipv6", hasv6);
+                Main.pref.putBoolean("validated.ipv6", hasv6);
             }, "IPv6-checker").start();
         }

trunk/src/org/openstreetmap/josm/gui/MainFrame.java

@@ -110 +110 @@
             geometry.remember("gui.geometry");
         }
-        Main.pref.put("gui.maximized", (windowState & JFrame.MAXIMIZED_BOTH) != 0);
+        Main.pref.putBoolean("gui.maximized", (windowState & JFrame.MAXIMIZED_BOTH) != 0);
     }
 

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -583 +583 @@
             public void actionPerformed(ActionEvent e) {
                 boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState();
-                Main.pref.put("sidetoolbar.always-visible", sel);
+                Main.pref.putBoolean("sidetoolbar.always-visible", sel);
             }
         });
@@ -625 +625 @@
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    Main.pref.put("sidetoolbar.visible", false);
+                    Main.pref.putBoolean("sidetoolbar.visible", false);
                 }
             });

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -775 +775 @@
             public void actionPerformed(ActionEvent e) {
                 boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState();
-                Main.pref.put("statusbar.always-visible", sel);
+                Main.pref.putBoolean("statusbar.always-visible", sel);
             }
         });
@@ -1079 +1079 @@
         // Compute total length of selected way(s) until an arbitrary limit set to 250 ways
         // in order to prevent performance issue if a large number of ways are selected (old behaviour kept in that case, see #8403)
-        int maxWays = Math.max(1, Main.pref.getInteger("selection.max-ways-for-statusline", 250));
+        int maxWays = Math.max(1, Main.pref.getInt("selection.max-ways-for-statusline", 250));
         if (!ways.isEmpty() && ways.size() <= maxWays) {
             dist = 0.0;

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -871 +871 @@
         if ((now.getTime() - zoomTimestamp.getTime()) > (Main.pref.getDouble("zoom.undo.delay", 1.0) * 1000)) {
             zoomUndoBuffer.push(new ZoomData(center, scale));
-            if (zoomUndoBuffer.size() > Main.pref.getInteger("zoom.undo.max", 50)) {
+            if (zoomUndoBuffer.size() > Main.pref.getInt("zoom.undo.max", 50)) {
                 zoomUndoBuffer.remove(0);
             }
@@ -1144 +1144 @@
 
         if (ds != null) {
-            double snapDistanceSq = Main.pref.getInteger("mappaint.segment.snap-distance", 10);
+            double snapDistanceSq = Main.pref.getInt("mappaint.segment.snap-distance", 10);
             snapDistanceSq *= snapDistanceSq;
 
-            for (Way w : ds.searchWays(getBBox(p, Main.pref.getInteger("mappaint.segment.snap-distance", 10)))) {
+            for (Way w : ds.searchWays(getBBox(p, Main.pref.getInt("mappaint.segment.snap-distance", 10)))) {
                 if (!predicate.test(w)) {
                     continue;

trunk/src/org/openstreetmap/josm/gui/Notification.java

@@ -43 +43 @@
      * E.g. "Please select at least one node".
      */
-    public static final int TIME_SHORT = Main.pref.getInteger("notification-time-short-ms", 3000);
+    public static final int TIME_SHORT = Main.pref.getInt("notification-time-short-ms", 3000);
 
     /**
      * Short message of one or two lines (5 s).
      */
-    public static final int TIME_DEFAULT = Main.pref.getInteger("notification-time-default-ms", 5000);
+    public static final int TIME_DEFAULT = Main.pref.getInt("notification-time-default-ms", 5000);
 
     /**
      * Somewhat longer message (10 s).
      */
-    public static final int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10_000);
+    public static final int TIME_LONG = Main.pref.getInt("notification-time-long-ms", 10_000);
 
     /**
@@ -59 +59 @@
      * (Make sure is still sensible to show as a notification)
      */
-    public static final int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20_000);
+    public static final int TIME_VERY_LONG = Main.pref.getInt("notification-time-very_long-ms", 20_000);
 
     private Component content;

trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -82 +82 @@
                 int w = getWidth();
                 if (w > 200) {
-                    Main.pref.putInteger("progressdialog.size", w);
+                    Main.pref.putInt("progressdialog.size", w);
                 }
             }
@@ -98 +98 @@
         setDropTarget(null); // Workaround to JDK bug 7027598/7100524/7169912 (#8613)
         pack();
-        setSize(Main.pref.getInteger("progressdialog.size", 600), getSize().height);
+        setSize(Main.pref.getInt("progressdialog.size", 600), getSize().height);
     }
 

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -162 +162 @@
             setFileCacheEnabled(Main.pref.getBoolean("slippy_map_chooser.file_cache", true));
         }
-        setMaxTilesInMemory(Main.pref.getInteger("slippy_map_chooser.max_tiles", 1000));
+        setMaxTilesInMemory(Main.pref.getInt("slippy_map_chooser.max_tiles", 1000));
 
         List<TileSource> tileSources = getAllTileSources();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java

@@ -78 +78 @@
      */
     public void rememberPreferences() {
-        Main.pref.put(getClass().getName() + ".showTagsWithConflictsOnly", cbShowTagsWithConflictsOnly.isSelected());
-        Main.pref.put(getClass().getName() + ".showTagsWithMultiValuesOnly", cbShowTagsWithMultiValuesOnly.isSelected());
+        Main.pref.putBoolean(getClass().getName() + ".showTagsWithConflictsOnly", cbShowTagsWithConflictsOnly.isSelected());
+        Main.pref.putBoolean(getClass().getName() + ".showTagsWithMultiValuesOnly", cbShowTagsWithMultiValuesOnly.isSelected());
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

@@ -275 +275 @@
         @Override
         public void itemStateChanged(ItemEvent e) {
-            Main.pref.put("changeset-dialog.for-selected-objects-only", cbInSelectionOnly.isSelected());
+            Main.pref.putBoolean("changeset-dialog.for-selected-objects-only", cbInSelectionOnly.isSelected());
             pnlList.removeAll();
             if (cbInSelectionOnly.isSelected()) {

trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java

@@ -180 +180 @@
     protected void restorePrimitivesHistory(HistoryComboBox cbHistory) {
         List<String> cmtHistory = new LinkedList<>(
-                Main.pref.getCollection(getClass().getName() + ".primitivesHistory", new LinkedList<String>()));
+                Main.pref.getList(getClass().getName() + ".primitivesHistory", new LinkedList<String>()));
         // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
         Collections.reverse(cmtHistory);
@@ -193 +193 @@
     protected void remindPrimitivesHistory(HistoryComboBox cbHistory) {
         cbHistory.addCurrentItemToHistory();
-        Main.pref.putCollection(getClass().getName() + ".primitivesHistory", cbHistory.getHistory());
+        Main.pref.putList(getClass().getName() + ".primitivesHistory", cbHistory.getHistory());
     }
 
@@ -208 +208 @@
     public void setupDialog() {
         setContent(panel, false);
-        cbType.setSelectedIndex(Main.pref.getInteger("downloadprimitive.lasttype", 0));
+        cbType.setSelectedIndex(Main.pref.getInt("downloadprimitive.lasttype", 0));
         tfId.setType(cbType.getType());
         if (Main.pref.getBoolean("downloadprimitive.autopaste", true)) {
@@ -221 +221 @@
         String buf = ClipboardUtils.getClipboardStringContent();
         if (buf == null || buf.isEmpty()) return;
-        if (buf.length() > Main.pref.getInteger("downloadprimitive.max-autopaste-length", 2000)) return;
+        if (buf.length() > Main.pref.getInt("downloadprimitive.max-autopaste-length", 2000)) return;
         final List<SimplePrimitiveId> ids = SimplePrimitiveId.fuzzyParse(buf);
         if (!ids.isEmpty()) {
@@ -244 +244 @@
     @Override public void windowClosed(WindowEvent e) {
         if (e != null && e.getComponent() == this && getValue() == getContinueButtonIndex()) {
-            Main.pref.putInteger("downloadprimitive.lasttype", cbType.getSelectedIndex());
+            Main.pref.putInt("downloadprimitive.lasttype", cbType.getSelectedIndex());
 
             if (!tfId.readIds()) {

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -524 +524 @@
                 }
             }
-            int maxsize = Main.pref.getInteger("select.history-size", SELECTION_HISTORY_SIZE);
+            int maxsize = Main.pref.getInt("select.history-size", SELECTION_HISTORY_SIZE);
             while (history.size() > maxsize) {
                 history.removeLast();
@@ -662 +662 @@
          */
         public synchronized void sort() {
-            if (selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100_000)) {
-                boolean quick = selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10_000);
+            if (selection.size() <= Main.pref.getInt("selection.no_sort_above", 100_000)) {
+                boolean quick = selection.size() > Main.pref.getInt("selection.fast_sort_above", 10_000);
                 Comparator<OsmPrimitive> c = Main.pref.getBoolean("selection.sort_relations_before_ways", true)
                         ? OsmPrimitiveComparator.orderingRelationsWaysNodes()

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -773 +773 @@
     protected void setIsShowing(boolean val) {
         isShowing = val;
-        Main.pref.put(preferencePrefix+".visible", val);
+        Main.pref.putBoolean(preferencePrefix+".visible", val);
         stateChanged();
     }
@@ -782 +782 @@
         }
         isDocked = val;
-        Main.pref.put(preferencePrefix+".docked", val);
+        Main.pref.putBoolean(preferencePrefix+".docked", val);
         stateChanged();
     }
@@ -788 +788 @@
     protected void setIsCollapsed(boolean val) {
         isCollapsed = val;
-        Main.pref.put(preferencePrefix+".minimized", val);
+        Main.pref.putBoolean(preferencePrefix+".minimized", val);
         stateChanged();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java

@@ -209 +209 @@
      */
     public void rememberSettings() {
-        Main.pref.put("changeset-query.advanced.user-restrictions", cbUserRestriction.isSelected());
-        Main.pref.put("changeset-query.advanced.open-restrictions", cbOpenAndCloseRestrictions.isSelected());
-        Main.pref.put("changeset-query.advanced.time-restrictions", cbTimeRestrictions.isSelected());
-        Main.pref.put("changeset-query.advanced.bbox-restrictions", cbBoundingBoxRestriction.isSelected());
+        Main.pref.putBoolean("changeset-query.advanced.user-restrictions", cbUserRestriction.isSelected());
+        Main.pref.putBoolean("changeset-query.advanced.open-restrictions", cbOpenAndCloseRestrictions.isSelected());
+        Main.pref.putBoolean("changeset-query.advanced.time-restrictions", cbTimeRestrictions.isSelected());
+        Main.pref.putBoolean("changeset-query.advanced.bbox-restrictions", cbBoundingBoxRestriction.isSelected());
 
         pnlUserRestriction.rememberSettings();

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java

@@ -191 +191 @@
             Main.pref.put("changeset-query.basic.query", q.toString());
         }
-        Main.pref.put("changeset-query.basic.my-changesets-only", cbMyChangesetsOnly.isSelected());
+        Main.pref.putBoolean("changeset-query.basic.my-changesets-only", cbMyChangesetsOnly.isSelected());
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.search.SearchSetting;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
-import org.openstreetmap.josm.data.preferences.CollectionProperty;
+import org.openstreetmap.josm.data.preferences.ListProperty;
 
 /**
@@ -44 +44 @@
     }
 
-    public void loadFromPreference(CollectionProperty property) {
+    public void loadFromPreference(ListProperty property) {
         recentTags.clear();
         Iterator<String> it = property.get().iterator();
@@ -54 +54 @@
     }
 
-    public void saveToPreference(CollectionProperty property) {
+    public void saveToPreference(ListProperty property) {
         List<String> c = new ArrayList<>(recentTags.size() * 2);
         for (Tag t : recentTags.keySet()) {

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -73 +73 @@
 import org.openstreetmap.josm.data.osm.search.SearchSetting;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.data.preferences.CollectionProperty;
+import org.openstreetmap.josm.data.preferences.ListProperty;
 import org.openstreetmap.josm.data.preferences.EnumProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -128 +128 @@
             DEFAULT_LRU_TAGS_NUMBER);
     /** The preference storage of recent tags */
-    public static final CollectionProperty PROPERTY_RECENT_TAGS = new CollectionProperty("properties.recent-tags",
+    public static final ListProperty PROPERTY_RECENT_TAGS = new ListProperty("properties.recent-tags",
             Collections.<String>emptyList());
     public static final StringProperty PROPERTY_TAGS_TO_IGNORE = new StringProperty("properties.recent-tags.ignore",

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -300 +300 @@
      */
     public final void save() {
-        List<Collection<String>> coll = new LinkedList<>();
+        List<List<String>> coll = new LinkedList<>();
         for (Object o : ((DefaultListModel<Bookmark>) getModel()).toArray()) {
             if (o instanceof HomeLocationBookmark || o instanceof ChangesetBookmark) {
@@ -315 +315 @@
             coll.add(Arrays.asList(array));
         }
-        Main.pref.putArray("bookmarks", coll);
+        Main.pref.putListOfLists("bookmarks", coll);
     }
 

trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java

@@ -103 +103 @@
         super.windowClosed(e);
         if (e != null && e.getComponent() == this && getValue() == 1) {
-            Main.pref.put("downloadprimitive.referrers", referrers.isSelected());
-            Main.pref.put("downloadprimitive.full", fullRel.isSelected());
-            Main.pref.put("download.newlayer", newLayer.isSelected());
+            Main.pref.putBoolean("downloadprimitive.referrers", referrers.isSelected());
+            Main.pref.putBoolean("downloadprimitive.full", fullRel.isSelected());
+            Main.pref.putBoolean("download.newlayer", newLayer.isSelected());
         }
     }

trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java

@@ -244 +244 @@
      */
     private void savePreferences() {
-        Collection<Map<String, String>> toSave = new ArrayList<>(this.items.size());
+        List<Map<String, String>> toSave = new ArrayList<>(this.items.size());
         for (SelectorItem item : this.items.values()) {
             Map<String, String> it = new HashMap<>();
@@ -254 +254 @@
         }
 
-        Main.pref.putListOfStructs(PREFERENCE_ITEMS, toSave);
+        Main.pref.putListOfMaps(PREFERENCE_ITEMS, toSave);
     }
 
@@ -263 +263 @@
     private static Map<String, SelectorItem> restorePreferences() {
         Collection<Map<String, String>> toRetrieve =
-                Main.pref.getListOfStructs(PREFERENCE_ITEMS, Collections.emptyList());
+                Main.pref.getListOfMaps(PREFERENCE_ITEMS, Collections.emptyList());
         Map<String, SelectorItem> result = new HashMap<>();
 

trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

@@ -20 +20 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.preferences.CollectionProperty;
+import org.openstreetmap.josm.data.preferences.ListProperty;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -47 +47 @@
     private static final String SPAN_START = "<span>";
     private static final String SPAN_END = "</span>";
-    private static final CollectionProperty OVERPASS_WIZARD_HISTORY =
-            new CollectionProperty("download.overpass.wizard", new ArrayList<String>());
+    private static final ListProperty OVERPASS_WIZARD_HISTORY =
+            new ListProperty("download.overpass.wizard", new ArrayList<String>());
     private final transient OverpassTurboQueryWizard overpassQueryBuilder;
 

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -115 +115 @@
         cbSearchExpression = new HistoryComboBox();
         cbSearchExpression.setToolTipText(tr("Enter a place name to search for"));
-        List<String> cmtHistory = new LinkedList<>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
+        List<String> cmtHistory = new LinkedList<>(Main.pref.getList(HISTORY_KEY, new LinkedList<String>()));
         Collections.reverse(cmtHistory);
         cbSearchExpression.setPossibleItems(cmtHistory);
@@ -189 +189 @@
                 return;
             cbSearchExpression.addCurrentItemToHistory();
-            Main.pref.putCollection(HISTORY_KEY, cbSearchExpression.getHistory());
+            Main.pref.putList(HISTORY_KEY, cbSearchExpression.getHistory());
             NameQueryTask task = new NameQueryTask(cbSearchExpression.getText());
             MainApplication.worker.submit(task);

trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

@@ -341 +341 @@
         Object val = tbl.getColumnModel().getColumn(col).getHeaderValue();
         Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, -1, col);
-        maxwidth = Math.max(comp.getPreferredSize().width + Main.pref.getInteger("table.header-inset", 0), maxwidth);
+        maxwidth = Math.max(comp.getPreferredSize().width + Main.pref.getInt("table.header-inset", 0), maxwidth);
 
         int spacing = tbl.getIntercellSpacing().width;

trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

@@ -78 +78 @@
         hcbUploadComment.setToolTipText(tr("Enter an upload comment"));
         hcbUploadComment.setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH);
-        List<String> cmtHistory = new LinkedList<>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
+        List<String> cmtHistory = new LinkedList<>(Main.pref.getList(HISTORY_KEY, new LinkedList<String>()));
         Collections.reverse(cmtHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
         hcbUploadComment.setPossibleItems(cmtHistory);
@@ -100 +100 @@
         hcbUploadSource.setToolTipText(tr("Enter a source"));
         hcbUploadSource.setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH);
-        List<String> sourceHistory = new LinkedList<>(Main.pref.getCollection(SOURCE_HISTORY_KEY, getDefaultSources()));
+        List<String> sourceHistory = new LinkedList<>(Main.pref.getList(SOURCE_HISTORY_KEY, getDefaultSources()));
         Collections.reverse(sourceHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
         hcbUploadSource.setPossibleItems(sourceHistory);
@@ -166 +166 @@
         // store the history of comments
         hcbUploadComment.addCurrentItemToHistory();
-        Main.pref.putCollection(HISTORY_KEY, hcbUploadComment.getHistory());
-        Main.pref.putInteger(HISTORY_LAST_USED_KEY, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
+        Main.pref.putList(HISTORY_KEY, hcbUploadComment.getHistory());
+        Main.pref.putInt(HISTORY_LAST_USED_KEY, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
         // store the history of sources
         hcbUploadSource.addCurrentItemToHistory();
-        Main.pref.putCollection(SOURCE_HISTORY_KEY, hcbUploadSource.getHistory());
+        Main.pref.putList(SOURCE_HISTORY_KEY, hcbUploadSource.getHistory());
     }
 

trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

@@ -256 +256 @@
             case ItemEvent.SELECTED:
                 firePropertyChange(CLOSE_CHANGESET_AFTER_UPLOAD, false, true);
-                Main.pref.put("upload.changeset.close", true);
+                Main.pref.putBoolean("upload.changeset.close", true);
                 break;
             case ItemEvent.DESELECTED:
                 firePropertyChange(CLOSE_CHANGESET_AFTER_UPLOAD, true, false);
-                Main.pref.put("upload.changeset.close", false);
+                Main.pref.putBoolean("upload.changeset.close", false);
                 break;
             default: // Do nothing

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -400 +400 @@
                         MainApplication.worker.submit(pluginDownloadTask);
                     }
-                    Collection<String> pls = new ArrayList<>(Main.pref.getCollection("plugins"));
+                    List<String> pls = new ArrayList<>(Main.pref.getList("plugins"));
                     for (PluginInformation pi2: toInstallPlugins) {
                         if (!pls.contains(pi2.name)) {
@@ -413 +413 @@
                         new File(Main.pref.getPluginsDirectory(), pi4.name+".jar").deleteOnExit();
                     }
-                    Main.pref.putCollection("plugins", pls);
+                    Main.pref.putList("plugins", pls);
                 });
             }

trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

@@ -58 +58 @@
     private void rebuild() {
         removeAll();
-        Collection<String> fileHistory = Main.pref.getCollection("file-open.history");
+        Collection<String> fileHistory = Main.pref.getList("file-open.history");
 
         for (final String file : fileHistory) {
@@ -101 +101 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Main.pref.putCollection("file-open.history", null);
+            Main.pref.putList("file-open.history", null);
         }
     }

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -653 +653 @@
 
     private static String getLastChangesetTagFromHistory(String historyKey, List<String> def) {
-        Collection<String> history = Main.pref.getCollection(historyKey, def);
-        int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
+        Collection<String> history = Main.pref.getList(historyKey, def);
+        int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInt(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
         if (history != null && age < Main.pref.getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
                 && !history.isEmpty()) {

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

@@ -323 +323 @@
         UploadStrategy strategy = UploadStrategy.getFromPreferences();
         rbStrategy.get(strategy).setSelected(true);
-        int chunkSize = Main.pref.getInteger("osm-server.upload-strategy.chunk-size", 1);
+        int chunkSize = Main.pref.getInt("osm-server.upload-strategy.chunk-size", 1);
         tfChunkSize.setText(Integer.toString(chunkSize));
         updateNumRequestsLabels();
@@ -337 +337 @@
         try {
             chunkSize = Integer.parseInt(tfChunkSize.getText().trim());
-            Main.pref.putInteger("osm-server.upload-strategy.chunk-size", chunkSize);
+            Main.pref.putInt("osm-server.upload-strategy.chunk-size", chunkSize);
         } catch (NumberFormatException e) {
             // don't save invalid value to preferences

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java

@@ -162 +162 @@
         setCanceled(false);
 
-        Main.pref.put("lastAddAuthor", author.isSelected());
+        Main.pref.putBoolean("lastAddAuthor", author.isSelected());
         if (!authorName.getText().isEmpty()) {
             Main.pref.put("lastAuthorName", authorName.getText());

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -174 +174 @@
                 Main.pref.put("geoimage.timezone", timezone.formatTimezone());
                 Main.pref.put("geoimage.delta", delta.formatOffset());
-                Main.pref.put("geoimage.showThumbs", yLayer.useThumbs);
+                Main.pref.putBoolean("geoimage.showThumbs", yLayer.useThumbs);
 
                 yLayer.useThumbs = cbShowThumbs.isSelected();

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -119 +119 @@
             for (Marker marker : layer.data) {
                 final Node node = new Node(marker.getCoor());
-                final Collection<String> mapping = Main.pref.getCollection("gpx.to-osm-mapping", Arrays.asList(
+                final Collection<String> mapping = Main.pref.getList("gpx.to-osm-mapping", Arrays.asList(
                         GpxConstants.GPX_NAME, "name",
                         GpxConstants.GPX_DESC, "description",

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java

@@ -105 +105 @@
         Main.pref.putLong(prefDateMin, dateFrom.getDate().getTime());
         Main.pref.putLong(prefDateMax, dateTo.getDate().getTime());
-        Main.pref.put(prefDate0, noTimestampCb.isSelected());
+        Main.pref.putBoolean(prefDate0, noTimestampCb.isSelected());
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java

@@ -85 +85 @@
             add(new JLabel(tr("Download near:")), GBC.eol());
             downloadNear = new JList<>(new String[]{tr("track only"), tr("waypoints only"), tr("track and waypoints")});
-            downloadNear.setSelectedIndex(Main.pref.getInteger(prefNear, 0));
+            downloadNear.setSelectedIndex(Main.pref.getInt(prefNear, 0));
             add(downloadNear, GBC.eol());
         } else {
@@ -138 +138 @@
      */
     protected final void rememberSettings() {
-        Main.pref.put(prefOsm, isDownloadOsmData());
-        Main.pref.put(prefGps, isDownloadGpxData());
+        Main.pref.putBoolean(prefOsm, isDownloadOsmData());
+        Main.pref.putBoolean(prefGps, isDownloadGpxData());
         Main.pref.putDouble(prefDist, getDistance());
         Main.pref.putDouble(prefArea, getArea());
         if (prefNear != null) {
-            Main.pref.putInteger(prefNear, getNear());
+            Main.pref.putInt(prefNear, getNear());
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -183 +183 @@
 
     private void setupColors() {
-        hdopAlpha = Main.pref.getInteger("hdop.color.alpha", -1);
+        hdopAlpha = Main.pref.getInt("hdop.color.alpha", -1);
         velocityScale = ColorScale.createHSBScale(256);
         /** Colors (without custom alpha channel, if given) for HDOP painting. **/
@@ -320 +320 @@
         colorModeDynamic = Main.pref.getBoolean("draw.rawgps.colors.dynamic", spec, false);
         /* good HDOP's are between 1 and 3, very bad HDOP's go into 3 digit values */
-        hdoprange = Main.pref.getInteger("hdop.range", 7);
-        minTrackDurationForTimeColoring = Main.pref.getInteger("draw.rawgps.date-coloring-min-dt", 60);
-        largePointAlpha = Main.pref.getInteger("draw.rawgps.large.alpha", -1) & 0xFF;
+        hdoprange = Main.pref.getInt("hdop.range", 7);
+        minTrackDurationForTimeColoring = Main.pref.getInt("draw.rawgps.date-coloring-min-dt", 60);
+        largePointAlpha = Main.pref.getInt("draw.rawgps.large.alpha", -1) & 0xFF;
 
         // get heatmap parameters

trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java

@@ -159 +159 @@
 
         ImageWarp.PointTransform transform;
-        int stride = Main.pref.getInteger("imagery.warp.projection-interpolation.stride", 7);
+        int stride = Main.pref.getInt("imagery.warp.projection-interpolation.stride", 7);
         if (stride > 0) {
             transform = new ImageWarp.GridTransform(pointTransform, stride);

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -64 +64 @@
         enabled = Main.pref.getBoolean("marker.traceaudio", true);
         if (!enabled) return;
-        dropTolerance = Main.pref.getInteger("marker.playHeadDropTolerance", 50);
+        dropTolerance = Main.pref.getInt("marker.playHeadDropTolerance", 50);
         if (MainApplication.isDisplayingMapView()) {
             MapFrame map = MainApplication.getMap();

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

@@ -256 +256 @@
         }
 
-        Collection<String> prefIconDirs = Main.pref.getCollection("mappaint.icon.sources");
+        Collection<String> prefIconDirs = Main.pref.getList("mappaint.icon.sources");
         for (String fileset : prefIconDirs) {
             String[] a;

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

@@ -79 +79 @@
                 Main.pref.put(prefKey, null);
             } else {
-                Main.pref.put(prefKey, b);
+                Main.pref.putBoolean(prefKey, b);
             }
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

@@ -90 +90 @@
             );
 
-            fillImage.alpha = Utils.clamp(Main.pref.getInteger("mappaint.fill-image-alpha", 255), 0, 255);
+            fillImage.alpha = Utils.clamp(Main.pref.getInt("mappaint.fill-image-alpha", 255), 0, 255);
             Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class));
             if (pAlpha != null) {

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

@@ -238 +238 @@
             } else {
                 this.nameTags = new ArrayList<>(
-                        Main.pref.getCollection("mappaint.nameOrder", Arrays.asList(DEFAULT_NAME_TAGS))
+                        Main.pref.getList("mappaint.nameOrder", Arrays.asList(DEFAULT_NAME_TAGS))
                 );
                 this.nameComplementTags = new ArrayList<>(
-                        Main.pref.getCollection("mappaint.nameComplementOrder", Arrays.asList(DEFAULT_NAME_COMPLEMENT_TAGS))
+                        Main.pref.getList("mappaint.nameComplementOrder", Arrays.asList(DEFAULT_NAME_COMPLEMENT_TAGS))
                 );
             }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -196 +196 @@
         mapImage.offsetY = Math.round(offsetYF);
 
-        mapImage.alpha = Utils.clamp(Main.pref.getInteger("mappaint.icon-image-alpha", 255), 0, 255);
+        mapImage.alpha = Utils.clamp(Main.pref.getInt("mappaint.icon-image-alpha", 255), 0, 255);
         Integer pAlpha = Utils.colorFloat2int(c.get(keys[ICON_OPACITY_IDX], null, float.class));
         if (pAlpha != null) {
@@ -357 +357 @@
             // However, it would be better, if the settings could be changed at runtime.
             int size = max(
-                    Main.pref.getInteger("mappaint.node.selected-size", 5),
-                    Main.pref.getInteger("mappaint.node.unselected-size", 3),
-                    Main.pref.getInteger("mappaint.node.connection-size", 5),
-                    Main.pref.getInteger("mappaint.node.tagged-size", 3)
+                    Main.pref.getInt("mappaint.node.selected-size", 5),
+                    Main.pref.getInt("mappaint.node.unselected-size", 3),
+                    Main.pref.getInt("mappaint.node.connection-size", 5),
+                    Main.pref.getInt("mappaint.node.tagged-size", 3)
             );
             return new SimpleBoxProvider(new Rectangle(-size/2, -size/2, size, size));

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java

@@ -148 +148 @@
                 s = defaultFontSize;
                 if (s == null) {
-                    defaultFontSize = s = (float) Main.pref.getInteger("mappaint.fontsize", 8);
+                    defaultFontSize = s = (float) Main.pref.getInt("mappaint.fontsize", 8);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java

@@ -281 +281 @@
     public void rememberPreferences(Preferences pref) {
         CheckParameterUtil.ensureParameterNotNull(pref, "pref");
-        pref.put("oauth.settings.use-default", cbUseDefaults.isSelected());
+        pref.putBoolean("oauth.settings.use-default", cbUseDefaults.isSelected());
         if (cbUseDefaults.isSelected()) {
             new OAuthParameters(null, null, null, null, null, null, null).rememberPreferences(pref);

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

@@ -423 +423 @@
 
             if (!iconPaths.isEmpty()) {
-                if (Main.pref.putCollection(iconPref, iconPaths)) {
+                if (Main.pref.putList(iconPref, iconPaths)) {
                     changed = true;
                 }
-            } else if (Main.pref.putCollection(iconPref, null)) {
+            } else if (Main.pref.putList(iconPref, null)) {
                 changed = true;
             }

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

@@ -496 +496 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                Collection<String> t = new LinkedList<>(getToolString());
+                List<String> t = new LinkedList<>(getToolString());
                 ActionParser parser = new ActionParser(null);
                 // get text definition of current action
@@ -502 +502 @@
                 // remove the button from toolbar preferences
                 t.remove(res);
-                Main.pref.putCollection("toolbar", t);
+                Main.pref.putList("toolbar", t);
                 MainApplication.getToolbar().refreshToolbarControl();
             }
@@ -532 +532 @@
             public void actionPerformed(ActionEvent e) {
                 boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState();
-                Main.pref.put("toolbar.always-visible", sel);
-                Main.pref.put("menu.always-visible", sel);
+                Main.pref.putBoolean("toolbar.always-visible", sel);
+                Main.pref.putBoolean("menu.always-visible", sel);
             }
         });
@@ -971 +971 @@
         @Override
         public boolean ok() {
-            Collection<String> t = new LinkedList<>();
+            List<String> t = new LinkedList<>();
             ActionParser parser = new ActionParser(null);
             for (int i = 0; i < selected.size(); ++i) {
@@ -987 +987 @@
                 t = Collections.singletonList(EMPTY_TOOLBAR_MARKER);
             }
-            Main.pref.putCollection("toolbar", t);
+            Main.pref.putList("toolbar", t);
             MainApplication.getToolbar().refreshToolbarControl();
             return false;
@@ -1074 +1074 @@
     public static Collection<String> getToolString() {
 
-        Collection<String> toolStr = Main.pref.getCollection("toolbar", Arrays.asList(deftoolbar));
+        Collection<String> toolStr = Main.pref.getList("toolbar", Arrays.asList(deftoolbar));
         if (toolStr == null || toolStr.isEmpty()) {
             toolStr = Arrays.asList(deftoolbar);
@@ -1214 +1214 @@
             }
         }
-        Main.pref.putCollection("toolbar", t);
+        Main.pref.putList("toolbar", t);
         MainApplication.getToolbar().refreshToolbarControl();
     }

trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java

@@ -133 +133 @@
     @Override
     public boolean ok() {
-        Main.pref.put("audio.menuinvisible", !audioMenuVisible.isSelected());
-        Main.pref.put("marker.traceaudio", markerAudioTraceVisible.isSelected());
-        Main.pref.put("marker.buttonlabels", markerButtonLabels.isSelected());
-        Main.pref.put("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected());
-        Main.pref.put("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected());
-        Main.pref.put("marker.audiofromnamedtrackpoints", audioMarkersFromNamedTrackpoints.isSelected());
-        Main.pref.put("marker.audiofromwavtimestamps", audioMarkersFromWavTimestamps.isSelected());
-        Main.pref.put("marker.audiofromstart", audioMarkersFromStart.isSelected());
+        Main.pref.putBoolean("audio.menuinvisible", !audioMenuVisible.isSelected());
+        Main.pref.putBoolean("marker.traceaudio", markerAudioTraceVisible.isSelected());
+        Main.pref.putBoolean("marker.buttonlabels", markerButtonLabels.isSelected());
+        Main.pref.putBoolean("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected());
+        Main.pref.putBoolean("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected());
+        Main.pref.putBoolean("marker.audiofromnamedtrackpoints", audioMarkersFromNamedTrackpoints.isSelected());
+        Main.pref.putBoolean("marker.audiofromwavtimestamps", audioMarkersFromWavTimestamps.isSelected());
+        Main.pref.putBoolean("marker.audiofromstart", audioMarkersFromStart.isSelected());
         Main.pref.put("audio.forwardbackamount", audioForwardBackAmount.getText());
         Main.pref.put("audio.fastfwdmultiplier", audioFastForwardMultiplier.getText());

trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

@@ -109 +109 @@
         // virtual nodes
         virtualNodes.setToolTipText(tr("Draw virtual nodes in select mode for easy way modification."));
-        virtualNodes.setSelected(Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0);
+        virtualNodes.setSelected(Main.pref.getInt("mappaint.node.virtual-size", 8) != 0);
 
         // background layers in inactive color
@@ -195 +195 @@
     public boolean ok() {
         boolean restart = gpxPanel.savePreferences();
-        Main.pref.put("draw.data.area_outline_only", outlineOnly.isSelected());
-        Main.pref.put("draw.segment.direction", directionHint.isSelected());
-        Main.pref.put("draw.segment.head_only", headArrow.isSelected());
-        Main.pref.put("draw.oneway", onewayArrow.isSelected());
-        Main.pref.put("draw.segment.order_number", segmentOrderNumber.isSelected());
-        Main.pref.put("draw.segment.order_number.on_selected", segmentOrderNumberOnSelectedWay.isSelected());
-        Main.pref.put("draw.data.downloaded_area", sourceBounds.isSelected());
-        Main.pref.put("draw.data.inactive_color", inactive.isSelected());
-        Main.pref.put("mappaint.use-antialiasing", useAntialiasing.isSelected());
-        Main.pref.put("mappaint.wireframe.use-antialiasing", useWireframeAntialiasing.isSelected());
-        Main.pref.put("draw.target-highlight", useHighlighting.isSelected());
-        Main.pref.put("draw.helper-line", drawHelperLine.isSelected());
-        Main.pref.put("display.discardable-keys", discardableKeys.isSelected());
+        Main.pref.putBoolean("draw.data.area_outline_only", outlineOnly.isSelected());
+        Main.pref.putBoolean("draw.segment.direction", directionHint.isSelected());
+        Main.pref.putBoolean("draw.segment.head_only", headArrow.isSelected());
+        Main.pref.putBoolean("draw.oneway", onewayArrow.isSelected());
+        Main.pref.putBoolean("draw.segment.order_number", segmentOrderNumber.isSelected());
+        Main.pref.putBoolean("draw.segment.order_number.on_selected", segmentOrderNumberOnSelectedWay.isSelected());
+        Main.pref.putBoolean("draw.data.downloaded_area", sourceBounds.isSelected());
+        Main.pref.putBoolean("draw.data.inactive_color", inactive.isSelected());
+        Main.pref.putBoolean("mappaint.use-antialiasing", useAntialiasing.isSelected());
+        Main.pref.putBoolean("mappaint.wireframe.use-antialiasing", useWireframeAntialiasing.isSelected());
+        Main.pref.putBoolean("draw.target-highlight", useHighlighting.isSelected());
+        Main.pref.putBoolean("draw.helper-line", drawHelperLine.isSelected());
+        Main.pref.putBoolean("display.discardable-keys", discardableKeys.isSelected());
         AutoFilterManager.PROP_AUTO_FILTER_ENABLED.put(autoFilters.isSelected());
         AutoFilterManager.PROP_AUTO_FILTER_RULE.put(((AutoFilterRule) autoFilterRules.getSelectedItem()).getKey());
-        int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);
+        int vn = Main.pref.getInt("mappaint.node.virtual-size", 8);
         if (virtualNodes.isSelected()) {
             if (vn < 1) {
@@ -218 +218 @@
             vn = 0;
         }
-        Main.pref.putInteger("mappaint.node.virtual-size", vn);
+        Main.pref.putInt("mappaint.node.virtual-size", vn);
         return restart;
     }

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -454 +454 @@
             layerNameDot = "";
         }
-        Main.pref.put("marker.makeautomarkers"+layerNameDot, makeAutoMarkers.isSelected());
+        Main.pref.putBoolean("marker.makeautomarkers"+layerNameDot, makeAutoMarkers.isSelected());
         if (drawRawGpsLinesGlobal.isSelected()) {
             Main.pref.put("draw.rawgps.lines" + layerNameDot, null);
@@ -466 +466 @@
         } else {
             if (layerName == null || !locLayer) {
-                Main.pref.put("draw.rawgps.lines" + layerNameDot, drawRawGpsLinesAll.isSelected());
+                Main.pref.putBoolean("draw.rawgps.lines" + layerNameDot, drawRawGpsLinesAll.isSelected());
                 Main.pref.put("draw.rawgps.max-line-length" + layerNameDot, drawRawGpsMaxLineLength.getText());
             }
             if (layerName == null || locLayer) {
-                Main.pref.put("draw.rawgps.lines.local" + layerNameDot, drawRawGpsLinesAll.isSelected() || drawRawGpsLinesLocal.isSelected());
+                Main.pref.putBoolean("draw.rawgps.lines.local" + layerNameDot, drawRawGpsLinesAll.isSelected() || drawRawGpsLinesLocal.isSelected());
                 Main.pref.put("draw.rawgps.max-line-length.local" + layerNameDot, drawRawGpsMaxLineLengthLocal.getText());
             }
-            Main.pref.put("draw.rawgps.lines.force"+layerNameDot, forceRawGpsLines.isSelected());
-            Main.pref.put("draw.rawgps.direction"+layerNameDot, drawGpsArrows.isSelected());
-            Main.pref.put("draw.rawgps.alternatedirection"+layerNameDot, drawGpsArrowsFast.isSelected());
+            Main.pref.putBoolean("draw.rawgps.lines.force"+layerNameDot, forceRawGpsLines.isSelected());
+            Main.pref.putBoolean("draw.rawgps.direction"+layerNameDot, drawGpsArrows.isSelected());
+            Main.pref.putBoolean("draw.rawgps.alternatedirection"+layerNameDot, drawGpsArrowsFast.isSelected());
             Main.pref.put("draw.rawgps.min-arrow-distance"+layerNameDot, drawGpsArrowsMinDist.getText());
         }
 
-        Main.pref.put("draw.rawgps.hdopcircle"+layerNameDot, hdopCircleGpsPoints.isSelected());
-        Main.pref.put("draw.rawgps.large"+layerNameDot, largeGpsPoints.isSelected());
+        Main.pref.putBoolean("draw.rawgps.hdopcircle"+layerNameDot, hdopCircleGpsPoints.isSelected());
+        Main.pref.putBoolean("draw.rawgps.large"+layerNameDot, largeGpsPoints.isSelected());
         Main.pref.put("draw.rawgps.linewidth"+layerNameDot, drawLineWidth.getText());
-        Main.pref.put("draw.rawgps.lines.alpha-blend"+layerNameDot, drawLineWithAlpha.isSelected());
-
-        Main.pref.put("mappaint.gpx.use-antialiasing", useGpsAntialiasing.isSelected());
+        Main.pref.putBoolean("draw.rawgps.lines.alpha-blend"+layerNameDot, drawLineWithAlpha.isSelected());
+
+        Main.pref.putBoolean("mappaint.gpx.use-antialiasing", useGpsAntialiasing.isSelected());
 
         TemplateEntryProperty.forMarker(layerName).put(waypointLabelPattern.getText());
@@ -495 +495 @@
             return false;
         } else if (colorTypeVelocity.isSelected()) {
-            Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 1);
+            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 1);
         } else if (colorTypeDilution.isSelected()) {
-            Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 2);
+            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 2);
         } else if (colorTypeDirection.isSelected()) {
-            Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 3);
+            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 3);
         } else if (colorTypeTime.isSelected()) {
-            Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 4);
+            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 4);
         } else if (colorTypeHeatMap.isSelected()) {
-            Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 5);
+            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 5);
         } else {
-            Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 0);
-        }
-        Main.pref.put("draw.rawgps.colors.dynamic"+layerNameDot, colorDynamic.isSelected());
+            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 0);
+        }
+        Main.pref.putBoolean("draw.rawgps.colors.dynamic"+layerNameDot, colorDynamic.isSelected());
         int ccti = colorTypeVelocityTune.getSelectedIndex();
-        Main.pref.putInteger("draw.rawgps.colorTracksTune"+layerNameDot, ccti == 2 ? 10 : (ccti == 1 ? 20 : 45));
-        Main.pref.putInteger("draw.rawgps.heatmap.colormap"+layerNameDot, colorTypeHeatMapTune.getSelectedIndex());
-        Main.pref.put("draw.rawgps.heatmap.use-points"+layerNameDot, colorTypeHeatMapPoints.isSelected());
-        Main.pref.putInteger("draw.rawgps.heatmap.gain"+layerNameDot, colorTypeHeatMapGain.getValue());
-        Main.pref.putInteger("draw.rawgps.heatmap.lower-limit"+layerNameDot, colorTypeHeatMapLowerLimit.getValue());
+        Main.pref.putInt("draw.rawgps.colorTracksTune"+layerNameDot, ccti == 2 ? 10 : (ccti == 1 ? 20 : 45));
+        Main.pref.putInt("draw.rawgps.heatmap.colormap"+layerNameDot, colorTypeHeatMapTune.getSelectedIndex());
+        Main.pref.putBoolean("draw.rawgps.heatmap.use-points"+layerNameDot, colorTypeHeatMapPoints.isSelected());
+        Main.pref.putInt("draw.rawgps.heatmap.gain"+layerNameDot, colorTypeHeatMapGain.getValue());
+        Main.pref.putInt("draw.rawgps.heatmap.lower-limit"+layerNameDot, colorTypeHeatMapLowerLimit.getValue());
 
         return false;

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -202 +202 @@
     public boolean ok() {
         boolean mod = false;
-        Main.pref.put("draw.splashscreen", showSplashScreen.isSelected());
-        Main.pref.put("osm-primitives.showid", showID.isSelected());
-        Main.pref.put("osm-primitives.localize-name", showLocalizedName.isSelected());
+        Main.pref.putBoolean("draw.splashscreen", showSplashScreen.isSelected());
+        Main.pref.putBoolean("osm-primitives.showid", showID.isSelected());
+        Main.pref.putBoolean("osm-primitives.localize-name", showLocalizedName.isSelected());
         MapFrame.MODELESS.put(modeless.isSelected());
-        Main.pref.put(ToggleDialog.PROP_DYNAMIC_BUTTONS.getKey(), dynamicButtons.isSelected());
-        Main.pref.put(DateUtils.PROP_ISO_DATES.getKey(), isoDates.isSelected());
-        Main.pref.put(FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.getKey(), nativeFileChoosers.isSelected());
+        Main.pref.putBoolean(ToggleDialog.PROP_DYNAMIC_BUTTONS.getKey(), dynamicButtons.isSelected());
+        Main.pref.putBoolean(DateUtils.PROP_ISO_DATES.getKey(), isoDates.isSelected());
+        Main.pref.putBoolean(FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.getKey(), nativeFileChoosers.isSelected());
         MapMover.PROP_ZOOM_REVERSE_WHEEL.put(zoomReverseWheel.isSelected());
         NavigatableComponent.PROP_ZOOM_INTERMEDIATE_STEPS.put(zoomIntermediateSteps.isSelected());

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

@@ -105 +105 @@
         @Override
         public Collection<String> getInitialIconPathsList() {
-            return Main.pref.getCollection(ICONPREF, null);
+            return Main.pref.getList(ICONPREF, null);
         }
 
@@ -170 +170 @@
     @Override
     public boolean ok() {
-        boolean reload = Main.pref.put("mappaint.icon.enable-defaults", enableIconDefault.isSelected());
+        boolean reload = Main.pref.putBoolean("mappaint.icon.enable-defaults", enableIconDefault.isSelected());
         reload |= sources.finish();
         if (reload) {

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

@@ -206 +206 @@
         @Override
         public Collection<String> getInitialIconPathsList() {
-            return Main.pref.getCollection(ICONPREF, null);
+            return Main.pref.getList(ICONPREF, null);
         }
 
@@ -246 +246 @@
     @Override
     public boolean ok() {
-        boolean restart = Main.pref.put("taggingpreset.sortmenu", sortMenu.getSelectedObjects() != null);
+        boolean restart = Main.pref.putBoolean("taggingpreset.sortmenu", sortMenu.getSelectedObjects() != null);
         restart |= sources.finish();
 

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -302 +302 @@
             List<String> l = new LinkedList<>(model.getSelectedPluginNames());
             Collections.sort(l);
-            Main.pref.putCollection("plugins", l);
+            Main.pref.putList("plugins", l);
             if (!model.getNewlyDeactivatedPlugins().isEmpty())
                 return true;
@@ -359 +359 @@
                         model.updateAvailablePlugins(task.getAvailablePlugins());
                         pnlPluginPreferences.refreshView();
-                        Main.pref.putInteger("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030
+                        Main.pref.putInt("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030
                     });
                 }

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

@@ -40 +40 @@
     public PluginPreferencesModel() {
         currentActivePlugins = new HashSet<>();
-        currentActivePlugins.addAll(Main.pref.getCollection("plugins", currentActivePlugins));
+        currentActivePlugins.addAll(Main.pref.getList("plugins"));
     }
 
@@ -80 +80 @@
         filterDisplayedPlugins(filterExpression);
         Set<String> activePlugins = new HashSet<>();
-        activePlugins.addAll(Main.pref.getCollection("plugins", activePlugins));
+        activePlugins.addAll(Main.pref.getList("plugins"));
         for (PluginInformation pi: availablePlugins) {
             if (selectedPluginsMap.get(pi) == null && activePlugins.contains(pi.name)) {
@@ -230 +230 @@
      */
     public void initFromPreferences() {
-        Collection<String> enabledPlugins = Main.pref.getCollection("plugins", null);
+        Collection<String> enabledPlugins = Main.pref.getList("plugins", null);
         if (enabledPlugins == null) {
             this.selectedPluginsMap.clear();

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java

@@ -196 +196 @@
         }
         if (days == 0) {
-            days = Main.pref.getInteger("pluginmanager.time-based-update.interval", PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL);
+            days = Main.pref.getInt("pluginmanager.time-based-update.interval", PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL);
         }
         tfUpdateInterval.setText(Integer.toString(days));
@@ -235 +235 @@
             days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL;
         }
-        Main.pref.putInteger("pluginmanager.time-based-update.interval", days);
+        Main.pref.putInt("pluginmanager.time-based-update.interval", days);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

@@ -72 +72 @@
                 }
             });
-            Collection<String> samples = Arrays.asList(
+            List<String> samples = Arrays.asList(
                     "+proj=lonlat +ellps=WGS84 +datum=WGS84 +bounds=-180,-90,180,90",
                     "+proj=tmerc +lat_0=0 +lon_0=9 +k_0=1 +x_0=3500000 +y_0=0 +ellps=bessel +nadgrids=BETA2007.gsb");
-            List<String> inputHistory = new LinkedList<>(Main.pref.getCollection("projection.custom.value.history", samples));
+            List<String> inputHistory = new LinkedList<>(Main.pref.getList("projection.custom.value.history", samples));
             Collections.reverse(inputHistory);
             cbInput.setPossibleItems(inputHistory);
@@ -149 +149 @@
         public void rememberHistory() {
             cbInput.addCurrentItemToHistory();
-            Main.pref.putCollection("projection.custom.value.history", cbInput.getHistory());
+            Main.pref.putList("projection.custom.value.history", cbInput.getHistory());
         }
     }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
 import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
-import org.openstreetmap.josm.data.preferences.CollectionProperty;
+import org.openstreetmap.josm.data.preferences.ListProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.data.projection.CustomProjection;
@@ -291 +291 @@
     private static final StringProperty PROP_PROJECTION_DEFAULT = new StringProperty("projection.default", mercator.getId());
     private static final StringProperty PROP_COORDINATES = new StringProperty("coordinates", null);
-    private static final CollectionProperty PROP_SUB_PROJECTION_DEFAULT = new CollectionProperty("projection.default.sub", null);
+    private static final ListProperty PROP_SUB_PROJECTION_DEFAULT = new ListProperty("projection.default.sub", null);
     private static final String[] unitsValues = ALL_SYSTEMS.keySet().toArray(new String[ALL_SYSTEMS.size()]);
     private static final String[] unitsValuesTr = new String[unitsValues.length];
@@ -482 +482 @@
         }
         id = pc.getId();
-        Main.pref.putCollection("projection.sub."+id, pref);
+        Main.pref.putList("projection.sub."+id, pref == null ? null : new ArrayList<>(pref));
         if (makeDefault) {
             PROP_PROJECTION_DEFAULT.put(id);
-            PROP_SUB_PROJECTION_DEFAULT.put(pref);
+            PROP_SUB_PROJECTION_DEFAULT.put(pref == null ? null : new ArrayList<>(pref));
         } else {
             projectionChoice = id;
@@ -560 +560 @@
      */
     public static Collection<String> getSubprojectionPreference(String pcId) {
-        return Main.pref.getCollection("projection.sub."+pcId, null);
+        return Main.pref.getList("projection.sub."+pcId, null);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java

@@ -196 +196 @@
         if (enabled) {
             for (Entry<PermissionPrefWithDefault, JCheckBox> p : prefs.entrySet()) {
-                Main.pref.put(p.getKey().pref, p.getValue().isSelected());
-            }
-            Main.pref.put(RequestHandler.loadInNewLayerKey, loadInNewLayer.isSelected());
-            Main.pref.put(RequestHandler.globalConfirmationKey, alwaysAskUserConfirm.isSelected());
+                Main.pref.putBoolean(p.getKey().pref, p.getValue().isSelected());
+            }
+            Main.pref.putBoolean(RequestHandler.loadInNewLayerKey, loadInNewLayer.isSelected());
+            Main.pref.putBoolean(RequestHandler.globalConfirmationKey, alwaysAskUserConfirm.isSelected());
         }
         if (changed) {

trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java

@@ -28 +28 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.preferences.CollectionProperty;
+import org.openstreetmap.josm.data.preferences.ListProperty;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -58 +58 @@
     /** indicates whether to use the default OSM URL or not */
     private JCheckBox cbUseDefaultServerUrl;
-    private final transient CollectionProperty SERVER_URL_HISTORY = new CollectionProperty("osm-server.url-history", Arrays.asList(
+    private final transient ListProperty SERVER_URL_HISTORY = new ListProperty("osm-server.url-history", Arrays.asList(
             "http://api06.dev.openstreetmap.org/api", "http://master.apis.dev.openstreetmap.org/api"));
 

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

@@ -97 +97 @@
     @Override
     public boolean ok() {
-        Collection<String> tests = new LinkedList<>();
-        Collection<String> testsBeforeUpload = new LinkedList<>();
+        List<String> tests = new LinkedList<>();
+        List<String> testsBeforeUpload = new LinkedList<>();
 
         for (Test test : allTests) {
@@ -116 +116 @@
         OsmValidator.initializeTests(testsToInitialize);
 
-        Main.pref.putCollection(ValidatorPrefHelper.PREF_SKIP_TESTS, tests);
-        Main.pref.putCollection(ValidatorPrefHelper.PREF_SKIP_TESTS_BEFORE_UPLOAD, testsBeforeUpload);
+        Main.pref.putList(ValidatorPrefHelper.PREF_SKIP_TESTS, tests);
+        Main.pref.putList(ValidatorPrefHelper.PREF_SKIP_TESTS_BEFORE_UPLOAD, testsBeforeUpload);
         ValidatorPrefHelper.PREF_USE_IGNORE.put(prefUseIgnore.isSelected());
         ValidatorPrefHelper.PREF_OTHER.put(prefOther.isSelected());

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

@@ -210 +210 @@
         }
         File arch = TaggingPresetReader.getZipIcons();
-        final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
+        final Collection<String> s = Main.pref.getList("taggingpreset.icon.sources", null);
         ImageProvider imgProv = new ImageProvider(iconName);
         imgProv.setDirs(s);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java

@@ -127 +127 @@
 
     protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
-        final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
+        final Collection<String> s = Main.pref.getList("taggingpreset.icon.sources", null);
         ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
         if (maxSize != null) {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java

@@ -91 +91 @@
             }
             for (JMenu submenu : submenus.values()) {
-                if (submenu.getItemCount() >= Main.pref.getInteger("taggingpreset.min-elements-for-scroller", 15)) {
+                if (submenu.getItemCount() >= Main.pref.getInt("taggingpreset.min-elements-for-scroller", 15)) {
                     MenuScroller.setScrollerFor(submenu);
                 }

trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java

@@ -24 +24 @@
      */
     public HistoryComboBox() {
-        int maxsize = Main.pref.getInteger("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE);
+        int maxsize = Main.pref.getInt("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE);
         model = new ComboBoxHistory(maxsize);
         setModel(model);