Ticket #19366: 19366.patch
File 19366.patch, 2.1 KB (added by , 4 years ago) |
---|
-
src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
53 53 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting; 54 54 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting; 55 55 import org.openstreetmap.josm.gui.util.GuiHelper; 56 import org.openstreetmap.josm.gui.widgets.FilterField; 56 57 import org.openstreetmap.josm.tools.CheckParameterUtil; 57 58 import org.openstreetmap.josm.tools.ColorHelper; 58 59 import org.openstreetmap.josm.tools.GBC; … … 76 77 } 77 78 } 78 79 80 private FilterField colorFilter; 79 81 private ColorTableModel tableModel; 80 82 private JTable colors; 81 83 … … 137 139 return new NamedColorProperty(info.getCategory(), info.getSource(), 138 140 info.getName(), info.getDefaultValue()); 139 141 } 142 143 @Override 144 public String toString() { 145 return new StringBuilder(super.toString()).append(" [").append(getDisplay()) 146 .append(' ').append(ColorHelper.color2html(getDisplayColor())).append(']').toString(); 147 } 140 148 } 141 149 142 150 private static class ColorTableModel extends AbstractTableModel { … … 299 307 defaultSet.setEnabled(false); 300 308 301 309 colors = new JTable(tableModel); 310 colors.setAutoCreateRowSorter(true); 311 colorFilter = new FilterField().filter(colors, tableModel); 302 312 colors.addMouseListener(new MouseAdapter() { 303 313 @Override 304 314 public void mousePressed(MouseEvent me) { … … 352 362 353 363 JPanel panel = new JPanel(new GridBagLayout()); 354 364 panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); 365 panel.add(colorFilter, GBC.eol().fill(GBC.HORIZONTAL)); 355 366 JScrollPane scrollpane = new JScrollPane(colors); 356 367 scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); 357 368 panel.add(scrollpane, GBC.eol().fill(GBC.BOTH));