Changeset 86 in josm for src/org/openstreetmap/josm/data/coor

Timestamp:

2006-04-21T14:31:51+02:00 (19 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

Location:

src/org/openstreetmap/josm/data/coor

Files:

• Coordinate.java (modified) (1 diff)
• EastNorth.java (modified) (1 diff)
• LatLon.java (modified) (1 diff)

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

@@ -50 +50 @@
         }
 
-        @Override
-        public boolean equals(Object obj) {
+        @Override public boolean equals(Object obj) {
                 return obj instanceof Coordinate ? x == ((Coordinate)obj).x && ((Coordinate)obj).y == y : false;
         }
 
-        @Override
-        public int hashCode() {
+        @Override public int hashCode() {
                 return (int)(x*65536+y*4096);
         }

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

@@ -22 +22 @@
         }
         
-        @Override
-        public String toString() {
+        @Override public String toString() {
                 return "EastNorth[e="+x+", n="+y+"]";
         }

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

@@ -42 +42 @@
         }
 
-    @Override
-    public String toString() {
+    @Override public String toString() {
         return "LatLon[lat="+lat()+",lon="+lon()+"]";
     }