Changeset 10721 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Timestamp:

2016-08-03T17:54:36+02:00 (10 years ago)

Author:

simon04

Message:

Remove too specific Utils functions

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -7 +7 @@
 import java.awt.Stroke;
 import java.util.Objects;
+import java.util.stream.IntStream;
 
 import org.openstreetmap.josm.Main;
@@ -324 +325 @@
                 }
 
-                final int size = Utils.max(selected ? settings.getSelectedNodeSize() : 0,
+                final int size = max(
+                        selected ? settings.getSelectedNodeSize() : 0,
                         n.isTagged() ? settings.getTaggedNodeSize() : 0,
                         isConnection ? settings.getConnectionNodeSize() : 0,
@@ -350 +352 @@
             // This is only executed once, so no performance concerns.
             // However, it would be better, if the settings could be changed at runtime.
-            int size = Utils.max(
+            int size = max(
                     Main.pref.getInteger("mappaint.node.selected-size", 5),
                     Main.pref.getInteger("mappaint.node.unselected-size", 3),
@@ -358 +360 @@
             return new SimpleBoxProvider(new Rectangle(-size/2, -size/2, size, size));
         }
+    }
+
+    private static int max(int... elements) {
+        return IntStream.of(elements).max().orElseThrow(IllegalStateException::new);
     }