Author: aidan
Date: Tue Jan 13 01:25:53 2009
New Revision: 734079

URL: http://svn.apache.org/viewvc?rev=734079&view=rev
Log:
QPID-1522: remove bogus COMMAND_NAME in CommandImpl.java, fix typos in help


Modified:
    
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
    
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
    
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
    
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
    
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java?rev=734079&r1=734078&r2=734079&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java 
(original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java 
Tue Jan 13 01:25:53 2009
@@ -22,9 +22,6 @@
 
 public interface Command
 {
-
-    public static String COMMAND_NAME = null;
-
     public void execute();
 
     public void printusage();

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java?rev=734079&r1=734078&r2=734079&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
 Tue Jan 13 01:25:53 2009
@@ -143,7 +143,7 @@
     public void unrecognizeoption()
     {
         echo("list: Unrecognized option");
-        echo("Try `" + COMMAND_NAME + " --help` for more information");
+        echo("Try --help for more information");
     }
 
     public abstract void execute();

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java?rev=734079&r1=734078&r2=734079&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
 Tue Jan 13 01:25:53 2009
@@ -76,7 +76,7 @@
 
             if (objname.getSet().size() != 1)
             {
-                echo("You quering return more than one queue to set was this 
intended?\n" + objname.getQueryString());
+                echo("Your query returned more than one object to set was this 
intended?\n" + objname.getQueryString());
             }
             else if (objname.getSet().size() == 1)
             {
@@ -91,9 +91,9 @@
                 if (hasName())
                 {
 
-                    echo("You might quering wrong " + this.getObject() + " 
name with --name or -n option ");
+                    echo("You might be querying wrong " + this.getObject() + " 
name with --name or -n option ");
                     echo("");
-                    echo(this.getObject() + "Type Objects might not in the 
broker currently");
+                    echo("No " + this.getObject() + "Type Objects might not in 
the broker currently");
                     echo("");
                 }
                 else

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java?rev=734079&r1=734078&r2=734079&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
 Tue Jan 13 01:25:53 2009
@@ -114,9 +114,9 @@
                 if (hasName())
                 {
 
-                    echo("You might quering wrong " + this.getObject() + " 
name with --name or -n option ");
+                    echo("You might querying wrong " + this.getObject() + " 
name with --name or -n option ");
                     echo("");
-                    echo(this.getObject() + "Type Objects might not in the 
broker currently");
+                    echo("No "+this.getObject() + "Type Objects might not be 
in the broker currently");
                     echo("");
                 }
                 else

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java?rev=734079&r1=734078&r2=734079&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
 Tue Jan 13 01:25:53 2009
@@ -86,7 +86,7 @@
 
             if (objname.getSet().size() != 1)
             {
-                echo("You quering return more than one queue to set was this 
intended?\n" + objname.getQueryString());
+                echo("Your query returned more than one object to set was this 
intended?" + objname.getQueryString());
             }
             else if (objname.getSet().size() == 1)
             {
@@ -122,9 +122,9 @@
                 if (hasName())
                 {
 
-                    echo("You might quering wrong " + this.getObject() + " 
name with --name or -n option ");
+                    echo("You might be querying wrong " + this.getObject() + " 
name with --name or -n option ");
                     echo("");
-                    echo(this.getObject() + "Type Objects might not in the 
broker currently");
+                    echo("No " + this.getObject() + "Type Objects might not in 
the broker currently");
                     echo("");
                 }
                 else


Reply via email to