Changeset 2212 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

Timestamp:

2009-09-29T07:11:39+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3603: Grammar error in search message

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (7 diffs)

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

@@ -61 +61 @@
         }
         SearchSetting se = showSearchDialog(s);
-        if(se != null) searchWithHistory(se);
+        if(se != null) {
+            searchWithHistory(se);
+        }
     }
 
@@ -126 +128 @@
                 Main.parent,
                 initialValues instanceof Filter ? tr("Filter") : tr("Search"),
-                new String[] {
-                   initialValues instanceof Filter ? tr("Submit filter") : tr("Start Search"),
-                tr("Cancel")}
+                        new String[] {
+                    initialValues instanceof Filter ? tr("Submit filter") : tr("Start Search"),
+                            tr("Cancel")}
         );
         dialog.setButtonIcons(new String[] {"dialogs/search.png", "cancel.png"});
@@ -140 +142 @@
         SearchMode mode = replace.isSelected() ? SearchAction.SearchMode.replace
                 : (add.isSelected() ? SearchAction.SearchMode.add
-                : (remove.isSelected() ? SearchAction.SearchMode.remove : SearchAction.SearchMode.in_selection));
+                        : (remove.isSelected() ? SearchAction.SearchMode.remove : SearchAction.SearchMode.in_selection));
         initialValues.text = input.getText();
         initialValues.mode = mode;
@@ -171 +173 @@
 
     public interface Function{
-       public Boolean isSomething(OsmPrimitive o);
+        public Boolean isSomething(OsmPrimitive o);
     }
 
@@ -179 +181 @@
             String searchText = s.text;
             if(s instanceof Filter){
-               searchText = "(" + s.text + ")" + (((Filter)s).applyForChildren ? ("| child (" + s.text + ")"): "");
-               searchText = (((Filter)s).inverted ? "-" : "") + "(" +  searchText + ")";
+                searchText = "(" + s.text + ")" + (((Filter)s).applyForChildren ? ("| child (" + s.text + ")"): "");
+                searchText = (((Filter)s).inverted ? "-" : "") + "(" +  searchText + ")";
             }
             /*System.out.println(searchText);*/
@@ -215 +217 @@
         return foundMatches;
     }
- 
+
     public static void search(String search, SearchMode mode, boolean caseSensitive, boolean regexSearch) {
-       search(new SearchSetting(search, mode, caseSensitive, regexSearch));
+        search(new SearchSetting(search, mode, caseSensitive, regexSearch));
     }
 
@@ -233 +235 @@
         //            }
         //        }
-         
-       Collection<OsmPrimitive> 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));
-       }
+
+        Collection<OsmPrimitive> 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 found 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));
+        }
     }