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

Timestamp:

2018-06-30T11:15:20+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16442 - IndexOutOfBoundsException when deleting the last color entry in preferences

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -170 +170 @@
             deleted.add(data.get(row));
             data.remove(row);
-            fireTableDataChanged();
+            fireTableRowsDeleted(row, row);
         }
 
@@ -440 +440 @@
     private void updateEnabledState() {
         int sel = colors.getSelectedRow();
-        ColorEntry ce = sel >= 0 ? tableModel.getEntry(sel) : null;
+        ColorEntry ce = sel >= 0 && sel < tableModel.getRowCount() ? tableModel.getEntry(sel) : null;
         remove.setEnabled(ce != null && isRemoveColor(ce));
         colorEdit.setEnabled(ce != null);