Migrate handling of AppEvents to AppService

This deprecates the AppEventService, moving the event handlers into
the DefaultAppService. Each event handler method simply invokes the
respective method of the highest priority app.

Author: ctrueden

src/main/java/org/scijava/app/DefaultAppService.java

@@ -36,7 +36,11 @@
 import java.util.List;
 import java.util.Map;
 
+import org.scijava.event.EventHandler;
 import org.scijava.log.LogService;
+import org.scijava.platform.event.AppAboutEvent;
+import org.scijava.platform.event.AppPreferencesEvent;
+import org.scijava.platform.event.AppQuitEvent;
 import org.scijava.plugin.AbstractSingletonService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -86,6 +90,26 @@ public Class<App> getPluginType() {
 		return App.class;
 	}
 
+	// -- Event handlers --
+
+	@EventHandler(key = "org.scijava.app.AppService#about")
+	protected void onEvent(@SuppressWarnings("unused") final AppAboutEvent event)
+	{
+		getApp().about();
+	}
+
+	@EventHandler(key = "org.scijava.app.AppService#prefs")
+	protected void onEvent(
+		@SuppressWarnings("unused") final AppPreferencesEvent event)
+	{
+		getApp().prefs();
+	}
+
+	@EventHandler(key = "org.scijava.app.AppService#quit")
+	protected void onEvent(@SuppressWarnings("unused") final AppQuitEvent event) {
+		getApp().quit();
+	}
+
 	// -- Helper methods - lazy initialization --
 
 	/** Gets {@link #apps}, initializing if necessary. */

src/main/java/org/scijava/platform/AppEventService.java

@@ -33,28 +33,28 @@
 
 import java.util.List;
 
+import org.scijava.app.App;
+import org.scijava.app.AppService;
 import org.scijava.command.Command;
 import org.scijava.service.SciJavaService;
 
-/**
- * Interface for service that handles application-level events.
- * 
- * @author Curtis Rueden
- */
+/** @deprecated Use {@link AppService} and {@link App} instead. */
+@Deprecated
 public interface AppEventService extends SciJavaService {
 
-	/** Displays an About ImageJ dialog. */
+	/** @deprecated Use {@link App#about()} instead. */
+	@Deprecated
 	void about();
 
-	/** Displays the ImageJ preferences dialog. */
+	/** @deprecated Use {@link App#prefs()} instead. */
+	@Deprecated
 	void prefs();
 
-	/** Quits ImageJ, prompting the user about any unsaved work first. */
+	/** @deprecated Use {@link App#quit()} instead. */
+	@Deprecated
 	void quit();
 
 	/**
-	 * Gets the commands associated with this service.
-	 * 
 	 * @deprecated Tag relevant commands instead:
 	 *             <code>attrs = { @Attr(name = "app-command") }</code>
 	 */

src/main/java/org/scijava/platform/DefaultAppEventService.java

@@ -35,70 +35,63 @@
 import java.util.List;
 
 import org.scijava.Priority;
+import org.scijava.app.App;
+import org.scijava.app.AppService;
 import org.scijava.command.Command;
-import org.scijava.event.EventHandler;
 import org.scijava.platform.event.AppAboutEvent;
 import org.scijava.platform.event.AppPreferencesEvent;
 import org.scijava.platform.event.AppQuitEvent;
+import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
 
-/**
- * Default service for handling application-level events.
- * <p>
- * An {@link AppAboutEvent} triggers a callback to {@link #about()}. An
- * {@link AppPreferencesEvent} triggers a callback to {@link #prefs()}. Finally,
- * an {@link AppQuitEvent} triggers a callback to {@link #quit()}. Note that
- * this class's implementations of the former two methods do nothing, and the
- * latter simply disposes the application context with no user checks.
- * </p>
- * 
- * @author Curtis Rueden
- */
+/** @deprecated Use {@link AppService} and {@link App} instead. */
+@Deprecated
 @Plugin(type = Service.class, priority = Priority.LOW_PRIORITY)
 public class DefaultAppEventService extends AbstractService implements
 	AppEventService
 {
 
+	@Parameter
+	private AppService appService;
+
 	// -- AppService methods --
 
 	@Override
 	public void about() {
-		// NB: Do nothing.
+		appService.getApp().about();
 	}
 
 	@Override
 	public void prefs() {
-		// NB: Do nothing.
+		appService.getApp().prefs();
 	}
 
 	@Override
 	public void quit() {
-		getContext().dispose();
+		appService.getApp().quit();
 	}
 
 	@Override
 	public List<Class<? extends Command>> getCommands() {
 		return Collections.emptyList();
 	}
 
-	// -- Event handlers --
-
-	@EventHandler(key = "org.scijava.platform.AppEventService#about")
+	@Deprecated
 	protected void onEvent(@SuppressWarnings("unused") final AppAboutEvent event)
 	{
 		about();
 	}
 
-	@EventHandler(key = "org.scijava.platform.AppEventService#prefs")
+	@Deprecated
 	protected void onEvent(
 		@SuppressWarnings("unused") final AppPreferencesEvent event)
 	{
 		prefs();
 	}
 
-	@EventHandler(key = "org.scijava.platform.AppEventService#quit")
+	@Deprecated
 	protected void onEvent(@SuppressWarnings("unused") final AppQuitEvent event) {
 		quit();
 	}