Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 2122) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 2123) @@ -25,4 +25,5 @@ import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.data.osm.Filter; public class SearchAction extends JosmAction{ @@ -31,5 +32,5 @@ public static enum SearchMode { - replace, add, remove + replace, add, remove, in_selection } @@ -57,11 +58,12 @@ SearchSetting s = lastSearch; if (s == null) { - s = new SearchSetting("", false, false, SearchMode.replace); - } - showSearchDialog(s); - } - - public void showSearchDialog(SearchSetting initialValues) { - JLabel label = new JLabel(tr("Please enter a search string.")); + s = new SearchSetting("", SearchMode.replace, false, false); + } + SearchSetting se = showSearchDialog(s); + if(se != null) searchWithHistory(se); + } + + public static SearchSetting showSearchDialog(SearchSetting initialValues) { + JLabel label = new JLabel( initialValues instanceof Filter ? tr("Please enter a filter string.") : tr("Please enter a search string.")); final JTextField input = new JTextField(initialValues.text); input.selectAll(); @@ -70,8 +72,10 @@ JRadioButton add = new JRadioButton(tr("add to selection"), initialValues.mode == SearchMode.add); JRadioButton remove = new JRadioButton(tr("remove from selection"), initialValues.mode == SearchMode.remove); + JRadioButton in_selection = new JRadioButton(tr("find in selection"), initialValues.mode == SearchMode.in_selection); ButtonGroup bg = new ButtonGroup(); bg.add(replace); bg.add(add); bg.add(remove); + bg.add(in_selection); JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), initialValues.caseSensitive); @@ -79,9 +83,19 @@ JPanel left = new JPanel(new GridBagLayout()); + + JTextField finput = null; + if(initialValues instanceof Filter){ + JLabel fLabel = new JLabel(tr("Please enter a filter name.")); + finput = new JTextField(((Filter)initialValues).filterName); + left.add(fLabel, GBC.eop()); + left.add(finput, GBC.eop().fill(GBC.HORIZONTAL)); + } + left.add(label, GBC.eop()); left.add(input, GBC.eop().fill(GBC.HORIZONTAL)); left.add(replace, GBC.eol()); left.add(add, GBC.eol()); - left.add(remove, GBC.eop()); + left.add(remove, GBC.eol()); + left.add(in_selection, GBC.eop()); left.add(caseSensitive, GBC.eol()); left.add(regexSearch, GBC.eol()); @@ -120,6 +134,8 @@ ExtendedDialog dialog = new ExtendedDialog( Main.parent, - tr("Search"), - new String[] {tr("Start Search"), tr("Cancel")} + initialValues instanceof Filter ? tr("Filter") : tr("Search"), + new String[] { + initialValues instanceof Filter ? tr("Make filter") : tr("Start Search"), + tr("Cancel")} ); dialog.setButtonIcons(new String[] {"dialogs/search.png", "cancel.png"}); @@ -128,11 +144,15 @@ int result = dialog.getValue(); - if(result != 1) return; + if(result != 1) return null; // User pressed OK - let's perform the search SearchMode mode = replace.isSelected() ? SearchAction.SearchMode.replace - : (add.isSelected() ? SearchAction.SearchMode.add : SearchAction.SearchMode.remove); - SearchSetting setting = new SearchSetting(input.getText(), caseSensitive.isSelected(), regexSearch.isSelected(), mode); - searchWithHistory(setting); + : (add.isSelected() ? SearchAction.SearchMode.add + : (remove.isSelected() ? SearchAction.SearchMode.remove : SearchAction.SearchMode.in_selection)); + if(initialValues instanceof Filter){ + return new Filter(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected(), finput.getText()); + } else { + return new SearchSetting(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected()); + } } @@ -151,13 +171,63 @@ } lastSearch = s; - search(s.text, s.mode, s.caseSensitive, s.regexSearch); + search(s); } public static void searchWithoutHistory(SearchSetting s) { lastSearch = s; - search(s.text, s.mode, s.caseSensitive, s.regexSearch); - } - + search(s); + } + + public interface Function{ + public Boolean isSomething(OsmPrimitive o); + } + + public static Integer getSelection(SearchSetting s, Collection sel, Function f) { + Integer foundMatches = 0; + try { + String searchText = s.text; + if(s instanceof Filter){ + searchText = ((Filter)s).inverted ? "-" : ""; + searchText = searchText + "(" + ((Filter)s).text + ")" + (((Filter)s).applyForChildren ? ("| child (" + ((Filter)s).text + ")"): ""); + } + /*System.out.println(searchText); */ + SearchCompiler.Match matcher = SearchCompiler.compile(searchText, s.caseSensitive, s.regexSearch); + foundMatches = 0; + for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives()) { + if (s.mode == SearchMode.replace) { + if (matcher.match(osm)) { + sel.add(osm); + ++foundMatches; + } else { + sel.remove(osm); + } + } else if (s.mode == SearchMode.add && !f.isSomething(osm) && matcher.match(osm)) { + sel.add(osm); + ++foundMatches; + } else if (s.mode == SearchMode.remove && f.isSomething(osm) && matcher.match(osm)) { + sel.remove(osm); + ++foundMatches; + } else if (s.mode == SearchMode.in_selection && f.isSomething(osm)&& !matcher.match(osm)) { + sel.remove(osm); + ++foundMatches; + } + } + } catch (SearchCompiler.ParseError e) { + JOptionPane.showMessageDialog( + Main.parent, + e.getMessage(), + tr("Error"), + JOptionPane.ERROR_MESSAGE + + ); + } + return foundMatches; + } + public static void search(String search, SearchMode mode, boolean caseSensitive, boolean regexSearch) { + search(new SearchSetting(search, mode, caseSensitive, regexSearch)); + } + + public static void search(SearchSetting s) { // FIXME: This is confusing. The GUI says nothing about loading primitives from an URL. We'd like to *search* // for URLs in the current data set. @@ -172,62 +242,42 @@ // } // } - try { - Collection sel = Main.main.getCurrentDataSet().getSelected(); - SearchCompiler.Match matcher = SearchCompiler.compile(search, caseSensitive, regexSearch); - int foundMatches = 0; - for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives()) { - if (mode == SearchMode.replace) { - if (matcher.match(osm)) { - sel.add(osm); - ++foundMatches; - } else { - sel.remove(osm); - } - } else if (mode == SearchMode.add && !osm.isSelected() && matcher.match(osm)) { - sel.add(osm); - ++foundMatches; - } else if (mode == SearchMode.remove && osm.isSelected() && matcher.match(osm)) { - sel.remove(osm); - ++foundMatches; - } - } - Main.main.getCurrentDataSet().setSelected(sel); - if (foundMatches == 0) { - String msg = null; - if (mode == SearchMode.replace) { - msg = tr("No match found for ''{0}''", search); - } else if (mode == SearchMode.add) { - msg = tr("Nothing added to selection by searching for ''{0}''", search); - } else if (mode == SearchMode.remove) { - msg = tr("Nothing removed from selection by searching for ''{0}''", search); - } - Main.map.statusLine.setHelpText(msg); - JOptionPane.showMessageDialog( - Main.parent, - msg, - tr("Warning"), - JOptionPane.WARNING_MESSAGE - ); - } else { - Main.map.statusLine.setHelpText(tr("Found {0} matches", foundMatches)); - } - } catch (SearchCompiler.ParseError e) { - JOptionPane.showMessageDialog( - Main.parent, - e.getMessage(), - tr("Error"), - JOptionPane.ERROR_MESSAGE - - ); - } + + Collection sel = Main.main.getCurrentDataSet().getSelected(); + int foundMatches = getSelection(s, sel, new Function(){ + public Boolean isSomething(OsmPrimitive o){ + return o.isSelected(); + } + }); + Main.main.getCurrentDataSet().setSelected(sel); + if (foundMatches == 0) { + String msg = null; + if (s.mode == SearchMode.replace) { + msg = tr("No match found for ''{0}''", s.text); + } else if (s.mode == SearchMode.add) { + msg = tr("Nothing added to selection by searching for ''{0}''", s.text); + } else if (s.mode == SearchMode.remove) { + msg = tr("Nothing removed from selection by searching for ''{0}''", s.text); + } else if (s.mode == SearchMode.in_selection) { + msg = tr("Nothing find in selection by searching for ''{0}''", s.text); + } + Main.map.statusLine.setHelpText(msg); + JOptionPane.showMessageDialog( + Main.parent, + msg, + tr("Warning"), + JOptionPane.WARNING_MESSAGE + ); + } else { + Main.map.statusLine.setHelpText(tr("Found {0} matches", foundMatches)); + } } public static class SearchSetting { - String text; - SearchMode mode; - boolean caseSensitive; - boolean regexSearch; - - public SearchSetting(String text, boolean caseSensitive, boolean regexSearch, SearchMode mode) { + public String text; + public SearchMode mode; + public boolean caseSensitive; + public boolean regexSearch; + + public SearchSetting(String text, SearchMode mode, boolean caseSensitive, boolean regexSearch) { super(); this.caseSensitive = caseSensitive; Index: /trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 2122) +++ /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 2123) @@ -29,4 +29,5 @@ import org.openstreetmap.josm.gui.dialogs.RelationListDialog; import org.openstreetmap.josm.gui.dialogs.SelectionListDialog; +import org.openstreetmap.josm.gui.dialogs.FilterDialog; import org.openstreetmap.josm.gui.dialogs.ToggleDialog; import org.openstreetmap.josm.gui.dialogs.UserListDialog; @@ -104,4 +105,6 @@ addToggleDialog(new HistoryDialog()); addToggleDialog(new SelectionListDialog()); + if(Main.pref.getBoolean("displayfilter", false)) + addToggleDialog(new FilterDialog()); addToggleDialog(new UserListDialog()); addToggleDialog(conflictDialog = new ConflictDialog()); @@ -251,10 +254,10 @@ * Replies the instance of a toggle dialog of type type managed by this * map frame - * + * * @param * @param type the class of the toggle dialog, i.e. UserListDialog.class * @return the instance of a toggle dialog of type type managed by this * map frame; null, if no such dialog exists - * + * */ public T getToggleDialog(Class type) {