Author: rob.stryker(a)jboss.com
Date: 2008-11-24 17:57:50 -0500 (Mon, 24 Nov 2008)
New Revision: 11999
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/OperationDetails.java
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/src/org/jboss/tools/jmx/ui/test/interactive/GreenTextControlFactory.java
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/src/org/jboss/tools/jmx/ui/test/interactive/RedTextControlFactory.java
Log:
JBIDE-3230
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/OperationDetails.java
===================================================================
---
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/OperationDetails.java 2008-11-24
21:48:01 UTC (rev 11998)
+++
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/OperationDetails.java 2008-11-24
22:57:50 UTC (rev 11999)
@@ -224,10 +224,7 @@
OperationInvocationResultDialog.open(container.getShell(), result);
}
} catch (Exception e) {
- String message = e.getLocalizedMessage();
- if (message == null) {
- message = e.getClass().getName();
- }
+ String message = e.getClass().getName() + ": " +
e.getLocalizedMessage();
JMXUIActivator.log(IStatus.ERROR, e.getClass().getName(), e);
// if the exception has a cause, it is likely more interesting
// since it may be the exception thrown by the mbean
@@ -235,7 +232,7 @@
// rather than the exception thrown by the mbean server
// connection
if (e.getCause() != null) {
- message = e.getCause().getLocalizedMessage();
+ message = e.getCause().getClass().getName() + ": " +
e.getCause().getLocalizedMessage();
}
MessageDialog.openError(container.getShell(),
Messages.OperationDetails_invocationError, message);
Modified:
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/src/org/jboss/tools/jmx/ui/test/interactive/GreenTextControlFactory.java
===================================================================
---
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/src/org/jboss/tools/jmx/ui/test/interactive/GreenTextControlFactory.java 2008-11-24
21:48:01 UTC (rev 11998)
+++
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/src/org/jboss/tools/jmx/ui/test/interactive/GreenTextControlFactory.java 2008-11-24
22:57:50 UTC (rev 11999)
@@ -9,6 +9,7 @@
package org.jboss.tools.jmx.ui.test.interactive;
+import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -23,8 +24,14 @@
boolean writable, String type, Object value,
IWritableAttributeHandler handler) {
- final Text text = toolkit.createText(parent, value.toString(),
- SWT.BORDER);
+ Text text;
+ if( toolkit != null ) {
+ text = toolkit.createText(parent, value.toString(), SWT.BORDER);
+ } else {
+ text = new Text(parent, SWT.BORDER | Window.getDefaultOrientation());
+ text.setText(value.toString());
+ }
+
text.setEditable(false);
text.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_GREEN));
return text;
Modified:
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/src/org/jboss/tools/jmx/ui/test/interactive/RedTextControlFactory.java
===================================================================
---
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/src/org/jboss/tools/jmx/ui/test/interactive/RedTextControlFactory.java 2008-11-24
21:48:01 UTC (rev 11998)
+++
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/src/org/jboss/tools/jmx/ui/test/interactive/RedTextControlFactory.java 2008-11-24
22:57:50 UTC (rev 11999)
@@ -9,6 +9,7 @@
package org.jboss.tools.jmx.ui.test.interactive;
+import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -22,9 +23,13 @@
public Control createControl(Composite parent, FormToolkit toolkit,
boolean writable, String type, Object value,
IWritableAttributeHandler handler) {
-
- final Text text = toolkit.createText(parent, value.toString(),
- SWT.BORDER);
+ Text text;
+ if( toolkit != null ) {
+ text = toolkit.createText(parent, value.toString(), SWT.BORDER);
+ } else {
+ text = new Text(parent, SWT.BORDER | Window.getDefaultOrientation());
+ text.setText(value.toString());
+ }
text.setEditable(false);
text.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_RED));
return text;
Show replies by date