StatusService: move to org.scijava.app package

ctrueden · ctrueden · commit 3df8f1565ed4 · 2013-04-04T15:30:17.000-05:00
The reasoning is that the status service now has a new method,
getStatusMessage(StatusEvent), which returns the given event's status
message, or in the case of an empty string returns some default
information about the application context, via the AppService.
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -33,8 +33,10 @@
  * #L%
  */
 
-package org.scijava.event;
+package org.scijava.app;
 
+import org.scijava.app.event.StatusEvent;
+import org.scijava.event.EventService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
@@ -53,6 +55,9 @@ public class DefaultStatusService extends AbstractService implements
 	@Parameter
 	private EventService eventService;
 
+	@Parameter
+	private AppService appService;
+
 	// -- StatusService methods --
 
 	@Override
@@ -89,4 +94,11 @@ public void clearStatus() {
 		eventService.publish(new StatusEvent(""));
 	}
 
+	@Override
+	public String getStatusMessage(final StatusEvent statusEvent) {
+		final String message = statusEvent.getStatusMessage();
+		if (!"".equals(message)) return message;
+		return appService.getInfo(false);
+	}
+
 }
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
@@ -33,8 +33,9 @@
  * #L%
  */
 
-package org.scijava.event;
+package org.scijava.app;
 
+import org.scijava.app.event.StatusEvent;
 import org.scijava.service.Service;
 
 /**
@@ -70,4 +71,14 @@ public interface StatusService extends Service {
 	/** Clears the status message. */
 	void clearStatus();
 
+	/**
+	 * Gets the status message of the given event. In the case of the empty string
+	 * (""), an alternative default string (such as application version
+	 * information) may be returned instead.
+	 * 
+	 * @see StatusEvent#getStatusMessage()
+	 * @see AppService#getInfo(boolean)
+	 */
+	String getStatusMessage(StatusEvent statusEvent);
+
 }
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -33,7 +33,9 @@
  * #L%
  */
 
-package org.scijava.event;
+package org.scijava.app.event;
+
+import org.scijava.event.SciJavaEvent;
 
 /**
  * An event indicating a status update.
