1:57 p.m.
Author: bbrodt
Date: 2011-02-04 14:57:34 -0500 (Fri, 04 Feb 2011)
New Revision: 29020
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationBPELReader.java
Log:
https://issues.jboss.org/browse/JBIDE-8305
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java 2011-02-04
19:25:48 UTC (rev 29019)
+++
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java 2011-02-04
19:57:34 UTC (rev 29020)
@@ -4936,14 +4936,25 @@
*/
int ON_EVENT__MESSAGE_TYPE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 6;
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
/**
+ * The feature id for the '<em><b>XSD Element</b></em>'
reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ON_EVENT__XSD_ELEMENT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 7;
+ /**
* The feature id for the '<em><b>Correlation
Sets</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ON_EVENT__CORRELATION_SETS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 7;
+ int ON_EVENT__CORRELATION_SETS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>From Parts</b></em>'
containment reference.
@@ -4952,7 +4963,7 @@
* @generated
* @ordered
*/
- int ON_EVENT__FROM_PARTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 8;
+ int ON_EVENT__FROM_PARTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 9;
/**
* The feature id for the '<em><b>Message
Exchange</b></em>' reference.
@@ -4961,7 +4972,7 @@
* @generated
* @ordered
*/
- int ON_EVENT__MESSAGE_EXCHANGE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 9;
+ int ON_EVENT__MESSAGE_EXCHANGE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 10;
/**
* The number of structural features of the '<em>On Event</em>'
class.
@@ -4970,7 +4981,7 @@
* @generated
* @ordered
*/
- int ON_EVENT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 10;
+ int ON_EVENT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Documentation
Element</b></em>' attribute.
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java 2011-02-04
19:25:48 UTC (rev 29019)
+++
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java 2011-02-04
19:57:34 UTC (rev 29020)
@@ -17,6 +17,7 @@
import org.eclipse.wst.wsdl.Message;
import org.eclipse.wst.wsdl.Operation;
import org.eclipse.wst.wsdl.PortType;
+import org.eclipse.xsd.XSDElementDeclaration;
/**
* <!-- begin-user-doc -->
@@ -223,6 +224,34 @@
*/
void setMessageType(Message value);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
+ /**
+ * Returns the value of the '<em><b>XSD
Element</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>XSD Element</em>' reference isn't
clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>XSDElementDeclaration Type</em>'
reference.
+ * @see #setXSDElement(XSDElementDeclaration)
+ * @see org.eclipse.bpel.model.BPELPackage#getOnEvent_XSDElement()
+ * @model required="true"
+ * @generated
+ */
+ XSDElementDeclaration getXSDElement();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.bpel.model.OnEvent#getXSDElement
<em>XSDElementDeclaration Type</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>XSDElementDeclaration
Type</em>' reference.
+ * @see #getXSDElement()
+ * @generated
+ */
+ void setXSDElement(XSDElementDeclaration value);
/**
* Returns the value of the '<em><b>Correlation
Sets</b></em>' containment reference.
* <!-- begin-user-doc -->
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java 2011-02-04
19:25:48 UTC (rev 29019)
+++
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java 2011-02-04
19:57:34 UTC (rev 29020)
@@ -3448,6 +3448,10 @@
createEReference(onEventEClass, ON_EVENT__OPERATION);
createEReference(onEventEClass, ON_EVENT__PORT_TYPE);
createEReference(onEventEClass, ON_EVENT__MESSAGE_TYPE);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
+ createEReference(onEventEClass, ON_EVENT__XSD_ELEMENT);
createEReference(onEventEClass, ON_EVENT__CORRELATION_SETS);
createEReference(onEventEClass, ON_EVENT__FROM_PARTS);
createEReference(onEventEClass, ON_EVENT__MESSAGE_EXCHANGE);
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java 2011-02-04
19:25:48 UTC (rev 29019)
+++
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java 2011-02-04
19:57:34 UTC (rev 29020)
@@ -35,6 +35,7 @@
import org.eclipse.wst.wsdl.Message;
import org.eclipse.wst.wsdl.Operation;
import org.eclipse.wst.wsdl.PortType;
+import org.eclipse.xsd.XSDElementDeclaration;
/**
* <!-- begin-user-doc -->
@@ -128,6 +129,16 @@
* @ordered
*/
protected Message messageType;
+
+ /**
+ * The cached value of the '{@link #getXSDElement() <em>XSD
Element</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getXSDElement()
+ * @generated
+ * @ordered
+ */
+ protected XSDElementDeclaration xsdElement;
/**
* The cached value of the '{@link #getCorrelationSets() <em>Correlation
Sets</em>}' containment reference.
@@ -589,6 +600,59 @@
eNotify(new ENotificationImpl(this, Notification.SET,
BPELPackage.ON_EVENT__MESSAGE_TYPE, oldMessageType,
messageType));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ * https://issues.jboss.org/browse/JBIDE-8305
+ * "element" attribute was missing from original model
+ * <!-- end-user-doc -->
+ * @customized
+ */
+ public XSDElementDeclaration getXSDElement() {
+ Variable variable = getVariable();
+ if (variable != null && variable instanceof Variable) {
+ return (variable).getXSDElement();
+ }
+ if (xsdElement != null && xsdElement.eIsProxy()) {
+ XSDElementDeclaration oldXSDElement = xsdElement;
+ xsdElement = (XSDElementDeclaration) eResolveProxy((InternalEObject) xsdElement);
+ if (xsdElement != oldXSDElement) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ BPELPackage.ON_EVENT__XSD_ELEMENT, oldXSDElement,
+ xsdElement));
+ }
+ }
+ return xsdElement;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public XSDElementDeclaration basicGetXSDElement() {
+ return xsdElement;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @customized
+ */
+ public void setXSDElement(XSDElementDeclaration newXSDElement) {
+ Variable variable = getVariable();
+ if (variable != null && variable instanceof Variable) {
+ (variable).setXSDElement(newXSDElement);
+ }
+ XSDElementDeclaration oldXSDElement = xsdElement;
+ xsdElement = newXSDElement;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ BPELPackage.ON_EVENT__XSD_ELEMENT, oldXSDElement,
+ xsdElement));
}
/**
@@ -809,6 +873,11 @@
if (resolve)
return getMessageType();
return basicGetMessageType();
+ case BPELPackage.ON_EVENT__XSD_ELEMENT:
+ // https://issues.jboss.org/browse/JBIDE-8305
+ if (resolve)
+ return getXSDElement();
+ return basicGetXSDElement();
case BPELPackage.ON_EVENT__CORRELATION_SETS:
return getCorrelationSets();
case BPELPackage.ON_EVENT__FROM_PARTS:
@@ -851,6 +920,10 @@
case BPELPackage.ON_EVENT__MESSAGE_TYPE:
setMessageType((Message) newValue);
return;
+ case BPELPackage.ON_EVENT__XSD_ELEMENT:
+ // https://issues.jboss.org/browse/JBIDE-8305
+ setXSDElement((XSDElementDeclaration) newValue);
+ return;
case BPELPackage.ON_EVENT__CORRELATION_SETS:
setCorrelationSets((CorrelationSets) newValue);
return;
@@ -892,6 +965,10 @@
return;
case BPELPackage.ON_EVENT__MESSAGE_TYPE:
setMessageType((Message) null);
+ return;
+ case BPELPackage.ON_EVENT__XSD_ELEMENT:
+ // https://issues.jboss.org/browse/JBIDE-8305
+ setXSDElement((XSDElementDeclaration) null);
return;
case BPELPackage.ON_EVENT__CORRELATION_SETS:
setCorrelationSets((CorrelationSets) null);
@@ -928,6 +1005,9 @@
return portType != null;
case BPELPackage.ON_EVENT__MESSAGE_TYPE:
return messageType != null;
+ case BPELPackage.ON_EVENT__XSD_ELEMENT:
+ // https://issues.jboss.org/browse/JBIDE-8305
+ return xsdElement != null;
case BPELPackage.ON_EVENT__CORRELATION_SETS:
return correlationSets != null;
case BPELPackage.ON_EVENT__FROM_PARTS:
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationBPELReader.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationBPELReader.java 2011-02-04
19:25:48 UTC (rev 29019)
+++
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationBPELReader.java 2011-02-04
19:57:34 UTC (rev 29020)
@@ -812,7 +812,21 @@
onEvent.setMessageType(null);
}
- // Set correlations
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336003
+ // https://issues.jboss.org/browse/JBIDE-8305
+ // "element" attribute was missing from original model
+ // Set xsd element
+ if (activityElement.hasAttribute("element")) {
+ QName qName = BPELUtils.createAttributeValue(activityElement,
+ "element");
+ XSDElementDeclaration element = new XSDElementDeclarationProxy(
+ getResource().getURI(), qName);
+ onEvent.setXSDElement(element);
+ } else {
+ onEvent.setXSDElement(null);
+ }
+
+ // Set correlations
Element correlationsElement = ReconciliationHelper
.getBPELChildElementByLocalName(activityElement, "correlations");
if (correlationsElement != null && onEvent.getCorrelations() == null) {