Changeset 34616 in osm for applications/viewer/jmapviewer/src/org

Timestamp:

2018-09-02T19:25:17+02:00 (6 years ago)

Author:

donvip

Message:

fix error-prone warnings

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• Coordinate.java (modified) (2 diffs)
• Projected.java (modified) (1 diff)
• Tile.java (modified) (3 diffs)
• interfaces/ICoordinate.java (modified) (1 diff)
• tilesources/ScanexTileSource.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Coordinate.java

@@ -20 +20 @@
     private transient Point2D.Double data;
 
+    /**
+     * Constructs a new {@code Coordinate}.
+     * @param lat latitude in degrees
+     * @param lon longitude in degrees
+     */
     public Coordinate(double lat, double lon) {
         data = new Point2D.Double(lon, lat);
@@ -62 +67 @@
     @Override
     public int hashCode() {
-        int hash = 3;
-        hash = 61 * hash + Objects.hashCode(this.data);
-        return hash;
+        return Objects.hashCode(data);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
+        if (this == obj)
+            return true;
+        if (obj == null || !(obj instanceof Coordinate))
             return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
         final Coordinate other = (Coordinate) obj;
-        return Objects.equals(this.data, other.data);
+        return Objects.equals(data, other.data);
     }
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Projected.java

@@ -53 +53 @@
     @Override
     public int hashCode() {
-        int hash = 3;
-        hash = 61 * hash + Objects.hashCode(this.data);
-        return hash;
+        return Objects.hashCode(data);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
+        if (this == obj)
+            return true;
+        if (obj == null || !(obj instanceof Projected))
             return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
         final Projected other = (Projected) obj;
-        return Objects.equals(this.data, other.data);
+        return Objects.equals(data, other.data);
     }
 }
-

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java

@@ -10 +10 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.Callable;
 
@@ -340 +341 @@
         if (this == obj)
             return true;
-        if (obj == null)
+        if (obj == null || !(obj instanceof Tile))
             return false;
-        if (getClass() != obj.getClass())
-            return false;
-        Tile other = (Tile) obj;
-        if (xtile != other.xtile)
-            return false;
-        if (ytile != other.ytile)
-            return false;
-        if (zoom != other.zoom)
-            return false;
-        return getTileSource().equals(other.getTileSource());
+        final Tile other = (Tile) obj;
+        return xtile == other.xtile
+            && ytile == other.ytile
+            && zoom == other.zoom
+            && Objects.equals(source, other.source);
     }
 
@@ -460 +456 @@
         loaded = false;
     }
-
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/ICoordinate.java

@@ -2 +2 @@
 package org.openstreetmap.gui.jmapviewer.interfaces;
 
+/**
+ * Latitude/Longitude coordinates.
+ */
 public interface ICoordinate {
 
+    /**
+     * Returns latitude.
+     * @return latitude in degrees
+     */
     double getLat();
 
+    /**
+     * Sets latitude.
+     * @param lat latitude in degrees
+     */
     void setLat(double lat);
 
+    /**
+     * Returns longitude.
+     * @return longitude in degrees
+     */
     double getLon();
 
+    /**
+     * Sets longitude.
+     * @param lon longitude in degrees
+     */
     void setLon(double lon);
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java

@@ -190 +190 @@
             ec * Math.pow(Math.tan(Math.PI/4 + Math.asin(E * sinl)/2), E);
         double df = 1/(1 - sinl) - ec * E * cosl/((1 - E * sinl) *
-            (Math.sqrt(1 - E * E * sinl * sinl)));
+            Math.sqrt(1 - E * E * sinl * sinl));
 
         return f/df;