Changeset 13204 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2017-12-17T00:17:20+01:00 (6 years ago)

Author:

Don-vip

Message:

enable new PMD rule AvoidFileStream - see ​https://pmd.github.io/pmd-6.0.0/pmd_rules_java_performance.html#avoidfilestream / ​https://bugs.openjdk.java.net/browse/JDK-8080225 for details

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• CustomConfigurator.java (modified) (2 diffs)
• DownloadFileTask.java (modified) (4 diffs)
• importexport/NoteExporter.java (modified) (2 diffs)
• importexport/ValidatorErrorExporter.java (modified) (2 diffs)
• importexport/WMSLayerExporter.java (modified) (2 diffs)
• importexport/WMSLayerImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.CharArrayReader;
 import java.io.CharArrayWriter;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -397 +397 @@
                 String fileDir = file.getParentFile().getAbsolutePath();
                 if (fileDir != null) engine.eval("scriptDir='"+normalizeDirName(fileDir) +"';");
-                try (InputStream is = new BufferedInputStream(new FileInputStream(file))) {
+                try (InputStream is = Files.newInputStream(file.toPath())) {
                     openAndReadXML(is);
                 }
-            } catch (ScriptException | IOException | SecurityException ex) {
+            } catch (ScriptException | IOException | SecurityException | InvalidPathException ex) {
                 PreferencesUtils.log(ex, "Error reading custom preferences:");
             }

trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -14 +13 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.StandardCopyOption;
 import java.util.Enumeration;
@@ -115 +115 @@
             try (
                 InputStream in = downloadConnection.getResponse().getContent();
-                OutputStream out = new FileOutputStream(file)
+                OutputStream out = Files.newOutputStream(file.toPath())
             ) {
                 byte[] buffer = new byte[32_768];
@@ -145 +145 @@
             Logging.warn(msg);
             throw new DownloadException(msg, e);
-        } catch (IOException e) {
+        } catch (IOException | InvalidPathException e) {
             if (canceled)
                 return;

trunk/src/org/openstreetmap/josm/gui/io/importexport/NoteExporter.java

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Files;
 
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -40 +40 @@
         Logging.info("exporting notes to file: " + file);
         if (layer instanceof NoteLayer) {
-            try (OutputStream os = new FileOutputStream(file);
+            try (OutputStream os = Files.newOutputStream(file.toPath());
                  NoteWriter writer = new NoteWriter(os)) {
                 writer.write(((NoteLayer) layer).getNoteData());

trunk/src/org/openstreetmap/josm/gui/io/importexport/ValidatorErrorExporter.java

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Files;
 
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -44 +44 @@
         if (layer instanceof ValidatorLayer && editLayer != null) {
             Logging.info("exporting validation errors to file: " + file);
-            try (OutputStream os = new FileOutputStream(file);
+            try (OutputStream os = Files.newOutputStream(file.toPath());
                  ValidatorErrorWriter writer = new ValidatorErrorWriter(os)) {
                 writer.write(editLayer.validationErrors);

trunk/src/org/openstreetmap/josm/gui/io/importexport/WMSLayerExporter.java

@@ -3 +3 @@
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
+import java.nio.file.Files;
 
 import org.openstreetmap.josm.data.StructUtils;
@@ -38 +38 @@
 
         if (layer instanceof AbstractTileSourceLayer) {
-            try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(file))) {
+            try (ObjectOutputStream oos = new ObjectOutputStream(Files.newOutputStream(file.toPath()))) {
                 oos.writeInt(CURRENT_FILE_VERSION); // file version
                 oos.writeObject(MainApplication.getMap().mapView.getCenter());
-                ImageryPreferenceEntry entry = new ImageryPreferenceEntry(((AbstractTileSourceLayer) layer).getInfo());
+                ImageryPreferenceEntry entry = new ImageryPreferenceEntry(((AbstractTileSourceLayer<?>) layer).getInfo());
                 oos.writeObject(StructUtils.serializeStruct(entry, ImageryPreferenceEntry.class));
             }

trunk/src/org/openstreetmap/josm/gui/io/importexport/WMSLayerImporter.java

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InvalidClassException;
 import java.io.ObjectInputStream;
+import java.nio.file.Files;
 import java.util.Map;
 
@@ -49 +49 @@
         final ImageryLayer layer;
 
-        try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) {
+        try (ObjectInputStream ois = new ObjectInputStream(Files.newInputStream(file.toPath()))) {
             int sfv = ois.readInt();
             if (sfv < 5) {