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

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

Files:

• PolyExporter.java (modified) (2 diffs)
• PolyImporter.java (modified) (2 diffs)

applications/editors/josm/plugins/poly/src/poly/PolyExporter.java

@@ -40 +40 @@
             try {
                 DataSet ds = ((OsmDataLayer)layer).data;
-                Map<Way, Boolean> ways = new TreeMap<Way, Boolean>();
+                Map<Way, Boolean> ways = new TreeMap<>();
                 String polygonName = file.getName();
                 if( polygonName.indexOf('.') > 0 )
@@ -91 +91 @@
 
     private Map<Way, Boolean> sortOuterInner( Map<Way, Boolean> ways ) {
-        LinkedHashMap<Way, Boolean> result = new LinkedHashMap<Way, Boolean>(ways.size());
-        List<Way> inner = new ArrayList<Way>();
+        LinkedHashMap<Way, Boolean> result = new LinkedHashMap<>(ways.size());
+        List<Way> inner = new ArrayList<>();
         for( Way w : ways.keySet() ) {
             Boolean outer = ways.get(w);

applications/editors/josm/plugins/poly/src/poly/PolyImporter.java

@@ -72 +72 @@
         if( name == null || name.trim().length() == 0 )
             throw new IllegalDataException(tr("The file must begin with a polygon name"));
-        List<Area> areas = new ArrayList<Area>();
+        List<Area> areas = new ArrayList<>();
         Area area = null;
         boolean parsingSection = false;
@@ -177 +177 @@
             if( !outer )
                 this.name = this.name.substring(1);
-            nodes = new ArrayList<LatLon>();
+            nodes = new ArrayList<>();
             way = null;
             polygonName = null;