Changeset 13849 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

Timestamp:

2018-05-26T19:36:19+02:00 (8 years ago)

Author:

Don-vip

Message:

SonarQube - fix minor code issues

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

@@ -15 +15 @@
 import java.util.Locale;
 import java.util.Optional;
-import java.util.function.Supplier;
+import java.util.function.DoubleSupplier;
 import java.util.logging.Level;
 
@@ -238 +238 @@
                 break;
             case 'b':
-                if (!getopt.getOptarg().equals("auto")) {
+                if (!"auto".equals(getopt.getOptarg())) {
                     try {
                         argBounds = new Bounds(getopt.getOptarg(), ",", Bounds.ParseMethod.LEFT_BOTTOM_RIGHT_TOP, false);
@@ -459 +459 @@
                 EastNorth projAnchor = proj.latlon2eastNorth(argAnchor);
 
-                Double enPerMeter = null;
-                Supplier<Double> getEnPerMeter = () -> {
+                double enPerMeter = Double.NaN;
+                DoubleSupplier getEnPerMeter = () -> {
                     double shiftMeter = 10;
                     EastNorth projAnchorShifted = projAnchor.add(
@@ -470 +470 @@
                 if (scale == null) {
                     if (argScale != null) {
-                        enPerMeter = getEnPerMeter.get();
+                        enPerMeter = getEnPerMeter.getAsDouble();
                         scale = argScale * enPerMeter / PIXEL_PER_METER;
                     } else if (argWidthM != null && argWidthPx != null) {
-                        enPerMeter = getEnPerMeter.get();
+                        enPerMeter = getEnPerMeter.getAsDouble();
                         scale = argWidthM / argWidthPx * enPerMeter;
                     } else if (argHeightM != null && argHeightPx != null) {
-                        enPerMeter = getEnPerMeter.get();
+                        enPerMeter = getEnPerMeter.getAsDouble();
                         scale = argHeightM / argHeightPx * enPerMeter;
                     } else {
@@ -486 +486 @@
                 double widthEn;
                 if (argWidthM != null) {
-                    enPerMeter = Optional.ofNullable(enPerMeter).orElseGet(getEnPerMeter);
+                    if (enPerMeter == Double.NaN) {
+                        enPerMeter = getEnPerMeter.getAsDouble();
+                    }
                     widthEn = argWidthM * enPerMeter;
                 } else if (argWidthPx != null) {
@@ -497 +499 @@
                 double heightEn;
                 if (argHeightM != null) {
-                    enPerMeter = Optional.ofNullable(enPerMeter).orElseGet(getEnPerMeter);
+                    if (enPerMeter == Double.NaN) {
+                        enPerMeter = getEnPerMeter.getAsDouble();
+                    }
                     heightEn = argHeightM * enPerMeter;
                 } else if (argHeightPx != null) {