Changeset 6169 in josm

Timestamp:

2013-08-21T10:14:51+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8987 - Fix NPE and Findbugs/Sonar violations

Location:

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

Files:

• Coordinate.java (modified) (2 diffs)
• EastNorth.java (modified) (2 diffs)
• LatLon.java (modified) (2 diffs)

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

@@ -16 +16 @@
  * @since 6162
  */
-abstract class Coordinate implements Cloneable, Serializable {
+abstract class Coordinate implements Serializable {
 
     protected final double x;
@@ -105 +105 @@
         if (this == obj)
             return true;
-        if (getClass() != obj.getClass())
+        if (obj == null || getClass() != obj.getClass())
             return false;
         Coordinate other = (Coordinate) obj;

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

@@ -9 +9 @@
  * @author Imi
  */
-public class EastNorth extends Coordinate {
+public class EastNorth extends Coordinate implements Cloneable {
 
     public EastNorth(double east, double north) {
@@ -132 +132 @@
 
     @Override
-    public EastNorth clone() {
-        return new EastNorth(x, y);
+    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 {
+public class LatLon extends Coordinate implements Cloneable {
 
     /**
@@ -397 +397 @@
 
     @Override
-    public LatLon clone() {
-        return new LatLon(x, y);
+    public LatLon clone() throws CloneNotSupportedException {
+        return (LatLon) super.clone();
     }
 }