Ticket #3475: improvements.diff

Index: src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 2125)
+++ src/org/openstreetmap/josm/actions/search/SearchAction.java (working copy)
@@ -82,15 +82,6 @@
         JCheckBox regexSearch   = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
 
         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());
@@ -135,7 +126,7 @@
                 Main.parent,
                 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")}
         );
         dialog.setButtonIcons(new String[] {"dialogs/search.png", "cancel.png"});
@@ -150,7 +141,7 @@
                 : (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());
+           return new Filter(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected());
         } else {
            return new SearchSetting(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected());
         }
Index: src/org/openstreetmap/josm/data/osm/Filters.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/Filters.java    (revision 2125)
+++ src/org/openstreetmap/josm/data/osm/Filters.java    (working copy)
@@ -133,7 +133,7 @@
    }
 
    public String getColumnName(int column){
-      String[] names = { tr("F"), tr("D"), tr("Name"), tr("C"), tr("I"), tr("M") };
+      String[] names = { tr("F"), tr("D"), tr("Text"), tr("C"), tr("I"), tr("M") };
       return names[column];
    }
 
@@ -158,7 +158,7 @@
                  savePref(row);
                  filter();
                  return;
-         case 2: f.filterName = (String)aValue;
+         case 2: f.text = (String)aValue;
                  savePref(row);
                  return;
          case 3: f.applyForChildren = (Boolean)aValue;
@@ -177,15 +177,15 @@
       switch(column){
          case 0: return f.filtered;
          case 1: return f.disabled;
-         case 2: return f.filterName;
+         case 2: return f.text;
          case 3: return f.applyForChildren;
          case 4: return f.inverted;
          case 5:
                  switch(f.mode){
-                    case replace: return "∅";
-                    case add: return "∪";
-                    case remove: return "∖";
-                    case in_selection: return "∩";
+                    case replace: return tr("R");
+                    case add: return tr("A");
+                    case remove: return tr("D");
+                    case in_selection: return tr("F");
                  }
       }
       return null;
Index: src/org/openstreetmap/josm/data/osm/Filter.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/Filter.java     (revision 2125)
+++ src/org/openstreetmap/josm/data/osm/Filter.java     (working copy)
@@ -10,7 +10,6 @@
  */
 public class Filter extends SearchSetting {
    private final String version = "1";
-   public String filterName = "";
    public Boolean filtered = false;
    public Boolean disabled = true;
    public Boolean inverted = false;
@@ -18,9 +17,8 @@
    public Filter() {
        super("", SearchMode.add, false, false);
    }
-   public Filter(String text, SearchMode mode, boolean caseSensitive, boolean regexSearch, String filterName) {
+   public Filter(String text, SearchMode mode, boolean caseSensitive, boolean regexSearch) {
        super(text, mode, caseSensitive, regexSearch);
-       this.filterName = filterName;
    }
 
    public Filter(String prefText){
@@ -35,7 +33,6 @@
       if(prfs[2].equals("in_selection")) mode = SearchMode.in_selection;
       caseSensitive = Boolean.parseBoolean(prfs[3]);
       regexSearch = Boolean.parseBoolean(prfs[4]);
-      filterName = prfs[5];
       filtered = Boolean.parseBoolean(prfs[6]);
       disabled = Boolean.parseBoolean(prfs[7]);
       inverted = Boolean.parseBoolean(prfs[8]);
@@ -46,7 +43,7 @@
    public String getPrefString(){
       return version + ";" + 
           text + ";" + mode + ";" + caseSensitive + ";" + regexSearch + ";" +
-          filterName + ";" + filtered + ";" + disabled + ";" + 
+          "legacy" + ";" + filtered + ";" + disabled + ";" + 
           inverted + ";" + applyForChildren;
    }
 }