Changeset 12432 in josm for trunk

Timestamp:

2017-06-25T11:53:30+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14929 - remember button pressed state

Location:

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

Files:

• AutoFilter.java (modified) (2 diffs)
• AutoFilterManager.java (modified) (1 diff)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.autofilter;
+
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.osm.Filter;
@@ -48 +50 @@
         return filter;
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(filter);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null || getClass() != obj.getClass())
+            return false;
+        AutoFilter other = (AutoFilter) obj;
+        return Objects.equals(filter, other.filter);
+    }
 }

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

@@ -141 +141 @@
             filter.text = enabledRule.getKey() + "=" + value;
             String label = enabledRule.getValueFormatter().apply(value);
-            AutoFilterButton button = new AutoFilterButton(new AutoFilter(label, filter.text, filter));
+            AutoFilter autoFilter = new AutoFilter(label, filter.text, filter);
+            AutoFilterButton button = new AutoFilterButton(autoFilter);
+            if (autoFilter.equals(currentAutoFilter)) {
+                button.getModel().setPressed(true);
+            }
             buttons.put(value, button);
             maxWidth = Math.max(maxWidth, button.getPreferredSize().width);