Changeset 13698 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-05-01T21:51:12+02:00 (6 years ago)

Author:

Don-vip

Message:

fix PMD violations

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/RightAngleBuildingTest.java (modified) (2 diffs)
• tools/WindowsShortcut.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/RightAngleBuildingTest.java

@@ -47 +47 @@
         List<Pair<Double, Node>> angles = w.getAngles();
         for (Pair<Double, Node> pair: angles) {
-            if (checkAngle(w, pair.a, pair.b)) {
+            if (checkAngle(pair.a)) {
                 TestError.Builder builder = TestError.builder(this, Severity.WARNING, 3701)
                                                      .message(tr("Building with an almost square angle"))
@@ -76 +76 @@
     }
 
-    private boolean checkAngle(Way w, double angle, Node n) {
+    private boolean checkAngle(double angle) {
         double difference = Math.abs(angle - 90);
         return difference > minAngleDelta && difference < maxAngleDelta;

trunk/src/org/openstreetmap/josm/tools/WindowsShortcut.java

@@ -4 +4 @@
 import java.io.ByteArrayOutputStream;
 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.text.ParseException;
 import java.util.Locale;
@@ -46 +46 @@
         final int minimum_length = 0x64;
         boolean isPotentiallyValid = false;
-        try (InputStream fis = new FileInputStream(file)) {
+        try (InputStream fis = Files.newInputStream(file.toPath())) {
             isPotentiallyValid = file.isFile()
                 && file.getName().toLowerCase(Locale.ENGLISH).endsWith(".lnk")
@@ -62 +62 @@
      */
     public WindowsShortcut(File file) throws IOException, ParseException {
-        try (InputStream in = new FileInputStream(file)) {
+        try (InputStream in = Files.newInputStream(file.toPath())) {
             parseLink(getBytes(in));
         }