Invoke command fix

Nasdanika · Oct 7, 2024 · 3b048b1 · 3b048b1
1 parent e68c51b
commit 3b048b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/cli/src/main/java/module-info.java b/cli/src/main/java/module-info.java
@@ -1,6 +1,7 @@
 import org.nasdanika.capability.CapabilityFactory;
 import org.nasdanika.cli.DrawioCommandFactory;
 import org.nasdanika.cli.HelpCommandFactory;
+import org.nasdanika.cli.InvokeCommandFactory;
 import org.nasdanika.cli.ModelCommandFactory;
 import org.nasdanika.cli.RootCommandFactory;
 import org.nasdanika.cli.SaveModelCommandFactory;
@@ -22,6 +23,7 @@
 		HelpCommandFactory,
 		DrawioCommandFactory,
 		ModelCommandFactory,
-		SaveModelCommandFactory;
+		SaveModelCommandFactory,
+		InvokeCommandFactory;
 
 }
diff --git a/cli/src/main/java/org/nasdanika/cli/InvokeCommand.java b/cli/src/main/java/org/nasdanika/cli/InvokeCommand.java
@@ -12,7 +12,6 @@
 import org.nasdanika.common.NasdanikaException;
 import org.nasdanika.common.ProgressMonitor;
 
-import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
@@ -52,7 +51,7 @@ public InvokeCommand(CapabilityLoader capablityLoader) {
 	private PropertiesMixIn propertiesMixIn;
 
 	@ParentCommand
-	CommandLine parentCommand;
+	Invocable.Invoker parentCommand;
 
 	@Mixin
 	private ProgressMonitorMixIn progressMonitorMixIn;
@@ -110,11 +109,8 @@ protected Invocable getInvocable() {
 	@Override
 	public Integer call() throws Exception {
 		if (parentCommand != null) {
-			Object puo = parentCommand.getCommandSpec().userObject();
-			if (puo instanceof Invocable.Invoker) {
-				((Invocable.Invoker) puo).invoke(getInvocable());
-				return 0;
-			}
+			((Invocable.Invoker) parentCommand).invoke(getInvocable());
+			return 0;
 		}
 		getInvocable().invoke();
 		return 0;