Changeset 11721 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-03-13T16:59:10+01:00 (8 years ago)

Author:

michael2402

Message:

Throw exception if clamp cannot produce any valid values.

File:

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

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

@@ -1507 +1507 @@
      * @param max maximum value
      * @return the value
+     * @throws IllegalArgumentException if min > max
      * @since 10805
      */
     public static double clamp(double val, double min, double max) {
-        if (val < min) {
+        if (min > max) {
+            throw new IllegalArgumentException(MessageFormat.format("Parameter min ({0}) cannot be greather than max ({1})", min, max));
+        } else if (val < min) {
             return min;
         } else if (val > max) {
@@ -1525 +1528 @@
      * @param max maximum value
      * @return the value
+     * @throws IllegalArgumentException if min > max
      * @since 11055
      */
     public static int clamp(int val, int min, int max) {
-        if (val < min) {
+        if (min > max) {
+            throw new IllegalArgumentException(MessageFormat.format("Parameter min ({0}) cannot be greather than max ({1})", min, max));
+        } else if (val < min) {
             return min;
         } else if (val > max) {