Changeset 7425 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

Timestamp:

2014-08-16T23:50:43+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #3916 - WMS: Improve exception handling. Proper message is now displayed on tiles.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -62 +62 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.WMSLayerImporter;
-import org.openstreetmap.josm.io.imagery.Grabber;
 import org.openstreetmap.josm.io.imagery.HTMLGrabber;
+import org.openstreetmap.josm.io.imagery.WMSException;
 import org.openstreetmap.josm.io.imagery.WMSGrabber;
 import org.openstreetmap.josm.io.imagery.WMSRequest;
@@ -147 +147 @@
     private final Lock requestQueueLock = new ReentrantLock();
     private final Condition queueEmpty = requestQueueLock.newCondition();
-    private final List<Grabber> grabbers = new ArrayList<>();
+    private final List<WMSGrabber> grabbers = new ArrayList<>();
     private final List<Thread> grabberThreads = new ArrayList<>();
     private boolean canceled;
@@ -163 +163 @@
     }
 
+    /**
+     * Constructs a new {@code WMSLayer}.
+     */
     public WMSLayer(ImageryInfo info) {
         super(info);
@@ -648 +651 @@
                 GeorefImage img = images[modulo(request.getXIndex(),dax)][modulo(request.getYIndex(),day)];
                 if (img.equalPosition(request.getXIndex(), request.getYIndex())) {
-                    img.changeImage(request.getState(), request.getImage());
+                    WMSException we = request.getException();
+                    img.changeImage(request.getState(), request.getImage(), we != null ? we.getMessage() : null);
                 }
             }
@@ -931 +935 @@
             Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), 1 / info.getPixelPerDegree());
         }
-
     }
 
@@ -938 +941 @@
         try {
             canceled = true;
-            for (Grabber grabber: grabbers) {
+            for (WMSGrabber grabber: grabbers) {
                 grabber.cancel();
             }
@@ -964 +967 @@
             grabberThreads.clear();
             for (int i=0; i<threadCount; i++) {
-                Grabber grabber = getGrabber(i == 0 && threadCount > 1);
+                WMSGrabber grabber = getGrabber(i == 0 && threadCount > 1);
                 grabbers.add(grabber);
                 Thread t = new Thread(grabber, "WMS " + getName() + " " + i);
@@ -1005 +1008 @@
     }
 
-    protected Grabber getGrabber(boolean localOnly) {
+    protected WMSGrabber getGrabber(boolean localOnly) {
         if (getInfo().getImageryType() == ImageryType.HTML)
             return new HTMLGrabber(Main.map.mapView, this, localOnly);