Changeset 15893 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2020-02-22T13:50:02+01:00 (5 years ago)

Author:

simon04

Message:

Fix SearchCompilerTest.testEqualsContract

Location:

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

Files:

• AutoFilterManager.java (modified) (1 diff)
• AutoFilterRule.java (modified) (1 diff)

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

@@ -159 +159 @@
         @Override
         public SearchCompiler.Match get() {
-            return new SearchCompiler.Match() {
-                @Override
-                public boolean match(OsmPrimitive osm) {
-                    return rule.getTagValuesForPrimitive(osm).anyMatch(v -> v == value);
-                }
-            };
+            return new Match(rule, value);
+        }
+    }
+
+    static class Match extends SearchCompiler.Match {
+        final AutoFilterRule rule;
+        final int value;
+
+        Match(AutoFilterRule rule, int value) {
+            this.rule = rule;
+            this.value = value;
+        }
+
+        @Override
+        public boolean match(OsmPrimitive osm) {
+            return rule.getTagValuesForPrimitive(osm).anyMatch(v -> v == value);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Match match = (Match) o;
+            return value == match.value &&
+                    Objects.equals(rule, match.rule);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(rule, value);
         }
     }

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

@@ -192 +192 @@
 
     @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AutoFilterRule that = (AutoFilterRule) o;
+        return Objects.equals(key, that.key);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(key);
+    }
+
+    @Override
     public String toString() {
         return key + '[' + minZoomLevel + ']';