Merge pull request #72 from NicoKiaru/master

ctrueden · web-flow · commit 304178cd459b · 2022-09-02T17:41:16.000-05:00
Fixes interactive command NPEs raised in SwingObjectWidget
diff --git a/src/main/java/org/scijava/ui/swing/widget/SwingObjectWidget.java b/src/main/java/org/scijava/ui/swing/widget/SwingObjectWidget.java
@@ -96,8 +96,8 @@ public void set(final WidgetModel model) {
 
 	@Override
 	public boolean supports(final WidgetModel model) {
-		return super.supports(model) && (model.getChoices() != null ||
-			(model.getObjectPool() != null && model.getObjectPool().size() > 0));
+		return super.supports(model) && ((model.getChoices() != null && model.getChoices().length>0) ||
+			((model.getObjectPool() != null) && (model.getObjectPool().size() > 0)));
 	}
 
 	// -- AbstractUIInputWidget methods ---
diff --git a/src/test/java/org/scijava/ui/swing/command/InteractiveCommandDemo.java b/src/test/java/org/scijava/ui/swing/command/InteractiveCommandDemo.java
@@ -0,0 +1,32 @@
+package org.scijava.ui.swing.command;
+
+import org.scijava.Context;
+import org.scijava.command.Command;
+import org.scijava.command.CommandService;
+import org.scijava.command.InteractiveCommand;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.ui.UIService;
+
+@Plugin(type = Command.class, menuPath = "Test>Test Interactive Command")
+public class InteractiveCommandDemo extends InteractiveCommand {
+
+    @Parameter
+    String a_string;
+
+    @Parameter(choices={"A", "B", "C"})
+    String another_string;
+
+    @Override
+    public void run() {
+        // nothing
+    }
+
+    public static void main(String... args) throws Exception {
+
+        Context context = new Context();
+        context.service(UIService.class).showUI();
+        context.service(CommandService.class).run(InteractiveCommandDemo.class, true);
+
+    }
+}
diff --git a/src/test/java/org/scijava/ui/swing/widget/SwingObjectWidgetTest.java b/src/test/java/org/scijava/ui/swing/widget/SwingObjectWidgetTest.java
@@ -39,6 +39,7 @@
 import org.scijava.Context;
 import org.scijava.command.CommandInfo;
 import org.scijava.command.ContextCommand;
+import org.scijava.command.InteractiveCommand;
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
 import org.scijava.module.ModuleService;
@@ -67,7 +68,7 @@ public void tearDown() {
 	}
 
 	@Test
-	public void testObjects() {
+	public void testObjectsCommand() {
 		Thing a = new Thing();
 		Thing b = new Thing();
 
@@ -93,6 +94,33 @@ public void testObjects() {
 		assertTrue(choicesWidget instanceof SwingObjectWidget);
 	}
 
+	@Test
+	public void testObjectsInteractiveCommand() {
+		Thing a = new Thing();
+		Thing b = new Thing();
+
+		CommandInfo commandInfo = new CommandInfo(MyInteractiveCommand.class);
+		Module module = moduleService.createModule(commandInfo);
+		InputPanel<?,?> panel = new SwingInputPanel();
+
+		ModuleItem<Thing> thingInput = moduleService.getSingleInput(module, Thing.class);
+		ModuleItem<Nothing> nothingInput = moduleService.getSingleInput(module, Nothing.class);
+		ModuleItem<Choices> choicesInput = moduleService.getSingleInput(module, Choices.class);
+
+		WidgetModel thingModel = widgetService.createModel(panel, module, thingInput, Arrays.asList(a, b));
+		WidgetModel nothingModel = widgetService.createModel(panel, module, nothingInput, null);
+		WidgetModel choicesModel = widgetService.createModel(panel, module, choicesInput, null);
+
+		InputWidget<?, ?> thingWidget = widgetService.create(thingModel);
+		assertTrue(thingWidget instanceof SwingObjectWidget);
+
+		InputWidget<?, ?> nothingWidget = widgetService.create(nothingModel);
+		assertFalse(nothingWidget instanceof SwingObjectWidget);
+
+		InputWidget<?, ?> choicesWidget = widgetService.create(choicesModel);
+		assertTrue(choicesWidget instanceof SwingObjectWidget);
+	}
+
 	private class Thing {
 		// dummy class
 	}
@@ -121,4 +149,22 @@ public void run() {
 		}
 
 	}
+
+	public static class MyInteractiveCommand extends InteractiveCommand {
+		@Parameter
+		private Thing thing;
+
+		@Parameter
+		private Nothing nothing;
+
+		@Parameter
+		private Choices choices;
+
+		@Override
+		public void run() {
+			// nothing to do
+		}
+
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ public void set(final WidgetModel model) {`
`96`	`96`
`97`	`97`	`@Override`
`98`	`98`	`public boolean supports(final WidgetModel model) {`
`99`		`- return super.supports(model) && (model.getChoices() != null \|\|`
`100`		`- (model.getObjectPool() != null && model.getObjectPool().size() > 0));`
	`99`	`+ return super.supports(model) && ((model.getChoices() != null && model.getChoices().length>0) \|\|`
	`100`	`+ ((model.getObjectPool() != null) && (model.getObjectPool().size() > 0)));`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// -- AbstractUIInputWidget methods ---`