Ignore:
Timestamp:
2014-04-29T01:09:09+02:00 (5 years ago)
Author:
Don-vip
Message:

see #8465 - fix remaining compilation warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

    r7005 r7020  
    3030    public final Collection<WayPoint> waypoints = new LinkedList<>();
    3131
    32     @SuppressWarnings("unchecked")
    3332    public void mergeFrom(GpxData other) {
    3433        if (storageFile == null && other.storageFile != null) {
     
    4140            String k = ent.getKey();
    4241            if (k.equals(META_LINKS) && attr.containsKey(META_LINKS)) {
    43                 ((Collection<GpxLink>) attr.get(META_LINKS)).addAll(
    44                         (Collection<GpxLink>) ent.getValue());
     42                @SuppressWarnings("unchecked")
     43                Collection<GpxLink> my = (Collection<GpxLink>) attr.get(META_LINKS);
     44                @SuppressWarnings("unchecked")
     45                Collection<GpxLink> their = (Collection<GpxLink>) ent.getValue();
     46                my.addAll(their);
    4547            } else {
    4648                attr.put(k, ent.getValue());
Note: See TracChangeset for help on using the changeset viewer.