Changeset 18217 in josm for trunk

Timestamp:

2021-09-12T03:22:18+02:00 (3 years ago)

Author:

Don-vip

Message:

coverity - spotbugs - FB.EQ_DOESNT_OVERRIDE_EQUALS

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateCircleAction.java (modified) (2 diffs)
• gui/autofilter/AutoFilterManager.java (modified) (1 diff)
• gui/layer/geoimage/ImageDisplay.java (modified) (1 diff)
• gui/layer/geoimage/WikimediaCommonsEntry.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -12 +12 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 
 import javax.swing.JOptionPane;
@@ -113 +114 @@
         public int compareTo(PolarNode o) {
             return Double.compare(a, o.a);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(a, node);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null || getClass() != obj.getClass())
+                return false;
+            PolarNode other = (PolarNode) obj;
+            return Double.doubleToLongBits(a) == Double.doubleToLongBits(other.a) && Objects.equals(node, other.node);
         }
     }

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

@@ -161 +161 @@
             return new Match(rule, value);
         }
+
+        @Override
+        public int hashCode() {
+            return 31 * super.hashCode() + Objects.hash(rule, value);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (!super.equals(obj) || getClass() != obj.getClass())
+                return false;
+            CompiledFilter other = (CompiledFilter) obj;
+            return Objects.equals(rule, other.rule) && value == other.value;
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -242 +242 @@
             }
         }
+
+        @Override
+        public int hashCode() {
+            return 31 * super.hashCode() + Objects.hash(init);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (!super.equals(obj) || getClass() != obj.getClass())
+                return false;
+            VisRect other = (VisRect) obj;
+            return Objects.equals(init, other.init);
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/WikimediaCommonsEntry.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.geoimage;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Objects;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.Mediawiki;
-
-import java.net.MalformedURLException;
-import java.net.URL;
 
 /**
@@ -33 +34 @@
         return "File:" + title;
     }
+
+    @Override
+    public int hashCode() {
+        return 31 * super.hashCode() + Objects.hash(title);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj) || getClass() != obj.getClass())
+            return false;
+        WikimediaCommonsEntry other = (WikimediaCommonsEntry) obj;
+        return Objects.equals(title, other.title);
+    }
 }