Changeset 30738 in osm for applications/editors/josm/plugins/poly/src

Timestamp:

2014-10-19T01:27:04+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

Location:

applications/editors/josm/plugins/poly/src/poly

Files:

• PolyExporter.java (modified) (3 diffs)
• PolyImporter.java (modified) (6 diffs)

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

@@ -25 +25 @@
 /**
  * Writes poly files.
- * 
+ *
  * @author zverik
  */
@@ -37 +37 @@
     public void exportData( File file, Layer layer ) throws IOException {
         if( layer instanceof OsmDataLayer ) {
-            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF8"));
-            try {
+            try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF8"))) {
                 DataSet ds = ((OsmDataLayer)layer).data;
                 Map<Way, Boolean> ways = new TreeMap<>();
@@ -71 +70 @@
                 writer.write("END");
                 writer.newLine();
-            } finally {
-                writer.close();
             }
         }

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

@@ -1 +1 @@
 package poly;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.BufferedReader;
@@ -7 +9 @@
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -19 +21 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.OsmImporter;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -44 +46 @@
             progressMonitor = NullProgressMonitor.INSTANCE;
         CheckParameterUtil.ensureParameterNotNull(in, "in");
-        BufferedReader reader = null;
-
-        try {
+
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF8"))) {
             progressMonitor.beginTask(tr("Reading polygon filter file..."), 2);
             progressMonitor.indeterminateSubTask(tr("Reading polygon filter file..."));
-            reader = new BufferedReader(new InputStreamReader(in, "UTF8"));
             List<Area> areas = loadPolygon(reader);
             progressMonitor.worked(1);
-            
+
             progressMonitor.indeterminateSubTask(tr("Preparing data set..."));
             DataSet ds = constructDataSet(areas);
@@ -60 +60 @@
             throw new IllegalDataException(tr("Error reading poly file: {0}", e.getMessage()), e);
         } finally {
-            try {
-                if( reader != null )
-                    reader.close();
-            } catch( IOException e ) { }
             progressMonitor.finishTask();
         }
     }
-    
+
     private List<Area> loadPolygon( BufferedReader reader ) throws IllegalDataException, IOException {
         String name = reader.readLine();
@@ -145 +141 @@
         DataSet ds = new DataSet();
         ds.setUploadDiscouraged(true);
-        
+
         boolean foundInner = false;
         for( Area area : areas ) {