Implement the Logged interface as appropriate

ctrueden · ctrueden · commit 23aada3eec76 · 2016-08-18T14:26:30.000-05:00
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
@@ -244,6 +244,7 @@ public interface Gateway extends RichPlugin {
 	 *
 	 * @return The {@link LogService} of this application context.
 	 */
+	@Override
 	LogService log();
 
 	/**
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -37,6 +37,7 @@
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
 import org.scijava.log.LogService;
+import org.scijava.log.Logged;
 import org.scijava.module.MethodCallException;
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Parameter;
@@ -60,7 +61,7 @@
  * @author Curtis Rueden
  */
 public abstract class InteractiveCommand extends DynamicCommand implements
-	Interactive, Previewable
+	Interactive, Previewable, Logged
 {
 
 	@Parameter
@@ -102,6 +103,13 @@ public void cancel() {
 		// That is, closing the non-modal dialog does nothing.
 	}
 
+	// -- Logged methods --
+
+	@Override
+	public LogService log() {
+		return log;
+	}
+
 	// -- Internal methods --
 
 	protected void updateInput(final ModuleItem<?> item) {
@@ -137,10 +145,6 @@ protected <T> void update(final ModuleItem<T> item, final T newValue) {
 		}
 	}
 
-	protected LogService log() {
-		return log;
-	}
-
 	// -- Event handlers --
 
 	@EventHandler
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -36,6 +36,8 @@
 import org.scijava.Locatable;
 import org.scijava.Prioritized;
 import org.scijava.Versioned;
+import org.scijava.log.LogService;
+import org.scijava.log.Logged;
 
 /**
  * Base interface for {@link Contextual}, {@link Prioritized} plugins that
@@ -46,7 +48,7 @@
  * @author Curtis Rueden
  */
 public interface RichPlugin extends SciJavaPlugin, Contextual, Prioritized,
-	HasPluginInfo, Identifiable, Locatable, Versioned
+	HasPluginInfo, Logged, Identifiable, Locatable, Versioned
 {
 
 	// -- Identifiable methods --
@@ -56,4 +58,10 @@ default String getIdentifier() {
 		return "plugin:" + getClass().getName();
 	}
 
+	// -- Logged methods --
+
+	@Override
+	default LogService log() {
+		return context().getService(LogService.class);
+	}
 }
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -40,6 +40,7 @@
 import javax.script.ScriptException;
 
 import org.scijava.log.LogService;
+import org.scijava.log.Logged;
 import org.scijava.log.StderrLogService;
 
 /**
@@ -48,7 +49,7 @@
  * 
  * @author Johannes Schindelin
  */
-public abstract class AbstractScriptEngine implements ScriptEngine {
+public abstract class AbstractScriptEngine implements ScriptEngine, Logged {
 
 	// Abstract methods
 
@@ -68,6 +69,7 @@ public abstract class AbstractScriptEngine implements ScriptEngine {
 
 	// log service
 
+	@Override
 	public synchronized LogService log() {
 		if (log == null) {
 			log = new StderrLogService();

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,7 @@ public interface Gateway extends RichPlugin {`
`244`	`244`	`*`
`245`	`245`	`* @return The {@link LogService} of this application context.`
`246`	`246`	`*/`
	`247`	`+ @Override`
`247`	`248`	`LogService log();`
`248`	`249`
`249`	`250`	`/**`