Changeset 7020 in josm for trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

Timestamp:

2014-04-29T01:09:09+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - fix remaining compilation warnings

File:

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

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

@@ -30 +30 @@
     public final Collection<WayPoint> waypoints = new LinkedList<>();
 
-    @SuppressWarnings("unchecked")
     public void mergeFrom(GpxData other) {
         if (storageFile == null && other.storageFile != null) {
@@ -41 +40 @@
             String k = ent.getKey();
             if (k.equals(META_LINKS) && attr.containsKey(META_LINKS)) {
-                ((Collection<GpxLink>) attr.get(META_LINKS)).addAll(
-                        (Collection<GpxLink>) ent.getValue());
+                @SuppressWarnings("unchecked")
+                Collection<GpxLink> my = (Collection<GpxLink>) attr.get(META_LINKS);
+                @SuppressWarnings("unchecked")
+                Collection<GpxLink> their = (Collection<GpxLink>) ent.getValue();
+                my.addAll(their);
             } else {
                 attr.put(k, ent.getValue());