You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by bh...@apache.org on 2007/02/06 13:44:22 UTC
svn commit: r504112 - in
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui:
./ views/
Author: bhupendrab
Date: Tue Feb 6 04:44:21 2007
New Revision: 504112
URL: http://svn.apache.org/viewvc?view=rev&rev=504112
Log:
To make this management console with the java broker with no virtual host mbean implementation, default virtual host is assigned to all mbeans
Modified:
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java?view=diff&rev=504112&r1=504111&r2=504112
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java Tue Feb 6 04:44:21 2007
@@ -41,6 +41,7 @@
public final static String NOTIFICATION = "Notifications";
public final static String RESULT = "Result";
public final static String VIRTUAL_HOST = "VirtualHost";
+ public final static String DEFAULT_VH = "Default";
// Attributes and operations are used to customize the GUI for Qpid. If these are changes in the
// Qpid server, then these should be updated accordingly
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java?view=diff&rev=504112&r1=504111&r2=504112
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java Tue Feb 6 04:44:21 2007
@@ -88,7 +88,8 @@
public String getVirtualHostName()
{
- return _virtualHostName;
+ // To make it work with the broker with no virtual host implementation
+ return _virtualHostName == null ? Constants.DEFAULT_VH : _virtualHostName;
}
/**
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java?view=diff&rev=504112&r1=504111&r2=504112
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java Tue Feb 6 04:44:21 2007
@@ -117,7 +117,8 @@
{
try
{
- refresh(_type);
+ // refresh the list from the broker server
+ populateList();
}
catch (Exception ex)
{
@@ -131,6 +132,7 @@
{
try
{
+ // sort the stored list of items
java.util.List<String> list = new ArrayList<String>(_objectsMap.keySet());
Collections.sort(list);
_list.setItems(list.toArray(new String[0]));
@@ -147,6 +149,7 @@
{
try
{
+ // sort the stored list of items
sortQueuesByQueueDepth();
}
catch (Exception ex)
@@ -254,8 +257,6 @@
_sortByConsumercountButton = _toolkit.createButton(sortingGroup, "Consumer Count", SWT.RADIO);
gridData = new GridData(SWT.LEAD, SWT.CENTER, true, false);
_sortByConsumercountButton.setLayoutData(gridData);
-
- selectDefaultSortingButton();
}
private void selectDefaultSortingButton()
@@ -269,6 +270,7 @@
{
_type = typeName;
setHeader();
+ selectDefaultSortingButton();
populateList();
_listComposite.layout();
@@ -303,27 +305,41 @@
{
list = serverRegistry.getQueues(MBeanView.getVirtualHost());
items = getQueueItems(list);
- selectDefaultSortingButton();
+ // sort the refreshed list in the selected order
+ if (_sortBySizeButton.getSelection())
+ {
+ sortQueuesByQueueDepth();
+ }
+ else if (_sortByConsumercountButton.getSelection())
+ {
+ sortQueuesByConsumerCount();
+ }
+ else
+ {
+ _list.setItems(items);
+ }
_sortingComposite.setVisible(true);
}
- else if (_type.equals(Constants.EXCHANGE))
- {
- list = serverRegistry.getExchanges(MBeanView.getVirtualHost());
- items = getItems(list);
- _sortingComposite.setVisible(false);
- }
- else if (_type.equals(Constants.CONNECTION))
- {
- list = serverRegistry.getConnections(MBeanView.getVirtualHost());
- items = getItems(list);
- _sortingComposite.setVisible(false);
- }
else
{
- throw new Exception("Unknown mbean type " + _type);
- }
-
- _list.setItems(items);
+ if (_type.equals(Constants.EXCHANGE))
+ {
+ list = serverRegistry.getExchanges(MBeanView.getVirtualHost());
+ items = getItems(list);
+ _sortingComposite.setVisible(false);
+ }
+ else if (_type.equals(Constants.CONNECTION))
+ {
+ list = serverRegistry.getConnections(MBeanView.getVirtualHost());
+ items = getItems(list);
+ _sortingComposite.setVisible(false);
+ }
+ else
+ {
+ throw new Exception("Unknown mbean type " + _type);
+ }
+ _list.setItems(items);
+ }
}
// sets the map with appropriate mbean and name
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java?view=diff&rev=504112&r1=504111&r2=504112
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java Tue Feb 6 04:44:21 2007
@@ -295,6 +295,16 @@
addManagedBean(domain, mbean);
}
}
+ // To make it work with the broker without virtual host implementation.
+ // This will add the default nodes to the domain node
+ for (TreeObject child : domain.getChildren())
+ {
+ if (!child.getName().startsWith(Constants.VIRTUAL_HOST))
+ {
+ addDefaultNodes(domain);
+ }
+ break;
+ }
}
/**
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java?view=diff&rev=504112&r1=504111&r2=504112
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java Tue Feb 6 04:44:21 2007
@@ -153,7 +153,7 @@
{
_mbean = mbean;
_opData = opData;
- _virtualHostName = _mbean.getProperty(Constants.VIRTUAL_HOST);
+ _virtualHostName = _mbean.getVirtualHostName();
// Setting the form to be invisible. Just in case the mbean server connection
// is done and it takes time in getting the response, then the ui should be blank
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java?view=diff&rev=504112&r1=504111&r2=504112
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java Tue Feb 6 04:44:21 2007
@@ -101,7 +101,8 @@
public String getVirtualHost()
{
- return _virtualHost;
+ // To make it work with the broker with no virtual host implementation
+ return _virtualHost == null ? Constants.DEFAULT_VH : _virtualHost;
}
public void setVirtualHost(String vHost)