Changeset 10721 in josm for trunk/src/org

Timestamp:

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

Author:

simon04

Message:

Remove too specific Utils functions

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/SimilarNamedWays.java (modified) (2 diffs)
• gui/mappaint/styleelement/NodeElement.java (modified) (4 diffs)
• tools/Utils.java (modified) (2 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.MultiMap;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -158 +157 @@
 
                 // Step 6
-                d[i][j] = Utils.min(d[i - 1][j] + 1, d[i][j - 1] + 1, d[i - 1][j - 1] + cost);
+                d[i][j] = Math.min(Math.min(d[i - 1][j] + 1, d[i][j - 1] + 1), d[i - 1][j - 1] + cost);
             }
         }

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);
     }
 

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

@@ -223 +223 @@
 
     /**
-     * Returns the minimum of three values.
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @param   c   another argument.
-     * @return  the smaller of {@code a}, {@code b} and {@code c}.
-     */
-    public static int min(int a, int b, int c) {
-        if (b < c) {
-            if (a < b)
-                return a;
-            return b;
-        } else {
-            if (a < c)
-                return a;
-            return c;
-        }
-    }
-
-    /**
-     * Returns the greater of four {@code int} values. That is, the
-     * result is the argument closer to the value of
-     * {@link Integer#MAX_VALUE}. If the arguments have the same value,
-     * the result is that same value.
-     *
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @param   c   another argument.
-     * @param   d   another argument.
-     * @return  the larger of {@code a}, {@code b}, {@code c} and {@code d}.
-     */
-    public static int max(int a, int b, int c, int d) {
-        return Math.max(Math.max(a, b), Math.max(c, d));
-    }
-
-    /**
      * Ensures a logical condition is met. Otherwise throws an assertion error.
      * @param condition the condition to be met
@@ -565 +530 @@
      */
     public static void close(ZipFile zip) {
-        if (zip == null) return;
-        try {
-            zip.close();
-        } catch (IOException e) {
-            Main.warn(e);
-        }
+        close((Closeable) zip);
     }