svn commit: r1548052 - /karaf/branches/karaf-2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java

[gnodet]

Author: gnodet
Date: Thu Dec  5 09:46:15 2013
New Revision: 1548052

URL: http://svn.apache.org/r1548052
Log:
[KARAF-2605] Use ConsoleReader instead of the keyboard stream

Modified:
    
karaf/branches/karaf-2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java

Modified: 
karaf/branches/karaf-2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java?rev=1548052&r1=1548051&r2=1548052&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
 (original)
+++ 
karaf/branches/karaf-2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
 Thu Dec  5 09:46:15 2013
@@ -16,11 +16,11 @@
  */
 package org.apache.karaf.shell.osgi;
 
+import jline.console.ConsoleReader;
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.felix.gogo.commands.Command;
-import org.osgi.framework.Bundle;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -77,37 +77,11 @@ public class Shutdown extends OsgiComman
         }
 
         for (; ; ) {
-            StringBuffer sb = new StringBuffer();
             String karafName = System.getProperty("karaf.name");
-            System.err.println(String.format("Confirm: shutdown instance %s 
(yes/no): ", karafName));
-
-            System.err.flush();
-            for (; ; ) {
-                int c = session.getKeyboard().read();
-                if (c < 0) {
-                    return null;
-                }
-                if (c == 127 || c == 'b') {
-                    System.err.print((char) '\b');
-                    System.err.print((char) ' ');
-                    System.err.print((char) '\b');
-                } else {
-                    System.err.print((char) c);
-                }
-                System.err.flush();
-                if (c == '\r' || c == '\n') {
-                    break;
-                }
-                if (c == 127 || c == 'b') {
-                    if (sb.length() > 0) {
-                        sb.deleteCharAt(sb.length() - 1);
-                    }
-                } else {
-                    sb.append((char) c);
-                }
-            }
-            String str = sb.toString();
-            if (str.equals("yes")) {
+            String msg = String.format("Confirm: shutdown instance %s 
(yes/no): ", karafName);
+            ConsoleReader reader = (ConsoleReader) 
session.get(".jline.reader");
+            String str = reader.readLine(msg);
+            if (str.equalsIgnoreCase("yes")) {
                 this.shutdown(sleep);
             }
             return null;