Changeset 4216 in josm for trunk

Timestamp:

2011-07-09T00:38:49+02:00 (13 years ago)

Author:

bastiK

Message:

see #6562 - loading of default imagery sources broken

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• gui/preferences/ImageryPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -37 +37 @@
     }
 
+    public void clear() {
+        layers.clear();
+    }
+
     public void load() {
-        layers.clear();
         for(Collection<String> c : Main.pref.getArray("imagery.layers",
                 Collections.<Collection<String>>emptySet())) {

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

@@ -292 +292 @@
         boolean restartRequired = false;
         layerInfo.save();
+        ImageryLayerInfo.instance.clear();
         ImageryLayerInfo.instance.load();
         Main.main.menu.imageryMenu.refreshImageryMenu();
@@ -836 +837 @@
 
     public static void initialize() {
+        ImageryLayerInfo.instance.clear();
         ImageryLayerInfo.instance.loadDefaults(false);
         ImageryLayerInfo.instance.load();