Changeset 12164 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-05-15T16:04:38+02:00 (7 years ago)

Author:

michael2402

Message:

Added missing ILatLon.java file.

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• coor/ILatLon.java (added)
• gpx/GpxData.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -40 +40 @@
     public String creator;
 
-    private ArrayList<GpxTrack> privateTracks = new ArrayList<>();
-    private ArrayList<GpxRoute> privateRoutes = new ArrayList<>();
-    private ArrayList<WayPoint> privateWaypoints = new ArrayList<>();
+    private final ArrayList<GpxTrack> privateTracks = new ArrayList<>();
+    private final ArrayList<GpxRoute> privateRoutes = new ArrayList<>();
+    private final ArrayList<WayPoint> privateWaypoints = new ArrayList<>();
     private final GpxTrackChangeListener proxy = e -> fireInvalidate();
 
@@ -580 +580 @@
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((dataSources == null) ? 0 : dataSources.hashCode());
-        result = prime * result + ((routes == null) ? 0 : routes.hashCode());
-        result = prime * result + ((tracks == null) ? 0 : tracks.hashCode());
-        result = prime * result + ((waypoints == null) ? 0 : waypoints.hashCode());
+        result = prime * result + dataSources.hashCode();
+        result = prime * result + privateRoutes.hashCode();
+        result = prime * result + privateTracks.hashCode();
+        result = prime * result + privateWaypoints.hashCode();
         return result;
     }
@@ -601 +601 @@
         } else if (!dataSources.equals(other.dataSources))
             return false;
-        if (routes == null) {
-            if (other.routes != null)
+        if (privateRoutes == null) {
+            if (other.privateRoutes != null)
                 return false;
-        } else if (!routes.equals(other.routes))
+        } else if (!privateRoutes.equals(other.privateRoutes))
             return false;
-        if (tracks == null) {
-            if (other.tracks != null)
+        if (privateTracks == null) {
+            if (other.privateTracks != null)
                 return false;
-        } else if (!tracks.equals(other.tracks))
+        } else if (!privateTracks.equals(other.privateTracks))
             return false;
-        if (waypoints == null) {
-            if (other.waypoints != null)
+        if (privateWaypoints == null) {
+            if (other.privateWaypoints != null)
                 return false;
-        } else if (!waypoints.equals(other.waypoints))
+        } else if (!privateWaypoints.equals(other.privateWaypoints))
             return false;
         return true;