CommandModuleItem: DRY up number conversion code

ctrueden · ctrueden · commit 57d06443a467 · 2015-05-20T22:26:22.000-05:00
Several methods were all converting from String to type T in the
same way. Let's make it a shared helper method, to facilitate
later refactoring.
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -46,7 +46,6 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.util.ConversionUtils;
 import org.scijava.util.GenericUtils;
-import org.scijava.util.NumberUtils;
 
 /**
  * {@link ModuleItem} implementation describing an input or output of a command.
@@ -136,20 +135,17 @@ public String getWidgetStyle() {
 
 	@Override
 	public T getMinimumValue() {
-		final Class<T> saneType = ConversionUtils.getNonprimitiveType(getType());
-		return ConversionUtils.convert(getParameter().min(), saneType);
+		return tValue(getParameter().min());
 	}
 
 	@Override
 	public T getMaximumValue() {
-		final Class<T> saneType = ConversionUtils.getNonprimitiveType(getType());
-		return ConversionUtils.convert(getParameter().max(), saneType);
+		return tValue(getParameter().max());
 	}
 
 	@Override
 	public Number getStepSize() {
-		final Class<T> saneType = ConversionUtils.getNonprimitiveType(getType());
-		return NumberUtils.toNumber(getParameter().stepSize(), saneType);
+		return tValue(getParameter().stepSize(), Number.class);
 	}
 
 	@Override
@@ -161,7 +157,7 @@ public int getColumnCount() {
 	public List<T> getChoices() {
 		final ArrayList<T> choices = new ArrayList<T>();
 		for (final String choice : getParameter().choices()) {
-			choices.add(ConversionUtils.convert(choice, getType()));
+			choices.add(tValue(choice));
 		}
 		return choices;
 	}
@@ -201,4 +197,15 @@ public String getName() {
 		return field.getName();
 	}
 
+	// -- Helper methods --
+
+	private T tValue(final String value) {
+		return tValue(value, getType());
+	}
+
+	private <D> D tValue(final String value, final Class<D> type) {
+		final Class<D> saneType = ConversionUtils.getNonprimitiveType(type);
+		return ConversionUtils.convert(value, saneType);
+	}
+
 }
