Changeset 10721 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.java

Timestamp:

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

Author:

simon04

Message:

Remove too specific Utils functions

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

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