Changeset 13204 in josm for trunk/src/org/openstreetmap/josm/data/projection

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

File:

• trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Proj4DirGridShiftFileSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Proj4DirGridShiftFileSource.java

@@ -3 +3 @@
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -63 +64 @@
         if (grid != null) {
             try {
-                return new FileInputStream(grid.getAbsoluteFile());
-            } catch (FileNotFoundException ex) {
-                Logging.warn("NTV2 grid shift file not found: " + grid);
-                Logging.trace(ex);
+                return Files.newInputStream(grid.getAbsoluteFile().toPath());
+            } catch (IOException | InvalidPathException ex) {
+                Logging.warn("Unable to open NTV2 grid shift file: " + grid);
+                Logging.debug(ex);
             }
         }