Changeset 7315 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-07-18T23:30:23+02:00 (10 years ago)

Author:

Don-vip

Message:

code simplification with some Java 7 new NIO2 Files methods (newBufferedReader, newBufferedWriter, readAllLines)

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -10 +10 @@
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -17 +16 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.KeyStore;
@@ -278 +278 @@
             String result = null;
             if (path != null) {
-                File file = new File(path);
-                if (file.exists()) {
-                    try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) {
+                Path p = Paths.get(path);
+                if (Files.exists(p)) {
+                    try (BufferedReader reader = Files.newBufferedReader(p, StandardCharsets.UTF_8)) {
                         String id = null;
                         String release = null;