Changeset 30737 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (modified) (4 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -55 +55 @@
     public void actionPerformed( ActionEvent e ) {
         Relation r = rel.get();
-        List<Way> ways = new ArrayList<Way>();
+        List<Way> ways = new ArrayList<>();
         boolean wont = false;
         for( RelationMember m : r.getMembers() ) {
@@ -81 +81 @@
         
         rel.clear();
-        List<Way> newSelection = new ArrayList<Way>();
-        List<Command> commands = new ArrayList<Command>();
+        List<Way> newSelection = new ArrayList<>();
+        List<Command> commands = new ArrayList<>();
         Command c = DeleteCommand.delete(Main.main.getEditLayer(), Collections.singleton(r), true, true);
         if( c == null )
@@ -92 +92 @@
             Map<String, String> tags = p.ways.get(0).getKeys();
             List<OsmPrimitive> relations = p.ways.get(0).getReferrers();
-            Set<String> noTags = new HashSet<String>(r.keySet());
+            Set<String> noTags = new HashSet<>(r.keySet());
             for( int i = 1; i < p.ways.size(); i++ ) {
                 Way w = p.ways.get(i);
@@ -115 +115 @@
                 if( w.getReferrers().equals(relations) ) {
                     // check tags that remain
-                    Set<String> keys = new HashSet<String>(w.keySet());
+                    Set<String> keys = new HashSet<>(w.keySet());
                     keys.removeAll(tags.keySet());
                     keys.removeAll(IRRELEVANT_KEYS);