Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/data/gpx

Timestamp:

2015-06-20T23:42:21+02:00 (10 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

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

Files:

• GpxConstants.java (modified) (1 diff)
• GpxData.java (modified) (4 diffs)
• GpxTrack.java (modified) (1 diff)
• GpxTrackSegment.java (modified) (1 diff)
• ImmutableGpxTrack.java (modified) (1 diff)
• ImmutableGpxTrackSegment.java (modified) (1 diff)
• WayPoint.java (modified) (3 diffs)
• WithAttributes.java (modified) (2 diffs)

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

@@ -102 +102 @@
      * Possible fix values.
      */
-    public static Collection<String> FIX_VALUES = Arrays.asList("none","2d","3d","dgps","pps");
+    public static Collection<String> FIX_VALUES = Arrays.asList("none", "2d", "3d", "dgps", "pps");
 }

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

@@ -200 +200 @@
             }
         }
-        if (earliest==null || latest==null) return null;
+        if (earliest == null || latest == null) return null;
         return new Date[]{earliest.getTime(), latest.getTime()};
     }
@@ -212 +212 @@
     */
     public Date[] getMinMaxTimeForAllTracks() {
-        double min=1e100;
-        double max=-1e100;
+        double min = 1e100;
+        double max = -1e100;
         double now = System.currentTimeMillis()/1000.0;
         for (GpxTrack trk: tracks) {
@@ -219 +219 @@
                 for (WayPoint pnt : seg.getWayPoints()) {
                     double t = pnt.time;
-                    if (t>0 && t<=now) {
-                        if (t>max) max=t;
-                        if (t<min) min=t;
-                    }
-                }
-            }
-        }
-        if (Utils.equalsEpsilon(min,1e100) || Utils.equalsEpsilon(max,-1e100)) return new Date[0];
+                    if (t > 0 && t <= now) {
+                        if (t > max) max = t;
+                        if (t < min) min = t;
+                    }
+                }
+            }
+        }
+        if (Utils.equalsEpsilon(min, 1e100) || Utils.equalsEpsilon(max, -1e100)) return new Date[0];
         return new Date[]{new Date((long) (min * 1000)), new Date((long) (max * 1000))};
     }
@@ -363 +363 @@
     public void resetEastNorthCache() {
         if (waypoints != null) {
-            for (WayPoint wp : waypoints){
+            for (WayPoint wp : waypoints) {
                 wp.invalidateEastNorthCache();
             }
         }
-        if (tracks != null){
+        if (tracks != null) {
             for (GpxTrack track: tracks) {
                 for (GpxTrackSegment segment: track.getSegments()) {

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

@@ -14 +14 @@
 
     Collection<GpxTrackSegment> getSegments();
+
     Map<String, Object> getAttributes();
+
     Bounds getBounds();
+
     double length();
 

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

@@ -13 +13 @@
 
     Bounds getBounds();
+
     Collection<WayPoint> getWayPoints();
+
     double length();
+
     /**
      *

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

@@ -30 +30 @@
     }
 
-    private double calculateLength(){
+    private double calculateLength() {
         double result = 0.0; // in meters
 

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

@@ -36 +36 @@
         WayPoint last = null;
         for (WayPoint tpt : wayPoints) {
-            if(last != null){
+            if (last != null) {
                 Double d = last.getCoor().greatCircleDistance(tpt.getCoor());
-                if(!d.isNaN() && !d.isInfinite()) {
+                if (!d.isNaN() && !d.isInfinite()) {
                     result += d;
                 }

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

@@ -67 +67 @@
 
     public final LatLon getCoor() {
-        return new LatLon(lat,lon);
+        return new LatLon(lat, lon);
     }
 
@@ -95 +95 @@
     @Override
     public String toString() {
-        return "WayPoint (" + (attr.containsKey(GPX_NAME) ? get(GPX_NAME) + ", " :"") + getCoor() + ", " + attr + ")";
+        return "WayPoint (" + (attr.containsKey(GPX_NAME) ? get(GPX_NAME) + ", " : "") + getCoor() + ", " + attr + ")";
     }
 
@@ -105 +105 @@
             try {
                 time = dateParser.get().parse(get(PT_TIME).toString()).getTime() / 1000.; /* ms => seconds */
-            } catch(Exception e) {
+            } catch (Exception e) {
                 time = 0;
             }

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

@@ -44 +44 @@
     public String getString(String key) {
         Object value = attr.get(key);
-        return (value instanceof String) ? (String)value : null;
+        return (value instanceof String) ? (String) value : null;
     }
 
@@ -60 +60 @@
     public <T> Collection<T> getCollection(String key) {
         Object value = attr.get(key);
-        return (value instanceof Collection) ? (Collection<T>)value : null;
+        return (value instanceof Collection) ? (Collection<T>) value : null;
     }