Ticket #23841: 23841.core.patch

src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java

@@ -136 +136 @@
         public void run() {
             BingAttributionData attributionLoader = new BingAttributionData();
             try {
+                if (true) throw new IOException("Temp exception");
                 String xml = attributionLoader.updateIfRequiredString();
                 List<Attribution> ret;
                 try (StringReader sr = new StringReader(xml)) {

src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -965 +965 @@
         invalidate();
     }
 
+    /**
+     * Remove all cached error tiles
+     * @since xxx
+     */
+    public void clearAllErrorTiles() {
+        tileCache.clearErrorTiles();
+        invalidate();
+    }
+
     @Override
     public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
         boolean done = (infoflags & (ERROR | FRAMEBITS | ALLBITS)) != 0;

src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -75 +76 @@
     @Override
     protected TMSTileSource getTileSource() {
         return getTileSourceStatic(info, () -> {
-            Logging.debug("Attribution loaded, running loadAllErrorTiles");
-            this.loadAllErrorTiles(false);
+            Logging.debug("Attribution loaded, running clearAllErrorTiles");
+            this.clearAllErrorTiles();
         });
     }