Changeset 7140 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java

Timestamp:

2014-05-18T15:47:10+02:00 (10 years ago)

Author:

Don-vip

Message:

fix compilation warnings with JDK8 - equals() and hashcode() must be overriden in pairs

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java

@@ -9 +9 @@
 /**
  * A MapCSS rule.
- * 
+ *
  * A MapCSS style is simply a list of MapCSS rules. Each rule has a selector
  * and a declaration. Whenever the selector matches the primitive, the
@@ -28 +28 @@
             this.idx = idx;
         }
-        
+
         /**
          * <p>Executes the instructions against the environment {@code env}</p>
@@ -39 +39 @@
             }
         }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + idx;
+            result = prime * result + ((instructions == null) ? 0 : instructions.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (!(obj instanceof Declaration))
+                return false;
+            Declaration other = (Declaration) obj;
+            if (idx != other.idx)
+                return false;
+            if (instructions == null) {
+                if (other.instructions != null)
+                    return false;
+            } else if (!instructions.equals(other.instructions))
+                return false;
+            return true;
+        }
     }
-    
+
     public MapCSSRule(Selector selector, Declaration declaration) {
         this.selector = selector;