Changeset 6173 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2013-08-22T00:33:32+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8987 - immutable coordinates (patch by shinigami)

Location:

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

Files:

• EastNorth.java (modified) (6 diffs)
• LatLon.java (modified) (6 diffs)

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

@@ -9 +9 @@
  * @author Imi
  */
-public class EastNorth extends Coordinate implements Cloneable {
+public class EastNorth extends Coordinate {
 
     public EastNorth(double east, double north) {
@@ -37 +37 @@
     public EastNorth interpolate(EastNorth en2, double proportion) {
         return new EastNorth(this.x + proportion * (en2.x - this.x),
-            this.y + proportion * (en2.y - this.y));
+                this.y + proportion * (en2.y - this.y));
     }
 
@@ -54 +54 @@
         return super.distance(en);
     }
-   
+
     /**
      * Returns the square of the euclidean distance from this {@code EastNorth} to a specified {@code EastNorth}.
@@ -74 +74 @@
         return Math.sqrt(x*x + y*y);
     }
-    
+
     /**
      * Returns the heading, in radians, that you have to use to get from
@@ -84 +84 @@
     public double heading(EastNorth other) {
         double hd = Math.atan2(other.east() - east(), other.north() - north());
-        if(hd < 0) hd = 2 * Math.PI + hd;
+        if(hd < 0) {
+            hd = 2 * Math.PI + hd;
+        }
         return hd;
     }
@@ -130 +132 @@
         return (Math.abs(x - other.x) < e && Math.abs(y - other.y) < e);
     }
-
-    @Override
-    public EastNorth clone() throws CloneNotSupportedException {
-        return (EastNorth) super.clone();
-    }
 }

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

@@ -26 +26 @@
  * @author Imi
  */
-public class LatLon extends Coordinate implements Cloneable {
+public class LatLon extends Coordinate {
 
     /**
@@ -158 +158 @@
     }
 
-    public LatLon(LatLon coor) {
+    protected LatLon(LatLon coor) {
         super(coor.lon(), coor.lat());
     }
@@ -222 +222 @@
 
     /**
-     * Check if this is contained in given area or area is null. 
+     * Check if this is contained in given area or area is null.
      * 
      * @param a Area
-     * @return <code>true</code> if this is contained in given area or area is null. 
+     * @return <code>true</code> if this is contained in given area or area is null.
      */
     public boolean isIn(Area a) {
@@ -306 +306 @@
         return super.distance(ll);
     }
-   
+
     /**
      * Returns the square of the euclidean distance from this {@code LatLon} to a specified {@code LatLon}.
@@ -317 +317 @@
         return super.distanceSq(ll);
     }
-    
+
     @Override public String toString() {
         return "LatLon[lat="+lat()+",lon="+lon()+"]";
@@ -395 +395 @@
         return true;
     }
-
-    @Override
-    public LatLon clone() throws CloneNotSupportedException {
-        return (LatLon) super.clone();
-    }
 }