Changeset 33279 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2017-04-26T01:03:00+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm14688 - NPE

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• DownloadWMSVectorImage.java (modified) (2 diffs)
• WMSLayer.java (modified) (1 diff)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java

@@ -32 +32 @@
         try {
             if (wmsLayer.grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
-                if (wmsLayer.getImages().isEmpty()) {
+                if (!wmsLayer.hasImages()) {
                     // first time we grab an image for this layer
                     if (CacheControl.cacheEnabled) {
@@ -54 +54 @@
                 // grab new images from wms server into active layer
                 wmsLayer.grab(bounds);
-            } else if (wmsLayer.getImages().size() == 0)
+            } else if (!wmsLayer.hasImages()) {
               // failed to contact WMS of find this commune. Remove layer if empty.
               Main.getLayerManager().removeLayer(wmsLayer);
+            }
         } catch (DuplicateLayerException e) {
             // we tried to grab onto a duplicated layer (removed)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java

@@ -707 +707 @@
     }
 
+    public boolean hasImages() {
+        return images != null && !images.isEmpty();
+    }
+
     public void addImage(GeorefImage img) {
         imagesLock.lock();