Skip to content

Commit 2eebc2a

Browse files
committed
Eliminate some deprecated method calls
1 parent 2405124 commit 2eebc2a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/main/java/org/scijava/command/CommandModuleItem.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
import org.scijava.module.ModuleItem;
4545
import org.scijava.plugin.Attr;
4646
import org.scijava.plugin.Parameter;
47-
import org.scijava.util.ClassUtils;
4847
import org.scijava.util.ConversionUtils;
48+
import org.scijava.util.GenericUtils;
4949
import org.scijava.util.NumberUtils;
5050

5151
/**
@@ -76,15 +76,16 @@ public Parameter getParameter() {
7676

7777
@Override
7878
public Class<T> getType() {
79-
final Class<?> type = ClassUtils.getTypes(field, getDelegateClass()).get(0);
79+
final Class<?> type =
80+
GenericUtils.getFieldClasses(field, getDelegateClass()).get(0);
8081
@SuppressWarnings("unchecked")
8182
final Class<T> typedType = (Class<T>) type;
8283
return typedType;
8384
}
8485

8586
@Override
8687
public Type getGenericType() {
87-
return ClassUtils.getGenericType(field, getDelegateClass());
88+
return GenericUtils.getFieldType(field, getDelegateClass());
8889
}
8990

9091
@Override

src/main/java/org/scijava/util/GenericUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ public static Class<?> getComponentClass(final Type type) {
121121
* field.getType(); // Object
122122
* field.getGenericType(); // T
123123
*
124-
* ClassUtils.getGenericType(field, Thing.class); // T
125-
* ClassUtils.getGenericType(field, NumberThing.class); // N extends Number
126-
* ClassUtils.getGenericType(field, IntegerThing.class); // Integer
124+
* GenericUtils.getFieldType(field, Thing.class); // T
125+
* GenericUtils.getFieldType(field, NumberThing.class); // N extends Number
126+
* GenericUtils.getFieldType(field, IntegerThing.class); // Integer
127127
* </pre>
128128
*/
129129
public static Type getFieldType(final Field field, final Class<?> type) {

0 commit comments

Comments
 (0)