Changeset 15116 in josm

Timestamp:

2019-05-25T22:32:11+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16301 - add filter for default imagery entries

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/imagery/ImageryProvidersPanel.java (modified) (9 diffs)
• preferences/plugin/PluginPreference.java (modified) (4 diffs)
• preferences/shortcut/PrefJPanel.java (modified) (7 diffs)
• widgets/FilterField.java (added)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryProvidersPanel.java

@@ -59 +59 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.FilterField;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
@@ -78 +79 @@
     /** The table of default providers **/
     public final JTable defaultTable;
+    /** The filter of default providers **/
+    private final FilterField defaultFilter;
     /** The selection listener synchronizing map display with table of default providers **/
     private final transient DefListSelectionListener defaultTableListener;
@@ -159 +162 @@
             JLabel label = (JLabel) super.getTableCellRendererComponent(
                     table, mapper.apply(obj), isSelected, hasFocus, row, column);
-            GuiHelper.setBackgroundReadable(label, UIManager.getColor("Table.background"));
+            GuiHelper.setBackgroundReadable(label,
+                    isSelected ? UIManager.getColor("Table.selectionBackground") : UIManager.getColor("Table.background"));
             if (obj != null) {
                 label.setToolTipText(tooltip.apply(obj));
@@ -225 +229 @@
         defaultModel = new ImageryDefaultLayerTableModel();
         defaultTable = new JTable(defaultModel);
+        defaultTable.setAutoCreateRowSorter(true);
+        defaultFilter = new FilterField().filter(defaultTable, defaultModel);
 
         defaultModel.addTableModelListener(e -> activeTable.repaint());
@@ -251 +257 @@
 
         // Add default item list
+        JPanel defaultPane = new JPanel(new GridBagLayout());
         JScrollPane scrolldef = new JScrollPane(defaultTable);
         scrolldef.setPreferredSize(new Dimension(200, 200));
-        add(scrolldef, GBC.std().insets(0, 5, 0, 0).fill(GridBagConstraints.BOTH).weight(1.0, 0.6).insets(5, 0, 0, 0));
+        defaultPane.add(defaultFilter, GBC.eol().insets(0, 0, 0, 0).fill(GridBagConstraints.HORIZONTAL));
+        defaultPane.add(scrolldef, GBC.eol().insets(0, 0, 0, 0).fill(GridBagConstraints.BOTH));
+        add(defaultPane, GBC.std().fill(GridBagConstraints.BOTH).weight(1.0, 0.6).insets(5, 0, 0, 0));
 
         // Add default item map
@@ -268 +277 @@
         defaultMap.setZoomControlsVisible(false);
         defaultMap.setMinimumSize(new Dimension(100, 200));
-        add(defaultMap, GBC.std().insets(5, 5, 0, 0).fill(GridBagConstraints.BOTH).weight(0.33, 0.6).insets(5, 0, 0, 0));
+        add(defaultMap, GBC.std().fill(GridBagConstraints.BOTH).weight(0.33, 0.6).insets(5, 0, 0, 0));
 
         defaultTableListener = new DefListSelectionListener();
@@ -341 +350 @@
                 // Only process complete (final) selection events
                 for (int i = e.getFirstIndex(); i <= e.getLastIndex(); i++) {
-                    updateBoundsAndShapes(i);
+                    updateBoundsAndShapes(defaultTable.convertRowIndexToModel(i));
                 }
                 // If needed, adjust map to show all map rectangles and polygons
@@ -351 +360 @@
         }
 
