Skip to content

Commit 97bc120

Browse files
committed
Types: Relax Map argument types
1 parent 4ce082e commit 97bc120

File tree

1 file changed

+6
-6
lines changed
  • scijava-types/src/main/java/org/scijava/types

1 file changed

+6
-6
lines changed

scijava-types/src/main/java/org/scijava/types/Types.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ public static int isApplicable(final Type[] args, final Type[] params) {
590590
}
591591

592592
public static int isApplicable(final Type[] args, final Type[] params,
593-
final HashMap<TypeVariable<?>, TypeVarInfo> typeBounds)
593+
final Map<TypeVariable<?>, TypeVarInfo> typeBounds)
594594
{
595595
if (args.length != params.length) {
596596
throw new IllegalArgumentException("src and dest lengths differ");
@@ -1027,7 +1027,7 @@ private static boolean isApplicableToRawTypes(
10271027
private static boolean isApplicableToParameterizedTypes(
10281028
final Type arg,
10291029
final ParameterizedType param,
1030-
final HashMap<TypeVariable<?>, TypeVarInfo> typeBounds
1030+
final Map<TypeVariable<?>, TypeVarInfo> typeBounds
10311031
) {
10321032
if (arg instanceof Class) {
10331033
Class<?> paramRaw = raw(param);
@@ -1087,7 +1087,7 @@ private static boolean isApplicableToParameterizedTypes(
10871087
private static boolean isApplicableToTypeParameter(
10881088
final Type arg,
10891089
final TypeVariable<?> param,
1090-
final HashMap<TypeVariable<?>, TypeVarInfo> typeBounds
1090+
final Map<TypeVariable<?>, TypeVarInfo> typeBounds
10911091
) {
10921092
// add the type variable to the HashMap if it does not yet exist.
10931093
if (!typeBounds.containsKey(param)) {
@@ -1118,7 +1118,7 @@ public boolean allowType(Type type, boolean refuseWildcards) {
11181118
private static boolean isApplicableToTypeVariable(
11191119
final Type arg,
11201120
final TypeVariable<?> param,
1121-
final HashMap<TypeVariable<?>, TypeVarInfo> typeBounds
1121+
final Map<TypeVariable<?>, TypeVarInfo> typeBounds
11221122
) {
11231123
// if the TypeVariable is not already in the hashMap add it.
11241124
if (!typeBounds.containsKey(param)) typeBounds.put(param,
@@ -1153,7 +1153,7 @@ private static boolean isApplicableToTypeVariable(
11531153
private static boolean isApplicableToTypeVariableBounds(
11541154
final Type arg,
11551155
final TypeVariable<?> param,
1156-
final HashMap<TypeVariable<?>, TypeVarInfo> typeBounds
1156+
final Map<TypeVariable<?>, TypeVarInfo> typeBounds
11571157
) {
11581158
final Type[] paramBounds = typeBounds.get(param).upperBounds;
11591159
for (final Type paramBound : paramBounds) {
@@ -1201,7 +1201,7 @@ private static boolean isApplicableToWildcardType(
12011201
private static boolean isApplicableToGenericArrayType(
12021202
final Type arg,
12031203
final GenericArrayType param,
1204-
final HashMap<TypeVariable<?>, TypeVarInfo> typeBounds
1204+
final Map<TypeVariable<?>, TypeVarInfo> typeBounds
12051205
) {
12061206
// get a class object of the component type of each array
12071207
final Type argComponent = component(arg);

0 commit comments

Comments
 (0)