Changeset 15477 in josm for trunk

Timestamp:

2019-10-27T12:58:42+01:00 (4 years ago)

Author:

Don-vip

Message:

preserve filter attributes when editing an existing filter with non-default attributes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Filter.java (modified) (1 diff)
• gui/dialogs/FilterDialog.java (modified) (1 diff)

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

@@ -54 +54 @@
     public Filter(SearchSetting setting) {
         super(setting);
+    }
+
+    /**
+     * Constructs a new {@code Filter} from a {@code SearchSetting} and filter-specific fields from an existing Filter.
+     * @param setting {@code SearchSetting} to construct information from
+     * @param f {@code Filter} to construct filter-specific fields from
+     * @since 15477
+     */
+    public Filter(SearchSetting setting, Filter f) {
+        super(setting);
+        this.enable = f.enable;
+        this.hiding = f.hiding;
+        this.inverted = f.inverted;
     }
 

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

@@ -164 +164 @@
             SearchSetting searchSetting = SearchAction.showSearchDialog(f);
             if (searchSetting != null) {
-                filterModel.setValue(index, new Filter(searchSetting));
+                filterModel.setValue(index, new Filter(searchSetting, f));
             }
         }