QPID-1522: Move common code up to CommandImpl. Rename methods to be consistent. Remove commented out code.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@732307 13f79535-47bb-0310-9956-ffa450edef68

16 files changed, 131 insertions, 436 deletions

diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
index 8c4068e948..27f47dfd2f 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
@@ -37,16 +37,14 @@
  */
 package org.apache.qpid;
 
-import org.apache.qpid.utils.CommandLineOption;
-
 public interface Command {
 
-    public static String commandname = null;
-    public static CommandLineOption options = null;
-
     public void execute();
 
     public void printusage();
 
-    public void optionvaluechecker();
+    public String optionchecker(String string);
+
+    public boolean checkoptionsetting(String string);
+
 }
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Command.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
index 02c50e37e4..28eb7d8ec6 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Command.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
@@ -39,37 +39,82 @@
 package org.apache.qpid.commands;
 
 
-import org.apache.qpid.utils.CommandLineOptionParser;
+import org.apache.qpid.Command;
 import org.apache.qpid.utils.JMXinfo;
 import org.apache.qpid.utils.CommandLineOption;
 
-import javax.management.remote.JMXConnector;
-import javax.management.MBeanServerConnection;
 import java.util.Map;
 
 
-public class Command {
-    public JMXinfo info = null;
-    public String commandname = null;
+public abstract class CommandImpl implements Command {
+    protected JMXinfo info = null;
+    private String commandname = null;
 
+    private String name;
+    private String virtualhost = null;
+    private String object = null;
 
-    public Command(JMXinfo info, String name) {
+    private String outputformat = null;
+    private String seperator = ",";
+
+    public CommandImpl(JMXinfo info, String name) {
         this.info = info;
         this.commandname = name;
     }
 
-    public Command() {
+    public CommandImpl() {
+
+    }
 
+    protected void setName(String name) {
+        this.name = name;
     }
 
-    public void execute() {
+    public String getName() {
+        return this.name;
+    }
+    
+    protected boolean hasName() {
+        if (this.name == null)
+            return false;
 
+        else
+            return true;
+    }
+    
+    protected void setObject(String object) {
+        this.object = object;
+    }
+    
+    public String getObject() {
+        return this.object;
+    }
+    
+    protected void setOutputFormat(String outputformat) {
+        this.outputformat = outputformat;
+    }
 
+    protected String getOutputFormat()
+    {
+        return outputformat;
+    }
+    
+    protected void setSeperator(String seperator) {
+        this.seperator = seperator;
     }
 
-    public void printusage() {
+    protected String getSeperator()
+    {
+        return seperator;
+    }
+    
+    protected void setVirtualhost(String virtualhost) {
+        this.virtualhost = virtualhost;
     }
 
+    public String getVirtualhost() {
+        return this.virtualhost;
+    }
 
     public String optionchecker(String option_letter) {
         Map map = info.getCommandLineOptionParser().getAlloptions();
@@ -96,11 +141,7 @@ public class Command {
         else
             return false;
     }
-
-    public void optionvaluechecker() {
-
-    }
-
+    
     public void echo(String str) {
         System.out.println(str);
     }
@@ -110,4 +151,8 @@ public class Command {
         echo("Try `" + this.commandname + " --help` for more information");
     }
 
+    public abstract void execute();
+
+    public abstract void printusage();
+
 }
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java
index 3b11687889..5e41bc7c0e 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java
@@ -60,9 +60,6 @@ import java.io.InputStreamReader;
  * To change this template use File | Settings | File Templates.
  */
 public class Commanddelete extends CommandImpl {
-    private String object;
-    private String name;
-    private String vhost;
     private int number = 0;
     private QueueObject objname;
     private MBeanServerConnection mbsc;
@@ -80,7 +77,7 @@ public class Commanddelete extends CommandImpl {
 
     public void deletemessages() {
         Set set = null;
-        objname.setQueryString(this.object, this.name, this.vhost);
+        objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
         set = objname.returnObjects();
 
         if (objname.getSet().size() != 0) {
@@ -111,7 +108,7 @@ public class Commanddelete extends CommandImpl {
             }
 
         } else {
-            if (isname()) {
+            if (hasName()) {
 
                 echo("The Queue you have specified is not in the current broker");
                 echo("");
@@ -132,7 +129,7 @@ public class Commanddelete extends CommandImpl {
                 object = optionchecker("o");
             }
             if (object.compareToIgnoreCase("queue") == 0)
-                setobject(object);
+                setObject(object);
             else {
                 unrecognizeoption();
                 echo("This command is only applicable for delete command so please start with queue");
@@ -142,13 +139,13 @@ public class Commanddelete extends CommandImpl {
                 if (name == null)
                     name = optionchecker("n");
 
-                setname(name);
+                setName(name);
             }
             if (checkoptionsetting("virtualhost") || checkoptionsetting("v")) {
                 String vhost = optionchecker("virtualhost");
                 if (vhost == null)
                     vhost = optionchecker("v");
-                setvhost(vhost);
+                setVirtualhost(vhost);
             }
             if (checkoptionsetting("top") || checkoptionsetting("t")) {
                 String number = optionchecker("top");
@@ -177,38 +174,6 @@ public class Commanddelete extends CommandImpl {
 
     }
 
-    private void setobject(String object) {
-        this.object = object;
-    }
-
-    public String getobject() {
-        return this.object;
-    }
-
-    private void setname(String name) {
-        this.name = name;
-    }
-
-    private boolean isname() {
-        if (this.name == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    private void setvhost(String vhost) {
-        this.vhost = vhost;
-    }
-
-    public String getvhost() {
-        return this.vhost;
-    }
-
-    public String getname() {
-        return this.name;
-    }
-
     private void setnumber(String number) {
         Integer i = new Integer(number);
         this.number = i.intValue();
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java
index 8dd90317b7..cb053a063d 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java
@@ -53,10 +53,10 @@ public class Commandhelp extends CommandImpl {
     }
 
     public void execute() {
-        displayhelp();
+        printusage();
     }
 
-    private void displayhelp() {
+    public void printusage() {
         echo("");
         echo("Current version of qpid CLI is supporting following commands");
         echo("");
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
index 40ac1008bf..ba192d6549 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
@@ -48,11 +48,6 @@ import java.util.Set;
 
 
 public class Commandinfo extends CommandImpl {
-    private String object = null;
-    private String name = null;
-    private String virtualhost = null;
-    private String outputformat = null;
-    private String seperator = ",";
 
     public Commandinfo(JMXinfo info, String name) {
 
@@ -99,17 +94,17 @@ public class Commandinfo extends CommandImpl {
                 echo("Wrong objectName");
                 return;
             }
-            objname.setQueryString(this.object, this.name, this.virtualhost);
+            objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
             objname.returnObjects();
             if (objname.getSet().size() != 0) {
-                objname.displayinfo(this.outputformat, this.seperator);
+                objname.displayinfo(this.getOutputFormat(), this.getSeperator());
 
             } else {
-                if (isname()) {
+                if (hasName()) {
 
-                    echo("You might quering wrong " + this.object + " name with --name or -n option ");
+                    echo("You might quering wrong " + this.getObject() + " name with --name or -n option ");
                     echo("");
-                    echo(this.object + "Type Objects might not in the broker currently");
+                    echo(this.getObject() + "Type Objects might not in the broker currently");
                     echo("");
                 } else {
                     printusage();
@@ -129,30 +124,30 @@ public class Commandinfo extends CommandImpl {
         with main option object or o
          */
         if (checkoptionsetting("output")) {
-            setoutputformat(optionchecker("output"));
+            setOutputFormat(optionchecker("output"));
             if (checkoptionsetting("separator"))
-                setseperator(optionchecker("separator"));
+                setSeperator(optionchecker("separator"));
         }
         if (checkoptionsetting("object") || checkoptionsetting("o")) {
             String object = optionchecker("object");
             if (object == null) {
                 object = optionchecker("o");
             }
-            setobject(object);
+            setObject(object);
             if (checkoptionsetting("name") || checkoptionsetting("n")) {
                 String name = optionchecker("name");
                 if (name == null)
                     name = optionchecker("n");
 
-                setname(name);
+                setName(name);
             }
             if (checkoptionsetting("virtualhost") || checkoptionsetting("v")) {
                 String vhost = optionchecker("virtualhost");
                 if (vhost == null)
                     vhost = optionchecker("v");
-                setvirtualhost(vhost);
+                setVirtualhost(vhost);
             }
-            listobjects(this.object);
+            listobjects(this.getObject());
         } else if (checkoptionsetting("h") || checkoptionsetting("help"))
             printusage();
         else
@@ -185,75 +180,4 @@ public class Commandinfo extends CommandImpl {
         echo("                              ex: <queue info -n ping> : Give all the information about queue objects ");
         echo("                              having queue name of ping\n");
     }
-
-    private void setobject(String object) {
-        this.object = object;
-    }
-
-    private void setname(String name) {
-        this.name = name;
-    }
-
-    private boolean isname() {
-        if (this.name == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    private void setvirtualhost(String vhost) {
-        this.virtualhost = vhost;
-    }
-
-    public String getvirtualhost() {
-        return this.virtualhost;
-    }
-
-    private void setoutputformat(String outputformat) {
-        this.outputformat = outputformat;
-    }
-
-    private void setseperator(String seperator) {
-        this.seperator = seperator;
-    }
-
-    private boolean isseperator() {
-        if (this.seperator == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    private boolean isoutputformat() {
-        if (this.outputformat == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    public String getname() {
-        return this.name;
-    }
-
-    public String getobject() {
-        return this.object;
-    }
-
-    /*
-    public String optionchecker(String option_letter) {
-       Map map =  info.getCommandLineOptionParser().getAlloptions();
-       if(map == null)
-       return null;
-       CommandLineOption option = (CommandLineOption) map.get(option_letter);
-       if(option == null)
-       return null;
-       String value = option.getOptionValue();
-       return value;
-
-
-    }
-    */
 }
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java
index d6b4d27aee..cca6709c01 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java
@@ -55,12 +55,6 @@ import java.util.Map;
 
 public class Commandlist extends CommandImpl {
 
-    private String object;
-    private String name;
-    private String vhost;
-    private String outputformat = null;
-    private String seperator = ","; //this variable is assigning if -n option is used otherwise this is null
-
     public Commandlist(JMXinfo info, String name) {
         super(info, name);
 
@@ -105,19 +99,19 @@ public class Commandlist extends CommandImpl {
                 echo("Wrong objectName");
                 return;
             }
-            objname.setQueryString(this.object, this.name, this.vhost);
+            objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
             objname.returnObjects();
             if (objname.getSet().size() != 0) {
-                if (this.object.compareToIgnoreCase("queue") == 0 || this.object.compareToIgnoreCase("queues") == 0)
-                    objname.displayqueues(this.outputformat, this.seperator);
+                if (this.getObject().compareToIgnoreCase("queue") == 0 || this.getObject().compareToIgnoreCase("queues") == 0)
+                    objname.displayqueues(this.getOutputFormat(), this.getSeperator());
                 else
-                    objname.displayobjects(this.outputformat, this.seperator);
+                    objname.displayobjects(this.getOutputFormat(), this.getSeperator());
             } else {
-                if (isname()) {
+                if (hasName()) {
 
-                    echo("You might quering wrong " + this.object + " name with --name or -n option ");
+                    echo("You might quering wrong " + this.getObject() + " name with --name or -n option ");
                     echo("");
-                    echo(this.object + "Type Objects might not in the broker currently");
+                    echo(this.getObject() + "Type Objects might not in the broker currently");
                     echo("");
                 } else {
                     printusage();
@@ -150,30 +144,30 @@ public class Commandlist extends CommandImpl {
         with main option object or o
          */
         if (checkoptionsetting("output")) {
-            setoutputformat(optionchecker("output"));
+            setOutputFormat(optionchecker("output"));
             if (checkoptionsetting("separator"))
-                setseperator(optionchecker("separator"));
+                setSeperator(optionchecker("separator"));
         }
         if (checkoptionsetting("object") || checkoptionsetting("o")) {
             String object = optionchecker("object");
             if (object == null) {
                 object = optionchecker("o");
             }
-            setobject(object);
+            setObject(object);
             if (checkoptionsetting("name") || checkoptionsetting("n")) {
                 String name = optionchecker("name");
                 if (name == null)
                     name = optionchecker("n");
 
-                setname(name);
+                setName(name);
             }
             if (checkoptionsetting("virtualhost") || checkoptionsetting("v")) {
                 String vhost = optionchecker("virtualhost");
                 if (vhost == null)
                     vhost = optionchecker("v");
-                setvhost(vhost);
+                setVirtualhost(vhost);
             }
-            listobjects(this.object);
+            listobjects(this.getObject());
         } else if (checkoptionsetting("domain") || checkoptionsetting("d"))
             listdomains();
         else if (checkoptionsetting("h") || checkoptionsetting("help"))
@@ -213,81 +207,6 @@ public class Commandlist extends CommandImpl {
 
 
     }
-
-    private void setobject(String object) {
-        this.object = object;
-    }
-
-    private void setname(String name) {
-        this.name = name;
-    }
-
-    private boolean isname() {
-        if (this.name == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    private void setvhost(String vhost) {
-        this.vhost = vhost;
-    }
-
-    public String getvhost() {
-        return this.vhost;
-    }
-
-    public String getname() {
-        return this.name;
-    }
-
-    public String getobject() {
-        return this.object;
-    }
-
-    private void setoutputformat(String outputformat) {
-        this.outputformat = outputformat;
-    }
-
-    private void setseperator(String seperator) {
-        this.seperator = seperator;
-    }
-
-    private boolean isseperator() {
-        if (this.seperator == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    private boolean isoutputformat() {
-        if (this.outputformat == null)
-            return false;
-
-        else
-            return true;
-    }
-
-
-    /*
-    public String optionchecker(String option_letter) {
-       Map map =  info.getCommandLineOptionParser().getAlloptions();
-       if(map == null)
-       return null;
-       CommandLineOption option = (CommandLineOption) map.get(option_letter);
-       if(option == null)
-       return null;
-       String value = option.getOptionValue();
-       return value;
-
-
-    }
-    */
-    public void optionvaluechecker() {
-
-    }
 }
 
 
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java
index 61b374534b..8dc5bc6087 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java
@@ -63,10 +63,8 @@ import java.io.BufferedReader;
  * To change this template use File | Settings | File Templates.
  */
 public class Commandmove extends CommandImpl {
-    private String object;
     private String name1 = null, name2 = null, vhost1 = null, vhost2 = null, method1 = null, method2 = null;    //target and starting queue specifications happen with these options
-    private int number = 0;
-    private QueueObject queue1, queue2;
+    private QueueObject queue1;
     private MBeanServerConnection mbsc;
     private ObjectName queue;
     private int fmid = 0, tmid = 0;
@@ -75,7 +73,6 @@ public class Commandmove extends CommandImpl {
         super(info, name);
         this.mbsc = info.getmbserverconnector();
         this.queue1 = new QueueObject(mbsc);
-//        this.queue2 = new QueueObject(mbsc);
         this.method1 = "moveMessages";
         this.method2 = "getMessagesOnTheQueue";
 
@@ -83,12 +80,8 @@ public class Commandmove extends CommandImpl {
 
     public void movemessages() {
         Set set = null;
-        queue1.setQueryString(this.object, this.name1, this.vhost1);
-//        queue2.setQueryString(this.object, this.name2, this.vhost2);
+        queue1.setQueryString(this.getObject(), this.name1, this.vhost1);
         set = queue1.returnObjects();
-        List messageidlist = null;
-        Long frommessageid = null, tomessageid, middle;
-        int temp = 0;
         if (queue1.getSet().size() != 0) {                   // find the queue 
             Iterator it = set.iterator();
             this.queue = (ObjectName) it.next();
@@ -101,43 +94,6 @@ public class Commandmove extends CommandImpl {
                 printusage();
             }
         }
-//        if(this.tmid == 0 || this.fmid == 0)
-//        {
-//            this.number = queue1.getmessagecount(this.queue);
-//            echo("");
-//            System.out.print("Do you want to delete all the messages from the Queue[Y/N] :");
-//            InputStreamReader isr = new InputStreamReader(System.in);
-//            BufferedReader br = new BufferedReader(isr);
-//            try{
-//                String s = br.readLine();
-//                echo(s);
-//                if(s.compareToIgnoreCase("y") != 0)
-//                    return;
-//            }catch(Exception ex)
-//            {
-//                ex.printStackTrace();
-//            }
-//
-//        }
-//        if(this.number > queue1.getmessagecount(this.queue))
-//        {
-//            System.out.println("Given number is Greater than the Queue Depth");
-//            return;
-//        }//if user doesn't specify -t option all the messages will be moved
-//        Object[] params = {new Integer(this.number)};
-//        String[] signature = {new String("java.lang.Integer")};
-//        try{
-//            messageidlist = (List)this.mbsc.invoke(queue,this.method2,params,signature);
-//            Iterator it1 = messageidlist.iterator();
-//            temp++;
-//            do
-//            {
-//                middle = (Long)it1.next();
-//                if(temp == 1)
-//                    frommessageid = middle; // get the messageid of first message
-//
-//            }while(it1.hasNext());
-//            tomessageid = middle;   // get the messageid of the last message
         try {
             Object[] params1 = {getfmid(), gettmid(), this.name2};
             String[] signature1 = {new String("long"), new String("long"), new String("java.lang.String")};
@@ -163,7 +119,7 @@ public class Commandmove extends CommandImpl {
                 object = optionchecker("o");
             }
             if (object.compareToIgnoreCase("queue") == 0)
-                setobject(object);
+                setObject(object);
             else {
                 unrecognizeoption();
                 echo("This command is only applicable for queue command so please start with queue");
@@ -214,10 +170,6 @@ public class Commandmove extends CommandImpl {
 
     }
 
-    private void setobject(String object) {
-        this.object = object;
-    }
-
     private void setname1(String name) {
         this.name1 = name;
     }
@@ -245,14 +197,6 @@ public class Commandmove extends CommandImpl {
     private void setvhost1(String vhost) {
         this.vhost1 = vhost;
     }
-//    private void setvhost2(String vhost) {
-//        this.vhost2 = vhost;
-//    }
-
-    private void setnumber(String number) {
-        Integer i = new Integer(number);
-        this.number = i.intValue();
-    }
 
     private static String removeSpaces(String s) {
         StringTokenizer st = new StringTokenizer(s, " ", false);
@@ -284,11 +228,4 @@ public class Commandmove extends CommandImpl {
         return this.name2;
     }
 
-    public String getvhost() {
-        return this.vhost1;
-    }
-
-    public String getobject() {
-        return this.object;
-    }
 }
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java
index 6d44cea668..5c8f692ab9 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java
@@ -60,13 +60,10 @@ import java.awt.font.OpenType;
  * To change this template use File | Settings | File Templates.
  */
 public class Commandview extends CommandImpl {
-    private String object;
-    private String name;
-    private String vhost;
     private int number = 0;
     private QueueObject objname;
     private MBeanServerConnection mbsc;
-    private String method1, method2;
+    private String method1;
     private ObjectName queue;
 
     public Commandview(JMXinfo info, String name) {
@@ -74,14 +71,13 @@ public class Commandview extends CommandImpl {
         this.mbsc = info.getmbserverconnector();
         this.objname = new QueueObject(mbsc);
         this.method1 = "viewMessages";
-        this.method2 = "viewMessaegContent";
 
     }
 
     public void viewmessages() {
         Set set = null;
         Object temp[] = {null};
-        objname.setQueryString(this.object, this.name, this.vhost);
+        objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
         set = objname.returnObjects();
         String header = "", temp_header = "", message_data = "", outline = "";
 
@@ -159,7 +155,7 @@ public class Commandview extends CommandImpl {
             }
 
         } else {
-            if (isname()) {
+            if (hasName()) {
 
                 echo("The Queue you have specified is not in the current broker");
                 echo("");
@@ -180,7 +176,7 @@ public class Commandview extends CommandImpl {
                 object = optionchecker("o");
             }
             if (object.compareToIgnoreCase("queue") == 0)
-                setobject(object);
+                setObject(object);
             else {
                 unrecognizeoption();
                 echo("This command is only applicable for delete command so please start with queue");
@@ -190,13 +186,13 @@ public class Commandview extends CommandImpl {
                 if (name == null)
                     name = optionchecker("n");
 
-                setname(name);
+                setName(name);
             }
             if (checkoptionsetting("virtualhost") || checkoptionsetting("v")) {
                 String vhost = optionchecker("virtualhost");
                 if (vhost == null)
                     vhost = optionchecker("v");
-                setvhost(vhost);
+                setVirtualhost(vhost);
             }
             if (checkoptionsetting("top") || checkoptionsetting("t")) {
                 String number = optionchecker("top");
@@ -225,30 +221,6 @@ public class Commandview extends CommandImpl {
 
     }
 
-    private void setobject(String object) {
-        this.object = object;
-    }
-
-    private void setname(String name) {
-        this.name = name;
-    }
-
-    private boolean isname() {
-        if (this.name == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    private void setvhost(String vhost) {
-        this.vhost = vhost;
-    }
-
-    public String getvhost() {
-        return this.vhost;
-    }
-
     private void setnumber(String number) {
         Integer i = new Integer(number);
         this.number = i.intValue();
@@ -261,16 +233,8 @@ public class Commandview extends CommandImpl {
         return t;
     }
 
-    public String getname() {
-        return this.name;
-    }
-
-    public String getobject() {
-        return this.object;
-    }
-
-    public int getnumber() {
-        return this.number;
+    public int getnumber()
+    {
+        return number;
     }
-
 }
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java
index 027d9e5310..8a71726c33 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java
@@ -92,12 +92,6 @@ public class Commandviewcontent extends CommandImpl {
                     echo("You haven't selected a MessageId Please use -id and give a message id");
                     echo("Or run view command with same arguemnts to view messageId list for the queue");
                 }
-
-//                if(objname.getmessagecount(this.queue) < this.number)
-//                {
-//                    echo("Given number is Greater than the Queue Depth");
-//                    return;
-//                }
                 else {
                     Object[] params = {this.number};
                     String[] signature = {new String("long")};
@@ -139,25 +133,6 @@ public class Commandviewcontent extends CommandImpl {
 
                     }
                     echo(message_data);
-//                    Object keys[] = data.keySet().toArray();
-//                    CompositeData comdata = data.get(keys);
-//                    for(int i=0;i < keys.length;i++)
-//                    {
-//                        System.out.println(keys[i].toString());
-//                        CompositeData cdata = data.get(temp);
-//                        System.out.println(cdata.toString());
-//                        temp[0] = null;
-//                    }
-//                    TabularType tabular = data.getTabularType();
-////                    System.out.println(tabular.toString());
-//                   List info = tabular.getIndexNames();
-//                   Iterator it1 = info.iterator();
-//
-//                    do{
-//                            String temp1 = (String)it1.next();
-//                        System.out.println(temp1);
-//                    }while(it1.hasNext());
-
                 }
             } catch (Exception ex) {
                 echo("Given MessageId is invalid, There's no message with the given messageId");
@@ -166,7 +141,7 @@ public class Commandviewcontent extends CommandImpl {
             }
 
         } else {
-            if (isname()) {
+            if (hasName()) {
 
                 echo("The Queue you have specified is not in the current broker");
                 echo("");
@@ -187,7 +162,7 @@ public class Commandviewcontent extends CommandImpl {
                 object = optionchecker("o");
             }
             if (object.compareToIgnoreCase("queue") == 0)
-                setobject(object);
+                setObject(object);
             else {
                 unrecognizeoption();
                 echo("This command is only applicable for delete command so please start with queue");
@@ -197,13 +172,13 @@ public class Commandviewcontent extends CommandImpl {
                 if (name == null)
                     name = optionchecker("n");
 
-                setname(name);
+                setName(name);
             }
             if (checkoptionsetting("virtualhost") || checkoptionsetting("v")) {
                 String vhost = optionchecker("virtualhost");
                 if (vhost == null)
                     vhost = optionchecker("v");
-                setvhost(vhost);
+                setVirtualhost(vhost);
             }
             if (checkoptionsetting("messageid") || checkoptionsetting("id")) {
                 String number = optionchecker("id");
@@ -232,30 +207,6 @@ public class Commandviewcontent extends CommandImpl {
 
     }
 
-    private void setobject(String object) {
-        this.object = object;
-    }
-
-    private void setname(String name) {
-        this.name = name;
-    }
-
-    private boolean isname() {
-        if (this.name == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    public void setvhost(String vhost) {
-        this.vhost = vhost;
-    }
-
-    public String getvhost() {
-        return this.vhost;
-    }
-
     private void setnumber(String number) {
         Integer i = new Integer(number);
         this.number = i.intValue();
@@ -268,14 +219,6 @@ public class Commandviewcontent extends CommandImpl {
         return t;
     }
 
-    public String getname() {
-        return this.name;
-    }
-
-    public String getobject() {
-        return this.object;
-    }
-
     public int getnumber() {
         return this.number;
     }
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
index 2c92b8d66d..833ad0478e 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
@@ -44,6 +44,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.After;
 import org.junit.Assert;
+import org.apache.qpid.Command;
 import org.apache.qpid.Connector;
 import org.apache.qpid.ConnectorFactory;
 import org.apache.qpid.ConnectionConstants;
@@ -74,7 +75,7 @@ public class TestCommand{
         parser = new CommandLineOptionParser(list);
         test = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT);
         info = new JMXinfo(test.getConnector(),parser,test.getMBeanServerConnection());
-        cmd = new Command(info,"list");
+        cmd = new Commandinfo(info,"list");
 
     }
     @Test
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
index 5bdca118d5..971c088fe1 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
@@ -79,9 +79,9 @@ public class TestCommanddelete {
     public void TestSetQueryString()
     {
          delete.execute();
-        Assert.assertEquals(delete.getobject(),"queue");
-        Assert.assertEquals(delete.getvhost(),"test");
-        Assert.assertEquals(delete.getname(),"ping");
+        Assert.assertEquals(delete.getObject(),"queue");
+        Assert.assertEquals(delete.getVirtualhost(),"test");
+        Assert.assertEquals(delete.getName(),"ping");
         Assert.assertEquals(delete.getnumber(),1);
 
     }
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
index f4bb403e18..5f0e8959a5 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
@@ -60,7 +60,7 @@ import javax.management.MBeanServerConnection;
 public class TestCommandinfo {
       JMXinfo info=null;
     String command = "info -o queue -n ping -v test";
-    Commandinfo infocommand = null;
+    CommandImpl infocommand = null;
     Connector conn = null;
     @Before
     public void startup()
@@ -77,9 +77,9 @@ public class TestCommandinfo {
     public void TestSetQueryString()
     {
         infocommand.execute();
-        Assert.assertEquals(infocommand.getobject(),"queue");
-        Assert.assertEquals(infocommand.getvirtualhost(),"test");
-        Assert.assertEquals(infocommand.getname(),"ping");
+        Assert.assertEquals(infocommand.getObject(),"queue");
+        Assert.assertEquals(infocommand.getVirtualhost(),"test");
+        Assert.assertEquals(infocommand.getName(),"ping");
     }
 
     @After
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
index c8e044d6fe..0af6f236f6 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
@@ -81,9 +81,9 @@ public class TestCommandlist {
     public void TestSetQueryString()
     {
         list.execute();
-        Assert.assertEquals(list.getobject(),"queue");
-        Assert.assertEquals(list.getvhost(),"test");
-        Assert.assertEquals(list.getname(),"ping");
+        Assert.assertEquals(list.getObject(),"queue");
+        Assert.assertEquals(list.getVirtualhost(),"test");
+        Assert.assertEquals(list.getName(),"ping");
     }
 
     @After
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
index 278fa72365..3a5d55c8dd 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
@@ -79,8 +79,8 @@ public class TestCommandmove {
     public void TestSetQueryString()
     {
         move.execute();
-        Assert.assertEquals(move.getobject(),"queue");
-        Assert.assertEquals(move.getvhost(),"test");
+        Assert.assertEquals(move.getObject(),"queue");
+        Assert.assertEquals(move.getVirtualhost(),"test");
         Assert.assertEquals(move.getname1(),"ping");
         Assert.assertEquals(move.getname2(),"message_queue");
         Assert.assertEquals(move.getfmid(),10);
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
index 385d197475..6867cf0d01 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
@@ -76,9 +76,9 @@ public class TestCommandview {
     public void TestSetQueryString()
     {
         view.execute();
-        Assert.assertEquals(view.getobject(),"queue");
-        Assert.assertEquals(view.getvhost(),"test");
-        Assert.assertEquals(view.getname(),"ping");
+        Assert.assertEquals(view.getObject(),"queue");
+        Assert.assertEquals(view.getVirtualhost(),"test");
+        Assert.assertEquals(view.getName(),"ping");
         Assert.assertEquals(view.getnumber(),10);
 
     }
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
index 2b8f0e3ffd..5ea6273561 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
@@ -79,11 +79,10 @@ public class TestCommandviewcontent {
     public void TestSetQueryString()
     {
         viewcontent.execute();
-        Assert.assertEquals(viewcontent.getobject(),"queue");
+        Assert.assertEquals(viewcontent.getObject(),"queue");
         Assert.assertEquals(viewcontent.getnumber(),10);
-        Assert.assertEquals(viewcontent.getname(),"ping");
-        Assert.assertEquals(viewcontent.getvhost(),"test");
-
+        Assert.assertEquals(viewcontent.getName(),"ping");
+        Assert.assertEquals(viewcontent.getVirtualhost(),"test");
     }
 
     @After