Changeset 14212 in josm

Timestamp:

2018-08-31T23:45:00+02:00 (6 years ago)

Author:

Don-vip

Message:

sonarqube - various minor issues

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageEntryTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -327 +327 @@
     @Override
     public void otherDatasetChange(AbstractDatasetChangedEvent event) {
-        if (!DatasetEventType.FILTERS_CHANGED.equals(event.getType())) {
+        if (DatasetEventType.FILTERS_CHANGED != event.getType()) {
             filterModel.executeFilters();
         }

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

@@ -759 +759 @@
 
         @Override
-        public void layerRemoving(LayerRemoveEvent e) {}
-
-        @Override
-        public void layerOrderChanged(LayerOrderChangeEvent e) {}
+        public void layerRemoving(LayerRemoveEvent e) {
+            // Not used
+        }
+
+        @Override
+        public void layerOrderChanged(LayerOrderChangeEvent e) {
+            // Not used
+        }
     }
 

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

@@ -5 +5 @@
 import java.io.File;
 import java.util.Collections;
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.gpx.GpxImageEntry;
@@ -63 +64 @@
         }
     }
+
+    @Override
+    public int hashCode() {
+        return 31 * super.hashCode() + ((thumbnail == null) ? 0 : thumbnail.hashCode());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj) || getClass() != obj.getClass())
+            return false;
+        ImageEntry other = (ImageEntry) obj;
+        return Objects.equals(thumbnail, other.thumbnail);
+    }
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageEntryTest.java

@@ -8 +8 @@
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.gpx.GpxImageEntry;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -23 +27 @@
         assertNotNull(e.getExifTime());
     }
+
+    /**
+     * Unit test of methods {@link ImageEntry#equals} and {@link ImageEntry#hashCode}.
+     */
+    @Test
+    public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
+        EqualsVerifier.forClass(ImageEntry.class).usingGetClass()
+            .suppress(Warning.NONFINAL_FIELDS)
+            .withPrefabValues(GpxImageEntry.class, new GpxImageEntry(new File("foo")), new GpxImageEntry(new File("bar")))
+            .verify();
+    }
 }