Merge pull request #211 from scijava/widget-empty-choice

Add empty option for not-required parameter in Widget

Author: ctrueden

src/main/java/org/scijava/widget/DefaultWidgetModel.java

@@ -87,6 +87,8 @@ public DefaultWidgetModel(final Context context, final InputPanel<?, ?> inputPan
 		this.module = module;
 		this.item = item;
 		this.objectPool = objectPool;
+		if (!item.isRequired())
+			this.objectPool.add(0, null);
 		convertedObjects = new WeakHashMap<Object, Object>();
 
 		if (item.getValue(module) == null) {
@@ -315,8 +317,10 @@ 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);
 		for (final Object o : list) {
-			if (o.equals(value)) return value; // value is valid
+			if (value.equals(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)) {