scijava
diff --git a/‎src/main/java/org/scijava/Context.java‎
Lines changed: 2 additions & 6 deletions b/‎src/main/java/org/scijava/Context.java‎
Lines changed: 2 additions & 6 deletions
@@ -31,18 +31,14 @@
 
 package org.scijava;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.scijava.event.ContextDisposingEvent;
 import org.scijava.event.EventHandler;
@@ -54,6 +50,7 @@
 import org.scijava.service.ServiceHelper;
 import org.scijava.service.ServiceIndex;
 import org.scijava.util.ClassUtils;
+import org.scijava.util.Query;
 
 /**
  * Top-level SciJava application context, which initializes and maintains a list
@@ -364,8 +361,7 @@ public Service getService(final String className) {
 	public void inject(final Object o) {
 		// Ensure parameter fields and event handler methods are cached for this
 		// object.
-		Map<Class<? extends Annotation>, Class<? extends AccessibleObject>> query =
-				new HashMap<Class<? extends Annotation>, Class<? extends AccessibleObject>>();
+		Query query = new Query();
 		query.put(Parameter.class, Field.class);
 		query.put(EventHandler.class, Method.class);
 		ClassUtils.cacheAnnotatedObjects(o.getClass(), query);