Changes in / [6162:6168] in josm

Location:

/trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (3 diffs)
• coor/Coordinate.java (modified) (3 diffs)
• coor/EastNorth.java (modified) (2 diffs)
• coor/LatLon.java (modified) (3 diffs)

/trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -963 +963 @@
         List<List<String>> prop = arrayProperties.get(key);
         if (prop != null) {
-            @SuppressWarnings("unchecked")
+            @SuppressWarnings({ "unchecked", "rawtypes" })
             Collection<Collection<String>> prop_cast = (Collection) prop;
             return prop_cast;
@@ -974 +974 @@
         List<List<String>> prop = arrayProperties.get(key);
         if (prop != null) {
-            @SuppressWarnings("unchecked")
+            @SuppressWarnings({ "unchecked", "rawtypes" })
             Collection<Collection<String>> prop_cast = (Collection) prop;
             return prop_cast;
@@ -982 +982 @@
 
     public boolean putArray(String key, Collection<Collection<String>> value) {
-        boolean changed = false;
+        //boolean changed = false;
 
         List<List<String>> oldValue = null;

/trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java

@@ -14 +14 @@
  * EastNorth.
  *
- * @author imi
+ * @since 6162
  */
-abstract class Coordinate implements Serializable {
+abstract class Coordinate implements Cloneable, Serializable {
 
     protected final double x;
@@ -39 +39 @@
     }
 
+    /**
+     * Returns the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}.
+     * 
+     * @param coor the specified coordinate to be measured against this {@code Coordinate}
+     * @return the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}
+     * @since 6166
+     */
+    protected final double distance(final Coordinate coor) {
+        return distance(coor.x, coor.y);
+    }
+   
+    /**
+     * Returns the euclidean distance from this {@code Coordinate} to a specified coordinate.
+     * 
+     * @param px the X coordinate of the specified point to be measured against this {@code Coordinate}
+     * @param py the Y coordinate of the specified point to be measured against this {@code Coordinate}
+     * @return the euclidean distance from this {@code Coordinate} to a specified coordinate
+     * @since 6166
+     */
+    public final double distance(final double px, final double py) {
+        final double dx = this.x-px;
+        final double dy = this.y-py;
+        return Math.sqrt(dx*dx + dy*dy);
+    }
+   
+    /**
+     * Returns the square of the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}.
+     * 
+     * @param coor the specified coordinate to be measured against this {@code Coordinate}
+     * @return the square of the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}
+     * @since 6166
+     */
+    protected final double distanceSq(final Coordinate coor) {
+        return distanceSq(coor.x, coor.y);
+    }
+
+    /**
+     * Returns the square of euclidean distance from this {@code Coordinate} to a specified coordinate.
+     * 
+     * @param px the X coordinate of the specified point to be measured against this {@code Coordinate}
+     * @param py the Y coordinate of the specified point to be measured against this {@code Coordinate}
+     * @return the square of the euclidean distance from this {@code Coordinate} to a specified coordinate
+     * @since 6166
+     */
+    public final double distanceSq(final double px, final double py) {
+        final double dx = this.x-px;
+        final double dy = this.y-py;
+        return dx*dx + dy*dy;
+    }
+
     @Override
     public int hashCode() {
@@ -55 +105 @@
         if (this == obj)
             return true;
-        if (!super.equals(obj))
-            return false;
         if (getClass() != obj.getClass())
             return false;

/trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

@@ -45 +45 @@
 
     /**
-     * Counts euclidean distance between this and other EastNorth.
+     * Returns the euclidean distance from this {@code EastNorth} to a specified {@code EastNorth}.
      * 
-     * @param en2 other EastNorth
-     * @return distance between this and other EastNorth
+     * @param en the specified coordinate to be measured against this {@code EastNorth}
+     * @return the euclidean distance from this {@code EastNorth} to a specified {@code EastNorth}
+     * @since 6166
      */
-    public double distance(final EastNorth en2) {
-        final double dx = this.x-en2.x;
-        final double dy = this.y-en2.y;
-        return Math.sqrt(dx*dx + dy*dy);
+    public double distance(final EastNorth en) {
+        return super.distance(en);
     }
-
+   
     /**
-     * Counts square of euclidean distance between this and other EastNorth.
+     * Returns the square of the euclidean distance from this {@code EastNorth} to a specified {@code EastNorth}.
      * 
-     * @param en2 other EastNorth
-     * @return square of distance between this and other EastNorth
+     * @param en the specified coordinate to be measured against this {@code EastNorth}
+     * @return the square of the euclidean distance from this {@code EastNorth} to a specified {@code EastNorth}
+     * @since 6166
      */
-    public double distanceSq(final EastNorth en2) {
-        final double dx = this.x-en2.x;
-        final double dy = this.y-en2.y;
-        return dx*dx + dy*dy;
+    public double distanceSq(final EastNorth en) {
+        return super.distanceSq(en);
     }
 
@@ -132 +130 @@
         return (Math.abs(x - other.x) < e && Math.abs(y - other.y) < e);
     }
+
+    @Override
+    public EastNorth clone() {
+        return new EastNorth(x, y);
+    }
 }

/trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -27 +27 @@
  */
 public class LatLon extends Coordinate {
-
 
     /**
@@ -298 +297 @@
 
     /**
-     * Counts euclidean distance between this and other LatLon.
+     * Returns the euclidean distance from this {@code LatLon} to a specified {@code LatLon}.
      * 
-     * @param ll2 other LatLon
-     * @return distance between this and other LatLon
-     */
-   public double distance(final LatLon ll2) {
-        final double dx = this.x-ll2.x;
-        final double dy = this.y-ll2.y;
-        return Math.sqrt(dx*dx + dy*dy);
-    }
-
+     * @param ll the specified coordinate to be measured against this {@code LatLon}
+     * @return the euclidean distance from this {@code LatLon} to a specified {@code LatLon}
+     * @since 6166
+     */
+    public double distance(final LatLon ll) {
+        return super.distance(ll);
+    }
+   
+    /**
+     * Returns the square of the euclidean distance from this {@code LatLon} to a specified {@code LatLon}.
+     * 
+     * @param ll the specified coordinate to be measured against this {@code LatLon}
+     * @return the square of the euclidean distance from this {@code LatLon} to a specified {@code LatLon}
+     * @since 6166
+     */
+    public double distanceSq(final LatLon ll) {
+        return super.distanceSq(ll);
+    }
+    
     @Override public String toString() {
         return "LatLon[lat="+lat()+",lon="+lon()+"]";
@@ -386 +395 @@
         return true;
     }
+
+    @Override
+    public LatLon clone() {
+        return new LatLon(x, y);
+    }
 }