Changeset 30737 in osm for applications/editors/josm/plugins/ext_tools/src

Timestamp:

2014-10-18T23:07:52+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/ext_tools/src/ext_tools

Files:

• DataSetToCmd.java (modified) (3 diffs)
• ExtTool.java (modified) (2 diffs)
• ToolsInformation.java (modified) (1 diff)

applications/editors/josm/plugins/ext_tools/src/ext_tools/DataSetToCmd.java

@@ -25 +25 @@
      * dataset
      */
-    private final Map<PrimitiveId, OsmPrimitive> mergedMap = new HashMap<PrimitiveId, OsmPrimitive>();
+    private final Map<PrimitiveId, OsmPrimitive> mergedMap = new HashMap<>();
 
-    private final LinkedList<Command> cmds = new LinkedList<Command>();
+    private final LinkedList<Command> cmds = new LinkedList<>();
 
     /**
@@ -110 +110 @@
                     "Missing merge target for way with id {0}", source.getUniqueId()));
 
-        List<Node> newNodes = new ArrayList<Node>(source.getNodesCount());
+        List<Node> newNodes = new ArrayList<>(source.getNodesCount());
         for (Node sourceNode : source.getNodes()) {
             Node targetNode = (Node) getMergeTarget(sourceNode);
@@ -148 +148 @@
                     tr("Missing merge target for relation with id {0}", source
                             .getUniqueId()));
-        LinkedList<RelationMember> newMembers = new LinkedList<RelationMember>();
+        LinkedList<RelationMember> newMembers = new LinkedList<>();
         for (RelationMember sourceMember : source.getMembers()) {
             OsmPrimitive targetMember = getMergeTarget(sourceMember.getMember());

applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java

@@ -162 +162 @@
         Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         // parse cmdline and build cmdParams array
-        HashMap<String, String> replace = new HashMap<String, String>();
+        HashMap<String, String> replace = new HashMap<>();
 
         replace.put("{lat}", "" + pos.lat());
@@ -169 +169 @@
         replace.put("{TZoom}", "" + getTMSZoom());
 
-        ArrayList<String> cmdParams = new ArrayList<String>();
+        ArrayList<String> cmdParams = new ArrayList<>();
         StringTokenizer st = new StringTokenizer(cmdline);
 

applications/editors/josm/plugins/ext_tools/src/ext_tools/ToolsInformation.java

@@ -12 +12 @@
     String filename;
 
-    ArrayList<ExtTool> tools = new ArrayList<ExtTool>();
+    ArrayList<ExtTool> tools = new ArrayList<>();
 
     public ToolsInformation(String filename) {