Types: make parameter names consistent

ctrueden · ctrueden · commit ba97d1ad02e0 · 2024-05-28T14:34:47.000-05:00
diff --git a/scijava-types/src/main/java/org/scijava/types/Types.java b/scijava-types/src/main/java/org/scijava/types/Types.java
@@ -691,19 +691,19 @@ public static Type substituteTypeVars(Type type,
 	 * just replaced.
 	 *
 	 * @param typesToMap
-	 * @param typeAssigns
+	 * @param typeVarAssigns
 	 */
 	public static Type[] mapVarToTypes(Type[] typesToMap,
-		Map<TypeVariable<?>, Type> typeAssigns)
+		Map<TypeVariable<?>, Type> typeVarAssigns)
 	{
 		return Arrays.stream(typesToMap).map(type -> mapVarToTypes(type,
-			typeAssigns)).toArray(Type[]::new);
+			typeVarAssigns)).toArray(Type[]::new);
 	}
 
 	public static Type mapVarToTypes(Type typeToMap,
-		Map<TypeVariable<?>, Type> typeAssigns)
+		Map<TypeVariable<?>, Type> typeVarAssigns)
 	{
-		return unroll(typeAssigns, typeToMap, false);
+		return unroll(typeVarAssigns, typeToMap, false);
 	}
 
 	/**
@@ -884,13 +884,13 @@ public static Map<TypeVariable<?>, Type> args(final Class<?> c,
 	 * Create a parameterized type instance.
 	 *
 	 * @param raw the raw class to create a parameterized type instance for
-	 * @param typeArgMappings the mapping used for parameterization
+	 * @param typeVarAssigns the mapping used for parameterization
 	 * @return {@link ParameterizedType}
 	 */
 	public static ParameterizedType parameterize(final Class<?> raw,
-		final Map<TypeVariable<?>, Type> typeArgMappings)
+		final Map<TypeVariable<?>, Type> typeVarAssigns)
 	{
-		return TypeUtils.parameterize(raw, typeArgMappings);
+		return TypeUtils.parameterize(raw, typeVarAssigns);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -691,19 +691,19 @@ public static Type substituteTypeVars(Type type,`
`691`	`691`	`* just replaced.`
`692`	`692`	`*`
`693`	`693`	`* @param typesToMap`
`694`		`- * @param typeAssigns`
	`694`	`+ * @param typeVarAssigns`
`695`	`695`	`*/`
`696`	`696`	`public static Type[] mapVarToTypes(Type[] typesToMap,`
`697`		`- Map<TypeVariable<?>, Type> typeAssigns)`
	`697`	`+ Map<TypeVariable<?>, Type> typeVarAssigns)`
`698`	`698`	`{`
`699`	`699`	`return Arrays.stream(typesToMap).map(type -> mapVarToTypes(type,`
`700`		`- typeAssigns)).toArray(Type[]::new);`
	`700`	`+ typeVarAssigns)).toArray(Type[]::new);`
`701`	`701`	`}`
`702`	`702`
`703`	`703`	`public static Type mapVarToTypes(Type typeToMap,`
`704`		`- Map<TypeVariable<?>, Type> typeAssigns)`
	`704`	`+ Map<TypeVariable<?>, Type> typeVarAssigns)`
`705`	`705`	`{`
`706`		`- return unroll(typeAssigns, typeToMap, false);`
	`706`	`+ return unroll(typeVarAssigns, typeToMap, false);`
`707`	`707`	`}`
`708`	`708`
`709`	`709`	`/**`
`@@ -884,13 +884,13 @@ public static Map<TypeVariable<?>, Type> args(final Class<?> c,`
`884`	`884`	`* Create a parameterized type instance.`
`885`	`885`	`*`
`886`	`886`	`* @param raw the raw class to create a parameterized type instance for`
`887`		`- * @param typeArgMappings the mapping used for parameterization`
	`887`	`+ * @param typeVarAssigns the mapping used for parameterization`
`888`	`888`	`* @return {@link ParameterizedType}`
`889`	`889`	`*/`
`890`	`890`	`public static ParameterizedType parameterize(final Class<?> raw,`
`891`		`- final Map<TypeVariable<?>, Type> typeArgMappings)`
	`891`	`+ final Map<TypeVariable<?>, Type> typeVarAssigns)`
`892`	`892`	`{`
`893`		`- return TypeUtils.parameterize(raw, typeArgMappings);`
	`893`	`+ return TypeUtils.parameterize(raw, typeVarAssigns);`
`894`	`894`	`}`
`895`	`895`
`896`	`896`	`/**`