From 9c4eca45ce657ffd01ad84078ecddd1930aed8fd Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael.hierweck@hostsharing.net>
Date: Wed, 28 Nov 2012 17:43:07 +0100
Subject: [PATCH] Updated prompt and some messages.

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

diff --git a/hsarjcli/src/de/hsadmin/jscli/ConsoleWrapper.java b/hsarjcli/src/de/hsadmin/jscli/ConsoleWrapper.java
index 28f1a44..57d59f4 100644
--- a/hsarjcli/src/de/hsadmin/jscli/ConsoleWrapper.java
+++ b/hsarjcli/src/de/hsadmin/jscli/ConsoleWrapper.java
@@ -47,7 +47,7 @@
 
 	public String readPassword() throws JSCliException {
 		try {
-			String pw = cons.readLine("password:", new Character('*'));
+			String pw = cons.readLine("Password: ", new Character('*'));
 			cons.setDefaultPrompt(prompt);
 			return pw;
 		} catch (IOException e) {
diff --git a/hsarjcli/src/de/hsadmin/jscli/Main.java b/hsarjcli/src/de/hsadmin/jscli/Main.java
index 7eec1a5..131047e 100644
--- a/hsarjcli/src/de/hsadmin/jscli/Main.java
+++ b/hsarjcli/src/de/hsadmin/jscli/Main.java
@@ -14,7 +14,7 @@
 			CommandlineParser cmdParser = new CommandlineParser(args);
 			String runAs = cmdParser.getRunAs();
 			console = new ConsoleWrapper();
-			console.open(runAs + "@hsadmin>");
+			console.open(runAs + "@hsadmin> ");
 			JSONFormatter formatter = new JSONFormatter();
 			ScriptClient scriptClient = new ScriptClient(console, cmdParser.getUser(), runAs);
 			String file = cmdParser.getFile();
@@ -26,7 +26,7 @@
 					try {
 						console.println(formatter.format(scriptClient.execute(new FileReader(fileHandle))));
 					} catch (FileNotFoundException e) {
-						System.err.println("file not found: " + file);
+						System.err.println("File not found: " + file);
 					}
 				}
 			}
@@ -40,7 +40,7 @@
 					try {
 						console.println(formatter.format(scriptClient.execute(command)));
 					} catch (Exception e) {
-						console.println("ERR: " + e.getLocalizedMessage() + "\n");
+						console.println("Error: " + e.getLocalizedMessage() + "\n");
 					}
 					command = console.readInput();
 				}

--
Gitblit v1.9.0-SNAPSHOT