Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java	(revision 30634)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java	(revision 30737)
@@ -12,8 +12,8 @@
 public class EditGpxData {
 
-    private final List<EditGpxTrack> tracks = new ArrayList<EditGpxTrack>();
+    private final List<EditGpxTrack> tracks = new ArrayList<>();
     // Only copy of routes and waypoints to preserve all info when converting back to gpx track
-    private final List<GpxRoute> routes = new ArrayList<GpxRoute>();
-    private final List<WayPoint> waypoints = new ArrayList<WayPoint>();
+    private final List<GpxRoute> routes = new ArrayList<>();
+    private final List<WayPoint> waypoints = new ArrayList<>();
 
     public void load(GpxData data) {
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java	(revision 30634)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java	(revision 30737)
@@ -19,6 +19,6 @@
 public class EditGpxTrack {
 
-    private final List<EditGpxTrackSegment> segments = new ArrayList<EditGpxTrackSegment>();
-    private final Map<String, Object> attributes = new HashMap<String, Object>();
+    private final List<EditGpxTrackSegment> segments = new ArrayList<>();
+    private final Map<String, Object> attributes = new HashMap<>();
     private boolean isDeleted;
 
@@ -39,5 +39,5 @@
     public GpxTrack createGpxTrack(boolean anonTime, double minTime) {
 
-        Collection<Collection<WayPoint>> wayPoints = new ArrayList<Collection<WayPoint>>();
+        Collection<Collection<WayPoint>> wayPoints = new ArrayList<>();
 
         final DateFormat iso8601 =
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java	(revision 30634)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java	(revision 30737)
@@ -10,5 +10,5 @@
 public class EditGpxTrackSegment {
 
-    private final List<EditGpxWayPoint> wayPoints = new ArrayList<EditGpxWayPoint>();
+    private final List<EditGpxWayPoint> wayPoints = new ArrayList<>();
     private boolean deleted;
 
@@ -24,5 +24,5 @@
 
     public List<WayPoint> getNonDeletedWaypoints() {
-        List<WayPoint> result = new ArrayList<WayPoint>();
+        List<WayPoint> result = new ArrayList<>();
 
         for (EditGpxWayPoint wp: wayPoints) {
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java	(revision 30634)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java	(revision 30737)
@@ -16,5 +16,5 @@
         this.time = wayPoint.time;
         this.coor = new CachedLatLon(wayPoint.getCoor());
-        this.attributes = new HashMap<String, Object>(wayPoint.attr);
+        this.attributes = new HashMap<>(wayPoint.attr);
     }