Changeset 16106 in josm

Timestamp:

2020-03-10T00:04:08+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18901 - NPE when no WMTS layer is selected

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (2 diffs)

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

@@ -42 +42 @@
 
 import javax.imageio.ImageIO;
+import javax.swing.ListSelectionModel;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -328 +329 @@
         }
 
+        @Override
+        public void setupDialog() {
+            super.setupDialog();
+            buttons.get(0).setEnabled(false);
+            ListSelectionModel selectionModel = list.getTable().getSelectionModel();
+            selectionModel.addListSelectionListener(e -> buttons.get(0).setEnabled(!selectionModel.isSelectionEmpty()));
+        }
+
         public DefaultLayer getSelectedLayer() {
             Layer selectedLayer = list.getSelectedLayer();
-            return new DefaultLayer(ImageryType.WMTS, selectedLayer.identifier, selectedLayer.style, selectedLayer.tileMatrixSet.identifier);
-        }
-
+            return selectedLayer == null ? null :
+                    new DefaultLayer(ImageryType.WMTS, selectedLayer.identifier, selectedLayer.style, selectedLayer.tileMatrixSet.identifier);
+        }
     }