Changeset 15678 in josm for trunk/src/org

Timestamp:

2020-01-10T23:04:42+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18545 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
@@ -66 +67 @@
             public void mouseClicked(MouseEvent e) {
                 if (e.getClickCount() == 2
-                    && !e.isAltDown() && !e.isAltGraphDown() && !e.isControlDown() && !e.isMetaDown() && !e.isShiftDown()
-                    && referrers.getCellBounds(referrers.getSelectedIndex(), referrers.getSelectedIndex()).contains(e.getPoint())) {
-                    editAction.actionPerformed(new ActionEvent(e.getSource(), ActionEvent.ACTION_PERFORMED, null));
+                    && !e.isAltDown() && !e.isAltGraphDown() && !e.isControlDown() && !e.isMetaDown() && !e.isShiftDown()) {
+                    Rectangle cellBounds = referrers.getCellBounds(referrers.getSelectedIndex(), referrers.getSelectedIndex());
+                    if (cellBounds != null && cellBounds.contains(e.getPoint())) {
+                        editAction.actionPerformed(new ActionEvent(e.getSource(), ActionEvent.ACTION_PERFORMED, null));
+                    }
                 }
             }
@@ -86 +89 @@
     }
 
+    /**
+     * Initializes the model with layer data.
+     */
     public void init() {
         model.populate(getLayer().data);