Changeset 16594 in josm for trunk

Timestamp:

2020-06-11T00:16:44+02:00 (4 years ago)

Author:

simon04

Message:

fix #19366 - Add filter box for Color Preferences (patch by taylor.smock, modified)

File:

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

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

@@ -54 +54 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.FilterField;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -138 +139 @@
                     info.getName(), info.getDefaultValue());
         }
+
+        @Override
+        public String toString() {
+            return "ColorEntry{" + getDisplay() + ' ' + ColorHelper.color2html(getDisplayColor()) + '}';
+        }
     }
 
@@ -259 +265 @@
         colorEdit.addActionListener(e -> {
             int sel = colors.getSelectedRow();
+            sel = colors.convertRowIndexToModel(sel);
             ColorEntry ce = tableModel.getEntry(sel);
             JColorChooser chooser = new JColorChooser(ce.getDisplayColor());
@@ -273 +280 @@
         defaultSet.addActionListener(e -> {
             int sel = colors.getSelectedRow();
+            sel = colors.convertRowIndexToModel(sel);
             ColorEntry ce = tableModel.getEntry(sel);
             Color c = ce.info.getDefaultValue();
@@ -293 +301 @@
         remove.addActionListener(e -> {
             int sel = colors.getSelectedRow();
+            sel = colors.convertRowIndexToModel(sel);
             tableModel.removeEntry(sel);
         });
@@ -300 +309 @@
 
         colors = new JTable(tableModel);
+        colors.setAutoCreateRowSorter(true);
+        FilterField colorFilter = new FilterField().filter(colors, tableModel);
         colors.addMouseListener(new MouseAdapter() {
             @Override
@@ -353 +364 @@
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        panel.add(colorFilter, GBC.eol().fill(GBC.HORIZONTAL));
         JScrollPane scrollpane = new JScrollPane(colors);
         scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -425 +437 @@
     private void updateEnabledState() {
         int sel = colors.getSelectedRow();
-        ColorEntry ce = sel >= 0 && sel < tableModel.getRowCount() ? tableModel.getEntry(sel) : null;
+        if (sel < 0 || sel >= tableModel.getRowCount()) {
+            return;
+        }
+        sel = colors.convertRowIndexToModel(sel);
+        ColorEntry ce = tableModel.getEntry(sel);
         remove.setEnabled(ce != null && isRemoveColor(ce));
         colorEdit.setEnabled(ce != null);