InputHarvester: move default method impls to iface

Author: ctrueden

src/main/java/org/scijava/widget/AbstractInputHarvester.java

@@ -38,7 +38,6 @@
 import org.scijava.convert.ConvertService;
 import org.scijava.log.LogService;
 import org.scijava.module.Module;
-import org.scijava.module.ModuleCanceledException;
 import org.scijava.module.ModuleException;
 import org.scijava.module.ModuleItem;
 import org.scijava.object.ObjectService;
@@ -74,21 +73,8 @@ public abstract class AbstractInputHarvester<P, W> extends AbstractContextual
 	// -- InputHarvester methods --
 
 	@Override
-	public void harvest(final Module module) throws ModuleException {
-		final InputPanel<P, W> inputPanel = createInputPanel();
-		buildPanel(inputPanel, module);
-		if (!inputPanel.hasWidgets()) return; // no inputs left to harvest
-
-		final boolean ok = harvestInputs(inputPanel, module);
-		if (!ok) throw new ModuleCanceledException();
-
-		processResults(inputPanel, module);
-	}
-
-	@Override
-	public void
-		buildPanel(final InputPanel<P, W> inputPanel, final Module module)
-			throws ModuleException
+	public void buildPanel(final InputPanel<P, W> inputPanel, final Module module)
+		throws ModuleException
 	{
 		final Iterable<ModuleItem<?>> inputs = module.getInfo().inputs();
 
@@ -107,18 +93,6 @@ public void harvest(final Module module) throws ModuleException {
 		module.preview();
 	}
 
-	@Override
-	public void processResults(final InputPanel<P, W> inputPanel,
-		final Module module) throws ModuleException
-	{
-		final Iterable<ModuleItem<?>> inputs = module.getInfo().inputs();
-
-		for (final ModuleItem<?> item : inputs) {
-			final String name = item.getName();
-			module.resolveInput(name);
-		}
-	}
-
 	// -- Helper methods --
 
 	private <T> WidgetModel addInput(final InputPanel<P, W> inputPanel,

src/main/java/org/scijava/widget/InputHarvester.java

@@ -33,7 +33,9 @@
 
 import org.scijava.Priority;
 import org.scijava.module.Module;
+import org.scijava.module.ModuleCanceledException;
 import org.scijava.module.ModuleException;
+import org.scijava.module.ModuleItem;
 
 /**
  * An input harvester collects {@link Module} input values, according to the
@@ -62,7 +64,16 @@ public interface InputHarvester<P, W> {
 	 * @param module The module whose inputs should be harvest.
 	 * @throws ModuleException If the process goes wrong, or is canceled.
 	 */
-	void harvest(Module module) throws ModuleException;
+	default void harvest(final Module module) throws ModuleException {
+		final InputPanel<P, W> inputPanel = createInputPanel();
+		buildPanel(inputPanel, module);
+		if (!inputPanel.hasWidgets()) return; // no inputs left to harvest
+
+		final boolean ok = harvestInputs(inputPanel, module);
+		if (!ok) throw new ModuleCanceledException();
+
+		processResults(inputPanel, module);
+	}
 
 	/**
 	 * Constructs an empty {@link InputPanel}. Widgets are added later using the
@@ -89,7 +100,15 @@ void buildPanel(InputPanel<P, W> inputPanel, Module module)
 	boolean harvestInputs(InputPanel<P, W> inputPanel, Module module);
 
 	/** Does any needed processing, after input values have been harvested. */
-	void processResults(InputPanel<P, W> inputPanel, Module module)
-		throws ModuleException;
+	@SuppressWarnings("unused")
+	default void processResults(final InputPanel<P, W> inputPanel,
+		final Module module) throws ModuleException
+	{
+		final Iterable<ModuleItem<?>> inputs = module.getInfo().inputs();
 
+		for (final ModuleItem<?> item : inputs) {
+			final String name = item.getName();
+			module.resolveInput(name);
+		}
+	}
 }