Changeset 10953 in josm for trunk/src

Timestamp:

2016-09-04T02:29:18+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S3655 - Optional value should only be accessed after calling isPresent()

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -34 +34 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
@@ -1286 +1287 @@
         if (!longHalfSegment.isEmpty()) {
             // find the segment with the best quality. If there are several with best quality, the one close to the center is prefered.
-            HalfSegment best = longHalfSegment.stream().max(
+            Optional<HalfSegment> besto = longHalfSegment.stream().max(
                     Comparator.comparingDouble(segment ->
                         segment.quality - 1e-5 * Math.abs(0.5 * (segment.end + segment.start) - 0.5 * pathLength)
-                    )).get();
+                    ));
+            if (!besto.isPresent())
+                throw new IllegalStateException("Unable to find the segment with the best quality for " + way);
+            HalfSegment best = besto.get();
             double remaining = best.end - best.start - rec.getWidth(); // total space left and right from the text
             // The space left and right of the text should be distributed 20% - 80% (towards the center),