Changeset 4016 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
- Timestamp:
- 2011-04-06T14:57:45+02:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
r3978 r4016 23 23 public static final ImageryLayerInfo instance = new ImageryLayerInfo(); 24 24 ArrayList<ImageryInfo> layers = new ArrayList<ImageryInfo>(); 25 ArrayList<ImageryInfo> defaultLayers = new ArrayList<ImageryInfo>();25 static ArrayList<ImageryInfo> defaultLayers = new ArrayList<ImageryInfo>(); 26 26 27 27 private final static String[] DEFAULT_LAYER_SITES = { … … 29 29 }; 30 30 31 public void load(boolean clearCache) { 31 private ImageryLayerInfo() { 32 } 33 34 public ImageryLayerInfo(ImageryLayerInfo info) { 35 layers.addAll(info.layers); 36 } 37 38 public void load() { 32 39 layers.clear(); 33 defaultLayers.clear();34 Collection<String> defaults = Main.pref.getCollection(35 "imagery.layers.default", Collections.<String>emptySet());36 40 for(Collection<String> c : Main.pref.getArray("imagery.layers", 37 41 Collections.<Collection<String>>emptySet())) { 38 42 add(new ImageryInfo(c)); 39 43 } 44 Collections.sort(layers); 45 } 40 46 47 public void loadDefaults(boolean clearCache) { 48 defaultLayers.clear(); 49 Collection<String> defaults = Main.pref.getCollection( 50 "imagery.layers.default", Collections.<String>emptySet()); 41 51 ArrayList<String> defaultsSave = new ArrayList<String>(); 42 52 for(String source : Main.pref.getCollection("imagery.layers.sites", Arrays.asList(DEFAULT_LAYER_SITES))) … … 97 107 } 98 108 109 Collections.sort(defaultLayers); 99 110 Main.pref.putCollection("imagery.layers.default", defaultsSave.size() > 0 100 111 ? defaultsSave : defaults); 101 Collections.sort(layers);102 Collections.sort(defaultLayers);103 save();104 112 } 105 113
Note:
See TracChangeset
for help on using the changeset viewer.