Changeset 207 in josm for src/org/openstreetmap/josm/actions/search/SearchAction.java
- Timestamp:
- 2007-04-03T17:46:00+02:00 (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/org/openstreetmap/josm/actions/search/SearchAction.java
r191 r207 9 9 10 10 import javax.swing.ButtonGroup; 11 import javax.swing.JCheckBox; 11 12 import javax.swing.JLabel; 12 13 import javax.swing.JOptionPane; … … 51 52 bg.add(add); 52 53 bg.add(remove); 54 55 JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), false); 53 56 54 57 JPanel p = new JPanel(new GridBagLayout()); … … 57 60 p.add(replace, GBC.eol()); 58 61 p.add(add, GBC.eol()); 59 p.add(remove, GBC.eol()); 62 p.add(remove, GBC.eop()); 63 p.add(caseSensitive, GBC.eol()); 60 64 JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null){ 61 65 @Override public void selectInitialValue() { … … 69 73 lastSearch = input.getText(); 70 74 SearchAction.SearchMode mode = replace.isSelected() ? SearchAction.SearchMode.replace : (add.isSelected() ? SearchAction.SearchMode.add : SearchAction.SearchMode.remove); 71 search(lastSearch, mode );75 search(lastSearch, mode, caseSensitive.isSelected()); 72 76 } 73 77 74 public static void search(String search, SearchMode mode ) {78 public static void search(String search, SearchMode mode, boolean caseSensitive) { 75 79 if (search.startsWith("http://") || search.startsWith("ftp://") || search.startsWith("https://") || search.startsWith("file:/")) { 76 80 SelectionWebsiteLoader loader = new SelectionWebsiteLoader(search, mode); … … 81 85 } 82 86 Collection<OsmPrimitive> sel = Main.ds.getSelected(); 83 SearchCompiler.Match matcher = SearchCompiler.compile(search );87 SearchCompiler.Match matcher = SearchCompiler.compile(search, caseSensitive); 84 88 for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) { 85 89 if (mode == SearchMode.replace) {
Note:
See TracChangeset
for help on using the changeset viewer.