Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/data/gpx

Timestamp:

2014-04-26T17:39:23+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

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

Files:

• GpxData.java (modified) (1 diff)
• GpxRoute.java (modified) (1 diff)
• ImmutableGpxTrack.java (modified) (2 diffs)
• ImmutableGpxTrackSegment.java (modified) (1 diff)
• WayPoint.java (modified) (1 diff)
• WithAttributes.java (modified) (1 diff)

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

@@ -26 +26 @@
     public String creator;
 
-    public final Collection<GpxTrack> tracks = new LinkedList<GpxTrack>();
-    public final Collection<GpxRoute> routes = new LinkedList<GpxRoute>();
-    public final Collection<WayPoint> waypoints = new LinkedList<WayPoint>();
+    public final Collection<GpxTrack> tracks = new LinkedList<>();
+    public final Collection<GpxRoute> routes = new LinkedList<>();
+    public final Collection<WayPoint> waypoints = new LinkedList<>();
 
     @SuppressWarnings("unchecked")

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

@@ -6 +6 @@
 
 public class GpxRoute extends WithAttributes {
-    public Collection<WayPoint> routePoints = new LinkedList<WayPoint>();
+    public Collection<WayPoint> routePoints = new LinkedList<>();
 }

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

@@ -18 +18 @@
 
     public ImmutableGpxTrack(Collection<Collection<WayPoint>> trackSegs, Map<String, Object> attributes) {
-        List<GpxTrackSegment> newSegments = new ArrayList<GpxTrackSegment>();
+        List<GpxTrackSegment> newSegments = new ArrayList<>();
         for (Collection<WayPoint> trackSeg: trackSegs) {
             if (trackSeg != null && !trackSeg.isEmpty()) {
@@ -24 +24 @@
             }
         }
-        this.attr = Collections.unmodifiableMap(new HashMap<String, Object>(attributes));
+        this.attr = Collections.unmodifiableMap(new HashMap<>(attributes));
         this.segments = Collections.unmodifiableCollection(newSegments);
         this.length = calculateLength();

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

@@ -15 +15 @@
 
     public ImmutableGpxTrackSegment(Collection<WayPoint> wayPoints) {
-        this.wayPoints = Collections.unmodifiableCollection(new ArrayList<WayPoint>(wayPoints));
+        this.wayPoints = Collections.unmodifiableCollection(new ArrayList<>(wayPoints));
         this.bounds = calculateBounds();
         this.length = calculateLength();

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

@@ -137 +137 @@
     @Override
     public List<String> getTemplateKeys() {
-        return new ArrayList<String>(attr.keySet());
+        return new ArrayList<>(attr.keySet());
     }
 }

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

@@ -19 +19 @@
      * The "attr" hash is used to store the XML payload (not only XML attributes!)
      */
-    public Map<String, Object> attr = new HashMap<String, Object>(0);
+    public Map<String, Object> attr = new HashMap<>(0);
 
     /**