Changeset 17130 in josm

Timestamp:

2020-10-08T23:32:32+02:00 (4 years ago)

Author:

simon04

Message:

see #16995 - Remove WayPoint.LegacyMap (to be removed mid 2019)

File:

• trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) (2 diffs)

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

@@ -64 +64 @@
      */
     public WayPoint(WayPoint p) {
-        attr = new LegacyMap();
+        attr = new HashMap<>();
         attr.putAll(p.attr);
         attr.put(PT_TIME, p.getDate());
@@ -82 +82 @@
      */
     public WayPoint(LatLon ll) {
-        attr = new LegacyMap();
+        attr = new HashMap<>();
         lat = ll.lat();
         lon = ll.lon();
-    }
-
-    /**
-     * Interim to detect legacy code that is not using {@code WayPoint.setTime(x)}
-     * functions, but {@code attr.put(PT_TIME, (String) x)} logic.
-     * To remove mid 2019
-     */
-    private static class LegacyMap extends HashMap<String, Object> {
-        private static final long serialVersionUID = 1;
-
-        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;
-        }
     }