Changeset 7315 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.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/Preferences.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -8 +8 @@
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -20 +18 @@
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -57 +56 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Utils;
+import org.xml.sax.SAXException;
 
 /**
@@ -790 +790 @@
     }
 
-    public void load() throws Exception {
+    /**
+     * Loads preferences from settings file.
+     * @throws IOException if any I/O error occurs while reading the file
+     * @throws SAXException if the settings file does not contain valid XML
+     * @throws XMLStreamException if an XML error occurs while parsing the file (after validation)
+     */
+    public void load() throws IOException, SAXException, XMLStreamException {
         settingsMap.clear();
         File pref = getPreferenceFile();
-        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), StandardCharsets.UTF_8))) {
+        try (BufferedReader in = Files.newBufferedReader(pref.toPath(), StandardCharsets.UTF_8)) {
             validateXML(in);
         }
-        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), StandardCharsets.UTF_8))) {
+        try (BufferedReader in = Files.newBufferedReader(pref.toPath(), StandardCharsets.UTF_8)) {
             fromXML(in);
         }
@@ -803 +809 @@
     }
 
-    public void init(boolean reset){
+    /**
+     * Initializes preferences.
+     * @param reset if {@code true}, current settings file is replaced by the default one
+     */
+    public void init(boolean reset) {
         // get the preferences.
         File prefDir = getPreferencesDirFile();
@@ -1388 +1398 @@
     protected XMLStreamReader parser;
 
-    public void validateXML(Reader in) throws Exception {
+    public void validateXML(Reader in) throws IOException, SAXException {
         SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
         try (InputStream xsdStream = new CachedFile("resource://data/preferences.xsd").getInputStream()) {