Changeset 3696 in josm


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r3549 r3696  
    620620    }
    621621   
     622    /**
     623     * Used to read a 2-dimensional array of strings from the preference file.
     624     * If not a single entry could be found, def is returned.
     625     */
    622626    synchronized public Collection<Collection<String>> getArray(String key,
    623627    Collection<Collection<String>> def) {
     
    630634            col.add(getCollection(key+num++, null));
    631635        }
    632         return num == 0 && def != null ? def : col;
     636        return num == 0 ? def : col;
    633637    }
    634638   
Note: See TracChangeset for help on using the changeset viewer.