ObjectIndex: support PluginIndex better

dscho · dscho · commit 87d902cbc3b3 · 2013-08-15T11:18:51.000-05:00
We used to require overriding the add() method for only one reason:
the type by which the objects are indexed in PluginIndex are not
obtained by getClass(), but by getPluginType().

This suggests that the base class actually needs a more flexible way
to obtain the types by which to index, so let's do that instead.

This will help with the upcoming performance enhancements which will
bypass the add() method completely for SortedObjectIndex' addAll().

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -147,7 +147,8 @@ public boolean isEmpty() {
 
 	@Override
 	public boolean contains(final Object o) {
-		return get(o.getClass()).contains(o);
+		if (!getBaseClass().isAssignableFrom(o.getClass())) return false;
+		return get(getType((E)o)).contains(o);
 	}
 
 	@Override
@@ -245,12 +246,18 @@ public int compare(final Class<?> c1, final Class<?> c2) {
 
 	/** Adds the object to all compatible type lists. */
 	protected boolean add(final E o, final boolean batch) {
-		return add(o, o.getClass(), batch);
+		return add(o, getType(o), batch);
+	}
+
+	/** Return the type by which to index the object. */
+	protected Class<?> getType(final E o) {
+		return o.getClass();
 	}
 
 	/** Removes the object from all compatible type lists. */
 	protected boolean remove(final Object o, final boolean batch) {
-		return remove(o, o.getClass(), batch);
+		if (!getBaseClass().isAssignableFrom(o.getClass())) return false;
+		return remove(o, getType((E)o), batch);
 	}
 
 	private Map<Class<?>, List<List<?>>> type2Lists = new HashMap<Class<?>, List<List<?>>>();
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -135,19 +135,13 @@ public <PT extends SciJavaPlugin> List<PluginInfo<PT>> getPlugins(
 	// -- Internal methods --
 
 	/**
-	 * Adds the plugin to all type lists compatible with its plugin type.
-	 * <p>
-	 * NB: This behavior differs from the default
-	 * {@link org.scijava.object.ObjectIndex} behavior in that the {@code info}
-	 * object's actual type hierarchy is not used for classification, but rather
-	 * the object is classified according to {@link PluginInfo#getPluginType()}.
-	 * </p>
+	 * Overrides the type by which the entries are indexed.
 	 * 
 	 * @see PluginInfo#getPluginType()
 	 */
 	@Override
-	protected boolean add(final PluginInfo<?> info, final boolean batch) {
-		return add(info, info.getPluginType(), batch);
+	protected Class<?> getType(final PluginInfo<?> info) {
+		return info.getPluginType();
 	}
 
 	/**
