Changeset 6739 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2014-01-19T20:30:52+01:00 (10 years ago)

Author:

simon04

Message:

Fix NPE when cycling through conflicts with Tab key

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java

@@ -73 +73 @@
             }
             changeSelection(row, col, false, false);
-            editCellAt(getSelectedRow(), getSelectedColumn());
-            getEditorComponent().requestFocusInWindow();
+            if (editCellAt(getSelectedRow(), getSelectedColumn())) {
+                getEditorComponent().requestFocusInWindow();
+            }
         }
     }
@@ -104 +105 @@
             }
             changeSelection(row, col, false, false);
-            editCellAt(getSelectedRow(), getSelectedColumn());
-            getEditorComponent().requestFocusInWindow();
+            if (editCellAt(getSelectedRow(), getSelectedColumn())) {
+                getEditorComponent().requestFocusInWindow();
+            }
         }
     }