Changeset 15817 in josm for trunk/src

Timestamp:

2020-02-05T22:09:38+01:00 (5 years ago)

Author:

simon04

Message:

AutoFilter: avoid parsing value from CompiledFilter

Location:

trunk/src/org/openstreetmap/josm/gui/autofilter

Files:

• AutoFilter.java (modified) (4 diffs)
• AutoFilterManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilter.java

@@ -3 +3 @@
 
 import java.util.Objects;
-
-import org.openstreetmap.josm.data.osm.Filter;
 
 /**
@@ -13 +11 @@
     private final String label;
     private final String description;
-    private final Filter filter;
+    private final AutoFilterManager.CompiledFilter filter;
 
     /**
@@ -21 +19 @@
      * @param filter associated filter
      */
-    public AutoFilter(String label, String description, Filter filter) {
+    public AutoFilter(String label, String description, AutoFilterManager.CompiledFilter filter) {
         this.label = label;
         this.description = description;
@@ -47 +45 @@
      * @return the filter
      */
-    public Filter getFilter() {
+    public AutoFilterManager.CompiledFilter getFilter() {
         return filter;
     }

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java

@@ -149 +149 @@
             // Make sure current auto filter button remains visible even if no data is found, to allow user to disable it
             if (currentAutoFilter != null) {
-                values.add(currentAutoFilter.getFilter().text.split("=")[1]);
+                values.add(currentAutoFilter.getFilter().value);
             }
             if (!values.equals(buttons.keySet())) {
@@ -186 +186 @@
         MapView mapView = MainApplication.getMap().mapView;
         for (final String value : values.descendingSet()) {
-            Filter filter = new CompiledFilter(enabledRule.getKey(), value);
+            CompiledFilter filter = new CompiledFilter(enabledRule.getKey(), value);
             String label = enabledRule.getValueFormatter().apply(value);
             AutoFilter autoFilter = new AutoFilter(label, filter.text, filter);