Changeset 30738 in osm for applications/editors/josm/plugins/dataimport/src/org

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

File:

• applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java (modified) (7 diffs)

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java

@@ -30 +30 @@
 
 /**
- * @author dmuecke Data import for TangoGPS file format.
+ * Data import for TangoGPS file format.
+ * @author dmuecke
  */
 public class TangoGPS extends FileImporter {
@@ -40 +41 @@
     /**
      * @author cbrill
-     * This function imports data from file and adds trackpoints
-     *         to a layer.
+     * This function imports data from file and adds trackpoints to a layer.
      * Read a log file from TangoGPS. These are simple text files in the
      * form: <lat>,<lon>,<elevation>,<speed>,<course>,<hdop>,<datetime>
@@ -53 +53 @@
         int failure = 0;
 
-        BufferedReader rd = null;
-        try {
+        try (
             InputStream source = new FileInputStream(file);
-            rd = new BufferedReader(new InputStreamReader(source));
-
+            BufferedReader rd = new BufferedReader(new InputStreamReader(source));
+         ) {
             String line;
             while ((line = rd.readLine()) != null) {
@@ -72 +71 @@
                         imported++;
                     } catch (NumberFormatException e) {
-                        e.printStackTrace();
+                        Main.error(e);
                     }
                 }
@@ -92 +91 @@
             }
             showInfobox(imported,failure);
-        } finally {
-            if (rd != null) {
-                rd.close();
-            }
         }
     }
@@ -106 +101 @@
         if (lineElements.length < 2)
             return null;
-        return new LatLon(parseCoord(lineElements[0]),
-                parseCoord(lineElements[1]));
+        return new LatLon(parseCoord(lineElements[0]), parseCoord(lineElements[1]));
     }
 
@@ -118 +112 @@
         }
     }
-
-
 }