Changeset 9829 in josm for trunk/src

Timestamp:

2016-02-19T02:34:18+01:00 (9 years ago)

Author:

Don-vip

Message:

fix warnings, add unit test

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)

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

@@ -1418 +1418 @@
      */
     public String toXML(Collection<Entry<String, Setting<?>>> settings, boolean nopass, boolean defaults) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        PreferencesWriter prefWriter = new PreferencesWriter(pw, nopass, defaults);
-        prefWriter.write(settings);
-        sw.flush();
-        StringBuffer sb = sw.getBuffer();
-        return sb.toString();
+        try (
+            StringWriter sw = new StringWriter();
+            PreferencesWriter prefWriter = new PreferencesWriter(new PrintWriter(sw), nopass, defaults);
+        ) {
+            prefWriter.write(settings);
+            sw.flush();
+            return sw.toString();
+        } catch (IOException e) {
+            Main.error(e);
+            return null;
+        }
     }