Refactor output writers

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

diff --git a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
index 9f5787aecd1f76f2702cad8fc25288c0c02ba93e..a4d4ffeae60cb708335089155f943aa97e76eac5 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
@@ -2,33 +2,34 @@ package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;

+
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;

 import org.asamk.signal.manager.Manager;
 
 import java.io.IOException;
 
 public class RemoveDeviceCommand implements LocalCommand {
 
 import org.asamk.signal.manager.Manager;
 
 import java.io.IOException;
 
 public class RemoveDeviceCommand implements LocalCommand {
 

-    @Override
-    public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("-d", "--deviceId")
+    public RemoveDeviceCommand(final OutputWriter outputWriter) {
+    }
+
+    public static void attachToSubparser(final Subparser subparser) {
+        subparser.help("Remove a linked device.");
+        subparser.addArgument("-d", "--device-id", "--deviceId")

                 .type(int.class)
                 .required(true)
                 .help("Specify the device you want to remove. Use listDevices to see the deviceIds.");
     }
 
     @Override
                 .type(int.class)
                 .required(true)
                 .help("Specify the device you want to remove. Use listDevices to see the deviceIds.");
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {

         try {
         try {

-            int deviceId = ns.getInt("deviceId");
+            int deviceId = ns.getInt("device-id");

             m.removeLinkedDevices(deviceId);
             m.removeLinkedDevices(deviceId);

-            return 0;

         } catch (IOException e) {
         } catch (IOException e) {

-            e.printStackTrace();
-            return 3;
+            throw new IOErrorException("Error while removing device: " + e.getMessage());

         }
     }
 }
         }
     }
 }