Refactor command creation

[signal-cli] / src / main / java / org / asamk / signal / commands / DbusCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/DbusCommand.java b/src/main/java/org/asamk/signal/commands/DbusCommand.java
index 4dee75b2b0e58485cc36b18f804826a38e6e0d2c..9f676a39f69399aef909842e605cdd4b32953650 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DbusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DbusCommand.java
@@ -3,8 +3,18 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.Signal;
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.dbus.DbusSignalImpl;
+import org.asamk.signal.manager.Manager;
 
-public interface DbusCommand extends Command {
+public interface DbusCommand extends LocalCommand {
 
-    int handleCommand(Namespace ns, Signal signal);
+    void handleCommand(Namespace ns, Signal signal, OutputWriter outputWriter) throws CommandException;
+
+    default void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        handleCommand(ns, new DbusSignalImpl(m, null), outputWriter);
+    }
 }