QPID-2047 : Updates to Qpid CLI to use super() calls rather than method that has the same name as the class.

Added generic discriminator to the return type of returnedObjects.

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

7 files changed, 9 insertions, 11 deletions

diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java
index 253119f057..8b2099f3e0 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java
@@ -28,7 +28,7 @@ public class AllObjects extends ObjectNames
 
     public AllObjects(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name)
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java
index cb1891481c..2746b2016f 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java
@@ -28,7 +28,7 @@ public class ConnectionObject extends ObjectNames
     public ConnectionObject(MBeanServerConnection mbsc)
     {
         /* calling parent classes constructor */
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java
index 2c1c4c47ff..96d7e6e5dc 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java
@@ -27,8 +27,7 @@ public class ExchangeObject extends ObjectNames
 {
     public ExchangeObject(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
-
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java
index dc676ebfe3..7791b84a4f 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java
@@ -35,17 +35,16 @@ public class ObjectNames
 {
     public String querystring = null;
     public MBeanServerConnection mbsc;
-    public Set set = null;
+    public Set<ObjectName> set = null;
     public String attributes = "";
     public String attributevalues = "";// = null;
 
-    /* method return the Set objects according to the Object type */
-    public void ObjectNames(MBeanServerConnection mbsc)
+    public ObjectNames(MBeanServerConnection mbsc)
     {
         this.mbsc = mbsc;
     }
 
-    public Set returnObjects()
+    public Set<ObjectName> returnObjects()
     {
         try
         {
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java
index e61d1e626c..7c82682c27 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java
@@ -30,7 +30,7 @@ public class QueueObject extends ObjectNames
 {
     public QueueObject(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java
index 1635877cea..fd5bc0ca72 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java
@@ -27,7 +27,7 @@ public class UserManagementObject extends ObjectNames
 {
     public UserManagementObject(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java
index c4df7a7093..77f8b66ac0 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java
@@ -28,7 +28,7 @@ public class VirtualHostObject extends ObjectNames
 
     public VirtualHostObject(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)