diff options
Diffstat (limited to 'qpid/java')
5 files changed, 517 insertions, 247 deletions
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java index cb758efa43..cd6f7ff808 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java @@ -20,6 +20,8 @@ */ package org.apache.qpid.management.ui; +import java.io.File; +import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -48,6 +50,8 @@ public abstract class ApplicationRegistry public static final int SUPPORTED_QPID_JMX_API_MAJOR_VERSION = 1; public static final int SUPPORTED_QPID_JMX_API_MINOR_VERSION = 3; + public static final String DATA_DIR = System.getProperty("user.home") + File.separator + ".qpidmc"; + static { imageRegistry.put(Constants.SUCCESS_IMAGE, diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java index bbb6686346..69a466c943 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java @@ -23,6 +23,7 @@ package org.apache.qpid.management.ui.jmx; import java.io.IOException; import java.math.BigInteger; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -276,6 +277,72 @@ public class MBeanUtility return value; } + + /** + * Returns a List of Object arrays containing the requested attribute values (in the same sequence requested) for each queue in the virtualhost. + * If a particular attribute cant be found or raises an mbean/reflection exception whilst being gathered its value is substituted with the String "-". + */ + public static List<List<Object>> getQueueAttributes(List<ManagedBean> mbeans, String[] attributes) + { + List<List<Object>> results = new ArrayList<List<Object>>(); + + MBeanServerConnection mbsc = null; + if(mbeans.isEmpty()) + { + return results; + } + else + { + ManagedBean mbean = mbeans.get(0); + JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(mbean); + mbsc = serverRegistry.getServerConnection(); + } + + if(mbsc == null) + { + return results; + } + + for(ManagedBean mbean : mbeans) + { + HashMap<String,Object> tempResults = new HashMap<String,Object>(); + + ObjectName objName = ((JMXManagedObject)mbean).getObjectName(); + try + { + AttributeList list = mbsc.getAttributes(objName, attributes); + + for (Attribute attr : list.toArray(new Attribute[0])) + { + tempResults.put(attr.getName(), attr.getValue()); + } + + List<Object> attributeValues = new ArrayList<Object>(attributes.length); + + for(int i = 0; i <attributes.length; i++) + { + if(tempResults.containsKey(attributes[i])) + { + attributeValues.add(tempResults.get(attributes[i])); + } + else + { + attributeValues.add(new String("-")); + } + } + + results.add(attributeValues); + } + catch (Exception ignore) + { + continue; + } + } + + return results; + } + + /** * Retrieves the attribute values from MBeanSever and stores in the server registry. * @param mbean diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java index 6563498d41..e66b690c98 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java @@ -21,6 +21,7 @@ package org.apache.qpid.management.ui.views; import static org.apache.qpid.management.ui.Constants.*; +import static org.apache.qpid.management.ui.ApplicationRegistry.DATA_DIR; import java.io.File; import java.io.IOException; @@ -82,8 +83,7 @@ import org.eclipse.ui.part.ViewPart; public class NavigationView extends ViewPart { public static final String ID = "org.apache.qpid.management.ui.navigationView"; - public static final String APP_DIR = System.getProperty("user.home") + File.separator + ".qpidmc"; - public static final String INI_FILENAME = APP_DIR + File.separator + "qpidmc_navigation.ini"; + public static final String INI_FILENAME = DATA_DIR + File.separator + "qpidmc_navigation.ini"; private static final String INI_SERVERS = "Servers"; private static final String INI_QUEUES = QUEUE + "s"; @@ -338,12 +338,12 @@ public class NavigationView extends ViewPart */ private void createConfigFile() { - File dir = new File(APP_DIR); + File dir = new File(DATA_DIR); if (!dir.exists()) { if(!dir.mkdir()) { - System.out.println("Could not create application data directory " + APP_DIR); + System.out.println("Could not create application data directory " + DATA_DIR); System.exit(1); } } diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java index 94b69e1231..37af1f8f31 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java @@ -65,17 +65,18 @@ import org.eclipse.ui.forms.widgets.FormToolkit; public abstract class MBeanTypeTabControl extends TabControl { - private FormToolkit _toolkit; - private Form _form; + protected FormToolkit _toolkit; + protected Form _form; protected Table _table = null; protected TableViewer _tableViewer = null; protected List<ManagedBean> _mbeans = null; - private String _type; + protected String _type; protected ApiVersion _ApiVersion; protected JMXManagedObject _vhostMbean; protected String _virtualHost; protected JMXServerRegistry _serverRegistry; + protected Composite _tableComposite; public MBeanTypeTabControl(TabFolder tabFolder, ManagedServer server, String virtualHost, String type) { @@ -88,8 +89,14 @@ public abstract class MBeanTypeTabControl extends TabControl _toolkit = new FormToolkit(_tabFolder.getDisplay()); _form = _toolkit.createForm(_tabFolder); _form.getBody().setLayout(new GridLayout()); + init(); createWidgets(); } + + protected void init() + { + + } /** * @see TabControl#getControl() @@ -131,9 +138,9 @@ public abstract class MBeanTypeTabControl extends TabControl protected abstract List<ManagedBean> getMbeans(); - protected void createTable(Composite tableComposite) + protected void createTable() { - _table = new Table (tableComposite, SWT.MULTI | SWT.SCROLL_LINE | SWT.BORDER | SWT.FULL_SELECTION); + _table = new Table (_tableComposite, SWT.MULTI | SWT.SCROLL_LINE | SWT.BORDER | SWT.FULL_SELECTION); _table.setLinesVisible (true); _table.setHeaderVisible (true); GridData data = new GridData(SWT.FILL, SWT.FILL, true, true); @@ -222,12 +229,12 @@ public abstract class MBeanTypeTabControl extends TabControl } }); - Composite tableComposite = _toolkit.createComposite(mainComposite); + _tableComposite = _toolkit.createComposite(mainComposite); gridData = new GridData(SWT.FILL, SWT.FILL, true, true); - tableComposite.setLayoutData(gridData); - tableComposite.setLayout(new GridLayout(1,false)); + _tableComposite.setLayoutData(gridData); + _tableComposite.setLayout(new GridLayout(1,false)); - createTable(tableComposite); + createTable(); favouritesButton.setEnabled(false); openButton.setEnabled(false); @@ -270,6 +277,13 @@ public abstract class MBeanTypeTabControl extends TabControl public void mouseDown(MouseEvent e){} public void mouseUp(MouseEvent e){} }); + + createLowerAreaButton(mainComposite); + } + + protected void createLowerAreaButton(Composite parent) + { + } /** diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java index 8f80426af8..3e1f198606 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java @@ -20,27 +20,44 @@ */ package org.apache.qpid.management.ui.views.type; +import java.io.File; +import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.Semaphore; import javax.management.MBeanServerConnection; import javax.management.MBeanServerInvocationHandler; +import static org.apache.qpid.management.ui.ApplicationRegistry.DATA_DIR; import static org.apache.qpid.management.ui.Constants.QUEUE; -import static org.apache.qpid.management.ui.Constants.ATTRIBUTE_QUEUE_DEPTH; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_NAME; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_ACTIVE_CONSUMER_COUNT; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_AUTODELETE; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_CONSUMER_COUNT; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_DURABLE; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_MAX_MSG_AGE; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_MAX_MSG_COUNT; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_MAX_MSG_SIZE; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_MAX_QUEUE_DEPTH; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_MSG_COUNT; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_OWNER; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_QUEUE_DEPTH; +import static org.apache.qpid.management.common.mbeans.ManagedQueue.ATTR_RCVD_MSG_COUNT; import org.apache.qpid.management.common.mbeans.ManagedBroker; +import org.apache.qpid.management.common.mbeans.ManagedQueue; import org.apache.qpid.management.ui.ApplicationRegistry; import org.apache.qpid.management.ui.ManagedBean; import org.apache.qpid.management.ui.ManagedServer; -import org.apache.qpid.management.ui.ServerRegistry; import org.apache.qpid.management.ui.jmx.MBeanUtility; -import org.apache.qpid.management.ui.model.AttributeData; import org.apache.qpid.management.ui.views.MBeanView; import org.apache.qpid.management.ui.views.NavigationView; import org.apache.qpid.management.ui.views.ViewUtility; +import org.eclipse.jface.preference.PreferenceStore; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; @@ -53,7 +70,10 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; @@ -64,85 +84,216 @@ public class QueueTypeTabControl extends MBeanTypeTabControl { private MBeanServerConnection _mbsc; private ManagedBroker _vhmb; - //Map for storing queue depths for servers using Qpid JMX API 1.2 and below - private Map<ManagedBean,Long> _queueDepths = new HashMap<ManagedBean, Long>(); + + private List<String> _selectedAttributes; + private PreferenceStore _preferences; + private Semaphore _tableViewerSemaphore = new Semaphore(1); + + private static final String APP_DIR = ApplicationRegistry.DATA_DIR; + private static final String INI_FILENAME = APP_DIR + File.separator + "qpidmc_queue_attributes.ini"; + private static final String INI_QUEUE_ATTRIBUES = "QueueAttributesSelection"; + + private static final ArrayList<String> FALLBACK_ATTRIBUTES_LIST = new ArrayList<String>(); + static + { + FALLBACK_ATTRIBUTES_LIST.add(ATTR_NAME); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_ACTIVE_CONSUMER_COUNT); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_AUTODELETE); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_CONSUMER_COUNT); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_DURABLE); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_MAX_MSG_AGE); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_MAX_MSG_COUNT); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_MAX_MSG_SIZE); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_MAX_QUEUE_DEPTH); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_MSG_COUNT); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_OWNER); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_QUEUE_DEPTH); + FALLBACK_ATTRIBUTES_LIST.add(ATTR_RCVD_MSG_COUNT); + } + + private static final Map<String, Integer> DEFAULT_COLUMN_WIDTHS = new HashMap<String,Integer>(); + static + { + DEFAULT_COLUMN_WIDTHS.put(ATTR_NAME, 215); + DEFAULT_COLUMN_WIDTHS.put(ATTR_OWNER,125); + DEFAULT_COLUMN_WIDTHS.put(ATTR_QUEUE_DEPTH,125); + } public QueueTypeTabControl(TabFolder tabFolder, ManagedServer server, String virtualHost) { super(tabFolder,server,virtualHost,QUEUE); _mbsc = (MBeanServerConnection) _serverRegistry.getServerConnection(); - _vhmb = (ManagedBroker) MBeanServerInvocationHandler.newProxyInstance(_mbsc, + + //create a proxy for the VirtualHostManager mbean to use in retrieving the attribute names/values + _vhmb = MBeanServerInvocationHandler.newProxyInstance(_mbsc, _vhostMbean.getObjectName(), ManagedBroker.class, false); + } @Override - public void refresh(ManagedBean mbean) + protected void init() { - if(_ApiVersion.greaterThanOrEqualTo(1, 3)) + createIniFileIfNecessary(); + loadAttributePreferences(); + } + + /** + * Create the ini file if it doesn't already exist. + */ + public static void createIniFileIfNecessary() + { + File dir = new File(DATA_DIR); + if (!dir.exists()) { - //Qpid JMX API 1.3+, use this virtualhosts VirtualHostManager MBean - //to retrieve the Queue Name and Queue Depth - - Map<String,Long> queueNamesDepths = null; - try + if(!dir.mkdir()) { - queueNamesDepths = _vhmb.viewQueueNamesDepths(); + System.err.println("Could not create application data directory " + DATA_DIR); + ViewUtility.popupErrorMessage("Error", "Fatal Error: Unable to create the application data directory: " + DATA_DIR); + System.exit(1); } - catch(Exception e) + } + + File file = new File(INI_FILENAME); + try + { + if (!file.exists()) { - MBeanUtility.handleException(_vhostMbean, e); + file.createNewFile(); } + } + catch (IOException ex) + { + System.err.println("Error creating the configuration file " + INI_FILENAME); + ViewUtility.popupErrorMessage("Error", "Fatal Error: Unable to create the configuration file: " + INI_FILENAME); + System.exit(1); + } + } + + private void loadAttributePreferences() + { + _preferences = new PreferenceStore(INI_FILENAME); + List<String> attributesList = new ArrayList<String>(); + + //ensure the name is present, and first + attributesList.add(ManagedQueue.ATTR_NAME); + + //add any others from the file + try + { + _preferences.load(); - _tableViewer.setInput(queueNamesDepths); + String selectedAttributes = _preferences.getString(INI_QUEUE_ATTRIBUES); + if (selectedAttributes.length() != 0) + { + String[] attributes = selectedAttributes.split(","); + for (String attr : attributes) + { + if(attr.equals(ManagedQueue.ATTR_NAME)) + { + //the Name attribute is already present + continue; + } + + attributesList.add(attr); + } + } } - else + catch (IOException e) { - //Qpid JMX API 1.2 or below, use the ManagedBeans and look - //up the attribute value for each - _mbeans = getMbeans(); - _tableViewer.setInput(_mbeans); + ViewUtility.popupErrorMessage("Error", "Unable to load previous attribute selections, defaulting to Name only"); + System.err.println(e); } - - layout(); + + _selectedAttributes = attributesList; } - @Override - protected List<ManagedBean> getMbeans() + private void saveAttributePreferences() { - ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(MBeanView.getServer()); + String chosenAttributes = new String(); + + for(String attr : _selectedAttributes) + { + chosenAttributes = chosenAttributes.concat(attr) + ","; + } + //cut off last "," + int lastIndex = chosenAttributes.lastIndexOf(','); + if (lastIndex != -1) + { + chosenAttributes = chosenAttributes.substring(0,lastIndex); + } + + _preferences.putValue(INI_QUEUE_ATTRIBUES, chosenAttributes); try { - return extractQueueDetails(serverRegistry.getQueues(MBeanView.getVirtualHost())); + _preferences.save(); } - catch(Exception e) + catch (IOException e) { - MBeanUtility.handleException(null, e); - return null; + ViewUtility.popupErrorMessage("Error", "Unable to save the attribute selection, choices will be lost at shutdown"); + System.err.println(e); } - } - private List<ManagedBean> extractQueueDetails(List<ManagedBean> list) throws Exception + @Override + public void refresh(ManagedBean mbean) { - _queueDepths.clear(); + //Try locking. If we cant aquire the lock, dont bother getting new values. + //Either the attributes are being changed and these values would be out of date, + //or another thread is still in the process of refreshing + if(_tableViewerSemaphore.tryAcquire()) + { + try + { + List<List<Object>> values = null; - List<ManagedBean> items = new ArrayList<ManagedBean>(); - for (ManagedBean mbean : list) - { - AttributeData data = MBeanUtility.getAttributeData(mbean, ATTRIBUTE_QUEUE_DEPTH); - _queueDepths.put(mbean, Long.valueOf(data.getValue().toString())); + if(_ApiVersion.greaterThanOrEqualTo(1, 3)) + { + //Qpid JMX API 1.3+, use this virtualhosts VirtualHostManager MBean + //to retrieve the attributes values requested for all queues at once + try + { + values = _vhmb.retrieveQueueAttributeValues(_selectedAttributes.toArray(new String[0])); + } + catch(Exception e) + { + MBeanUtility.handleException(_vhostMbean, e); + } + } + else + { + //Qpid JMX API 1.2 or below, use the local ManagedBeans and look + //up the attribute values for each queue individually + _mbeans = getMbeans(); + values = MBeanUtility.getQueueAttributes(_mbeans, _selectedAttributes.toArray(new String[0])); + } - items.add(mbean); + _tableViewer.setInput(values); + layout(); + } + finally + { + _tableViewerSemaphore.release(); + } } - - return items; + + } + + @Override + protected List<ManagedBean> getMbeans() + { + return _serverRegistry.getQueues(_virtualHost); + } + + private void clearTableComposite() + { + ViewUtility.disposeChildren(_tableComposite); } @Override - protected void createTable(Composite tableComposite) + protected void createTable() { - _table = new Table (tableComposite, SWT.MULTI | SWT.SCROLL_LINE | SWT.BORDER | SWT.FULL_SELECTION); + _table = new Table (_tableComposite, SWT.MULTI | SWT.SCROLL_LINE | SWT.BORDER | SWT.FULL_SELECTION); _table.setLinesVisible (true); _table.setHeaderVisible (true); GridData data = new GridData(SWT.FILL, SWT.FILL, true, true); @@ -150,31 +301,28 @@ public class QueueTypeTabControl extends MBeanTypeTabControl _tableViewer = new TableViewer(_table); - String[] titles = new String[]{"Queue Name", "Queue Depth"}; - int[] bounds = new int[]{325, 200}; - - final TableSorter tableSorter; - - if(_ApiVersion.greaterThanOrEqualTo(1, 3)) - { - //QpidJMX API 1.3+ using the new getQueueNamesDepths method in VHostManager MBean. - //requires sorting Map.Entry elements - tableSorter = new NewerTableSorter(); - } - else - { - //QpidJMX API 1.2 or below. Requires sorting ManagedBeans and using the _queueDepths map - tableSorter = new OlderTableSorter(); - } + final QueueTableSorter tableSorter = new QueueTableSorter(); - for (int i = 0; i < titles.length; i++) + for (int i = 0; i < _selectedAttributes.size(); i++) { final int index = i; final TableViewerColumn viewerColumn = new TableViewerColumn(_tableViewer, SWT.NONE); final TableColumn column = viewerColumn.getColumn(); - column.setText(titles[i]); - column.setWidth(bounds[i]); + String attrName = _selectedAttributes.get(i); + column.setMoveable(true); + column.setText(attrName); + column.pack(); + if(DEFAULT_COLUMN_WIDTHS.containsKey(attrName)) + { + //retrieve the desired default width + column.setWidth(DEFAULT_COLUMN_WIDTHS.get(attrName)); + } + else + { + //add padding for sort direction indicator + column.setWidth(column.getWidth() + 15); + } column.setResizable(true); //Setting the right sorter @@ -201,75 +349,166 @@ public class QueueTypeTabControl extends MBeanTypeTabControl }); } - - if(_ApiVersion.greaterThanOrEqualTo(1, 3)) - { - _tableViewer.setContentProvider(new NewerContentProviderImpl()); - _tableViewer.setLabelProvider(new NewerLabelProviderImpl()); - } - else - { - _tableViewer.setContentProvider(new OlderContentProviderImpl()); - _tableViewer.setLabelProvider(new OlderLabelProviderImpl()); - } - + + _tableViewer.setContentProvider(new QueueContentProviderImpl()); + _tableViewer.setLabelProvider(new QueueLabelProviderImpl()); + _tableViewer.setUseHashlookup(true); _tableViewer.setSorter(tableSorter); _table.setSortColumn(_table.getColumn(0)); _table.setSortDirection(SWT.UP); } - /** - * Content Provider class for the table viewer for Qpid JMX API 1.2 and below. - */ - private class OlderContentProviderImpl implements IStructuredContentProvider + protected void createLowerAreaButton(Composite parent) { + Composite lowerButtonComposite = _toolkit.createComposite(parent, SWT.NONE); + GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false); + lowerButtonComposite.setLayoutData(gridData); + lowerButtonComposite.setLayout(new GridLayout()); - public void inputChanged(Viewer v, Object oldInput, Object newInput) + final Button attributesButton = _toolkit.createButton(lowerButtonComposite, "Select Attributes ...", SWT.PUSH); + gridData = new GridData(SWT.RIGHT, SWT.CENTER, true, false); + attributesButton.setLayoutData(gridData); + attributesButton.addSelectionListener(new SelectionAdapter() { - - } - - public void dispose() + public void widgetSelected(SelectionEvent e) + { + chooseAttributes(attributesButton.getShell()); + } + }); + } + + private void chooseAttributes(final Shell parent) + { + + List<String> availableAttributes; + if(_ApiVersion.greaterThanOrEqualTo(1, 3)) { - + //Qpid JMX API 1.3+, request the current queue attributes names from the broker + try + { + availableAttributes = _vhmb.retrieveQueueAttributeNames(); + } + catch (IOException e) + { + availableAttributes = new ArrayList<String>(FALLBACK_ATTRIBUTES_LIST); + } } - - @SuppressWarnings("unchecked") - public Object[] getElements(Object parent) + else { - return ((List<ManagedBean>) parent).toArray(); + //Qpid JMX API 1.2 or below, use the falllback list of names. + availableAttributes = new ArrayList<String>(FALLBACK_ATTRIBUTES_LIST); } - } - - /** - * Label Provider class for the table viewer for Qpid JMX API 1.2 and below. - */ - private class OlderLabelProviderImpl extends LabelProvider implements ITableLabelProvider - { - @Override - public String getColumnText(Object element, int columnIndex) + + + final List<String> chosenAttributes = new ArrayList<String>(); + + final Shell shell = ViewUtility.createModalDialogShell(parent, "Select Attributes"); + + Composite attributesComposite = _toolkit.createComposite(shell, SWT.NONE); + attributesComposite.setBackground(shell.getBackground()); + attributesComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); + attributesComposite.setLayout(new GridLayout(2,false)); + + //add a selected-but-disabled check box for the Name attribute (its a mandatory attribute) + final Button nameCheckbox = new Button(attributesComposite, SWT.CHECK); + nameCheckbox.setText(ManagedQueue.ATTR_NAME); + nameCheckbox.setSelection(true); + nameCheckbox.setEnabled(false); + + for(String attr : availableAttributes) { - ManagedBean mbean = (ManagedBean) element; + if(attr.equals(ManagedQueue.ATTR_NAME)) + { + //Name attribute is mandatory and gets added to the front of the list later + continue; + } + + final Button attrButton = new Button(attributesComposite, SWT.CHECK); + attrButton.setText(attr); - switch (columnIndex) + //if it was checked before, select it again now + if(_selectedAttributes.contains(attr)) { - case 0 : // name column - return mbean.getName(); - case 1 : // queue depth column - return getQueueDepthString(_queueDepths.get(mbean)); - default: - return "-"; + attrButton.setSelection(true); + chosenAttributes.add(attr); } + + //add a selection listener to update the selected attribute list + attrButton.addSelectionListener(new SelectionAdapter() + { + public void widgetSelected(SelectionEvent e) + { + if(attrButton.getSelection()) + { + chosenAttributes.add(attrButton.getText()); + } + else + { + chosenAttributes.remove(attrButton.getText()); + } + } + }); } - @Override - public Image getColumnImage(Object element, int columnIndex) + Composite okCancelButtonsComp = _toolkit.createComposite(shell); + okCancelButtonsComp.setBackground(shell.getBackground()); + okCancelButtonsComp.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true)); + okCancelButtonsComp.setLayout(new GridLayout(2,false)); + + Button okButton = _toolkit.createButton(okCancelButtonsComp, "OK", SWT.PUSH); + okButton.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false, false)); + Button cancelButton = _toolkit.createButton(okCancelButtonsComp, "Cancel", SWT.PUSH); + cancelButton.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false, false)); + + okButton.addSelectionListener(new SelectionAdapter() { - return null; - } + public void widgetSelected(SelectionEvent e) + { + shell.dispose(); + + //The Name attribute is mandatory, add it now, also + //ensuring it is left-most by placing it first in the list + List<String> newSelection = new ArrayList<String>(); + newSelection.add(ManagedQueue.ATTR_NAME); + + //now add all remaining choices in alphabetical order + Collections.sort(chosenAttributes); + newSelection.addAll(chosenAttributes); + + _tableViewerSemaphore.acquireUninterruptibly(); + try + { + _selectedAttributes = newSelection; + + clearTableComposite(); + createTable(); + saveAttributePreferences(); + } + finally + { + _tableViewerSemaphore.release(); + } + + refresh(_mbean); + } + }); + + cancelButton.addSelectionListener(new SelectionAdapter() + { + public void widgetSelected(SelectionEvent e) + { + shell.dispose(); + } + }); + + shell.setDefaultButton(okButton); + shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + + shell.open(); } - + private String getQueueDepthString(Long value) { if(value == null) @@ -277,7 +516,12 @@ public class QueueTypeTabControl extends MBeanTypeTabControl return "-"; } - if (_ApiVersion.lessThanOrEqualTo(1,1)) + if (_ApiVersion.greaterThanOrEqualTo(1,2)) + { + //Qpid JMX API 1.2 or above, returns Bytes + return convertLongBytesToText(value); + } + else { //Qpid JMX API 1.1 or below, returns KB double mb = 1024.0; @@ -291,33 +535,37 @@ public class QueueTypeTabControl extends MBeanTypeTabControl return value + " KB"; } } - else + } + + private String convertLongBytesToText(Long value) + { + if(value == null) { - //Qpid JMX API 1.2 or above, returns Bytes - double mb = 1024.0 * 1024.0; - double kb = 1024.0; + return "-"; + } - if(value >= mb) //MB - { - return String.format("%.3f", (Double)(value / mb)) + " MB"; - } - else if (value >= kb) //KB - { - return String.format("%.3f", (Double)(value / kb)) + " KB"; - } - else //Bytes - { - return value + " Bytes"; - } + double mb = 1024.0 * 1024.0; + double kb = 1024.0; + + if(value >= mb) //MB + { + return String.format("%.3f", (Double)((double)value / mb)) + " MB"; + } + else if (value >= kb) //KB + { + return String.format("%.3f", (Double)((double)value / kb)) + " KB"; + } + else //Bytes + { + return value + " Bytes"; } } - /** - * Abstract sorter class for the table viewer. + * sorter class for the table viewer. * */ - private abstract class TableSorter extends ViewerSorter + private class QueueTableSorter extends ViewerSorter { protected int column; protected static final int ASCENDING = 0; @@ -325,7 +573,7 @@ public class QueueTypeTabControl extends MBeanTypeTabControl protected int direction; - public TableSorter() + public QueueTableSorter() { this.column = 0; direction = ASCENDING; @@ -346,76 +594,21 @@ public class QueueTypeTabControl extends MBeanTypeTabControl } } - @Override - public abstract int compare(Viewer viewer, Object e1, Object e2); - } - - /** - * sorter class for the table viewer for Qpid JMX API 1.2 and below. - * - */ - private class OlderTableSorter extends TableSorter - { - public OlderTableSorter() - { - super(); - } - - @Override - public int compare(Viewer viewer, Object e1, Object e2) - { - ManagedBean mbean1 = (ManagedBean) e1; - ManagedBean mbean2 = (ManagedBean) e2; - - int comparison = 0; - switch(column) - { - case 0: //name - comparison = mbean1.getName().compareTo(mbean2.getName()); - break; - case 1: //queue depth - comparison = _queueDepths.get(mbean1).compareTo(_queueDepths.get(mbean2)); - default: - comparison = 0; - } - // If descending order, flip the direction - if(direction == DESCENDING) - { - comparison = -comparison; - } - return comparison; - } - } - - /** - * sorter class for the table viewer for Qpid JMX API 1.3 and above. - * - */ - private class NewerTableSorter extends TableSorter - { - public NewerTableSorter() - { - super(); - } - @SuppressWarnings("unchecked") @Override public int compare(Viewer viewer, Object e1, Object e2) { - Map.Entry<String, Long> queue1 = (Map.Entry<String, Long>) e1; - Map.Entry<String, Long> queue2 = (Map.Entry<String, Long>) e2; + List<Object> queue1 = (List<Object>) e1; + List<Object> queue2 = (List<Object>) e2; int comparison = 0; switch(column) { - case 0://name - comparison = (queue1.getKey()).compareTo(queue2.getKey()); - break; - case 1://queue depth - comparison = (queue1.getValue()).compareTo(queue2.getValue());; - break; default: - comparison = 0; + if(queue1.get(column) instanceof Comparable) + { + comparison = ((Comparable)queue1.get(column)).compareTo((Comparable) queue2.get(column)); + } } // If descending order, flip the direction if(direction == DESCENDING) @@ -429,7 +622,7 @@ public class QueueTypeTabControl extends MBeanTypeTabControl /** * Content Provider class for the table viewer for Qpid JMX API 1.3 and above. */ - private class NewerContentProviderImpl implements IStructuredContentProvider + private class QueueContentProviderImpl implements IStructuredContentProvider { public void inputChanged(Viewer v, Object oldInput, Object newInput) @@ -445,30 +638,41 @@ public class QueueTypeTabControl extends MBeanTypeTabControl @SuppressWarnings("unchecked") public Object[] getElements(Object parent) { - Map<String, Long> map = (Map<String, Long>) parent; - return map.entrySet().toArray(new Map.Entry[0]); + return ((List<List<Object>>) parent).toArray(); } } /** * Label Provider class for the table viewer for for Qpid JMX API 1.3 and above. */ - private class NewerLabelProviderImpl extends LabelProvider implements ITableLabelProvider + private class QueueLabelProviderImpl extends LabelProvider implements ITableLabelProvider { @SuppressWarnings("unchecked") @Override public String getColumnText(Object element, int columnIndex) { - Map.Entry<String, Long> queue = (Map.Entry<String, Long>) element; + List<Object> attributes = (List<Object>) element; switch (columnIndex) { - case 0 : // name column - return queue.getKey(); - case 1 : // depth column - return getQueueDepthString(queue.getValue()); default : - return "-"; + String attrName = _selectedAttributes.get(columnIndex); + + if(ATTR_QUEUE_DEPTH.equals(attrName)) + { + return getQueueDepthString((Long) attributes.get(columnIndex)); + } + else if(ATTR_MAX_QUEUE_DEPTH.equals(attrName) || ATTR_MAX_MSG_SIZE.equals(attrName)) + { + Number val = (Number)attributes.get(columnIndex); + return convertLongBytesToText(val.longValue()); + } + else if(ATTR_MAX_MSG_AGE.equals(attrName)) + { + return String.valueOf(attributes.get(columnIndex) + "ms"); + } + + return String.valueOf(attributes.get(columnIndex)); } } @@ -479,6 +683,7 @@ public class QueueTypeTabControl extends MBeanTypeTabControl } } + @SuppressWarnings("unchecked") @Override protected void addMBeanToFavourites() { @@ -492,25 +697,13 @@ public class QueueTypeTabControl extends MBeanTypeTabControl int[] selectedIndices = _table.getSelectionIndices(); ArrayList<ManagedBean> selectedMBeans = new ArrayList<ManagedBean>(); - - if(_ApiVersion.greaterThanOrEqualTo(1, 3)) - { - //if we have Qpid JMX API 1.3+ the entries are created from Map.Entry<String,Long> - for(int index = 0; index < selectedIndices.length ; index++) - { - Map.Entry<String, Long> queueEntry = (Map.Entry<String, Long>) _table.getItem(selectedIndices[index]).getData(); - String queueName = queueEntry.getKey(); - selectedMBeans.add(_serverRegistry.getQueue(queueName, _virtualHost)); - } - } - else + + //the entries are created from an List<Object> with the attribute values (name first) + for(int index = 0; index < selectedIndices.length ; index++) { - //if we have a Qpid JMX API 1.2 or less server, entries are created from ManagedBeans directly - for(int index = 0; index < selectedIndices.length ; index++) - { - ManagedBean mbean = (ManagedBean) _table.getItem(selectedIndices[index]).getData(); - selectedMBeans.add(mbean); - } + List<Object> queueEntry = (List<Object>) _table.getItem(selectedIndices[index]).getData(); + String queueName = (String) queueEntry.get(0); + selectedMBeans.add(_serverRegistry.getQueue(queueName, _virtualHost)); } IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); @@ -531,6 +724,7 @@ public class QueueTypeTabControl extends MBeanTypeTabControl } } + @SuppressWarnings("unchecked") @Override protected void openMBean() { @@ -542,20 +736,11 @@ public class QueueTypeTabControl extends MBeanTypeTabControl } ManagedBean selectedMBean; - - if(_ApiVersion.greaterThanOrEqualTo(1, 3)) - { - //if we have Qpid JMX API 1.3+ the entries are created from Map.Entry<String,Long> - Map.Entry<String, Long> queueEntry = (Map.Entry<String, Long>) _table.getItem(selectionIndex).getData(); - String queueName = queueEntry.getKey(); - selectedMBean = _serverRegistry.getQueue(queueName, _virtualHost); - } - else - { - //if we have a Qpid JMX API 1.2 or less server, entries are created from ManagedBeans directly - selectedMBean = (ManagedBean)_table.getItem(selectionIndex).getData(); - } + //the entries are created from an List<Object> with the attribute values (name first) + List<Object> queueEntry = (List<Object>) _table.getItem(selectionIndex).getData(); + String queueName = (String) queueEntry.get(0); + selectedMBean = _serverRegistry.getQueue(queueName, _virtualHost); if(selectedMBean == null) { |