Changeset 30738 in osm for applications/editors/josm/plugins/NanoLog/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

File:

• applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java (modified) (1 diff)

applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java

@@ -103 +103 @@
         final SimpleDateFormat fmt = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss.SS");
         List<NanoLogEntry> result = new ArrayList<>();
-        BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF8"));
-        while( r.ready() ) {
-            String line = r.readLine();
-            if( line != null ) {
-                Matcher m = NANOLOG_LINE.matcher(line);
-                if( m.matches() ) {
-                    String time = m.group(1);
-                    String message = m.group(2);
-                    String lat = m.group(3);
-                    String lon = m.group(4);
-                    String dir = m.group(5);
-                    Date timeDate = null;
-                    try {
-                        timeDate = fmt.parse(time);
-                    } catch( ParseException e ) {
-                    }
-                    if( message == null || message.length() == 0 || timeDate == null )
-                        continue;
-                    LatLon pos = null;
-                    Integer direction = null;
-                    if( lat != null && lon != null ) {
-                        try {
-                            pos = new LatLon(Double.parseDouble(lat), Double.parseDouble(lon));
-                            direction = new Integer(dir);
-                        } catch( NumberFormatException e ) {
-                            // well...
-                        }
-                    }
-                    NanoLogEntry entry = new NanoLogEntry(timeDate, message, pos, direction);
-                    result.add(entry);
-                }
-            }
-        }
-        r.close();
+        try (BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF8"))) {
+                while( r.ready() ) {
+                    String line = r.readLine();
+                    if( line != null ) {
+                        Matcher m = NANOLOG_LINE.matcher(line);
+                        if( m.matches() ) {
+                            String time = m.group(1);
+                            String message = m.group(2);
+                            String lat = m.group(3);
+                            String lon = m.group(4);
+                            String dir = m.group(5);
+                            Date timeDate = null;
+                            try {
+                                timeDate = fmt.parse(time);
+                            } catch( ParseException e ) {
+                            }
+                            if( message == null || message.length() == 0 || timeDate == null )
+                                continue;
+                            LatLon pos = null;
+                            Integer direction = null;
+                            if( lat != null && lon != null ) {
+                                try {
+                                    pos = new LatLon(Double.parseDouble(lat), Double.parseDouble(lon));
+                                    direction = new Integer(dir);
+                                } catch( NumberFormatException e ) {
+                                    // well...
+                                }
+                            }
+                            NanoLogEntry entry = new NanoLogEntry(timeDate, message, pos, direction);
+                            result.add(entry);
+                        }
+                    }
+                }
+        }
         return result;
     }