Push default PTService behavior to iface

ctrueden · ctrueden · commit c7e578e89b45 · 2016-08-18T14:26:30.000-05:00
Thanks, Java 8.
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -31,8 +31,6 @@
 
 package org.scijava.plugin;
 
-import java.util.List;
-
 import org.scijava.service.AbstractService;
 
 /**
@@ -54,19 +52,4 @@ public abstract class AbstractPTService<PT extends SciJavaPlugin> extends
 	public PluginService pluginService() {
 		return pluginService;
 	}
-
-	@Override
-	public List<PluginInfo<PT>> getPlugins() {
-		return pluginService().getPluginsOfType(getPluginType());
-	}
-
-	@Override
-	public <P extends PT> P create(final Class<P> pluginClass) {
-		final PluginInfo<PT> info =
-			pluginService().getPlugin(pluginClass, getPluginType());
-		@SuppressWarnings("unchecked")
-		final P plugin = (P) pluginService().createInstance(info);
-		return plugin;
-	}
-
 }
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
@@ -90,13 +90,21 @@ public interface PTService<PT extends SciJavaPlugin> extends Service {
 	PluginService pluginService();
 
 	/** Gets the plugins managed by this service. */
-	List<PluginInfo<PT>> getPlugins();
+	default List<PluginInfo<PT>> getPlugins() {
+		return pluginService().getPluginsOfType(getPluginType());
+	}
 
 	/** Gets the type of plugins managed by this service. */
 	Class<PT> getPluginType();
 
 	/** Creates an instance of the given plugin class. */
-	<P extends PT> P create(final Class<P> pluginClass);
+	default <P extends PT> P create(final Class<P> pluginClass) {
+		final PluginInfo<PT> info =
+			pluginService().getPlugin(pluginClass, getPluginType());
+		@SuppressWarnings("unchecked")
+		final P plugin = (P) pluginService().createInstance(info);
+		return plugin;
+	}
 
 	// -- Deprecated methods --
 
