Changeset 30737 in osm for applications/editors/josm/plugins/dataimport
- Timestamp:
- 2014-10-18T23:07:52+02:00 (10 years ago)
- Location:
- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java
r23191 r30737 48 48 public void importData(File file, ProgressMonitor progressMonitor) throws IOException { 49 49 // create the data tree 50 List<WayPoint> currentTrackSeg = new ArrayList< WayPoint>();50 List<WayPoint> currentTrackSeg = new ArrayList<>(); 51 51 52 52 int imported = 0; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java
r23191 r30737 160 160 XMLGregorianCalendar startTime = activityLap 161 161 .getStartTime(); 162 Collection<Collection<WayPoint>> currentTrack = new ArrayList< Collection<WayPoint>>();162 Collection<Collection<WayPoint>> currentTrack = new ArrayList<>(); 163 163 for (TrackT track : activityLap.getTrack()) { 164 164 if (track.getTrackpoint() != null) { 165 Collection<WayPoint> currentTrackSeg = new ArrayList< WayPoint>();165 Collection<WayPoint> currentTrackSeg = new ArrayList<>(); 166 166 currentTrack.add(currentTrackSeg); 167 167 for (TrackpointT tp : … … 198 198 for (CourseT course : tcd.getCourses().getCourse()) { 199 199 if (course.getTrack() != null) { 200 Collection<Collection<WayPoint>> currentTrack = new ArrayList< Collection<WayPoint>>();200 Collection<Collection<WayPoint>> currentTrack = new ArrayList<>(); 201 201 for (TrackT track : course.getTrack()) { 202 202 if (track.getTrackpoint() != null) { 203 Collection<WayPoint> currentTrackSeg = new ArrayList< WayPoint>();203 Collection<WayPoint> currentTrackSeg = new ArrayList<>(); 204 204 currentTrack.add(currentTrackSeg); 205 205 for (TrackpointT tp : track.getTrackpoint()) { -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityLapT.java
r23191 r30737 313 313 public List<TrackT> getTrack() { 314 314 if (track == null) { 315 track = new ArrayList< TrackT>();315 track = new ArrayList<>(); 316 316 } 317 317 return this.track; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityListT.java
r23191 r30737 73 73 public List<ActivityT> getActivity() { 74 74 if (activity == null) { 75 activity = new ArrayList< ActivityT>();75 activity = new ArrayList<>(); 76 76 } 77 77 return this.activity; … … 102 102 public List<MultiSportSessionT> getMultiSportSession() { 103 103 if (multiSportSession == null) { 104 multiSportSession = new ArrayList< MultiSportSessionT>();104 multiSportSession = new ArrayList<>(); 105 105 } 106 106 return this.multiSportSession; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityT.java
r23191 r30737 120 120 public List<ActivityLapT> getLap() { 121 121 if (lap == null) { 122 lap = new ArrayList< ActivityLapT>();122 lap = new ArrayList<>(); 123 123 } 124 124 return this.lap; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseFolderT.java
r23191 r30737 85 85 public List<CourseFolderT> getFolder() { 86 86 if (folder == null) { 87 folder = new ArrayList< CourseFolderT>();87 folder = new ArrayList<>(); 88 88 } 89 89 return this.folder; … … 114 114 public List<NameKeyReferenceT> getCourseNameRef() { 115 115 if (courseNameRef == null) { 116 courseNameRef = new ArrayList< NameKeyReferenceT>();116 courseNameRef = new ArrayList<>(); 117 117 } 118 118 return this.courseNameRef; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseListT.java
r23191 r30737 69 69 public List<CourseT> getCourse() { 70 70 if (course == null) { 71 course = new ArrayList< CourseT>();71 course = new ArrayList<>(); 72 72 } 73 73 return this.course; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseT.java
r23191 r30737 120 120 public List<CourseLapT> getLap() { 121 121 if (lap == null) { 122 lap = new ArrayList< CourseLapT>();122 lap = new ArrayList<>(); 123 123 } 124 124 return this.lap; … … 149 149 public List<TrackT> getTrack() { 150 150 if (track == null) { 151 track = new ArrayList< TrackT>();151 track = new ArrayList<>(); 152 152 } 153 153 return this.track; … … 202 202 public List<CoursePointT> getCoursePoint() { 203 203 if (coursePoint == null) { 204 coursePoint = new ArrayList< CoursePointT>();204 coursePoint = new ArrayList<>(); 205 205 } 206 206 return this.coursePoint; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ExtensionsT.java
r23191 r30737 71 71 public List<Object> getAny() { 72 72 if (any == null) { 73 any = new ArrayList< Object>();73 any = new ArrayList<>(); 74 74 } 75 75 return this.any; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/HistoryFolderT.java
r23191 r30737 89 89 public List<HistoryFolderT> getFolder() { 90 90 if (folder == null) { 91 folder = new ArrayList< HistoryFolderT>();91 folder = new ArrayList<>(); 92 92 } 93 93 return this.folder; … … 118 118 public List<ActivityReferenceT> getActivityRef() { 119 119 if (activityRef == null) { 120 activityRef = new ArrayList< ActivityReferenceT>();120 activityRef = new ArrayList<>(); 121 121 } 122 122 return this.activityRef; … … 147 147 public List<WeekT> getWeek() { 148 148 if (week == null) { 149 week = new ArrayList< WeekT>();149 week = new ArrayList<>(); 150 150 } 151 151 return this.week; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportFolderT.java
r23191 r30737 89 89 public List<MultiSportFolderT> getFolder() { 90 90 if (folder == null) { 91 folder = new ArrayList< MultiSportFolderT>();91 folder = new ArrayList<>(); 92 92 } 93 93 return this.folder; … … 118 118 public List<ActivityReferenceT> getMultisportActivityRef() { 119 119 if (multisportActivityRef == null) { 120 multisportActivityRef = new ArrayList< ActivityReferenceT>();120 multisportActivityRef = new ArrayList<>(); 121 121 } 122 122 return this.multisportActivityRef; … … 147 147 public List<WeekT> getWeek() { 148 148 if (week == null) { 149 week = new ArrayList< WeekT>();149 week = new ArrayList<>(); 150 150 } 151 151 return this.week; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportSessionT.java
r23191 r30737 132 132 public List<NextSportT> getNextSport() { 133 133 if (nextSport == null) { 134 nextSport = new ArrayList< NextSportT>();134 nextSport = new ArrayList<>(); 135 135 } 136 136 return this.nextSport; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ObjectFactory.java
r23191 r30737 471 471 @XmlElementDecl(namespace = "http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2", name = "TrainingCenterDatabase") 472 472 public JAXBElement<TrainingCenterDatabaseT> createTrainingCenterDatabase(TrainingCenterDatabaseT value) { 473 return new JAXBElement< TrainingCenterDatabaseT>(_TrainingCenterDatabase_QNAME, TrainingCenterDatabaseT.class, null, value);473 return new JAXBElement<>(_TrainingCenterDatabase_QNAME, TrainingCenterDatabaseT.class, null, value); 474 474 } 475 475 -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/RepeatT.java
r23191 r30737 91 91 public List<AbstractStepT> getChild() { 92 92 if (child == null) { 93 child = new ArrayList< AbstractStepT>();93 child = new ArrayList<>(); 94 94 } 95 95 return this.child; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/TrackT.java
r23191 r30737 69 69 public List<TrackpointT> getTrackpoint() { 70 70 if (trackpoint == null) { 71 trackpoint = new ArrayList< TrackpointT>();71 trackpoint = new ArrayList<>(); 72 72 } 73 73 return this.trackpoint; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutFolderT.java
r23191 r30737 81 81 public List<WorkoutFolderT> getFolder() { 82 82 if (folder == null) { 83 folder = new ArrayList< WorkoutFolderT>();83 folder = new ArrayList<>(); 84 84 } 85 85 return this.folder; … … 110 110 public List<NameKeyReferenceT> getWorkoutNameRef() { 111 111 if (workoutNameRef == null) { 112 workoutNameRef = new ArrayList< NameKeyReferenceT>();112 workoutNameRef = new ArrayList<>(); 113 113 } 114 114 return this.workoutNameRef; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutListT.java
r23191 r30737 69 69 public List<WorkoutT> getWorkout() { 70 70 if (workout == null) { 71 workout = new ArrayList< WorkoutT>();71 workout = new ArrayList<>(); 72 72 } 73 73 return this.workout; -
applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutT.java
r23191 r30737 123 123 public List<AbstractStepT> getStep() { 124 124 if (step == null) { 125 step = new ArrayList< AbstractStepT>();125 step = new ArrayList<>(); 126 126 } 127 127 return this.step; … … 152 152 public List<XMLGregorianCalendar> getScheduledOn() { 153 153 if (scheduledOn == null) { 154 scheduledOn = new ArrayList< XMLGregorianCalendar>();154 scheduledOn = new ArrayList<>(); 155 155 } 156 156 return this.scheduledOn;
Note:
See TracChangeset
for help on using the changeset viewer.