NWidgetDemo: use slider for age, and fix a bug

ctrueden · ctrueden · commit d7dee0210a81 · 2017-09-25T19:02:07.000+02:00
diff --git a/src/main/java/org/scijava/nwidget/swing/NSwingNumberWidgetFactory.java b/src/main/java/org/scijava/nwidget/swing/NSwingNumberWidgetFactory.java
@@ -162,7 +162,15 @@ else if (source == spinner) {
 		// -- Helper methods --
 
 		private Number number(final Object value, final Number defaultValue) {
-			final Number converted = convertService.convert(value, Number.class);
+			// FIXME: discuss best way forward
+			// Right now, the widgets do not have the T of their model
+			// Should they? It is nice that they don't, mostly.
+			// But here, would be handy to have a utility method that converts from
+			// the given value to one compatible with this widget's model.
+			// How deep should this conversion logic live.
+			final Class<?> modelType = model().member().getRawType();
+			final Number converted = //
+				(Number) convertService.convert(value, modelType);
 			return converted == null ? defaultValue : converted;
 		}
 
diff --git a/src/test/java/org/scijava/nwidget/NWidgetDemo.java b/src/test/java/org/scijava/nwidget/NWidgetDemo.java
@@ -7,8 +7,6 @@
 import javax.swing.JPanel;
 
 import org.scijava.Context;
-import org.scijava.nwidget.NWidgetPanel;
-import org.scijava.nwidget.NWidgetService;
 import org.scijava.nwidget.swing.NSwingWidgetPanelFactory;
 import org.scijava.param.Parameter;
 import org.scijava.param.ParameterStructs;
@@ -26,8 +24,7 @@ public static void main(final String... args) throws Exception {
 
 			@Parameter
 			private String name = "Chuckles McGee";
-//			@Parameter(min = "0", max = "100", style = NumberWidget.SCROLL_BAR_STYLE)
-			@Parameter
+			@Parameter(min = "0", max = "100", style = NNumberWidget.SCROLL_BAR_STYLE)
 			private Integer age = 27;
 		};
 		final StructInstance<Object> structInstance = //
