scijava · ctrueden · Feb 22, 2016 · Apr 23, 2015 · Apr 23, 2015 · Apr 23, 2015
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -108,8 +108,10 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		if (src == null) return false;
-		return ConversionUtils.canCast(src, getInputType()) &&
-			ConversionUtils.canCast(getOutputType(), dest);
+		final Class<?> saneSrc = ConversionUtils.getNonprimitiveType(src);
+		final Class<?> saneDest = ConversionUtils.getNonprimitiveType(dest);
+		return ConversionUtils.canCast(saneSrc, getInputType()) &&
+			ConversionUtils.canCast(getOutputType(), saneDest);
 	}
 
 	@Override

diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -41,7 +41,7 @@
  *
  * @author Mark Hiner hinerm at gmail.com
  */
-@Plugin(type = Converter.class, priority = Priority.FIRST_PRIORITY - 1)
+@Plugin(type = Converter.class, priority = Priority.FIRST_PRIORITY)
 public class CastingConverter extends AbstractConverter<Object, Object> {
 
 	@SuppressWarnings("deprecation")
@@ -63,17 +63,14 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
 		// NB: Regardless of whether the destination type is an array or
-		// collection,
-		// we still want to cast directly if doing so is possible. But note that
-		// in
-		// general, this check does not detect cases of incompatible generic
-		// parameter types. If this limitation becomes a problem in the future
-		// we
-		// can extend the logic here to provide additional signatures of canCast
-		// which operate on Types in general rather than only Classes. However,
-		// the
-		// logic could become complex very quickly in various subclassing cases,
-		// generic parameters resolved vs. propagated, etc.
+		// collection, we still want to cast directly if doing so is possible.
+		// But note that in general, this check does not detect cases of
+		// incompatible generic parameter types. If this limitation becomes a
+		// problem in the future we can extend the logic here to provide
+		// additional signatures of canCast which operate on Types in general
+		// rather than only Classes. However, the logic could become complex
+		// very quickly in various subclassing cases, generic parameters
+		// resolved vs. propagated, etc.
 		final Class<?> c = GenericUtils.getClass(dest);
 		return (T) ConversionUtils.cast(src, c);
 	}

diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -0,0 +1,173 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.math.BigInteger;
+
+import org.scijava.plugin.Plugin;
+
+/**
+ * Converter plugins that convert from primitive numeric types to other
+ * primitive numeric types.
+ *
+ * @author Alison Walter
+ */
+public final class NumberConverters {
+
+	private NumberConverters() {
+		// prevent instantiation of container class
+	}
+
+	//convert to short 
+	@Plugin(type = Converter.class)
+	public static class ByteToShortConverter extends NumberToShortConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	//convert to int
+	@Plugin(type = Converter.class)
+	public static class ByteToIntegerConverter extends NumberToIntegerConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class ShortToIntegerConverter extends NumberToIntegerConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+	//convert to long
+	@Plugin(type = Converter.class)
+	public static class ByteToLongConverter extends NumberToLongConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class ShortToLongConverter extends NumberToLongConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class IntegerToLongConverter extends NumberToLongConverter<Integer> {
+		@Override public Class<Integer> getInputType() { return Integer.class; }
+	}
+
+	//convert to float
+	@Plugin(type = Converter.class)
+	public static class ByteToFloatConverter extends NumberToFloatConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class ShortToFloatConverter extends NumberToFloatConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+
+	//convert to double
+	@Plugin(type = Converter.class)
+	public static class ByteToDoubleConverter extends NumberToDoubleConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class ShortToDoubleConverter extends NumberToDoubleConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class IntegerToDoubleConverter extends NumberToDoubleConverter<Integer> {
+		@Override public Class<Integer> getInputType() { return Integer.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class FloatToDoubleConverter extends NumberToDoubleConverter<Float> {
+		@Override public Class<Float> getInputType() { return Float.class; }
+	}
+
+	//convert to BigInteger
+	@Plugin(type = Converter.class)
+	public static class ByteToBigIntegerConverter extends NumberToBigIntegerConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class ShortToBigIntegerConverter extends NumberToBigIntegerConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class IntegerToBigIntegerConverter extends NumberToBigIntegerConverter<Integer> {
+		@Override public Class<Integer> getInputType() { return Integer.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class LongToBigIntegerConverter extends NumberToBigIntegerConverter<Long> {
+		@Override public Class<Long> getInputType() { return Long.class; }
+	}
+
+	//convert to BigDecimal 
+	@Plugin(type = Converter.class)
+	public static class ByteToBigDecimalConverter extends NumberToBigDecimalConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class ShortToBigDecimalConverter extends NumberToBigDecimalConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class IntegerToBigDecimalConverter extends NumberToBigDecimalConverter<Integer> {
+		@Override public Class<Integer> getInputType() { return Integer.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class LongToBigDecimalConverter extends NumberToBigDecimalConverter<Long> {
+		@Override public Class<Long> getInputType() { return Long.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class FloatToBigDecimalConverter extends NumberToBigDecimalConverter<Float> {
+		@Override public Class<Float> getInputType() { return Float.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class DoubleToBigDecimalConverter extends NumberToBigDecimalConverter<Double> {
+		@Override public Class<Double> getInputType() { return Double.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class BigIntegerToBigDecimalConverter extends NumberToBigDecimalConverter<BigInteger> {
+		@Override public Class<BigInteger> getInputType() { return BigInteger.class; }
+	}
+
+}
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.math.BigDecimal;
+
+import org.scijava.util.NumberUtils;
+
+/**
+ * Converts numbers to BigDecimals.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToBigDecimalConverter<N extends Number> extends NumberToNumberConverter<N, BigDecimal> {
+
+	@Override
+	public BigDecimal convert(Number n) {
+		return NumberUtils.asBigDecimal(n);
+	}
+
+	@Override
+	public Class<BigDecimal> getOutputType() {
+		return BigDecimal.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.math.BigInteger;
+
+import org.scijava.util.NumberUtils;
+
+/**
+ * Converts numbers to BigIntegers.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToBigIntegerConverter<N extends Number> extends
+	NumberToNumberConverter<N, BigInteger>
+{
+
+	@Override
+	public BigInteger convert(final Number n) {
+		return NumberUtils.asBigInteger(n);
+	}
+
+	@Override
+	public Class<BigInteger> getOutputType() {
+		return BigInteger.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+/**
+ * Converts numbers to doubles.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToDoubleConverter<N extends Number> extends NumberToNumberConverter<N, Double> {
+
+	@Override
+	public Double convert(Number n) {
+		return n.doubleValue();
+	}
+
+	@Override
+	public Class<Double> getOutputType() {
+		return Double.class;
+	}
+
+}