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

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/terracer/src/terracer

Files:

• HouseNumberInputDialog.java (modified) (1 diff)
• ReverseTerraceAction.java (modified) (3 diffs)
• TerracerAction.java (modified) (7 diffs)

applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java

@@ -366 +366 @@
      */
     TreeSet<String> createAutoCompletionInfo() {
-        final TreeSet<String> names = new TreeSet<String>();
+        final TreeSet<String> names = new TreeSet<>();
         for (OsmPrimitive osm : Main.main.getCurrentDataSet()
                 .allNonDeletedPrimitives()) {

applications/editors/josm/plugins/terracer/src/terracer/ReverseTerraceAction.java

@@ -55 +55 @@
         // Set to keep track of all the nodes that have been visited - that is: if
         // we encounter them again we will not follow onto the connected ways.
-        HashSet<Node> visitedNodes = new HashSet<Node>();
+        HashSet<Node> visitedNodes = new HashSet<>();
 
         // Set to keep track of the ways the algorithm has seen, but not yet visited.
         // Since when a way is visited all of its nodes are marked as visited, there
         // is no need to keep a visitedWays set.
-        HashSet<Way> front = new HashSet<Way>();
+        HashSet<Way> front = new HashSet<>();
 
         // Find the first or last way from the teracced houses.
@@ -85 +85 @@
 
         // This is like a visitedWays set, but in a linear order.
-        LinkedList<Way> orderedWays = new LinkedList<Way>();
+        LinkedList<Way> orderedWays = new LinkedList<>();
 
         // And the tags to reverse on the orderedWays.
-        LinkedList<String> houseNumbers = new LinkedList<String>();
+        LinkedList<String> houseNumbers = new LinkedList<>();
 
         while (front.size() > 0) {
@@ -114 +114 @@
         }
 
-        Collection<Command> commands = new LinkedList<Command>();
+        Collection<Command> commands = new LinkedList<>();
         for (int i = 0; i < orderedWays.size(); ++i) {
             commands.add(new ChangePropertyCommand(

applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java

@@ -82 +82 @@
 
     protected static final Set<Relation> findAssociatedStreets(Collection<OsmPrimitive> objects) {
-        Set<Relation> result = new HashSet<Relation>();
+        Set<Relation> result = new HashSet<>();
         if (objects != null) {
             for (OsmPrimitive c : objects) {
@@ -113 +113 @@
         Way street = null;
         String streetname = null;
-        ArrayList<Node> housenumbers = new ArrayList<Node>();
+        ArrayList<Node> housenumbers = new ArrayList<>();
         Node init = null;
 
@@ -361 +361 @@
         // This list will contain nodes of the outline that are used in new lines.
         // These nodes will not be deleted with the outline (if deleting was prompted).
-        ArrayList<Node> reused_nodes = new ArrayList<Node>();
-
-        this.commands = new LinkedList<Command>();
-        Collection<Way> ways = new LinkedList<Way>();
+        ArrayList<Node> reused_nodes = new ArrayList<>();
+
+        this.commands = new LinkedList<>();
+        Collection<Way> ways = new LinkedList<>();
 
         if (nb > 1) {
@@ -401 +401 @@
                 // Delete outline nodes having no tags and referrers but the outline itself
                 List<Node> nodes = outline.getNodes();
-                ArrayList<Node> nodesToDelete = new ArrayList<Node>();
+                ArrayList<Node> nodesToDelete = new ArrayList<>();
                 for (Node n : nodes)
                     if (!n.hasKeys() && n.getReferrers().size() == 1 && !reused_nodes.contains(n))
@@ -462 +462 @@
                                 tagsInConflict, primitives, Collections.singleton(outline));
                         if (!conflictCommands.isEmpty()) {
-                            List<Command> newCommands = new ArrayList<Command>(commands);
+                            List<Command> newCommands = new ArrayList<>(commands);
                             newCommands.addAll(conflictCommands);
                             setSequence(newCommands.toArray(new Command[0]));
@@ -638 +638 @@
         }
 
-        return new Pair<Way, Way>(front, back);
+        return new Pair<>(front, back);
     }
 
@@ -700 +700 @@
 
         final int length = a.length;
-        ArrayList<SortWithIndex> sortable = new ArrayList<SortWithIndex>(length);
+        ArrayList<SortWithIndex> sortable = new ArrayList<>(length);
         for (int i = 0; i < length; ++i) {
             sortable.add(new SortWithIndex(a[i], i));