[jbosstools-commits] JBoss Tools SVN: r29865 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.
Author: bbrodt
Date: 2011-03-17 11:17:02 -0400 (Thu, 17 Mar 2011)
New Revision: 29865
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java
Log:
https://issues.jboss.org/browse/JBIDE-8045
browseForVariableType() returns an Object[] instead of Object
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java 2011-03-17
15:02:25 UTC (rev 29864)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java 2011-03-17
15:17:02 UTC (rev 29865)
@@ -189,7 +189,7 @@
// https://issues.jboss.org/browse/JBIDE-8045
variableTypeSelector = new VariableTypeSelector(composite, SWT.NONE, getBPELEditor(),
- fWidgetFactory, new VariableTypeCallback(), true,
+ fWidgetFactory, new VariableTypeCallback(), false,
TypeSelectorDialog.INCLUDE_ALL);
FlatFormData data = new FlatFormData();
data.top = new FlatFormAttachment(0,0);
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java 2011-03-17
15:02:25 UTC (rev 29864)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java 2011-03-17
15:17:02 UTC (rev 29865)
@@ -677,9 +677,10 @@
public void widgetSelected(SelectionEvent e) {
// https://issues.jboss.org/browse/JBIDE-8045
- Object xsdType = BrowseUtil.browseForVariableType(
+ Object selection[] = BrowseUtil.browseForVariableType(
bpelEditor.getProcess(), getShell(),requireLowerTreeSelection,filter);
- if (xsdType != null) {
+ if (selection != null) {
+ Object xsdType = selection[0];
lastChangeContext = DATATYPE_BROWSE_CONTEXT;
if (xsdType instanceof XSDTypeDefinition) {
// TODO:WDG: if type is anonymous, use enclosing element