Changeset 3978 in josm

Timestamp:

Mar 11, 2011 10:52:07 PM (2 years ago)

Author:

bastiK

Message:

fix reload of imagery sources

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -29 +29 @@
     };
 
-    public void load() {
+    public void load(boolean clearCache) {
         layers.clear();
         defaultLayers.clear();
@@ -44 +44 @@
             try
             {
+                if (clearCache) {
+                    MirroredInputStream.cleanup(source);
+                }
                 MirroredInputStream s = new MirroredInputStream(source, -1);
                 InputStreamReader r;

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

@@ -567 +567 @@
 
             public void actionPerformed(ActionEvent evt) {
-                layerInfo.load();
+                layerInfo.load(true);
                 modeldef.fireTableDataChanged();
             }
@@ -857 +857 @@
             settingsMigration = null;
         }
-        ImageryLayerInfo.instance.load();
+        ImageryLayerInfo.instance.load(false);
         OffsetBookmark.loadBookmarks();
         Main.main.menu.imageryMenu.refreshImageryMenu();