Changeset 14202 in josm for trunk

Timestamp:

2018-08-29T20:50:13+02:00 (7 years ago)

Author:

Don-vip

Message:

spotbugs - more fixes

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -33 +33 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
@@ -190 +191 @@
         }
 
+        @Override
+        public int hashCode() {
+            return Objects.hash(order, osm, style, flags);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null || getClass() != obj.getClass())
+                return false;
+            StyleRecord other = (StyleRecord) obj;
+            return flags == other.flags
+                && order == other.order
+                && Objects.equals(osm, other.osm)
+                && Objects.equals(style, other.style);
+        }
+
         /**
          * Get the style for this style element.

trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java

@@ -36 +36 @@
      * Lat/Lon sample values for unit tests
      */
+    @SuppressFBWarnings(value = "MS_MUTABLE_COLLECTION")
     public static final List<Double> SAMPLE_VALUES = Arrays.asList(
             // CHECKSTYLE.OFF: SingleSpaceSeparator

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererTest.java

@@ -7 +7 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer.StyleRecord;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -70 +73 @@
     }
 
-    private long floatToFixedCheckBits(float number, int totalBits) {
+    private static long floatToFixedCheckBits(float number, int totalBits) {
         long result = StyleRecord.floatToFixed(number, totalBits);
         long shouldBeZero = result >> totalBits;
@@ -77 +80 @@
     }
 
+    /**
+     * Unit test of methods {@link StyleRecord#equals} and {@link StyleRecord#hashCode}.
+     */
+    @Test
+    public void testEqualsContract() {
+        EqualsVerifier.forClass(StyleRecord.class).usingGetClass()
+            .suppress(Warning.NONFINAL_FIELDS)
+            .verify();
+    }
 }