summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/management/tools/qpid-cli/src/org/apache/qpid/Command.java3
-rw-r--r--java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java2
-rw-r--r--java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java6
-rw-r--r--java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java4
-rw-r--r--java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java6
5 files changed, 9 insertions, 12 deletions
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java b/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
index cf6bee619c..eadc87186f 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
@@ -22,9 +22,6 @@ package org.apache.qpid;
public interface Command
{
-
- public static String COMMAND_NAME = null;
-
public void execute();
public void printusage();
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
index 0e24dc3d6f..6fdae4c0a6 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
@@ -143,7 +143,7 @@ public abstract class CommandImpl implements Command
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();
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
index 35a07798a1..8d690ac7f7 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
@@ -76,7 +76,7 @@ public class Commandget extends CommandImpl
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 @@ public class Commandget extends CommandImpl
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
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
index d016e224b0..7094a8fc7f 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
@@ -114,9 +114,9 @@ public class Commandinfo extends CommandImpl
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
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
index 4dd97e30b0..b5cc9e6090 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
@@ -86,7 +86,7 @@ public class Commandset extends CommandImpl
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 @@ public class Commandset extends CommandImpl
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