Changeset 2129 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-09-14T11:37:34+02:00 (15 years ago)

Author:

stoecker

Message:

see #3475 - minor cleanup

File:

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

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

@@ -83 +83 @@
 
         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));
@@ -136 +127 @@
                 initialValues instanceof Filter ? tr("Filter") : tr("Search"),
                 new String[] {
-                   initialValues instanceof Filter ? tr("Make filter") : tr("Start Search"),
+                   initialValues instanceof Filter ? tr("Submit filter") : tr("Start Search"),
                 tr("Cancel")}
         );
@@ -151 +142 @@
                 : (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());
+           return new Filter(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected());
         } else {
            return new SearchSetting(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected());