Changeset 12894 in josm for trunk

Timestamp:

2017-09-24T11:11:20+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - update method name and signature for consistency

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenFileAction.java (modified) (1 diff)
• actions/SaveActionBase.java (modified) (1 diff)
• data/Preferences.java (modified) (3 diffs)
• data/PreferencesUtils.java (modified) (3 diffs)
• io/UploadStrategy.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -337 +337 @@
                 fileHistory.removeAll(failedAll);
                 int maxsize = Math.max(0, Config.getPref().getInt("file-open.history.max-size", 15));
-                PreferencesUtils.putCollectionBounded(Config.getPref(), "file-open.history", maxsize, fileHistory);
+                PreferencesUtils.putListBounded(Config.getPref(), "file-open.history", maxsize, new ArrayList<>(fileHistory));
             }
         }

trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

@@ -236 +236 @@
         history.remove(filepath);
         history.add(0, filepath);
-        PreferencesUtils.putCollectionBounded(Config.getPref(), "file-open.history", maxsize, history);
+        PreferencesUtils.putListBounded(Config.getPref(), "file-open.history", maxsize, history);
     }
 }

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1078 +1078 @@
      * @param def The default value
      * @return The integer value or the default value if it could not be parsed
-     * @deprecated use {@link PreferencesUtils#getInteger(IPreferences, String, String, int)
+     * @deprecated use {@link PreferencesUtils#getInteger(IPreferences, String, String, int)}
      */
     @Deprecated
@@ -1126 +1126 @@
      * @param value The value that should be removed in the collection
      * @see #getList(String)
-     * @deprecated use {@link PreferencesUtils#removeFromCollection(IPreferences, String, String)}
+     * @deprecated use {@link PreferencesUtils#removeFromList(IPreferences, String, String)}
      */
     @Deprecated
@@ -1236 +1236 @@
      * @param val value
      * @return {@code true}, if something has changed (i.e. value is different than before)
-     * @deprecated use {@link PreferencesUtils#putCollectionBounded(IPreferences, String, int, Collection)}
+     * @deprecated use {@link PreferencesUtils#putListBounded(IPreferences, String, int, List)}
      */
     @Deprecated

trunk/src/org/openstreetmap/josm/data/PreferencesUtils.java

@@ -528 +528 @@
 
     /**
-     * Removes a value from a given String collection
+     * Removes a value from a given String list
      * @param prefs the preferences
-     * @param key The preference key the collection is stored with
-     * @param value The value that should be removed in the collection
-     * @see #getList(String)
-     * @since 12891
-     */
-    public static void removeFromCollection(IPreferences prefs, String key, String value) {
+     * @param key The preference key the list is stored with
+     * @param value The value that should be removed in the list
+     * @since 12894
+     */
+    public static void removeFromList(IPreferences prefs, String key, String value) {
         synchronized (prefs) {
             List<String> a = new ArrayList<>(prefs.getList(key, Collections.<String>emptyList()));
@@ -544 +543 @@
 
     /**
-     * Saves at most {@code maxsize} items of collection {@code val}.
+     * Saves at most {@code maxsize} items of list {@code val}.
      * @param prefs the preferences
      * @param key key
@@ -550 +549 @@
      * @param val value
      * @return {@code true}, if something has changed (i.e. value is different than before)
-     * @since 12891
-     */
-    public static boolean putCollectionBounded(IPreferences prefs, String key, int maxsize, Collection<String> val) {
+     * @since 12894
+     */
+    public static boolean putListBounded(IPreferences prefs, String key, int maxsize, List<String> val) {
         List<String> newCollection = new ArrayList<>(Math.min(maxsize, val.size()));
         for (String i : val) {

trunk/src/org/openstreetmap/josm/io/UploadStrategy.java

@@ -85 +85 @@
             v = Config.getPref().get("osm-server.atomic-upload", null);
             if (v != null) {
-                PreferencesUtils.removeFromCollection(Config.getPref(), "osm-server.atomic-upload", v);
+                PreferencesUtils.removeFromList(Config.getPref(), "osm-server.atomic-upload", v);
             } else {
                 v = "";

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -349 +349 @@
             if (plugins.contains(depr.name)) {
                 plugins.remove(depr.name);
-                PreferencesUtils.removeFromCollection(Config.getPref(), "plugins", depr.name);
+                PreferencesUtils.removeFromList(Config.getPref(), "plugins", depr.name);
                 removedPlugins.add(depr);
             }
@@ -403 +403 @@
                     Utils.escapeReservedCharactersHTML(unmaintained));
             if (confirmDisablePlugin(parent, msg, unmaintained)) {
-                PreferencesUtils.removeFromCollection(Config.getPref(), "plugins", unmaintained);
+                PreferencesUtils.removeFromList(Config.getPref(), "plugins", unmaintained);
                 plugins.remove(unmaintained);
             }
@@ -801 +801 @@
         }
         if (msg != null && confirmDisablePlugin(parent, msg, plugin.name)) {
-            PreferencesUtils.removeFromCollection(Config.getPref(), "plugins", plugin.name);
+            PreferencesUtils.removeFromList(Config.getPref(), "plugins", plugin.name);
         }
     }