ServiceHelper: populate annotated Context fields

ctrueden · ctrueden · commit ecb7d01de6db · 2013-08-08T16:42:22.000-05:00
This is not necessarily useful by itself. But it will be necessary
to at least not choke on annotated Context fields very soon, when
AbstractContextual (superclass of AbstractService) introduces one.
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -267,6 +267,11 @@ private <S extends Service> S createServiceRecursively(final Class<S> c)
 			f.setAccessible(true); // expose private fields
 
 			final Class<?> type = f.getType();
+			if (type.isAssignableFrom(getContext().getClass())) {
+				// populate annotated Context field
+				ClassUtils.setValue(f, service, getContext());
+				continue;
+			}
 			if (!Service.class.isAssignableFrom(type)) {
 				throw new IllegalArgumentException("Invalid parameter: " + f.getName());
 			}
