Changeset 207 in josm for src/org/openstreetmap/josm/actions/search

Timestamp:

2007-04-03T17:46:00+02:00 (19 years ago)

Author:

imi

Message:

• added "case sensitive" option to search dialog
• added a plugin manifest option "Plugin-Stage" to specify boot stage order (default is 50, smaller first)

Location:

src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (5 diffs)
• SearchCompiler.java (modified) (5 diffs)

src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -9 +9 @@
 
 import javax.swing.ButtonGroup;
+import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -51 +52 @@
         bg.add(add);
         bg.add(remove);
+        
+        JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), false);
     
         JPanel p = new JPanel(new GridBagLayout());
@@ -57 +60 @@
         p.add(replace, GBC.eol());
         p.add(add, GBC.eol());
-        p.add(remove, GBC.eol());
+        p.add(remove, GBC.eop());
+        p.add(caseSensitive, GBC.eol());
         JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null){
                 @Override public void selectInitialValue() {
@@ -69 +73 @@
         lastSearch = input.getText();
         SearchAction.SearchMode mode = replace.isSelected() ? SearchAction.SearchMode.replace : (add.isSelected() ? SearchAction.SearchMode.add : SearchAction.SearchMode.remove);
-        search(lastSearch, mode);
+        search(lastSearch, mode, caseSensitive.isSelected());
     }
 
-        public static void search(String search, SearchMode mode) {
+        public static void search(String search, SearchMode mode, boolean caseSensitive) {
         if (search.startsWith("http://") || search.startsWith("ftp://") || search.startsWith("https://") || search.startsWith("file:/")) {
                 SelectionWebsiteLoader loader = new SelectionWebsiteLoader(search, mode);
@@ -81 +85 @@
         }
         Collection<OsmPrimitive> sel = Main.ds.getSelected();
-        SearchCompiler.Match matcher = SearchCompiler.compile(search);
+        SearchCompiler.Match matcher = SearchCompiler.compile(search, caseSensitive);
         for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
                 if (mode == SearchMode.replace) {

src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -17 +17 @@
 public class SearchCompiler {
 
+        boolean caseSensitive = false;
+        
         abstract public static class Match {
                 abstract public boolean match(OsmPrimitive osm);
@@ -65 +67 @@
         }
 
-        private static class KeyValue extends Match {
+        private class KeyValue extends Match {
                 private String key;
                 private String value;
@@ -78 +80 @@
                         if (value == null)
                                 return notValue;
-                        return (value.toLowerCase().indexOf(this.value.toLowerCase()) != -1) != notValue;
+                        String v1 = caseSensitive ? value : value.toLowerCase();
+                        String v2 = caseSensitive ? this.value : this.value.toLowerCase();
+                        return (v1.indexOf(v2) != -1) != notValue;
                 }
                 @Override public String toString() {return key+"="+(notValue?"!":"")+value;}
         }
 
-        private static class Any extends Match {
+        private class Any extends Match {
                 private String s;
                 public Any(String s) {this.s = s;}
@@ -89 +93 @@
                         if (osm.keys == null)
                                 return s.equals("");
-                        for (Entry<String, String> e : osm.keys.entrySet())
-                                if (e.getKey().toLowerCase().indexOf(s.toLowerCase()) != -1 
-                                                || e.getValue().toLowerCase().indexOf(s.toLowerCase()) != -1)
+                        for (Entry<String, String> e : osm.keys.entrySet()) {
+                                String key = caseSensitive ? e.getKey() : e.getKey().toLowerCase();
+                                String value = caseSensitive ? e.getValue() : e.getValue().toLowerCase();
+                                String search = caseSensitive ? s : s.toLowerCase();
+                                if (key.indexOf(search) != -1 || value.indexOf(search) != -1)
                                         return true;
+                        }
                         return false;
                 }
@@ -134 +141 @@
         }
         
-        public static Match compile(String searchStr) {
-                return new SearchCompiler().parse(new PushbackReader(new StringReader(searchStr)));
+        public static Match compile(String searchStr, boolean caseSensitive) {
+                SearchCompiler searchCompiler = new SearchCompiler();
+                searchCompiler.caseSensitive = caseSensitive;
+                return searchCompiler.parse(new PushbackReader(new StringReader(searchStr)));
         }