No need to pass the declaring class

Treiblesschorle · ctrueden · commit 551ba08536ee · 2019-09-22T19:37:36.000+02:00
diff --git a/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
@@ -83,7 +83,7 @@ public OpFieldInfo(final Object instance, final Field field) {
 		// NB: Subclassing a collection and inheriting its fields is NOT
 		// ALLOWED!
 		try {
-			struct = ParameterStructs.structOf(field.getDeclaringClass(), field);
+			struct = ParameterStructs.structOf(field);
 			OpUtils.checkHasSingleOutput(struct);
 			// NB: Contextual parameters not supported for now.
 		} catch (ValidityException e) {
diff --git a/src/main/java/org/scijava/param/ParameterStructs.java b/src/main/java/org/scijava/param/ParameterStructs.java
@@ -53,10 +53,10 @@ public static Struct structOf(final Class<?> type)
 		return () -> items;
 	}
 	
-	public static Struct structOf(final Class<?> c, final Field f)
+	public static Struct structOf(final Field field)
 			throws ValidityException
 	{
-		final List<Member<?>> items = parse(c, f);
+		final List<Member<?>> items = parse(field);
 		return () -> items;
 	}
 
@@ -87,7 +87,8 @@ public static List<Member<?>> parse(final Class<?> type)
 		return items;
 	}
 	
-	public static List<Member<?>> parse(final Class<?> c, final Field field) throws ValidityException {
+	public static List<Member<?>> parse(final Field field) throws ValidityException {
+		Class<?> c = field.getDeclaringClass();
 		if (c == null || field == null) return null;
 
 		field.setAccessible(true);

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ public static Struct structOf(final Class<?> type)`
`53`	`53`	`return () -> items;`
`54`	`54`	`}`
`55`	`55`
`56`		`- public static Struct structOf(final Class<?> c, final Field f)`
	`56`	`+ public static Struct structOf(final Field field)`
`57`	`57`	`throws ValidityException`
`58`	`58`	`{`
`59`		`- final List<Member<?>> items = parse(c, f);`
	`59`	`+ final List<Member<?>> items = parse(field);`
`60`	`60`	`return () -> items;`
`61`	`61`	`}`
`62`	`62`
`@@ -87,7 +87,8 @@ public static List<Member<?>> parse(final Class<?> type)`
`87`	`87`	`return items;`
`88`	`88`	`}`
`89`	`89`
`90`		`- public static List<Member<?>> parse(final Class<?> c, final Field field) throws ValidityException {`
	`90`	`+ public static List<Member<?>> parse(final Field field) throws ValidityException {`
	`91`	`+ Class<?> c = field.getDeclaringClass();`
`91`	`92`	`if (c == null \|\| field == null) return null;`
`92`	`93`
`93`	`94`	`field.setAccessible(true);`