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 2007/01/26 11:51:24 UTC
svn commit: r500215 - in
/incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin:
plugins/ src/main/java/org/apache/qpid/management/ui/model/
src/main/java/org/apache/qpid/management/ui/views/
Author: ritchiem
Date: Fri Jan 26 02:51:23 2007
New Revision: 500215
URL: http://svn.apache.org/viewvc?view=rev&rev=500215
Log:
Revision: 499043
Author: bhupendrab
Date: 15:07:20, 23 January 2007
Message:
QPID-302
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
Revision: 494437
Author: bhupendrab
Date: 15:37:38, 09 January 2007
Message:
QPID-213
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
Revision: 492956
Author: bhupendrab
Date: 10:09:14, 05 January 2007
Message:
QPID-213
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
Revision: 492514
Author: bhupendrab
Date: 10:52:06, 04 January 2007
Message:
QPID-213
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
Revision: 492184
Author: bhupendrab
Date: 15:38:03, 03 January 2007
Message:
QPID-213
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
Revision: 491031
Author: bhupendrab
Date: 15:47:42, 29 December 2006
Message:
QPID-213
----
Added : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
Revision: 491029
Author: bhupendrab
Date: 15:38:05, 29 December 2006
Message:
QPID-213
----
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
Modified : /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
Added:
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/plugins/
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/plugins/org.apache.qpid.management.ui_0.1.0.jar (with props)
Modified:
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
Added: incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/plugins/org.apache.qpid.management.ui_0.1.0.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/plugins/org.apache.qpid.management.ui_0.1.0.jar?view=auto&rev=500215
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/plugins/org.apache.qpid.management.ui_0.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java?view=diff&rev=500215&r1=500214&r2=500215
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java (original)
+++ incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java Fri Jan 26 02:51:23 2007
@@ -25,7 +25,7 @@
String name = "";
String description = "";
String dataType = "";
- Object value = null;
+ Object value = "";
boolean readable = true;
boolean writable = false;
@@ -63,7 +63,8 @@
}
public void setValue(Object value)
{
- this.value = value;
+ if (value != null)
+ this.value = value;
}
public boolean isReadable()
{
Modified: incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java?view=diff&rev=500215&r1=500214&r2=500215
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java (original)
+++ incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java Fri Jan 26 02:51:23 2007
@@ -20,8 +20,6 @@
*/
package org.apache.qpid.management.ui.views;
-import javax.management.openmbean.TabularDataSupport;
-
import org.apache.qpid.management.ui.ApplicationRegistry;
import org.apache.qpid.management.ui.Constants;
import org.apache.qpid.management.ui.ManagedBean;
@@ -421,7 +419,7 @@
{
int width = 500;
int height = 250;
- if (data.getValue() instanceof TabularDataSupport)
+ if (!isSimpleType(data.getValue()))
{
width = 650;
height = 450;
@@ -516,12 +514,12 @@
}
else
{
- if (attribute.getValue() instanceof TabularDataSupport)
+ if (!isSimpleType(attribute.getValue()))
{
Composite composite = new Composite(parent, SWT.BORDER);
composite.setLayout(new GridLayout());
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- ViewUtility.createTabularDataHolder(_toolkit, composite,(TabularDataSupport)attribute.getValue());
+ ViewUtility.populateCompositeWithData(_toolkit, composite, attribute.getValue());
}
else
{
Modified: incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java?view=diff&rev=500215&r1=500214&r2=500215
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java (original)
+++ incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java Fri Jan 26 02:51:23 2007
@@ -718,19 +718,21 @@
{
while(true)
{
- if (_managedServerMap.isEmpty())
- continue;
+ if (!_managedServerMap.isEmpty())
+ {
+ refreshRemovedObjects();
+ refreshClosedServerConnections();
+ }
try
{
- Thread.sleep(2000);
+ Thread.sleep(3000);
}
catch(Exception ex)
{
}
- refreshRemovedObjects();
- refreshClosedServerConnections();
+
}// end of while loop
}// end of run method.
}// end of Worker class
Modified: incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java?view=diff&rev=500215&r1=500214&r2=500215
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java (original)
+++ incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java Fri Jan 26 02:51:23 2007
@@ -24,9 +24,6 @@
import java.util.List;
import java.util.Map.Entry;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.TabularDataSupport;
-
import org.apache.qpid.management.ui.ApplicationRegistry;
import org.apache.qpid.management.ui.Constants;
import org.apache.qpid.management.ui.ManagedBean;
@@ -472,7 +469,7 @@
int width = 600;
int height = 400;
Shell shell = ViewUtility.createPopupShell(Constants.RESULT, width, height);
- populateResults(result, shell);
+ ViewUtility.populateCompositeWithData(_toolkit, shell, result);
shell.open();
while (!shell.isDisposed()) {
@@ -484,23 +481,6 @@
}
/**
- * Displays the operation result
- * @param result
- * @param parent
- */
- private void populateResults(Object result, Composite parent)
- {
- if (result instanceof TabularDataSupport)
- {
- ViewUtility.createTabularDataHolder(_toolkit, parent, (TabularDataSupport)result);
- }
- else if (result instanceof CompositeDataSupport)
- {
- ViewUtility.populateCompositeDataHolder(_toolkit, parent, (CompositeDataSupport)result);
- }
- }
-
- /**
* Clears the parameter values of the operation
*/
private void clearParameters()
@@ -623,7 +603,7 @@
else
{
ViewUtility.disposeChildren(_resultsComposite);
- populateResults(result, _resultsComposite);
+ ViewUtility.populateCompositeWithData(_toolkit, _resultsComposite, result);
_resultsComposite.layout();
_form.layout();
}
Modified: incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java?view=diff&rev=500215&r1=500214&r2=500215
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java (original)
+++ incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java Fri Jan 26 02:51:23 2007
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.management.ui.views;
+import java.util.ArrayList;
+
import org.apache.qpid.management.ui.ManagedBean;
import org.apache.qpid.management.ui.model.OperationData;
import org.eclipse.swt.widgets.Control;
@@ -34,6 +36,26 @@
protected ManagedBean _mbean = null;
protected TabFolder _tabFolder = null;
+ private static java.util.List<String> simpleTypes = new ArrayList<String>();
+
+ static
+ {
+ simpleTypes.add("java.math.BigDecimal");
+ simpleTypes.add("java.math.BigInteger");
+ simpleTypes.add("java.lang.Boolean");
+ simpleTypes.add("java.lang.Byte");
+ simpleTypes.add("java.lang.Character");
+ simpleTypes.add("java.util.Date");
+ simpleTypes.add("java.lang.Double");
+ simpleTypes.add("java.lang.Float");
+ simpleTypes.add("java.lang.Integer");
+ simpleTypes.add("java.lang.Long");
+ simpleTypes.add("javax.management.ObjectName");
+ simpleTypes.add("java.lang.Short");
+ simpleTypes.add("java.lang.String");
+ simpleTypes.add("boolean");
+ }
+
public TabControl(TabFolder tabFolder)
{
_tabFolder = tabFolder;
@@ -60,5 +82,10 @@
public void setFocus()
{
+ }
+
+ public boolean isSimpleType(Object data)
+ {
+ return simpleTypes.contains(data.getClass().getName());
}
}
Modified: incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java?view=diff&rev=500215&r1=500214&r2=500215
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java (original)
+++ incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java Fri Jan 26 02:51:23 2007
@@ -28,6 +28,7 @@
import javax.management.openmbean.ArrayType;
import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.CompositeType;
import javax.management.openmbean.OpenType;
import javax.management.openmbean.TabularDataSupport;
@@ -53,6 +54,10 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
+/**
+ * Utility Class for displaying OpenMbean data types by creating required SWT widgets
+ * @author Bhupendra Bhardwaj
+ */
public class ViewUtility
{
public static final String OP_NAME = "operation_name";
@@ -77,8 +82,26 @@
SUPPORTED_ARRAY_DATATYPES.add("java.util.Date");
}
+ /**
+ * Populates the composite with given openmbean data type (TabularType or CompositeType)
+ * @param toolkit
+ * @param parent composite
+ * @param data open mbean data type(either composite type or tabular data type)
+ */
+ public static void populateCompositeWithData(FormToolkit toolkit, Composite parent, Object data)
+ {
+ if (data instanceof TabularDataSupport)
+ {
+ ViewUtility.createTabularDataHolder(toolkit, parent, (TabularDataSupport)data);
+ }
+ else if (data instanceof CompositeDataSupport)
+ {
+ ViewUtility.populateCompositeWithCompositeData(toolkit, parent, (CompositeDataSupport)data);
+ }
+ }
+
@SuppressWarnings("unchecked")
- public static void createTabularDataHolder(FormToolkit toolkit, Composite parent, TabularDataSupport tabularData)
+ private static void createTabularDataHolder(FormToolkit toolkit, Composite parent, TabularDataSupport tabularData)
{
Composite composite = toolkit.createComposite(parent, SWT.BORDER);
GridLayout layout = new GridLayout(4, true);
@@ -109,7 +132,7 @@
// display the first record
CompositeData data = (CompositeData)(list.get(0)).getValue();
composite.setData(INDEX, 0);
- populateCompositeDataHolder(toolkit, compositeDataHolder, data);
+ populateCompositeWithCompositeData(toolkit, compositeDataHolder, data);
enableOrDisableTraversalButtons(composite);
}
@@ -135,7 +158,15 @@
}
}
- public static Composite createCompositeDataHolder(final FormToolkit toolkit, final Composite dataHolder, CompositeType compositeType)
+ /**
+ * Sets up the given composite for holding a CompositeData. Create traversal buttons, label etc and
+ * creates a child Composite, which should be populated with the CompositeData
+ * @param toolkit
+ * @param dataHolder
+ * @param compositeType
+ * @return
+ */
+ private static Composite createCompositeDataHolder(final FormToolkit toolkit, final Composite dataHolder, CompositeType compositeType)
{
String desc = compositeType.getDescription();
Label description = toolkit.createLabel(dataHolder, desc, SWT.CENTER);
@@ -164,6 +195,7 @@
layoutData.widthHint = 80;
lastRecordButton.setLayoutData(layoutData);
+ // Now create the composite, which will hold the CompositeData
final Composite composite = toolkit.createComposite(dataHolder, SWT.NONE);
GridLayout layout = new GridLayout();
layout.horizontalSpacing = layout.verticalSpacing = 0;
@@ -179,7 +211,8 @@
dataHolder.setData(PREV, previousRecordButton);
dataHolder.setData(LAST, lastRecordButton);
- // Listener for the traversal buttons
+ // Listener for the traversal buttons. When a button is clicked the respective
+ // CompositeData will be populated in the composite
SelectionListener listener = new SelectionAdapter()
{
public void widgetSelected(SelectionEvent e)
@@ -188,8 +221,9 @@
return;
Button traverseButton =(Button)e.widget;
+ // Get the CompositeData respective to the button selected
CompositeData data = getCompositeData(dataHolder, traverseButton.getText());
- populateCompositeDataHolder(toolkit, composite, data);
+ populateCompositeWithCompositeData(toolkit, composite, data);
enableOrDisableTraversalButtons(dataHolder);
}
};
@@ -202,6 +236,13 @@
return composite;
}
+ /**
+ * The CompositeData is set as data with the Composite and using the index, this method will
+ * return the corresponding CompositeData
+ * @param compositeHolder
+ * @param dataIndex
+ * @return the CompositeData respective to the index
+ */
private static CompositeData getCompositeData(Composite compositeHolder, String dataIndex)
{
List objectData = (List)compositeHolder.getData();
@@ -241,8 +282,14 @@
return (CompositeData)((Map.Entry)objectData.get(index)).getValue();
}
+ /**
+ * Populates the given composite with the CompositeData. Creates required widgets to hold the data types
+ * @param toolkit
+ * @param parent
+ * @param data CompositeData
+ */
@SuppressWarnings("unchecked")
- public static void populateCompositeDataHolder(FormToolkit toolkit, Composite parent, CompositeData data/*String dataIndex*/)
+ private static void populateCompositeWithCompositeData(FormToolkit toolkit, Composite parent, CompositeData data)
{
Control[] oldControls = parent.getChildren();
for (int i = 0; i < oldControls.length; i++)