Changeset 7315 in josm for trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

Timestamp:

2014-07-18T23:30:23+02:00 (12 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/data/validation/OsmValidator.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -170 +170 @@
         ignoredErrors.clear();
         if (Main.pref.getBoolean(ValidatorPreference.PREF_USE_IGNORE, true)) {
-            File file = new File(getValidatorDir() + "ignorederrors");
-            if (file.exists()) {
-                try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) {
-                    for (String line = in.readLine(); line != null; line = in.readLine()) {
-                        ignoredErrors.add(line);
-                    }
+            Path path = Paths.get(getValidatorDir() + "ignorederrors");
+            if (Files.exists(path)) {
+                try {
+                    ignoredErrors.addAll(Files.readAllLines(path, StandardCharsets.UTF_8));
                 } catch (final FileNotFoundException e) {
                     Main.debug(Main.getErrorMessage(e));