Ticket #17522: 17522.patch

src/org/openstreetmap/josm/data/osm/Filter.java

@@ -46 +46 @@
     }
 
     /**
+     * Constructs a new {@code Filter} from a {@code SearchSetting}
+     * @param setting {@code SearchSetting} to construct information from
+     * @since xxx
+     */
+    public Filter(SearchSetting setting) {
+        super(setting);
+    }
+
+    /**
      * Constructs a new {@code Filter} from a preference entry.
      * @param e preference entry
      */

src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -40 +40 @@
 import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.data.osm.search.SearchSetting;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener;
@@ -141 +142 @@
 
             @Override
             public void actionPerformed(ActionEvent e) {
-                Filter filter = (Filter) SearchAction.showSearchDialog(new Filter());
-                if (filter != null) {
-                    filterModel.addFilter(filter);
+                SearchSetting searchSetting = SearchAction.showSearchDialog(new Filter());
+                if (searchSetting != null) {
+                    filterModel.addFilter(new Filter(searchSetting));
                 }
             }
         });
@@ -159 +160 @@
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
                 if (index < 0) return;
                 Filter f = filterModel.getFilter(index);
-                Filter filter = (Filter) SearchAction.showSearchDialog(f);
-                if (filter != null) {
-                    filterModel.setFilter(index, filter);
+                SearchSetting searchSetting = SearchAction.showSearchDialog(f);
+                if (searchSetting != null) {
+                    filterModel.setFilter(index, new Filter(searchSetting));
                 }
             }
         });