Changeset 30737 in osm for applications/editors/josm/plugins/tracer

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

Files:

• ConnectWays.java (modified) (2 diffs)
• TracerAction.java (modified) (1 diff)
• TracerServer.java (modified) (2 diffs)

applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java

@@ -37 +37 @@
      */
     public static Command connect(Way way) {
-        Map<Way, Way> modifiedWays = new HashMap<Way, Way>();
-        LinkedList<Command> cmds = new LinkedList<Command>();
+        Map<Way, Way> modifiedWays = new HashMap<>();
+        LinkedList<Command> cmds = new LinkedList<>();
         Way newWay = new Way(way);
         for (int i = 0; i < way.getNodesCount() - 1; i++) {
@@ -92 +92 @@
      */
     private static List<Command> mergeNodes(Node n1, Node n2, Way way){
-        List<Command> cmds = new LinkedList<Command>();
+        List<Command> cmds = new LinkedList<>();
         cmds.add(new MoveCommand(n2,
                  (n1.getEastNorth().getX() - n2.getEastNorth().getX())/2,

applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java

@@ -102 +102 @@
 
     private void traceSync(LatLon pos, ProgressMonitor progressMonitor) {
-        Collection<Command> commands = new LinkedList<Command>();
+        Collection<Command> commands = new LinkedList<>();
 
         progressMonitor.beginTask(null, 3);

applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerServer.java

@@ -50 +50 @@
         try {
             String content = callServer("trace/simple/" + pos.lat() + ";" + pos.lon());
-            ArrayList<LatLon> nodelist = new ArrayList<LatLon>();
+            ArrayList<LatLon> nodelist = new ArrayList<>();
             String[] lines = content.split("\\|");
             for (String line : lines) {
@@ -60 +60 @@
             return nodelist;
         } catch (Exception e) {
-            return new ArrayList<LatLon>();
+            return new ArrayList<>();
         }
     }