Skip to content

Commit e904155

Browse files
Treiblesschorlegselzer
authored andcommitted
WIP: Move hack to Types utility class
1 parent c9ba2f6 commit e904155

3 files changed

Lines changed: 7 additions & 63 deletions

File tree

‎src/main/java/org/scijava/ops/base/TypeUtils.java‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.scijava.struct;
22

3-
import org.scijava.ops.base.TypeUtils;
43
import org.scijava.util.Types;
54

65
public class ValueAccessibleMemberInstance<T> implements MemberInstance<T> {
@@ -40,7 +39,7 @@ public T get() {
4039
@Override
4140
public void set(Object value) {
4241
final Class<?> type = member().getRawType();
43-
if (!TypeUtils.isAssignable(value != null ? value.getClass() : null, type)) {
42+
if (!Types.isAssignable(value != null ? value.getClass() : null, type)) {
4443
throw new IllegalArgumentException("value of type " + //
4544
Types.name(value.getClass()) + " is not assignable to " + //
4645
Types.name(type));

‎src/main/java/org/scijava/util/Types.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,12 @@ public static Type param(final Type type, final Class<?> c, final int no) {
751751
* @see Class#isAssignableFrom(Class)
752752
*/
753753
public static boolean isAssignable(final Type source, final Type target) {
754+
// Workaround for possible bug in TypeUtils.isAssignable, which returns
755+
// false if one wants to assign primitives to their wrappers and the other
756+
// way around
757+
if (source instanceof Class && target instanceof Class) {
758+
return TypeUtils.isAssignable(Types.box((Class<?>) source), Types.box((Class<?>) target));
759+
}
754760
return TypeUtils.isAssignable(source, target);
755761
}
756762

0 commit comments

Comments
 (0)