From 81237641540903d8ba3cc4ba76ed773fc8528e6d Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Fri, 8 Nov 2013 16:49:17 +0100
Subject: [PATCH] support numbers

---
 hsarjcli/src/de/hsadmin/jscli/JSONFormatter.java | 7 +++++++
 hsarjcli/src/de/hsadmin/jscli/Main.java          | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/hsarjcli/src/de/hsadmin/jscli/JSONFormatter.java b/hsarjcli/src/de/hsadmin/jscli/JSONFormatter.java
index 2f221fb..5f2e32e 100644
--- a/hsarjcli/src/de/hsadmin/jscli/JSONFormatter.java
+++ b/hsarjcli/src/de/hsadmin/jscli/JSONFormatter.java
@@ -19,6 +19,9 @@ public class JSONFormatter {
 		if (object instanceof String) {
 			return formatString((String) object);
 		}
+		if (object instanceof Number) {
+			return formatNumber((Number) object);
+		}
 		if (object instanceof Object[]) {
 			return formatArr((Object[]) object);
 		}
@@ -52,6 +55,10 @@ public class JSONFormatter {
 		return "'" + str + "'";
 	}
 	
+	private String formatNumber(Number num) {
+		return num.toString();
+	}
+
 	public String formatList(List<?> list) {
 		return formatArr(list.toArray());
 	}
diff --git a/hsarjcli/src/de/hsadmin/jscli/Main.java b/hsarjcli/src/de/hsadmin/jscli/Main.java
index fbfe97f..1bd6c78 100644
--- a/hsarjcli/src/de/hsadmin/jscli/Main.java
+++ b/hsarjcli/src/de/hsadmin/jscli/Main.java
@@ -34,8 +34,8 @@ public class Main {
 			}
 			String expr = cmdParser.getExpression();
 			if (expr != null && expr.length() > 0) {
-				scriptClient.execute(expr);
-				console.println(formatter.format(scriptClient.getLastRpcResult()));
+				Object execute = scriptClient.execute(expr);
+				console.println(formatter.format(execute));
 			}
 			if (cmdParser.isInteractive()) {
 				String command = console.readInput();