Author: bbrodt
Date: 2010-11-02 20:24:36 -0400 (Tue, 02 Nov 2010)
New Revision: 26197
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrSetImplSection.java
Log:
CODING IN PROGRESS - issue JBIDE-7107: Problems when creating BPEL Correlation Set
https://jira.jboss.org/browse/JBIDE-7107
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java 2010-11-02
21:10:17 UTC (rev 26196)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java 2010-11-03
00:24:36 UTC (rev 26197)
@@ -374,9 +374,9 @@
data.horizontalSpan = 3;
separator.setLayoutData(data);
- data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
- typeOrElementNameLabel.setLayoutData(data);
data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+ typeOrElementNameLabel.setLayoutData(data);
+ data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
typeOrElementNameText.setLayoutData(data);
data = new GridData(GridData.HORIZONTAL_ALIGN_END);
browseTypeButton.setLayoutData(data);
@@ -557,6 +557,7 @@
elementRadio.setSelection(false);
propertyType = xsdTypeDefinition;
}
+ typeOrElementNameLabel.pack();
updateTypeFileText();
}
@@ -656,8 +657,6 @@
protected void createAlias() {
EditPropertyAliasDialog dialog = new EditPropertyAliasDialog(getShell(), property,
null, bpelEditor, wf);
if (dialog.open() == Window.OK) {
- if (property.eResource()==null)
- createProperty();
final PropertyAlias alias = dialog.getPropertyAlias();
if (alias != null) {
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java 2010-11-02
21:10:17 UTC (rev 26196)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java 2010-11-03
00:24:36 UTC (rev 26197)
@@ -22,8 +22,11 @@
import org.eclipse.bpel.ui.properties.ExpressionSection;
import org.eclipse.bpel.ui.util.BrowseUtil;
import org.eclipse.bpel.ui.util.WSDLImportHelper;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.gef.commands.Command;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -466,6 +469,12 @@
// e.g. the message is defined in a WSDL and the XSD type is defined in externally
// with a different namespace.
Definition definition = property.getEnclosingDefinition();
+ if (definition==null) {
+ IFile targetFile =
bpelEditor.getEditModelClient().getArtifactsResourceInfo().getFile();
+ URI uri = URI.createPlatformResourceURI(targetFile.getFullPath().toString());
+ Resource resource = bpelEditor.getResourceSet().getResource(uri, true);
+ definition = (Definition) resource.getContents().get(0);
+ }
query = "";
while (index<result.length) {
if (result[index] instanceof XSDComponent) {
@@ -473,8 +482,10 @@
WSDLImportHelper.addImportAndNamespace(definition, nc.getSchema(),
bpelEditor.getEditModelClient().getPrimaryResourceInfo().getFile());
String prefix = definition.getPrefix(nc.getTargetNamespace());
- // prefix is always non-null here, see WSDLImportHelper#addNamespace()
- query = query + "/" + prefix + ":" + nc.getName();
+ if (prefix!=null)
+ query = query + "/" + prefix + ":" + nc.getName();
+ else
+ query = query + "/" + nc.getName();
}
++index;
}
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrSetImplSection.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrSetImplSection.java 2010-11-02
21:10:17 UTC (rev 26196)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrSetImplSection.java 2010-11-03
00:24:36 UTC (rev 26197)
@@ -303,16 +303,21 @@
editButton.setEnabled(hasSelection);
}
- protected void updatePropertyWidgets(Property property) {
+ protected void updatePropertyWidgets(final Property property) {
Object input = getInput();
if (input == null) throw new IllegalStateException();
propertyViewer.setInput(getInput());
- if (property != null) {
- propertyViewer.refresh(property, true);
- } else {
- propertyViewer.refresh();
- }
+ //
https://jira.jboss.org/browse/JBIDE-7351
+ propertyViewer.getControl().getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ if (property != null) {
+ propertyViewer.refresh(property, true);
+ } else {
+ propertyViewer.refresh();
+ }
+ }
+ });
}
@Override