Changeset 30737 in osm for applications/editors/josm/plugins/editgpx/src/org/openstreetmap

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/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data

Files:

• EditGpxData.java (modified) (1 diff)
• EditGpxTrack.java (modified) (2 diffs)
• EditGpxTrackSegment.java (modified) (2 diffs)
• EditGpxWayPoint.java (modified) (1 diff)

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java

@@ -12 +12 @@
 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) {

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java

@@ -19 +19 @@
 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 +39 @@
     public GpxTrack createGpxTrack(boolean anonTime, double minTime) {
 
-        Collection<Collection<WayPoint>> wayPoints = new ArrayList<Collection<WayPoint>>();
+        Collection<Collection<WayPoint>> wayPoints = new ArrayList<>();
 
         final DateFormat iso8601 =

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java

@@ -10 +10 @@
 public class EditGpxTrackSegment {
 
-    private final List<EditGpxWayPoint> wayPoints = new ArrayList<EditGpxWayPoint>();
+    private final List<EditGpxWayPoint> wayPoints = new ArrayList<>();
     private boolean deleted;
 
@@ -24 +24 @@
 
     public List<WayPoint> getNonDeletedWaypoints() {
-        List<WayPoint> result = new ArrayList<WayPoint>();
+        List<WayPoint> result = new ArrayList<>();
 
         for (EditGpxWayPoint wp: wayPoints) {

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java

@@ -16 +16 @@
         this.time = wayPoint.time;
         this.coor = new CachedLatLon(wayPoint.getCoor());
-        this.attributes = new HashMap<String, Object>(wayPoint.attr);
+        this.attributes = new HashMap<>(wayPoint.attr);
     }