Changeset 14932 in josm for trunk/src/org

Timestamp:

2019-03-26T00:07:36+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15051, fix #17522 - crash in filter dialog caused by r14927 (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (1 diff)
• data/osm/Filter.java (modified) (1 diff)
• gui/dialogs/FilterDialog.java (modified) (3 diffs)

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

@@ -173 +173 @@
      * @param initialValues A set of initial values needed in order to initialize the search dialog.
      *                      If is {@code null}, then default settings are used.
-     * @return Returns {@link SearchAction} object containing parameters of the search.
+     * @return Returns new {@link SearchSetting} object containing parameters of the search.
      */
     public static SearchSetting showSearchDialog(SearchSetting initialValues) {

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

@@ -44 +44 @@
         super();
         mode = SearchMode.add;
+    }
+
+    /**
+     * Constructs a new {@code Filter} from a {@code SearchSetting}
+     * @param setting {@code SearchSetting} to construct information from
+     * @since 14932
+     */
+    public Filter(SearchSetting setting) {
+        super(setting);
     }
 

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

@@ -41 +41 @@
 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;
@@ -142 +143 @@
             @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));
                 }
             }
@@ -160 +161 @@
                 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));
                 }
             }