Changeset 33286 in osm

Timestamp:

2017-05-01T16:56:02+02:00 (8 years ago)

Author:

donvip

Message:

sonar - fix various issues

Location:

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

Files:

• Coordinate.java (modified) (1 diff)
• MapPolygonImpl.java (modified) (3 diffs)
• Projected.java (modified) (1 diff)
• Tile.java (modified) (3 diffs)
• tilesources/TMSTileSource.java (modified) (1 diff)

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

@@ -76 +76 @@
         }
         final Coordinate other = (Coordinate) obj;
-        if (!Objects.equals(this.data, other.data)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(this.data, other.data);
     }
 }

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

@@ -22 +22 @@
     private List<? extends ICoordinate> points;
 
-    public MapPolygonImpl(ICoordinate ... points) {
+    public MapPolygonImpl(ICoordinate... points) {
         this(null, null, points);
     }
@@ -34 +34 @@
     }
 
-    public MapPolygonImpl(String name, ICoordinate ... points) {
+    public MapPolygonImpl(String name, ICoordinate... points) {
         this(null, name, points);
     }
@@ -46 +46 @@
     }
 
-    public MapPolygonImpl(Layer layer, String name, ICoordinate ... points) {
+    public MapPolygonImpl(Layer layer, String name, ICoordinate... points) {
         this(layer, name, Arrays.asList(points), getDefaultStyle());
     }

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

@@ -67 +67 @@
         }
         final Projected other = (Projected) obj;
-        if (!Objects.equals(this.data, other.data)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(this.data, other.data);
     }
 }

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

@@ -4 +4 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Point;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
@@ -303 +302 @@
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder("Tile ").append(key);
+        StringBuilder sb = new StringBuilder(35).append("Tile ").append(key);
         if (loading) {
             sb.append(" [LOADING...]");
@@ -352 +351 @@
         if (zoom != other.zoom)
             return false;
-        if (!getTileSource().equals(other.getTileSource())) {
-            return false;
-        }
-        return true;
+        return getTileSource().equals(other.getTileSource());
     }
 

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

@@ -91 +91 @@
         double mercatorWidth = 2 * Math.PI * OsmMercator.EARTH_RADIUS;
         double f = mercatorWidth * getTileSize() / osmMercator.getMaxPixels(zoom);
-        return new TileXY((p.getEast() + mercatorWidth / 2) / f , (-p.getNorth() + mercatorWidth / 2) / f);
+        return new TileXY((p.getEast() + mercatorWidth / 2) / f, (-p.getNorth() + mercatorWidth / 2) / f);
     }