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();