Ignore:
Timestamp:
2014-04-26T17:39:23+02:00 (5 years ago)
Author:
Don-vip
Message:

see #8465 - use diamond operator where applicable

Location:
trunk/src/org/openstreetmap/josm/data/gpx
Files:
6 edited

Legend:

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

    r6830 r7005  
    2626    public String creator;
    2727
    28     public final Collection<GpxTrack> tracks = new LinkedList<GpxTrack>();
    29     public final Collection<GpxRoute> routes = new LinkedList<GpxRoute>();
    30     public final Collection<WayPoint> waypoints = new LinkedList<WayPoint>();
     28    public final Collection<GpxTrack> tracks = new LinkedList<>();
     29    public final Collection<GpxRoute> routes = new LinkedList<>();
     30    public final Collection<WayPoint> waypoints = new LinkedList<>();
    3131
    3232    @SuppressWarnings("unchecked")
  • trunk/src/org/openstreetmap/josm/data/gpx/GpxRoute.java

    r6380 r7005  
    66
    77public class GpxRoute extends WithAttributes {
    8     public Collection<WayPoint> routePoints = new LinkedList<WayPoint>();
     8    public Collection<WayPoint> routePoints = new LinkedList<>();
    99}
  • trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrack.java

    r5681 r7005  
    1818
    1919    public ImmutableGpxTrack(Collection<Collection<WayPoint>> trackSegs, Map<String, Object> attributes) {
    20         List<GpxTrackSegment> newSegments = new ArrayList<GpxTrackSegment>();
     20        List<GpxTrackSegment> newSegments = new ArrayList<>();
    2121        for (Collection<WayPoint> trackSeg: trackSegs) {
    2222            if (trackSeg != null && !trackSeg.isEmpty()) {
     
    2424            }
    2525        }
    26         this.attr = Collections.unmodifiableMap(new HashMap<String, Object>(attributes));
     26        this.attr = Collections.unmodifiableMap(new HashMap<>(attributes));
    2727        this.segments = Collections.unmodifiableCollection(newSegments);
    2828        this.length = calculateLength();
  • trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java

    r6084 r7005  
    1515
    1616    public ImmutableGpxTrackSegment(Collection<WayPoint> wayPoints) {
    17         this.wayPoints = Collections.unmodifiableCollection(new ArrayList<WayPoint>(wayPoints));
     17        this.wayPoints = Collections.unmodifiableCollection(new ArrayList<>(wayPoints));
    1818        this.bounds = calculateBounds();
    1919        this.length = calculateLength();
  • trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

    r6895 r7005  
    137137    @Override
    138138    public List<String> getTemplateKeys() {
    139         return new ArrayList<String>(attr.keySet());
     139        return new ArrayList<>(attr.keySet());
    140140    }
    141141}
  • trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java

    r6830 r7005  
    1919     * The "attr" hash is used to store the XML payload (not only XML attributes!)
    2020     */
    21     public Map<String, Object> attr = new HashMap<String, Object>(0);
     21    public Map<String, Object> attr = new HashMap<>(0);
    2222
    2323    /**
Note: See TracChangeset for help on using the changeset viewer.