Changeset 2159 in josm for trunk/src

Timestamp:

2009-09-19T10:55:26+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3539: NullPointerException when deleting the only data layer from the context menu

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -8 +8 @@
 import java.awt.GridLayout;
 import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -18 +19 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -28 +28 @@
 import javax.swing.JLabel;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -42 +41 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.MergeLayerAction;
-import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -57 +54 @@
 /**
  * This is a toggle dialog which displays the list of layers. Actions allow to
- * change the ordering the layer, to hide/show layers, to activate layers
+ * change the ordering of the layers, to hide/show layers, to activate layers,
  * and to delete layers.
  * 
@@ -317 +314 @@
                 dialog.setVisible(true);
                 switch(dialog.getUserAction()) {
-                case CANCEL: return false;
-                case PROCEED: return true;
-                default: return false;
+                    case CANCEL: return false;
+                    case PROCEED: return true;
+                    default: return false;
                 }
             }
@@ -1031 +1028 @@
         protected void processMouseEvent(MouseEvent e) {
             // if the layer list is embedded in a detached dialog, the last row is
-            // is selected if a user clicks in the empty space *below* the last row.
+            // selected if a user clicks in the empty space *below* the last row.
             // This mouse event filter prevents this.
             //
             int idx = locationToIndex(e.getPoint());
-            if (getCellBounds(idx, idx).contains(e.getPoint())) {
+            // sometimes bounds can be null, see #3539
+            Rectangle bounds = getCellBounds(idx,idx);
+            if (bounds != null && bounds.contains(e.getPoint())) {
                 super.processMouseEvent(e);
             }