From 6c3ed41f66720fe77e1a12b306ffb973f1d22b8d Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Fri, 30 Oct 2020 16:28:35 +0100 Subject: [PATCH] AbstractConverter: make deprecated API consistent The canConvert(Class, Class) signature is deprecated in the Converter interface, so let's deprecate the overridden method as well, as it's the case for canConvert(Class, Type) already. --- .../scijava/convert/AbstractConverter.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java index 08699df4f..1fb2cade1 100644 --- a/src/main/java/org/scijava/convert/AbstractConverter.java +++ b/src/main/java/org/scijava/convert/AbstractConverter.java @@ -98,19 +98,9 @@ public boolean canConvert(final Object src, final Type dest) { public boolean canConvert(final Object src, final Class dest) { if (src == null) return false; final Class srcClass = src.getClass(); - return canConvert(srcClass, dest); } - @Override - public boolean canConvert(final Class src, final Class dest) { - if (src == null) return false; - final Class saneSrc = Types.box(src); - final Class saneDest = Types.box(dest); - return Types.isAssignable(saneSrc, getInputType()) && - Types.isAssignable(getOutputType(), saneDest); - } - @Override public Object convert(final Object src, final Type dest) { final Class destClass = Types.raw(dest); @@ -148,6 +138,16 @@ public Class getType() { // -- Deprecated API -- + @Override + @Deprecated + public boolean canConvert(final Class src, final Class dest) { + if (src == null) return false; + final Class saneSrc = Types.box(src); + final Class saneDest = Types.box(dest); + return Types.isAssignable(saneSrc, getInputType()) && + Types.isAssignable(getOutputType(), saneDest); + } + @Override @Deprecated public boolean canConvert(final Class src, final Type dest) {