Ignore:
Timestamp:
2014-10-18T23:07:52+02:00 (10 years ago)
Author:
donvip
Message:

[josm_plugins] fix Java 7 / unused code warnings

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  
    4848    public void importData(File file, ProgressMonitor progressMonitor) throws IOException {
    4949        // create the data tree
    50         List<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
     50        List<WayPoint> currentTrackSeg = new ArrayList<>();
    5151
    5252        int imported = 0;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java

    r23191 r30737  
    160160                            XMLGregorianCalendar startTime = activityLap
    161161                                    .getStartTime();
    162                             Collection<Collection<WayPoint>> currentTrack = new ArrayList<Collection<WayPoint>>();
     162                            Collection<Collection<WayPoint>> currentTrack = new ArrayList<>();
    163163                            for (TrackT track : activityLap.getTrack()) {
    164164                                if (track.getTrackpoint() != null) {
    165                                     Collection<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
     165                                    Collection<WayPoint> currentTrackSeg = new ArrayList<>();
    166166                                    currentTrack.add(currentTrackSeg);
    167167                                    for (TrackpointT tp :
    … …  
    198198            for (CourseT course : tcd.getCourses().getCourse()) {
    199199                if (course.getTrack() != null) {
    200                     Collection<Collection<WayPoint>> currentTrack = new ArrayList<Collection<WayPoint>>();
     200                    Collection<Collection<WayPoint>> currentTrack = new ArrayList<>();
    201201                    for (TrackT track : course.getTrack()) {
    202202                        if (track.getTrackpoint() != null) {
    203                             Collection<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
     203                            Collection<WayPoint> currentTrackSeg = new ArrayList<>();
    204204                            currentTrack.add(currentTrackSeg);
    205205                            for (TrackpointT tp : track.getTrackpoint()) {

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityLapT.java

    r23191 r30737  
    313313    public List<TrackT> getTrack() {
    314314        if (track == null) {
    315             track = new ArrayList<TrackT>();
     315            track = new ArrayList<>();
    316316        }
    317317        return this.track;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityListT.java

    r23191 r30737  
    7373    public List<ActivityT> getActivity() {
    7474        if (activity == null) {
    75             activity = new ArrayList<ActivityT>();
     75            activity = new ArrayList<>();
    7676        }
    7777        return this.activity;
    … …  
    102102    public List<MultiSportSessionT> getMultiSportSession() {
    103103        if (multiSportSession == null) {
    104             multiSportSession = new ArrayList<MultiSportSessionT>();
     104            multiSportSession = new ArrayList<>();
    105105        }
    106106        return this.multiSportSession;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ActivityT.java

    r23191 r30737  
    120120    public List<ActivityLapT> getLap() {
    121121        if (lap == null) {
    122             lap = new ArrayList<ActivityLapT>();
     122            lap = new ArrayList<>();
    123123        }
    124124        return this.lap;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseFolderT.java

    r23191 r30737  
    8585    public List<CourseFolderT> getFolder() {
    8686        if (folder == null) {
    87             folder = new ArrayList<CourseFolderT>();
     87            folder = new ArrayList<>();
    8888        }
    8989        return this.folder;
    … …  
    114114    public List<NameKeyReferenceT> getCourseNameRef() {
    115115        if (courseNameRef == null) {
    116             courseNameRef = new ArrayList<NameKeyReferenceT>();
     116            courseNameRef = new ArrayList<>();
    117117        }
    118118        return this.courseNameRef;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseListT.java

    r23191 r30737  
    6969    public List<CourseT> getCourse() {
    7070        if (course == null) {
    71             course = new ArrayList<CourseT>();
     71            course = new ArrayList<>();
    7272        }
    7373        return this.course;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/CourseT.java

    r23191 r30737  
    120120    public List<CourseLapT> getLap() {
    121121        if (lap == null) {
    122             lap = new ArrayList<CourseLapT>();
     122            lap = new ArrayList<>();
    123123        }
    124124        return this.lap;
    … …  
    149149    public List<TrackT> getTrack() {
    150150        if (track == null) {
    151             track = new ArrayList<TrackT>();
     151            track = new ArrayList<>();
    152152        }
    153153        return this.track;
    … …  
    202202    public List<CoursePointT> getCoursePoint() {
    203203        if (coursePoint == null) {
    204             coursePoint = new ArrayList<CoursePointT>();
     204            coursePoint = new ArrayList<>();
    205205        }
    206206        return this.coursePoint;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ExtensionsT.java

    r23191 r30737  
    7171    public List<Object> getAny() {
    7272        if (any == null) {
    73             any = new ArrayList<Object>();
     73            any = new ArrayList<>();
    7474        }
    7575        return this.any;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/HistoryFolderT.java

    r23191 r30737  
    8989    public List<HistoryFolderT> getFolder() {
    9090        if (folder == null) {
    91             folder = new ArrayList<HistoryFolderT>();
     91            folder = new ArrayList<>();
    9292        }
    9393        return this.folder;
    … …  
    118118    public List<ActivityReferenceT> getActivityRef() {
    119119        if (activityRef == null) {
    120             activityRef = new ArrayList<ActivityReferenceT>();
     120            activityRef = new ArrayList<>();
    121121        }
    122122        return this.activityRef;
    … …  
    147147    public List<WeekT> getWeek() {
    148148        if (week == null) {
    149             week = new ArrayList<WeekT>();
     149            week = new ArrayList<>();
    150150        }
    151151        return this.week;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportFolderT.java

    r23191 r30737  
    8989    public List<MultiSportFolderT> getFolder() {
    9090        if (folder == null) {
    91             folder = new ArrayList<MultiSportFolderT>();
     91            folder = new ArrayList<>();
    9292        }
    9393        return this.folder;
    … …  
    118118    public List<ActivityReferenceT> getMultisportActivityRef() {
    119119        if (multisportActivityRef == null) {
    120             multisportActivityRef = new ArrayList<ActivityReferenceT>();
     120            multisportActivityRef = new ArrayList<>();
    121121        }
    122122        return this.multisportActivityRef;
    … …  
    147147    public List<WeekT> getWeek() {
    148148        if (week == null) {
    149             week = new ArrayList<WeekT>();
     149            week = new ArrayList<>();
    150150        }
    151151        return this.week;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/MultiSportSessionT.java

    r23191 r30737  
    132132    public List<NextSportT> getNextSport() {
    133133        if (nextSport == null) {
    134             nextSport = new ArrayList<NextSportT>();
     134            nextSport = new ArrayList<>();
    135135        }
    136136        return this.nextSport;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/ObjectFactory.java

    r23191 r30737  
    471471    @XmlElementDecl(namespace = "http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2", name = "TrainingCenterDatabase")
    472472    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);
    474474    }
    475475

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/RepeatT.java

    r23191 r30737  
    9191    public List<AbstractStepT> getChild() {
    9292        if (child == null) {
    93             child = new ArrayList<AbstractStepT>();
     93            child = new ArrayList<>();
    9494        }
    9595        return this.child;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/TrackT.java

    r23191 r30737  
    6969    public List<TrackpointT> getTrackpoint() {
    7070        if (trackpoint == null) {
    71             trackpoint = new ArrayList<TrackpointT>();
     71            trackpoint = new ArrayList<>();
    7272        }
    7373        return this.trackpoint;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutFolderT.java

    r23191 r30737  
    8181    public List<WorkoutFolderT> getFolder() {
    8282        if (folder == null) {
    83             folder = new ArrayList<WorkoutFolderT>();
     83            folder = new ArrayList<>();
    8484        }
    8585        return this.folder;
    … …  
    110110    public List<NameKeyReferenceT> getWorkoutNameRef() {
    111111        if (workoutNameRef == null) {
    112             workoutNameRef = new ArrayList<NameKeyReferenceT>();
     112            workoutNameRef = new ArrayList<>();
    113113        }
    114114        return this.workoutNameRef;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutListT.java

    r23191 r30737  
    6969    public List<WorkoutT> getWorkout() {
    7070        if (workout == null) {
    71             workout = new ArrayList<WorkoutT>();
     71            workout = new ArrayList<>();
    7272        }
    7373        return this.workout;

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/tcx/WorkoutT.java

    r23191 r30737  
    123123    public List<AbstractStepT> getStep() {
    124124        if (step == null) {
    125             step = new ArrayList<AbstractStepT>();
     125            step = new ArrayList<>();
    126126        }
    127127        return this.step;
    … …  
    152152    public List<XMLGregorianCalendar> getScheduledOn() {
    153153        if (scheduledOn == null) {
    154             scheduledOn = new ArrayList<XMLGregorianCalendar>();
     154            scheduledOn = new ArrayList<>();
    155155        }
    156156        return this.scheduledOn;
Note: See TracChangeset for help on using the changeset viewer.