Added SSH ClientAction; support multiple parameters

justinsb · justinsb · commit be7ead3f681d · 2012-05-27T17:00:03.000-07:00
diff --git a/shared-cli/src/main/java/com/fathomdb/cli/formatter/ClientActionDefaultFormatter.java b/shared-cli/src/main/java/com/fathomdb/cli/formatter/ClientActionDefaultFormatter.java
@@ -6,6 +6,7 @@
 import com.fathomdb.cli.output.ClientAction;
 import com.fathomdb.cli.output.ClientActionFormatter;
 import com.fathomdb.cli.output.OutputSink;
+import com.google.common.base.Joiner;
 import com.google.common.collect.Maps;
 
 public class ClientActionDefaultFormatter extends SimpleFormatter<ClientAction> implements
@@ -20,7 +21,7 @@ public void visit(ClientAction o, OutputSink sink) throws IOException {
 		LinkedHashMap<String, Object> values = Maps.newLinkedHashMap();
 
 		values.put("action", o.getAction());
-		values.put("parameter", o.getParameter());
+		values.put("parameter", Joiner.on(' ').join(o.getParameters()));
 
 		sink.outputRow(values);
 	}
diff --git a/shared-cli/src/main/java/com/fathomdb/cli/output/ActionOutputSink.java b/shared-cli/src/main/java/com/fathomdb/cli/output/ActionOutputSink.java
@@ -2,11 +2,13 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.List;
 import java.util.Map;
 
 import com.fathomdb.cli.formatter.DefaultFormatter;
 import com.fathomdb.cli.formatter.Formatter;
 import com.fathomdb.cli.formatter.FormatterRegistry;
+import com.google.common.base.Joiner;
 
 public class ActionOutputSink implements OutputSink {
 
@@ -33,7 +35,9 @@ <T> void formatClientAction(Formatter formatter, T object) {
 			ClientActionFormatter<T> clientActionFormatter = (ClientActionFormatter<T>) formatter;
 			ClientAction clientAction = clientActionFormatter.formatAction(object);
 
-			out.println(clientAction.getAction().toString().toLowerCase() + " " + clientAction.getParameter());
+			List<String> parameters = clientAction.getParameters();
+
+			out.println(clientAction.getAction().toString().toLowerCase() + " " + Joiner.on(' ').join(parameters));
 		} else {
 			throw new UnsupportedOperationException("Cannot format for action");
 		}
diff --git a/shared-cli/src/main/java/com/fathomdb/cli/output/ClientAction.java b/shared-cli/src/main/java/com/fathomdb/cli/output/ClientAction.java
@@ -1,24 +1,27 @@
 package com.fathomdb.cli.output;
 
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
 public class ClientAction {
 	public enum ClientActionType {
-		BROWSER
+		BROWSER, SSH
 	}
 
 	final ClientActionType action;
-	final String parameter;
+	final List<String> parameters;
 
-	public ClientAction(ClientActionType action, String parameter) {
+	public ClientAction(ClientActionType action, String... parameters) {
 		this.action = action;
-		this.parameter = parameter;
+		this.parameters = Lists.newArrayList(parameters);
 	}
 
 	public ClientActionType getAction() {
 		return action;
 	}
 
-	public String getParameter() {
-		return parameter;
+	public List<String> getParameters() {
+		return parameters;
 	}
-
 }
