svn commit: r1038672 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/cli/CliMain.java

[jb...@apache.org]

Author: jbellis
Date: Wed Nov 24 16:23:31 2010
New Revision: 1038672

URL: http://svn.apache.org/viewvc?rev=1038672&view=rev
Log:
cli updates prompt to ... in continuation lines
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-1770

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1038672&r1=1038671&r2=1038672&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed Nov 24 16:23:31 2010
@@ -9,6 +9,7 @@ dev
    on ColumnDef (CASSANDRA-1759)
  * fix add/remove index bugs in CFMetadata (CASSANDRA-1768)
  * rebuild Strategy during system_update_keyspace (CASSANDRA-1762)
+ * cli updates prompt to ... in continuation lines (CASSANDRA-1770)
 
 
 0.7.0-rc1

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java?rev=1038672&r1=1038671&r2=1038672&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java Wed Nov 24 16:23:31 2010
@@ -183,7 +183,7 @@ public class CliMain
     private static void printBanner()
     {
         sessionState.out.println("Welcome to cassandra CLI.\n");
-        sessionState.out.println("Type 'help' or '?' for help. Type 'quit' or 'exit' to quit.");
+        sessionState.out.println("Type 'help;' or '?' for help. Type 'quit;' or 'exit;' to quit.");
     }
 
     /**
@@ -323,7 +323,7 @@ public class CliMain
 
         while (line != null)
         {
-            prompt = (inCompoundStatement) ? "\t" : getPrompt(cliClient);
+            prompt = (inCompoundStatement) ? "...\t" : getPrompt(cliClient);
 
             line = reader.readLine(prompt).trim();
 
@@ -332,7 +332,7 @@ public class CliMain
 
             currentStatement += line;
 
-            if (line.endsWith(";"))
+            if (line.endsWith(";") || line.equals("?"))
             {
                 processStatement(currentStatement);
                 currentStatement = "";