Changeset 14624 in josm for trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Proj4DirGridShiftFileSource.java

Timestamp:

2018-12-31T19:36:59+01:00 (5 years ago)

Author:

Don-vip

Message:

fix various SonarQube issues

File:

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

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

@@ -10 +10 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Platform;
@@ -74 +76 @@
     }
 
+    private static List<File> visit(String prefSuffix, String... defaults) {
+        return Config.getPref().getList("ntv2.proj4.grid.dir." + prefSuffix, Arrays.asList(defaults))
+                               .stream().map(File::new).collect(Collectors.toList());
+    }
+
     @Override
     public List<File> visitUnixoid() {
-        return Arrays.asList(new File("/usr/local/share/proj"), new File("/usr/share/proj"));
+        return visit("unix", "/usr/local/share/proj", "/usr/share/proj");
     }
 
     @Override
     public List<File> visitWindows() {
-        return Arrays.asList(new File("C:\\PROJ\\NAD"));
+        return visit("windows", "C:\\PROJ\\NAD");
     }