Merge pull request #15 from scijava/ignore-output-folder

Prepare public release

Author: imagejan

src/main/java/org/scijava/batch/FileScriptBatchProcessor.java

@@ -59,8 +59,8 @@ public class FileScriptBatchProcessor extends DynamicCommand {
 	@Parameter(visibility = ItemVisibility.MESSAGE, persist = false)
 	private String message = " "; // Placeholder message
 
-	@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
-	private File outputFolder;
+//	@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
+//	private File outputFolder;
 
 	private List<File> fileList;
 	private ModuleInfo moduleInfo;
@@ -80,7 +80,7 @@ public void run() {
 		inputMap.put("moduleInfo", moduleInfo);
 		File[] fileArray = fileList.toArray(new File[fileList.size()]);
 		inputMap.put("inputFileList", fileArray);
-		inputMap.put("outputFolder", outputFolder);
+//		inputMap.put("outputFolder", outputFolder);
 		commands.run(ModuleBatchProcessor.class, true, inputMap);
 	}
 
@@ -105,6 +105,8 @@ private List<File> populateFileList(File folder, FilenameFilter filter, boolean
 	 * Count all applicable files and display them in the dialog message
 	 */
 	protected void directoryCallback() {
+		if (inputFolder == null || !inputFolder.exists()) return;
+
 		// get list of all applicable files
 		FilenameFilter inputFilter;
 		try {

src/main/java/org/scijava/batch/MenuScriptBatchProcessor.java

@@ -47,8 +47,8 @@ public class MenuScriptBatchProcessor extends DynamicCommand {
 	@Parameter(visibility = ItemVisibility.MESSAGE, persist = false)
 	private String message = " "; // Placeholder message
 
-	@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
-	private File outputFolder;
+//	@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
+//	private File outputFolder;
 
 	private List<File> fileList;
 
@@ -58,7 +58,7 @@ public void run() {
 		inputMap.put("moduleInfo", scriptInfo);
 		File[] fileArray = fileList.toArray(new File[fileList.size()]);
 		inputMap.put("inputFileList", fileArray);
-		inputMap.put("outputFolder", outputFolder);
+//		inputMap.put("outputFolder", outputFolder);
 		commands.run(ModuleBatchProcessor.class, true, inputMap);
 	}
 
@@ -85,6 +85,8 @@ private List<File> populateFileList(File folder, FilenameFilter filter,
 	 * Count all applicable files and display them in the dialog message
 	 */
 	protected void directoryCallback() {
+		if (inputFolder == null || !inputFolder.exists()) return;
+
 		// get list of all applicable files
 		FilenameFilter inputFilter;
 		try {

src/main/java/org/scijava/batch/ModuleBatchProcessor.java

@@ -46,8 +46,8 @@ public class ModuleBatchProcessor extends DynamicCommand {
 	@Parameter(label = "Input files")
 	private File[] inputFileList;
 
-	@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
-	private File outputFolder;
+//	@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
+//	private File outputFolder;
 
 	@SuppressWarnings("rawtypes")
 	@Parameter(type = ItemIO.OUTPUT)

src/main/java/org/scijava/batch/SwingScriptInfoWidget.java

@@ -2,18 +2,16 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.swing.JComboBox;
 import javax.swing.JPanel;
 
 import org.scijava.Priority;
-import org.scijava.convert.ConvertService;
 import org.scijava.log.LogService;
-import org.scijava.module.Module;
-import org.scijava.module.ModuleService;
+import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptInfo;
@@ -22,18 +20,15 @@
 import org.scijava.widget.InputWidget;
 import org.scijava.widget.WidgetModel;
 
-@Plugin(type = InputWidget.class, priority = Priority.NORMAL_PRIORITY)
+@Plugin(type = InputWidget.class, priority = Priority.NORMAL)
 public class SwingScriptInfoWidget extends SwingInputWidget<ScriptInfo>
 		implements ActionListener, ScriptInfoWidget<JPanel> {
 
 	@Parameter
-	private ScriptService scripts;
+	private ScriptService scriptService;
 
 	@Parameter
-	private ModuleService modules;
-
-	@Parameter
-	private ConvertService convert;
+	private BatchService batchService;
 
 	@Parameter
 	private LogService log;
@@ -55,30 +50,11 @@ public void actionPerformed(final ActionEvent e) {
 	public void set(final WidgetModel model) {
 		super.set(model);
 
-		// get required class from style attribute
-		String style = model.getItem().getWidgetStyle();
-		if (style == null) {
-			style = "java.io.File"; // default to File
-		}
-		Class<?> inputType;
-		try {
-			inputType = Class.forName(style);
-		} catch (ClassNotFoundException exc) {
-			log.warn("Wrong style attribute: ", exc);
-			inputType = File.class;
-		}
-
 		// create script map
-		for (ScriptInfo script : scripts.getScripts()) {
-			Module scriptModule = modules.createModule(script);
-			for (String inputItem : scriptModule.getInputs().keySet()) {
-				// TODO consider replacing by isAssignableFrom
-				if (convert.supports(inputType, script.getInput(inputItem).getType())) {
-				//if (script.getInput(inputItem).getType().isAssignableFrom(inputType)) {
-					log.info("Support conversion from " + inputType + " to " + script.getInput(inputItem).getType());
-					scriptMap.put(script.getMenuPath().getMenuString(), script);
-					break;
-				}
+		for (ScriptInfo script : scriptService.getScripts()) {
+			List<ModuleItem<?>> compatibleInputs = batchService.batchableInputs(script);
+			if (!compatibleInputs.isEmpty()) {
+				scriptMap.put(script.getMenuPath().getMenuString(), script);
 			}
 		}