You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/08/12 20:10:06 UTC

svn commit: r803641 - in /qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects: AllObjects.java ConnectionObject.java ExchangeObject.java ObjectNames.java QueueObject.java UserManagementObject.java VirtualHostObject.java

Author: ritchiem
Date: Wed Aug 12 18:10:06 2009
New Revision: 803641

URL: http://svn.apache.org/viewvc?rev=803641&view=rev
Log:
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.

Modified:
    qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java
    qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java
    qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java
    qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java
    qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java
    qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java
    qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java

Modified: qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java?rev=803641&r1=803640&r2=803641&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java (original)
+++ qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java Wed Aug 12 18:10:06 2009
@@ -28,7 +28,7 @@
 
     public AllObjects(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name)

Modified: qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java?rev=803641&r1=803640&r2=803641&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java (original)
+++ qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java Wed Aug 12 18:10:06 2009
@@ -28,7 +28,7 @@
     public ConnectionObject(MBeanServerConnection mbsc)
     {
         /* calling parent classes constructor */
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)

Modified: qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java?rev=803641&r1=803640&r2=803641&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java (original)
+++ qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java Wed Aug 12 18:10:06 2009
@@ -27,8 +27,7 @@
 {
     public ExchangeObject(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
-
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)

Modified: qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java?rev=803641&r1=803640&r2=803641&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java (original)
+++ qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java Wed Aug 12 18:10:06 2009
@@ -35,17 +35,16 @@
 {
     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
         {

Modified: qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java?rev=803641&r1=803640&r2=803641&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java (original)
+++ qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java Wed Aug 12 18:10:06 2009
@@ -30,7 +30,7 @@
 {
     public QueueObject(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)

Modified: qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java?rev=803641&r1=803640&r2=803641&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java (original)
+++ qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java Wed Aug 12 18:10:06 2009
@@ -27,7 +27,7 @@
 {
     public UserManagementObject(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)

Modified: qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java?rev=803641&r1=803640&r2=803641&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java (original)
+++ qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java Wed Aug 12 18:10:06 2009
@@ -28,7 +28,7 @@
 
     public VirtualHostObject(MBeanServerConnection mbsc)
     {
-        ObjectNames(mbsc);
+        super(mbsc);
     }
 
     public void setQueryString(String object, String name, String vhost)



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org