Stop using deprecated SortablePlugin class

ctrueden · ctrueden · commit eb3398bd0009 · 2013-10-24T15:12:35.000-05:00
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
@@ -35,7 +35,7 @@
 
 package org.scijava.app;
 
-import org.scijava.plugin.SortablePlugin;
+import org.scijava.plugin.AbstractRichPlugin;
 import org.scijava.util.Manifest;
 import org.scijava.util.POM;
 
@@ -44,7 +44,7 @@
  * 
  * @author Curtis Rueden
  */
-public abstract class AbstractApp extends SortablePlugin implements App {
+public abstract class AbstractApp extends AbstractRichPlugin implements App {
 
 	/** Maven POM with metadata about the application. */
 	private POM pom;
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
@@ -35,10 +35,8 @@
 
 package org.scijava.app;
 
-import org.scijava.Contextual;
-import org.scijava.Prioritized;
 import org.scijava.plugin.Plugin;
-import org.scijava.plugin.SciJavaPlugin;
+import org.scijava.plugin.RichPlugin;
 import org.scijava.util.Manifest;
 import org.scijava.util.POM;
 
@@ -56,7 +54,7 @@
  * @see Plugin
  * @see AppService
  */
-public interface App extends SciJavaPlugin, Contextual, Prioritized {
+public interface App extends RichPlugin {
 
 	/** Gets the title of the application. */
 	String getTitle();
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -44,8 +44,8 @@
  * @param <D> Data type associated with the plugin.
  * @see Typed
  */
-public abstract class AbstractTypedPlugin<D> extends SortablePlugin implements
-	TypedPlugin<D>
+public abstract class AbstractTypedPlugin<D> extends AbstractRichPlugin
+	implements TypedPlugin<D>
 {
 
 	// -- Typed methods --
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -35,8 +35,6 @@
 
 package org.scijava.plugin;
 
-import org.scijava.Contextual;
-import org.scijava.Prioritized;
 import org.scijava.Typed;
 
 /**
@@ -46,8 +44,6 @@
  * @param <D> Data type associated with the plugin.
  * @see Typed
  */
-public interface TypedPlugin<D> extends SciJavaPlugin, Contextual, Prioritized,
-	Typed<D>
-{
+public interface TypedPlugin<D> extends RichPlugin, Typed<D> {
 	// NB: Marker interface.
 }
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
@@ -37,14 +37,14 @@
 
 import org.scijava.Context;
 import org.scijava.event.EventService;
-import org.scijava.plugin.SortablePlugin;
+import org.scijava.plugin.AbstractRichPlugin;
 
 /**
  * Abstract superclass of {@link Service} implementations.
  * 
  * @author Curtis Rueden
  */
-public abstract class AbstractService extends SortablePlugin implements
+public abstract class AbstractService extends AbstractRichPlugin implements
 	Service
 {
 
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
@@ -35,11 +35,9 @@
 
 package org.scijava.service;
 
-import org.scijava.Contextual;
 import org.scijava.Disposable;
-import org.scijava.Prioritized;
 import org.scijava.plugin.Plugin;
-import org.scijava.plugin.SciJavaPlugin;
+import org.scijava.plugin.RichPlugin;
 
 /**
  * A SciJava service, for a particular area of functionality.
@@ -54,9 +52,7 @@
  * @author Curtis Rueden
  * @see Plugin
  */
-public interface Service extends SciJavaPlugin, Contextual, Prioritized,
-	Disposable
-{
+public interface Service extends RichPlugin, Disposable {
 
 	/**
 	 * Performs any needed initialization when the service is first loaded.

Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,14 @@`
`37`	`37`
`38`	`38`	`import org.scijava.Context;`
`39`	`39`	`import org.scijava.event.EventService;`
`40`		`-import org.scijava.plugin.SortablePlugin;`
	`40`	`+import org.scijava.plugin.AbstractRichPlugin;`
`41`	`41`
`42`	`42`	`/**`
`43`	`43`	`* Abstract superclass of {@link Service} implementations.`
`44`	`44`	`*`
`45`	`45`	`* @author Curtis Rueden`
`46`	`46`	`*/`
`47`		`-public abstract class AbstractService extends SortablePlugin implements`
	`47`	`+public abstract class AbstractService extends AbstractRichPlugin implements`
`48`	`48`	`Service`
`49`	`49`	`{`
`50`	`50`