Changeset 33378 in osm

Timestamp:

2017-06-07T14:51:46+02:00 (8 years ago)

Author:

donvip

Message:

use try-with-resources

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java (modified) (4 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java

@@ -214 +214 @@
                 FeatureSource<?, ?> featureSource = dataStore.getFeatureSource(typeName);
                 FeatureCollection<?, ?> collection = featureSource.getFeatures();
-                FeatureIterator<?> iterator = collection.features();
 
                 if (instance != null) {
@@ -224 +223 @@
                 Component parent = instance != null ? instance.getWindowParent() : Main.parent;
 
-                try {
+                try (FeatureIterator<?> iterator = collection.features()) {
                     while (iterator.hasNext()) {
                         n++;
@@ -243 +242 @@
                     }
                 } finally {
-                    iterator.close();
                     nodes.clear();
                     if (instance != null) {
@@ -251 +249 @@
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            Main.error(e);
             throw e;
         } catch (Exception e) {
-            e.printStackTrace();
+            Main.error(e);
             throw new IOException(e);
         }