You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2009/11/06 16:56:46 UTC
svn commit: r833448 - in
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui:
ApplicationRegistry.java views/connection/ConnectionOperationsTabControl.java
Author: robbie
Date: Fri Nov 6 15:56:45 2009
New Revision: 833448
URL: http://svn.apache.org/viewvc?rev=833448&view=rev
Log:
QPID-2178: update console to allow display of new channel blocking status
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java?rev=833448&r1=833447&r2=833448&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java Fri Nov 6 15:56:45 2009
@@ -48,7 +48,7 @@
//max supported broker management interface supported by this release of the management console
public static final int SUPPORTED_QPID_JMX_API_MAJOR_VERSION = 1;
- public static final int SUPPORTED_QPID_JMX_API_MINOR_VERSION = 4;
+ public static final int SUPPORTED_QPID_JMX_API_MINOR_VERSION = 5;
public static final String DATA_DIR = System.getProperty("user.home") + File.separator + ".qpidmc";
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java?rev=833448&r1=833447&r2=833448&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java Fri Nov 6 15:56:45 2009
@@ -28,6 +28,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.TabularDataSupport;
+import org.apache.qpid.management.ui.ApiVersion;
import org.apache.qpid.management.ui.ApplicationRegistry;
import org.apache.qpid.management.ui.ManagedBean;
import org.apache.qpid.management.ui.ServerRegistry;
@@ -79,16 +80,19 @@
private TabularDataSupport _channels = null;
private ManagedConnection _cmb;
+ private ApiVersion _ApiVersion;
static final String CHAN_ID = ManagedConnection.COMPOSITE_ITEM_NAMES[0];
static final String TRANSACTIONAL = ManagedConnection.COMPOSITE_ITEM_NAMES[1];
static final String DEFAULT_QUEUE = ManagedConnection.COMPOSITE_ITEM_NAMES[2];
static final String UNACKED_COUNT = ManagedConnection.COMPOSITE_ITEM_NAMES[3];
+ static final String FLOW_BLOCKED = ManagedConnection.COMPOSITE_ITEM_NAMES[4];
public ConnectionOperationsTabControl(TabFolder tabFolder, JMXManagedObject mbean, MBeanServerConnection mbsc)
{
super(tabFolder);
_mbean = mbean;
+ _ApiVersion = ApplicationRegistry.getServerRegistry(mbean).getManagementApiVersion();
_cmb = (ManagedConnection) MBeanServerInvocationHandler.newProxyInstance(mbsc,
mbean.getObjectName(), ManagedConnection.class, false);
_toolkit = new FormToolkit(_tabFolder.getDisplay());
@@ -167,8 +171,16 @@
_tableViewer = new TableViewer(_table);
final TableSorter tableSorter = new TableSorter();
- String[] titles = {"Channel Id", "Transactional", "Num Unacked Msg", "Default Queue"};
- int[] bounds = { 105, 115, 145, 200 };
+ String[] titles;
+ if(_ApiVersion.greaterThanOrEqualTo(1, 5))
+ {
+ titles = new String[]{"Id", "Transactional", "Num Unacked Msg", "Default Queue", "Flow Blocked"};
+ }
+ else
+ {
+ titles = new String[]{"Id", "Transactional", "Num Unacked Msg", "Default Queue"};
+ }
+ int[] bounds = { 40, 110, 145, 200, 110 };
for (int i = 0; i < titles.length; i++)
{
final int index = i;
@@ -407,6 +419,8 @@
return String.valueOf(((CompositeDataSupport) element).get(UNACKED_COUNT));
case 3 : // default queue column
return String.valueOf(((CompositeDataSupport) element).get(DEFAULT_QUEUE));
+ case 4 : // flow blocked column
+ return String.valueOf(((CompositeDataSupport) element).get(FLOW_BLOCKED));
default :
return "-";
}
@@ -476,6 +490,10 @@
comparison = String.valueOf(chan1.get(DEFAULT_QUEUE)).compareTo(
String.valueOf(chan2.get(DEFAULT_QUEUE)));
break;
+ case 4:
+ comparison = String.valueOf(chan1.get(FLOW_BLOCKED)).compareTo(
+ String.valueOf(chan2.get(FLOW_BLOCKED)));
+ break;
default:
comparison = 0;
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org