wip

hinerm · hinerm · commit e9c0d1e9c331 · 2016-02-24T14:23:38.000-06:00
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -317,13 +317,17 @@ private Object ensureValidObject(final Object value) {
 
 	/** Ensures the value is on the given list. */
 	private Object ensureValid(final Object value, final List<?> list) {
-		if (value == null)
-			return list.contains(null);
+		Number nValue = toNumber(value);
+		// If the value is a number, check if it's within the valid min/max
+		if (nValue != null && Double.compare(getMin().doubleValue(), nValue.doubleValue()) <= 0
+				&& Double.compare(getMax().doubleValue(), nValue.doubleValue()) >= 0) {
+			return nValue;
+		}
 		for (final Object o : list) {
-			if (value.equals(o)) return value; // value is valid
+			if (MiscUtils.equal(value, o)) return value; // value is valid
 			// check if value was converted and cached
 			final Object convertedValue = convertedObjects.get(o);
-			if (convertedValue != null && value.equals(convertedValue)) {
+			if (convertedValue != null && MiscUtils.equal(value, convertedValue)) {
 				return convertedValue;
 			}
 		}
