Allow non-static fields

Treiblesschorle · ctrueden · commit b33ea4f9f83d · 2019-04-18T12:16:31.000-05:00
diff --git a/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
@@ -54,6 +54,7 @@ public class OpFieldInfo implements OpInfo {
 	private final Field field;
 	private Struct struct;
 	private ValidityException validityException;
+	private Object instance;
 
 	public OpFieldInfo(final Field field) {
 
@@ -68,12 +69,19 @@ public OpFieldInfo(final Field field) {
 		this.field = field;
 		try {
 			struct = ParameterStructs.structOf(field.getDeclaringClass(), field);
+			if (!Modifier.isStatic(field.getModifiers())) {
+				instance = field.getDeclaringClass().newInstance();
+			}
+			// NB: Contextual parameters not supported for now.
 		} catch (ValidityException e) {
 			problems.addAll(e.problems());
+		} catch (InstantiationException | IllegalAccessException e) {
+			problems.add(new ValidityProblem("Could not instantiate field's class", e));
 		}
 		if (!problems.isEmpty()) {
 			validityException = new ValidityException(problems);
 		}
+		
 	}
 
 	// -- OpInfo methods --
@@ -107,7 +115,7 @@ public StructInstance<?> createOp() {
 		// 2. _SHOULD_ we do that? Or can we simply reuse the same function
 		// instance every time?
 		try {
-			final Object object = field.get(null); // NB: value of static field!
+			final Object object = field.get(instance); // NB: value of static field!
 			return struct().createInstance(object);
 		} catch (final IllegalAccessException exc) {
 			// FIXME
diff --git a/src/main/java/org/scijava/param/ParameterStructs.java b/src/main/java/org/scijava/param/ParameterStructs.java
@@ -85,7 +85,7 @@ public static List<Member<?>> parse(final Class<?> c, final Field field) throws
 		final Set<String> names = new HashSet<>();
 		final Type fieldType = Types.fieldType(field, c);
 
-		checkModifiers(field.toString() + ": ", problems, field.getModifiers(), false, Modifier.STATIC, Modifier.FINAL);
+		checkModifiers(field.toString() + ": ", problems, field.getModifiers(), false, Modifier.FINAL);
 		parseFunctionalParameters(items, names, problems, field, fieldType);
 
 		// Fail if there were any problems.
