Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/io/NMEAImporter.java

Timestamp:

2014-05-01T02:34:43+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - global use of try-with-resources, according to

• ​http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
• ​https://blogs.oracle.com/darcy/entry/project_coin_null_try_with

File:

• trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/NMEAImporter.java

@@ -7 +7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 import javax.swing.JOptionPane;
@@ -35 +36 @@
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException {
         final String fn = file.getName();
-        final NmeaReader r = new NmeaReader(new FileInputStream(file));
-        if (r.getNumberOfCoordinates() > 0) {
-            r.data.storageFile = file;
-            final GpxLayer gpxLayer = new GpxLayer(r.data, fn, true);
-            final File fileFinal = file;
-
-            GuiHelper.runInEDT(new Runnable() {
-                @Override
-                public void run() {
-                    Main.main.addLayer(gpxLayer);
-                    if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
-                        MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), fileFinal, gpxLayer);
-                        if (!ml.data.isEmpty()) {
-                            Main.main.addLayer(ml);
+        try (InputStream fis = new FileInputStream(file)) {
+            final NmeaReader r = new NmeaReader(fis);
+            if (r.getNumberOfCoordinates() > 0) {
+                r.data.storageFile = file;
+                final GpxLayer gpxLayer = new GpxLayer(r.data, fn, true);
+                final File fileFinal = file;
+    
+                GuiHelper.runInEDT(new Runnable() {
+                    @Override
+                    public void run() {
+                        Main.main.addLayer(gpxLayer);
+                        if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
+                            MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), fileFinal, gpxLayer);
+                            if (!ml.data.isEmpty()) {
+                                Main.main.addLayer(ml);
+                            }
                         }
                     }
-                }
-            });
+                });
+            }
+            showNmeaInfobox(r.getNumberOfCoordinates() > 0, r);
         }
-        showNmeaInfobox(r.getNumberOfCoordinates() > 0, r);
     }