Merge pull request #11 from scijava/cleanup

imagejan · web-flow · commit 00c2834827df · 2018-01-24T15:23:37.000+01:00
Code clean-up
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>18.0.0</version>
+		<version>19.0.0</version>
 		<relativePath />
 	</parent>
 
diff --git a/src/main/java/org/scijava/batch/FileScriptBatchProcessor.java b/src/main/java/org/scijava/batch/FileScriptBatchProcessor.java
@@ -17,7 +17,6 @@
 import org.scijava.convert.ConvertService;
 import org.scijava.module.ModuleInfo;
 import org.scijava.module.ModuleItem;
-import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptService;
@@ -30,9 +29,6 @@ public class FileScriptBatchProcessor extends DynamicCommand {
 	private final String WILDCARD = "Wildcard";
 	private final String REGEX = "Regex";
 
-	@Parameter
-	private ModuleService modules;
-
 	@Parameter
 	private ScriptService scripts;
 
@@ -66,7 +62,6 @@ public class FileScriptBatchProcessor extends DynamicCommand {
 	@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
 	private File outputFolder;
 
-	private FilenameFilter inputFilter;
 	private List<File> fileList;
 	private ModuleInfo moduleInfo;
 
@@ -111,6 +106,7 @@ private List<File> populateFileList(File folder, FilenameFilter filter, boolean
 	 */
 	protected void directoryCallback() {
 		// get list of all applicable files
+		FilenameFilter inputFilter;
 		try {
 			switch (filterChoice) {
 			case WILDCARD:
@@ -119,6 +115,7 @@ protected void directoryCallback() {
 			case REGEX:
 			default:
 				inputFilter = new RegexFileFilter(pattern);
+				break;
 			}
 			fileList = populateFileList(inputFolder, inputFilter, recursive);
 		} catch (PatternSyntaxException e) {
diff --git a/src/main/java/org/scijava/batch/MenuScriptBatchProcessor.java b/src/main/java/org/scijava/batch/MenuScriptBatchProcessor.java
@@ -14,11 +14,9 @@
 import org.scijava.command.Command;
 import org.scijava.command.CommandService;
 import org.scijava.command.DynamicCommand;
-import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptInfo;
-import org.scijava.script.ScriptService;
 import org.scijava.widget.ChoiceWidget;
 import org.scijava.widget.FileWidget;
 
@@ -28,12 +26,6 @@ public class MenuScriptBatchProcessor extends DynamicCommand {
 	private final String WILDCARD = "Wildcard";
 	private final String REGEX = "Regex";
 
-	@Parameter
-	private ModuleService modules;
-
-	@Parameter
-	private ScriptService scripts;
-
 	@Parameter
 	private CommandService commands;
 
@@ -58,7 +50,6 @@ public class MenuScriptBatchProcessor extends DynamicCommand {
 	@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
 	private File outputFolder;
 
-	private FilenameFilter inputFilter;
 	private List<File> fileList;
 
 	@Override
@@ -95,6 +86,7 @@ private List<File> populateFileList(File folder, FilenameFilter filter,
 	 */
 	protected void directoryCallback() {
 		// get list of all applicable files
+		FilenameFilter inputFilter;
 		try {
 			switch (filterChoice) {
 			case WILDCARD:
@@ -103,6 +95,7 @@ protected void directoryCallback() {
 			case REGEX:
 			default:
 				inputFilter = new RegexFileFilter(pattern);
+				break;
 			}
 			fileList = populateFileList(inputFolder, inputFilter, recursive);
 		} catch (PatternSyntaxException e) {
