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/01/27 13:27:19 UTC
svn commit: r738068 - in
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views:
MBeanTypeTabControl.java QueueTypeTabControl.java
Author: ritchiem
Date: Tue Jan 27 12:27:19 2009
New Revision: 738068
URL: http://svn.apache.org/viewvc?rev=738068&view=rev
Log:
QPID-1128 - Patch from Robbert Gemmell to prevent NPE whilst adding queue to navigation.
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java?rev=738068&r1=738067&r2=738068&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java Tue Jan 27 12:27:19 2009
@@ -204,6 +204,11 @@
for (int i = 0; i < selectedItems.length; i++)
{
String name = selectedItems[i];
+ int nameEnd = name.indexOf(" (");
+ if (nameEnd != -1)
+ {
+ name = name.substring(0, nameEnd);
+ }
// pass the ManagedBean to the navigation view to be added
ManagedBean mbean = _objectsMap.get(name);
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java?rev=738068&r1=738067&r2=738068&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java Tue Jan 27 12:27:19 2009
@@ -246,11 +246,10 @@
{
continue;
}
- AttributeData data = MBeanUtility.getAttributeData(mbean, Constants.ATTRIBUTE_QUEUE_DEPTH);
- String value = mbean.getName() + " (" + data.getValue().toString() + " KB)";
+ String value = mbean.getName();
items.add(value);
- //items[i] = mbean.getName() + " (" + value + " KB)";
getMBeansMap().put(value, mbean);
+ AttributeData data = MBeanUtility.getAttributeData(mbean, Constants.ATTRIBUTE_QUEUE_DEPTH);
_queueDepthMap.put(data, mbean);
data = MBeanUtility.getAttributeData(mbean, Constants.ATTRIBUTE_QUEUE_CONSUMERCOUNT);
_queueConsumerCountMap.put(data, mbean);
@@ -289,7 +288,7 @@
{
ManagedBean mbean = _queueConsumerCountMap.get(data);
String value = data.getValue().toString();
- items[i++] = mbean.getName() + " (" + value + " )";
+ items[i++] = mbean.getName() + " (" + value + ")";
}
getListWidget().setItems(items);
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org