Skip to content

Commit 06b9c28

Browse files
committed
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.
1 parent afe795a commit 06b9c28

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/main/java/org/scijava/convert/AbstractConverter.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,9 @@ public boolean canConvert(final Object src, final Type dest) {
9898
public boolean canConvert(final Object src, final Class<?> dest) {
9999
if (src == null) return false;
100100
final Class<?> srcClass = src.getClass();
101-
102101
return canConvert(srcClass, dest);
103102
}
104103

105-
@Override
106-
public boolean canConvert(final Class<?> src, final Class<?> dest) {
107-
if (src == null) return false;
108-
final Class<?> saneSrc = Types.box(src);
109-
final Class<?> saneDest = Types.box(dest);
110-
return Types.isAssignable(saneSrc, getInputType()) &&
111-
Types.isAssignable(getOutputType(), saneDest);
112-
}
113-
114104
@Override
115105
public Object convert(final Object src, final Type dest) {
116106
final Class<?> destClass = Types.raw(dest);
@@ -148,6 +138,16 @@ public Class<ConversionRequest> getType() {
148138

149139
// -- Deprecated API --
150140

141+
@Override
142+
@Deprecated
143+
public boolean canConvert(final Class<?> src, final Class<?> dest) {
144+
if (src == null) return false;
145+
final Class<?> saneSrc = Types.box(src);
146+
final Class<?> saneDest = Types.box(dest);
147+
return Types.isAssignable(saneSrc, getInputType()) &&
148+
Types.isAssignable(getOutputType(), saneDest);
149+
}
150+
151151
@Override
152152
@Deprecated
153153
public boolean canConvert(final Class<?> src, final Type dest) {

0 commit comments

Comments
 (0)