OptionsPlugin: fix bug with cancelation

After canceling an options plugin, it would not run again.

Great idea Curtis to make OptionsPlugins singletons... >_<

Author: ctrueden

src/main/java/org/scijava/command/DynamicCommand.java

@@ -140,4 +140,8 @@ public String getCancelReason() {
 		return cancelReason;
 	}
 
+	// HACK: For OptionsPlugin.
+	public void uncancel() {
+		cancelReason = null;
+	}
 }

src/main/java/org/scijava/options/OptionsPlugin.java

@@ -108,19 +108,20 @@ public void reset() {
 		prefService.clear(getClass());
 	}
 
+	// -- Module methods --
+
+	@Override
+	public void cancel() {
+		resetState();
+	}
+
 	// -- Runnable methods --
 
 	@Override
 	public void run() {
 		save();
-
-		// NB: Clear "resolved" status of all inputs.
-		// Otherwise, no inputs are harvested on next run.
-		for (final ModuleItem<?> input : getInfo().inputs()) {
-			unresolveInput(input.getName());
-		}
-
 		eventService.publish(new OptionsEvent(this));
+		resetState();
 	}
 
 	// -- Helper methods --
@@ -135,4 +136,15 @@ private <T> void saveInput(final ModuleItem<T> input) {
 		moduleService.save(input, value);
 	}
 
+	private void resetState() {
+		// NB: Clear "resolved" status of all inputs.
+		// Otherwise, no inputs are harvested on next run.
+		for (final ModuleItem<?> input : getInfo().inputs()) {
+			unresolveInput(input.getName());
+		}
+
+		// NB: Clear "canceled" status.
+		// Otherwise, the command cannot run again.
+		uncancel();
+	}
 }