Changeset 10952 in josm

Timestamp:

2016-09-04T02:22:44+02:00 (8 years ago)

Author:

Don-vip

Message:

simplify uses of PrintWriter

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (2 diffs)
• data/validation/OsmValidator.java (modified) (2 diffs)
• plugins/ReadRemotePluginInformationTask.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import java.awt.Toolkit;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Reader;
@@ -596 +594 @@
         }
 
-        try (PrintWriter out = new PrintWriter(new OutputStreamWriter(
-                new FileOutputStream(prefFile + "_tmp"), StandardCharsets.UTF_8), false)) {
-            PreferencesWriter writer = new PreferencesWriter(out, false, defaults);
+        try (PreferencesWriter writer = new PreferencesWriter(
+                new PrintWriter(new File(prefFile + "_tmp"), StandardCharsets.UTF_8.name()), false, defaults)) {
             writer.write(settings);
         }

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

@@ -6 +6 @@
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
@@ -206 +204 @@
 
     public static void saveIgnoredErrors() {
-        try (PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(
-                new File(getValidatorDir(), "ignorederrors")), StandardCharsets.UTF_8), false)) {
+        try (PrintWriter out = new PrintWriter(new File(getValidatorDir(), "ignorederrors"), StandardCharsets.UTF_8.name())) {
             for (String e : ignoredErrors) {
                 out.println(e);

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -8 +8 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.MalformedURLException;
@@ -236 +234 @@
         File cacheFile = createSiteCacheFile(pluginDir, site);
         getProgressMonitor().subTask(tr("Writing plugin list to local cache ''{0}''", cacheFile.toString()));
-        try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), StandardCharsets.UTF_8))) {
+        try (PrintWriter writer = new PrintWriter(cacheFile, StandardCharsets.UTF_8.name())) {
             writer.write(list);
             writer.flush();