Changeset 14460 in josm for trunk/src/org

Timestamp:

2018-11-28T01:09:01+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16995 - fix spotbugs/pmd/sonar warnings

Location:

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

Files:

• GpxData.java (modified) (2 diffs)
• WayPoint.java (modified) (3 diffs)

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

@@ -693 +693 @@
         final LongSummaryStatistics statistics = trk.getSegments().stream()
                 .flatMap(seg -> seg.getWayPoints().stream())
-                .mapToLong(pnt -> pnt.getTimeInMillis())
+                .mapToLong(WayPoint::getTimeInMillis)
                 .summaryStatistics();
         return statistics.getCount() == 0
@@ -712 +712 @@
                 .flatMap(trk -> trk.getSegments().stream())
                 .flatMap(seg -> seg.getWayPoints().stream())
-                .mapToLong(pnt -> pnt.getTimeInMillis())
+                .mapToLong(WayPoint::getTimeInMillis)
                 .filter(t -> t > 0 && t <= now)
                 .summaryStatistics();

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

@@ -63 +63 @@
      */
     public WayPoint(WayPoint p) {
-        init_attr();
+        attr = new LegacyMap();
         attr.putAll(p.attr);
         attr.put(PT_TIME, p.getDate());
@@ -81 +81 @@
      */
     public WayPoint(LatLon ll) {
-        init_attr();
+        attr = new LegacyMap();
         lat = ll.lat();
         lon = ll.lon();
@@ -91 +91 @@
      * To remove mid 2019
      */
-    private void init_attr() {
-        attr = new HashMap<String, Object>(0) {
-            @Override
-            public Object put(String key, Object value) {
-                Object ret = null;
-                if (key != PT_TIME || (key == PT_TIME && value instanceof Date)) {
-                    ret = super.put(key, value);
-                } else {
-                    if (value instanceof String) {
-                        ret = super.put(PT_TIME, DateUtils.fromString((String) value));
-                        List<String> lastErrorAndWarnings = Logging.getLastErrorAndWarnings();
-                        if (!lastErrorAndWarnings.isEmpty() && !lastErrorAndWarnings.get(0).contains("calling WayPoint.put")) {
-                            StackTraceElement[] e = Thread.currentThread().getStackTrace();
-                            int n = 1;
-                            while (n < e.length && "put".equals(e[n].getMethodName())) {
-                                n++;
-                            }
-                            if (n < e.length) {
-                                Logging.warn("{0}:{1} calling WayPoint.put(PT_TIME, ..) is deprecated. " +
-                                    "Use WayPoint.setTime(..) instead.", e[n].getClassName(), e[n].getMethodName());
-                            }
-                        }
+    private static class LegacyMap extends HashMap<String, Object> {
+
+        LegacyMap() {
+            super(0);
+        }
+
+        @Override
+        public Object put(String key, Object value) {
+            Object ret = null;
+            if (!PT_TIME.equals(key) || value instanceof Date) {
+                ret = super.put(key, value);
+            } else if (value instanceof String) {
+                ret = super.put(PT_TIME, DateUtils.fromString((String) value));
+                List<String> lastErrorAndWarnings = Logging.getLastErrorAndWarnings();
+                if (!lastErrorAndWarnings.isEmpty() && !lastErrorAndWarnings.get(0).contains("calling WayPoint.put")) {
+                    StackTraceElement[] e = Thread.currentThread().getStackTrace();
+                    int n = 1;
+                    while (n < e.length && "put".equals(e[n].getMethodName())) {
+                        n++;
+                    }
+                    if (n < e.length) {
+                        Logging.warn("{0}:{1} calling WayPoint.put(PT_TIME, ..) is deprecated. " +
+                            "Use WayPoint.setTime(..) instead.", e[n].getClassName(), e[n].getMethodName());
                     }
                 }
-                return ret;
             }
-        };
+            return ret;
+        }
     }