Skip to content

Commit f8875f5

Browse files
committed
Stop using deprecated ClassUtils methods
There is now the Types utility class instead.
1 parent ec2e7c1 commit f8875f5

File tree

5 files changed

+25
-26
lines changed

5 files changed

+25
-26
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import org.scijava.plugin.PluginInfo;
5858
import org.scijava.util.ClassUtils;
5959
import org.scijava.util.StringMaker;
60+
import org.scijava.util.Types;
6061

6162
/**
6263
* A collection of metadata about a particular {@link Command}.
@@ -502,8 +503,7 @@ private void checkFields(final Class<?> type) {
502503
private boolean isImmutable(final Class<?> type) {
503504
// NB: All eight primitive types, as well as the boxed primitive
504505
// wrapper classes, as well as strings, are immutable objects.
505-
return ClassUtils.isNumber(type) || ClassUtils.isText(type) ||
506-
ClassUtils.isBoolean(type);
506+
return Types.isNumber(type) || Types.isText(type) || Types.isBoolean(type);
507507
}
508508

509509
private Class<?> loadCommandClass() {

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.scijava.Priority;
4747
import org.scijava.plugin.Plugin;
4848
import org.scijava.util.ArrayUtils;
49-
import org.scijava.util.ClassUtils;
5049
import org.scijava.util.ConversionUtils;
5150
import org.scijava.util.Types;
5251

@@ -313,10 +312,9 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
313312
final Class<?> saneDest = Types.box(dest);
314313

315314
// OK for numerical conversions
316-
if (ConversionUtils.canCast(Types.box(src), Number.class) &&
317-
(ClassUtils.isByte(dest) || ClassUtils.isDouble(dest) ||
318-
ClassUtils.isFloat(dest) || ClassUtils.isInteger(dest) ||
319-
ClassUtils.isLong(dest) || ClassUtils.isShort(dest)))
315+
if (ConversionUtils.canCast(Types.box(src), Number.class) && //
316+
(Types.isByte(dest) || Types.isDouble(dest) || Types.isFloat(dest) ||
317+
Types.isInteger(dest) || Types.isLong(dest) || Types.isShort(dest)))
320318
{
321319
return true;
322320
}

src/main/java/org/scijava/module/AbstractModuleItem.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
import org.scijava.AbstractBasicDetails;
4040
import org.scijava.ItemIO;
4141
import org.scijava.ItemVisibility;
42-
import org.scijava.util.ClassUtils;
4342
import org.scijava.util.ConversionUtils;
4443
import org.scijava.util.NumberUtils;
4544
import org.scijava.util.Prefs;
4645
import org.scijava.util.StringMaker;
46+
import org.scijava.util.Types;
4747

4848
/**
4949
* Abstract superclass of {@link ModuleItem} implementations.
@@ -264,7 +264,7 @@ public T getSoftMaximum() {
264264

265265
@Override
266266
public Number getStepSize() {
267-
if (!ClassUtils.isNumber(getType())) return null;
267+
if (!Types.isNumber(getType())) return null;
268268
return NumberUtils.toNumber("1", getType());
269269
}
270270

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import java.math.BigDecimal;
3636
import java.math.BigInteger;
3737

38+
import org.scijava.util.Types;
39+
3840

3941
/**
4042
* Useful methods for working with {@link Number} objects.
@@ -73,22 +75,22 @@ public static BigInteger asBigInteger(final Number n) {
7375
}
7476

7577
public static Number getMinimumNumber(final Class<?> type) {
76-
if (ClassUtils.isByte(type)) return Byte.MIN_VALUE;
77-
if (ClassUtils.isShort(type)) return Short.MIN_VALUE;
78-
if (ClassUtils.isInteger(type)) return Integer.MIN_VALUE;
79-
if (ClassUtils.isLong(type)) return Long.MIN_VALUE;
80-
if (ClassUtils.isFloat(type)) return -Float.MAX_VALUE;
81-
if (ClassUtils.isDouble(type)) return -Double.MAX_VALUE;
78+
if (Types.isByte(type)) return Byte.MIN_VALUE;
79+
if (Types.isShort(type)) return Short.MIN_VALUE;
80+
if (Types.isInteger(type)) return Integer.MIN_VALUE;
81+
if (Types.isLong(type)) return Long.MIN_VALUE;
82+
if (Types.isFloat(type)) return -Float.MAX_VALUE;
83+
if (Types.isDouble(type)) return -Double.MAX_VALUE;
8284
return null;
8385
}
8486

8587
public static Number getMaximumNumber(final Class<?> type) {
86-
if (ClassUtils.isByte(type)) return Byte.MAX_VALUE;
87-
if (ClassUtils.isShort(type)) return Short.MAX_VALUE;
88-
if (ClassUtils.isInteger(type)) return Integer.MAX_VALUE;
89-
if (ClassUtils.isLong(type)) return Long.MAX_VALUE;
90-
if (ClassUtils.isFloat(type)) return Float.MAX_VALUE;
91-
if (ClassUtils.isDouble(type)) return Double.MAX_VALUE;
88+
if (Types.isByte(type)) return Byte.MAX_VALUE;
89+
if (Types.isShort(type)) return Short.MAX_VALUE;
90+
if (Types.isInteger(type)) return Integer.MAX_VALUE;
91+
if (Types.isLong(type)) return Long.MAX_VALUE;
92+
if (Types.isFloat(type)) return Float.MAX_VALUE;
93+
if (Types.isDouble(type)) return Double.MAX_VALUE;
9294
return null;
9395
}
9496

src/main/java/org/scijava/widget/DefaultWidgetModel.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.scijava.module.ModuleService;
5050
import org.scijava.plugin.Parameter;
5151
import org.scijava.thread.ThreadService;
52-
import org.scijava.util.ClassUtils;
5352
import org.scijava.util.NumberUtils;
5453
import org.scijava.util.Types;
5554

@@ -253,22 +252,22 @@ public boolean isMessage() {
253252

254253
@Override
255254
public boolean isText() {
256-
return ClassUtils.isText(getItem().getType());
255+
return Types.isText(getItem().getType());
257256
}
258257

259258
@Override
260259
public boolean isCharacter() {
261-
return ClassUtils.isCharacter(getItem().getType());
260+
return Types.isCharacter(getItem().getType());
262261
}
263262

264263
@Override
265264
public boolean isNumber() {
266-
return ClassUtils.isNumber(getItem().getType());
265+
return Types.isNumber(getItem().getType());
267266
}
268267

269268
@Override
270269
public boolean isBoolean() {
271-
return ClassUtils.isBoolean(getItem().getType());
270+
return Types.isBoolean(getItem().getType());
272271
}
273272

274273
@Override

0 commit comments

Comments
 (0)