Changeset 3696 in josm for trunk

Timestamp:

2010-12-04T18:31:39+01:00 (14 years ago)

Author:

bastiK

Message:

Slightly change the behaviour of getArray. This enables support for migration of old bookmark format in BookmarkList.java (which did not work for some reason). There shouldn't be anything else that depends on the previous behaviour.

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)

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

@@ -620 +620 @@
     }
     
+    /**
+     * Used to read a 2-dimensional array of strings from the preference file.
+     * If not a single entry could be found, def is returned.
+     */ 
     synchronized public Collection<Collection<String>> getArray(String key,
     Collection<Collection<String>> def) {
@@ -630 +634 @@
             col.add(getCollection(key+num++, null));
         }
-        return num == 0 && def != null ? def : col;
+        return num == 0 ? def : col;
     }