Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 30737)
@@ -48,5 +48,5 @@
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException {
         // create the data tree
-        List<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
+        List<WayPoint> currentTrackSeg = new ArrayList<>();
 
         int imported = 0;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 30737)
@@ -160,8 +160,8 @@
                             XMLGregorianCalendar startTime = activityLap
                                     .getStartTime();
-                            Collection<Collection<WayPoint>> currentTrack = new ArrayList<Collection<WayPoint>>();
+                            Collection<Collection<WayPoint>> currentTrack = new ArrayList<>();
                             for (TrackT track : activityLap.getTrack()) {
                                 if (track.getTrackpoint() != null) {
-                                    Collection<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
+                                    Collection<WayPoint> currentTrackSeg = new ArrayList<>();
                                     currentTrack.add(currentTrackSeg);
                                     for (TrackpointT tp :
@@ -198,8 +198,8 @@
             for (CourseT course : tcd.getCourses().getCourse()) {
                 if (course.getTrack() != null) {
-                    Collection<Collection<WayPoint>> currentTrack = new ArrayList<Collection<WayPoint>>();
+                    Collection<Collection<WayPoint>> currentTrack = new ArrayList<>();
                     for (TrackT track : course.getTrack()) {
                         if (track.getTrackpoint() != null) {
-                            Collection<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
+                            Collection<WayPoint> currentTrackSeg = new ArrayList<>();
                             currentTrack.add(currentTrackSeg);
                             for (TrackpointT tp : track.getTrackpoint()) {
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityLapT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityLapT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityLapT.java	(revision 30737)
@@ -313,5 +313,5 @@
     public List<TrackT> getTrack() {
         if (track == null) {
-            track = new ArrayList<TrackT>();
+            track = new ArrayList<>();
         }
         return this.track;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityListT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityListT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityListT.java	(revision 30737)
@@ -73,5 +73,5 @@
     public List<ActivityT> getActivity() {
         if (activity == null) {
-            activity = new ArrayList<ActivityT>();
+            activity = new ArrayList<>();
         }
         return this.activity;
@@ -102,5 +102,5 @@
     public List<MultiSportSessionT> getMultiSportSession() {
         if (multiSportSession == null) {
-            multiSportSession = new ArrayList<MultiSportSessionT>();
+            multiSportSession = new ArrayList<>();
         }
         return this.multiSportSession;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityT.java	(revision 30737)
@@ -120,5 +120,5 @@
     public List<ActivityLapT> getLap() {
         if (lap == null) {
-            lap = new ArrayList<ActivityLapT>();
+            lap = new ArrayList<>();
         }
         return this.lap;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseFolderT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseFolderT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseFolderT.java	(revision 30737)
@@ -85,5 +85,5 @@
     public List<CourseFolderT> getFolder() {
         if (folder == null) {
-            folder = new ArrayList<CourseFolderT>();
+            folder = new ArrayList<>();
         }
         return this.folder;
@@ -114,5 +114,5 @@
     public List<NameKeyReferenceT> getCourseNameRef() {
         if (courseNameRef == null) {
-            courseNameRef = new ArrayList<NameKeyReferenceT>();
+            courseNameRef = new ArrayList<>();
         }
         return this.courseNameRef;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseListT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseListT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseListT.java	(revision 30737)
@@ -69,5 +69,5 @@
     public List<CourseT> getCourse() {
         if (course == null) {
-            course = new ArrayList<CourseT>();
+            course = new ArrayList<>();
         }
         return this.course;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseT.java	(revision 30737)
@@ -120,5 +120,5 @@
     public List<CourseLapT> getLap() {
         if (lap == null) {
-            lap = new ArrayList<CourseLapT>();
+            lap = new ArrayList<>();
         }
         return this.lap;
@@ -149,5 +149,5 @@
     public List<TrackT> getTrack() {
         if (track == null) {
-            track = new ArrayList<TrackT>();
+            track = new ArrayList<>();
         }
         return this.track;
@@ -202,5 +202,5 @@
     public List<CoursePointT> getCoursePoint() {
         if (coursePoint == null) {
-            coursePoint = new ArrayList<CoursePointT>();
+            coursePoint = new ArrayList<>();
         }
         return this.coursePoint;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ExtensionsT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ExtensionsT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ExtensionsT.java	(revision 30737)
@@ -71,5 +71,5 @@
     public List<Object> getAny() {
         if (any == null) {
-            any = new ArrayList<Object>();
+            any = new ArrayList<>();
         }
         return this.any;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/HistoryFolderT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/HistoryFolderT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/HistoryFolderT.java	(revision 30737)
@@ -89,5 +89,5 @@
     public List<HistoryFolderT> getFolder() {
         if (folder == null) {
-            folder = new ArrayList<HistoryFolderT>();
+            folder = new ArrayList<>();
         }
         return this.folder;
@@ -118,5 +118,5 @@
     public List<ActivityReferenceT> getActivityRef() {
         if (activityRef == null) {
-            activityRef = new ArrayList<ActivityReferenceT>();
+            activityRef = new ArrayList<>();
         }
         return this.activityRef;
@@ -147,5 +147,5 @@
     public List<WeekT> getWeek() {
         if (week == null) {
-            week = new ArrayList<WeekT>();
+            week = new ArrayList<>();
         }
         return this.week;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportFolderT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportFolderT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportFolderT.java	(revision 30737)
@@ -89,5 +89,5 @@
     public List<MultiSportFolderT> getFolder() {
         if (folder == null) {
-            folder = new ArrayList<MultiSportFolderT>();
+            folder = new ArrayList<>();
         }
         return this.folder;
@@ -118,5 +118,5 @@
     public List<ActivityReferenceT> getMultisportActivityRef() {
         if (multisportActivityRef == null) {
-            multisportActivityRef = new ArrayList<ActivityReferenceT>();
+            multisportActivityRef = new ArrayList<>();
         }
         return this.multisportActivityRef;
@@ -147,5 +147,5 @@
     public List<WeekT> getWeek() {
         if (week == null) {
-            week = new ArrayList<WeekT>();
+            week = new ArrayList<>();
         }
         return this.week;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportSessionT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportSessionT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportSessionT.java	(revision 30737)
@@ -132,5 +132,5 @@
     public List<NextSportT> getNextSport() {
         if (nextSport == null) {
-            nextSport = new ArrayList<NextSportT>();
+            nextSport = new ArrayList<>();
         }
         return this.nextSport;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ObjectFactory.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ObjectFactory.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ObjectFactory.java	(revision 30737)
@@ -471,5 +471,5 @@
     @XmlElementDecl(namespace = "http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2", name = "TrainingCenterDatabase")
     public JAXBElement<TrainingCenterDatabaseT> createTrainingCenterDatabase(TrainingCenterDatabaseT value) {
-        return new JAXBElement<TrainingCenterDatabaseT>(_TrainingCenterDatabase_QNAME, TrainingCenterDatabaseT.class, null, value);
+        return new JAXBElement<>(_TrainingCenterDatabase_QNAME, TrainingCenterDatabaseT.class, null, value);
     }
 
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/RepeatT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/RepeatT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/RepeatT.java	(revision 30737)
@@ -91,5 +91,5 @@
     public List<AbstractStepT> getChild() {
         if (child == null) {
-            child = new ArrayList<AbstractStepT>();
+            child = new ArrayList<>();
         }
         return this.child;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/TrackT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/TrackT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/TrackT.java	(revision 30737)
@@ -69,5 +69,5 @@
     public List<TrackpointT> getTrackpoint() {
         if (trackpoint == null) {
-            trackpoint = new ArrayList<TrackpointT>();
+            trackpoint = new ArrayList<>();
         }
         return this.trackpoint;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutFolderT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutFolderT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutFolderT.java	(revision 30737)
@@ -81,5 +81,5 @@
     public List<WorkoutFolderT> getFolder() {
         if (folder == null) {
-            folder = new ArrayList<WorkoutFolderT>();
+            folder = new ArrayList<>();
         }
         return this.folder;
@@ -110,5 +110,5 @@
     public List<NameKeyReferenceT> getWorkoutNameRef() {
         if (workoutNameRef == null) {
-            workoutNameRef = new ArrayList<NameKeyReferenceT>();
+            workoutNameRef = new ArrayList<>();
         }
         return this.workoutNameRef;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutListT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutListT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutListT.java	(revision 30737)
@@ -69,5 +69,5 @@
     public List<WorkoutT> getWorkout() {
         if (workout == null) {
-            workout = new ArrayList<WorkoutT>();
+            workout = new ArrayList<>();
         }
         return this.workout;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutT.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutT.java	(revision 30736)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutT.java	(revision 30737)
@@ -123,5 +123,5 @@
     public List<AbstractStepT> getStep() {
         if (step == null) {
-            step = new ArrayList<AbstractStepT>();
+            step = new ArrayList<>();
         }
         return this.step;
@@ -152,5 +152,5 @@
     public List<XMLGregorianCalendar> getScheduledOn() {
         if (scheduledOn == null) {
-            scheduledOn = new ArrayList<XMLGregorianCalendar>();
+            scheduledOn = new ArrayList<>();
         }
         return this.scheduledOn;