+        /**
+         * update bounds and shapes for a new entry
+         * @param i model index
+         */
         private void updateBoundsAndShapes(int i) {
             ImageryBounds bounds = defaultModel.getRow(i).getBounds();
             if (bounds != null) {
+                int viewIndex = defaultTable.convertRowIndexToView(i);
                 List<Shape> shapes = bounds.getShapes();
                 if (shapes != null && !shapes.isEmpty()) {
-                    if (defaultTable.getSelectionModel().isSelectedIndex(i)) {
+                    if (defaultTable.getSelectionModel().isSelectedIndex(viewIndex)) {
                         if (!mapPolygons.containsKey(i)) {
                             List<MapPolygon> list = new ArrayList<>();
@@ -376 +390 @@
                     // Only display bounds when no polygons (shapes) are defined for this provider
                 } else {
-                    if (defaultTable.getSelectionModel().isSelectedIndex(i)) {
+                    if (defaultTable.getSelectionModel().isSelectedIndex(viewIndex)) {
                         if (!mapRectangles.containsKey(i)) {
                             // Add new map rectangle

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -40 +40 @@
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
@@ -56 +54 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.PreferencePanel;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.FilterField;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
-import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -192 +190 @@
         gc.gridx = 1;
         gc.weightx = 1.0;
-        tfFilter = new JosmTextField();
+        tfFilter = new FilterField().filter(expr -> {
+            model.filterDisplayedPlugins(expr);
+            pnlPluginPreferences.refreshView();
+        });
         pnl.add(tfFilter, gc);
-        tfFilter.setToolTipText(tr("Enter a search expression"));
-        SelectAllOnFocusGainedDecorator.decorate(tfFilter);
-        tfFilter.getDocument().addDocumentListener(new SearchFieldAdapter());
         return pnl;
     }
@@ -565 +563 @@
     }
 
-    /**
-     * Applies the current filter condition in the filter text field to the model.
-     */
-    class SearchFieldAdapter implements DocumentListener {
-        private void filter() {
-            String expr = tfFilter.getText().trim();
-            if (expr.isEmpty()) {
-                expr = null;
-            }
-            model.filterDisplayedPlugins(expr);
-            pnlPluginPreferences.refreshView();
-        }
-
-        @Override
-        public void changedUpdate(DocumentEvent evt) {
-            filter();
-        }
-
-        @Override
-        public void insertUpdate(DocumentEvent evt) {
-            filter();
-        }
-
-        @Override
-        public void removeUpdate(DocumentEvent evt) {
-            filter();
-        }
-    }
-
     private static class PluginConfigurationSitesPanel extends JPanel {
 

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -16 +16 @@
 import java.awt.im.InputContext;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.PatternSyntaxException;
 
 import javax.swing.AbstractAction;
@@ -33 +31 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
-import javax.swing.RowFilter;
 import javax.swing.SwingConstants;
 import javax.swing.UIManager;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -43 +38 @@
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
 
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.FilterField;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
-import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.tools.KeyboardUtils;
 import org.openstreetmap.josm.tools.Logging;
@@ -89 +81 @@
 
     private final JTable shortcutTable = new JTable();
-
-    private final JosmTextField filterField = new JosmTextField();
+    private final FilterField filterField;
 
     /** Creates new form prefJPanel */
     public PrefJPanel() {
         this.model = new ScListModel();
+        this.filterField = new FilterField();
         initComponents();
     }
@@ -207 +199 @@
         shortcutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         shortcutTable.setAutoCreateRowSorter(true);
+        filterField.filter(shortcutTable, model);
         TableColumnModel mod = shortcutTable.getColumnModel();
         mod.getColumn(0).setCellRenderer(new ShortcutTableCellRenderer(true));
@@ -268 +261 @@
         gc.weightx = 1.0;
         pnl.add(filterField, gc);
-        filterField.setToolTipText(tr("Enter a search expression"));
-        SelectAllOnFocusGainedDecorator.decorate(filterField);
-        filterField.getDocument().addDocumentListener(new FilterFieldAdapter());
         pnl.setMaximumSize(new Dimension(300, 10));
         return pnl;
@@ -372 +362 @@
         }
     }
-
-    class FilterFieldAdapter implements DocumentListener {
-        private void filter() {
-            String expr = filterField.getText().trim();
-            if (expr.isEmpty()) {
-                expr = null;
-            }
-            try {
-                final TableRowSorter<? extends TableModel> sorter =
-                    (TableRowSorter<? extends TableModel>) shortcutTable.getRowSorter();
-                if (expr == null) {
-                    sorter.setRowFilter(null);
-                } else {
-                    expr = expr.replace("+", "\\+");
-                    // split search string on whitespace, do case-insensitive AND search
-                    List<RowFilter<Object, Object>> andFilters = new ArrayList<>();
-                    for (String word : expr.split("\\s+")) {
-                        andFilters.add(RowFilter.regexFilter("(?i)" + word));
-                    }
-                    sorter.setRowFilter(RowFilter.andFilter(andFilters));
-                }
-                model.fireTableDataChanged();
-            } catch (PatternSyntaxException | ClassCastException ex) {
-                Logging.warn(ex);
-            }
-        }
-
-        @Override
-        public void changedUpdate(DocumentEvent e) {
-            filter();
-        }
-
-        @Override
-        public void insertUpdate(DocumentEvent e) {
-            filter();
-        }
-
-        @Override
-        public void removeUpdate(DocumentEvent e) {
-            filter();
-        }
-    }
 }