Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[bpel-dev] BPEL model generated with WTP2.0


Hi all,

Simon asked me to investigate whether the BPEL model could be generated using WTP2.0. Today I spent some hours of work on this - The answer is YES. I did some basic tests  and BPEL editor works like a charme.
I attached a workbench patch for all of you to review...

To make it easier here are some setup instructions.
1. Install eclipse-SDK-3.3M7-win32.zip
2. Install emf-sdo-xsd-SDK-2.3.0RC1.zip
3. Install GEF-ALL-3.3RC1.zip
4. Install dtp-sdk_1.5RC1.zip
5. Install wtp-sdk-S-2.0RC0-200705171455.zip

6. Get all BPEL plugins from CVS
7. Apply my workbench patch
(8. in my environment it was necessary to import javax.wsdl into the workspace. I talked to one of the WTP guys and he told me that this is a known limitation for WTP 2.0 RC0 and will be fixed for RC1)




In Eclipse 3.3 there are 4 additional methods that must be implemented for org.eclipse.ui.IEditorReference.
        getEditorInput()
        addPartPropertyListener()
        getPartProperty()
        removePartPropertyListener()
We use this interface in org.eclipse.bpel.common.ui.composite.EditorReference. For now I simply added default implementations for these methods. Does anybody know what EdiorReference really does?



Mit freundlichen Grüßen / Regards

Michael



Software Developer - BPEL Editor / WID
WSS Business Process Solutions Development 1
Dept. 4722, Bldg. 71032-01, Room 086
IBM Böblingen Laboratory
Schönaicherstr. 220, D-71032 Böblingen


Notes: Michael Illiger2/Germany/IBM
Internet:
milliger@xxxxxxxxxx
Phone: ++49-(0)7031-16-1273
Fax: ++49-(0)7031-16-4890


IBM Deutschland Entwicklung GmbH
Chairman of the Supervisory Board: Martin Jetter
Board of Management: Herbert Kircher (Chairman)
Corporate Seat: Böblingen
Commercial Register: Amtsgericht Stuttgart, HRB 243294





### Eclipse Workspace Patch 1.0
#P org.eclipse.bpel.common.ui
Index: src/org/eclipse/bpel/common/ui/composite/EditorReference.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/composite/EditorReference.java,v
retrieving revision 1.1
diff -u -r1.1 EditorReference.java
--- src/org/eclipse/bpel/common/ui/composite/EditorReference.java	29 Nov 2005 18:50:34 -0000	1.1
+++ src/org/eclipse/bpel/common/ui/composite/EditorReference.java	24 May 2007 13:06:19 -0000
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.bpel.common.ui.composite;
 
+import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
@@ -70,4 +71,16 @@
 	public IEditorInput getEditorInput() throws PartInitException {
 		return null;
 	}
+	public void addPartPropertyListener(IPropertyChangeListener listener) {
+		// TODO Auto-generated method stub
+		
+	}
+	public String getPartProperty(String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	public void removePartPropertyListener(IPropertyChangeListener listener) {
+		// TODO Auto-generated method stub
+		
+	}
 }
\ No newline at end of file
#P org.eclipse.bpel.validator
Index: src/org/eclipse/bpel/validator/ModelQuery.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java,v
retrieving revision 1.1
diff -u -r1.1 ModelQuery.java
--- src/org/eclipse/bpel/validator/ModelQuery.java	11 Apr 2007 22:56:52 -0000	1.1
+++ src/org/eclipse/bpel/validator/ModelQuery.java	24 May 2007 13:06:21 -0000
@@ -20,15 +20,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-/**
- * Dependency on the BPEL Validator model 
- */
-
 import org.eclipse.bpel.validator.model.Filters;
 import org.eclipse.bpel.validator.model.IConstants;
 import org.eclipse.bpel.validator.model.IFilter;
@@ -38,17 +29,11 @@
 import org.eclipse.bpel.validator.model.Selector;
 import org.eclipse.bpel.validator.model.UndefinedNode;
 import org.eclipse.bpel.validator.model.XNotImplemented;
-
-/** 
- * Dependency on the platform adapter manager
- */
-
 import org.eclipse.core.runtime.IAdapterManager;
-
-/** 
- * Dependency on the DOM Elements 
- */
-
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.wst.wsdl.WSDLElement;
+import org.eclipse.xsd.XSDConcreteComponent;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -329,7 +314,7 @@
 		 
 		 // set it on all the children of this element as well.
 		 //
-		 Iterator<Object> it = eObj.eAllContents();
+		 Iterator<EObject> it = eObj.eAllContents();
 		 
 		 while (it.hasNext()) {
 			 Object next = it.next();
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF,v
retrieving revision 1.3
diff -u -r1.3 MANIFEST.MF
--- META-INF/MANIFEST.MF	23 Apr 2007 18:33:37 -0000	1.3
+++ META-INF/MANIFEST.MF	24 May 2007 13:06:21 -0000
@@ -16,8 +16,7 @@
  org.eclipse.bpel.common.model,
  org.eclipse.wst.validation,
  org.eclipse.wst.wsdl.validation,
- org.eclipse.wst.xml.core,
- org.junit4
+ org.eclipse.wst.xml.core
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: bin
#P org.eclipse.bpel.model
Index: src/model/bpel.genmodel
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/model/bpel.genmodel,v
retrieving revision 1.5
diff -u -r1.5 bpel.genmodel
--- src/model/bpel.genmodel	11 Apr 2007 20:36:30 -0000	1.5
+++ src/model/bpel.genmodel	24 May 2007 13:06:24 -0000
@@ -4,7 +4,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"; modelDirectory="/org.eclipse.bpel.model/src"
     editDirectory="/org.eclipse.bpel.model.edit/src" editorDirectory="/org.eclipse.bpel.model.editor/src"
     modelPluginID="org.eclipse.bpel.model" modelName="Bpel" modelPluginClass="" importerID="org.eclipse.emf.importer.ecore"
-    usedGenPackages="../../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore messageproperties.genmodel#//messageproperties partnerlinktype.genmodel#//partnerlinktype ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.genmodel#//wsdl ../../../org.eclipse.xsd/src-xsd/model/XSD.genmodel#//xsd">
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
+  <foreignModel>bpel.ecore</foreignModel>
   <genPackages prefix="BPEL" basePackage="org.eclipse.bpel" disposableProviderFactory="true"
       ecorePackage="bpel.ecore#/">
     <genEnums ecoreEnum="bpel.ecore#//CorrelationPattern">
@@ -151,8 +152,8 @@
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference bpel.ecore#//Scope/messageExchanges"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute bpel.ecore#//Scope/exitOnStandardFault"/>
     </genClasses>
-    <genClasses ecoreClass="bpel.ecore#//Compensate">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference bpel.ecore#//Compensate/scope"/>
+    <genClasses ecoreClass="bpel.ecore#//CompensateScope">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference bpel.ecore#//CompensateScope/target"/>
     </genClasses>
     <genClasses ecoreClass="bpel.ecore#//CompensationHandler">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference bpel.ecore#//CompensationHandler/activity"/>
@@ -329,5 +330,42 @@
     <genClasses ecoreClass="bpel.ecore#//MessageExchange">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute bpel.ecore#//MessageExchange/name"/>
     </genClasses>
+    <genClasses ecoreClass="bpel.ecore#//Compensate"/>
+  </genPackages>
+  <genPackages prefix="Partnerlinktype" basePackage="org.eclipse.bpel.model" disposableProviderFactory="true"
+      ecorePackage="partnerlinktype.ecore#/">
+    <genClasses ecoreClass="partnerlinktype.ecore#//PartnerLinkType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute partnerlinktype.ecore#//PartnerLinkType/name"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute partnerlinktype.ecore#//PartnerLinkType/ID"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference partnerlinktype.ecore#//PartnerLinkType/role"/>
+    </genClasses>
+    <genClasses ecoreClass="partnerlinktype.ecore#//Role">
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute partnerlinktype.ecore#//Role/ID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute partnerlinktype.ecore#//Role/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute partnerlinktype.ecore#//Role/portType"/>
+    </genClasses>
+  </genPackages>
+  <genPackages prefix="Messageproperties" basePackage="org.eclipse.bpel.model" disposableProviderFactory="true"
+      ecorePackage="messageproperties.ecore#/">
+    <genClasses ecoreClass="messageproperties.ecore#//Property">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//Property/qName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//Property/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//Property/type"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//Property/ID"/>
+    </genClasses>
+    <genClasses ecoreClass="messageproperties.ecore#//PropertyAlias">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//PropertyAlias/messageType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//PropertyAlias/part"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//PropertyAlias/propertyName"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//PropertyAlias/ID"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference messageproperties.ecore#//PropertyAlias/wsdlPart"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference messageproperties.ecore#//PropertyAlias/query"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//PropertyAlias/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//PropertyAlias/XSDElement"/>
+    </genClasses>
+    <genClasses ecoreClass="messageproperties.ecore#//Query">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//Query/queryLanguage"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute messageproperties.ecore#//Query/value"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
Index: src/model/partnerlinktype.ecore
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/model/partnerlinktype.ecore,v
retrieving revision 1.3
diff -u -r1.3 partnerlinktype.ecore
--- src/model/partnerlinktype.ecore	11 Apr 2007 20:36:30 -0000	1.3
+++ src/model/partnerlinktype.ecore	24 May 2007 13:06:24 -0000
@@ -3,18 +3,17 @@
     xmlns:xmi="http://www.omg.org/XMI"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"; name="partnerlinktype"
     nsURI="http://docs.oasis-open.org/wsbpel/2.0/plnktype"; nsPrefix="plnk">
-  <eClassifiers xsi:type="ecore:EClass" name="PartnerLinkType" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString";
-        iD="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PartnerLinkType" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibilityElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString";
         changeable="false" volatile="true" transient="true" derived="true" iD="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="role" upperBound="-1" eType="#//Role"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//ExtensibilityElement">
+  <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibilityElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString";
         changeable="false" volatile="true" transient="true" derived="true" iD="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="portType" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="portType" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
   </eClassifiers>
 </ecore:EPackage>
Index: src/model/messageproperties.ecore
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/model/messageproperties.ecore,v
retrieving revision 1.3
diff -u -r1.3 messageproperties.ecore
--- src/model/messageproperties.ecore	11 Apr 2007 20:36:30 -0000	1.3
+++ src/model/messageproperties.ecore	24 May 2007 13:06:24 -0000
@@ -3,28 +3,28 @@
     xmlns:xmi="http://www.omg.org/XMI"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"; name="messageproperties"
     nsURI="http://docs.oasis-open.org/wsbpel/2.0/varprop"; nsPrefix="vprop">
-  <eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="ecore:EDataType ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//QName"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibilityElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString";
         changeable="false" volatile="true" transient="true" derived="true" iD="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PropertyAlias" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageType" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PropertyAlias" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibilityElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageType" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="part" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyName" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString";
         changeable="false" volatile="true" transient="true" derived="true" iD="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlPart" lowerBound="1"
-        eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//Part"
+        eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"
         transient="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="query" eType="#//Query"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="XSDElement" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="XSDElement" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Query" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//ExtensibilityElement">
+  <eClassifiers xsi:type="ecore:EClass" name="Query" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibilityElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="queryLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
Index: src/model/bpel.ecore
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/model/bpel.ecore,v
retrieving revision 1.29
diff -u -r1.29 bpel.ecore
--- src/model/bpel.ecore	20 Apr 2007 23:31:44 -0000	1.29
+++ src/model/bpel.ecore	24 May 2007 13:06:23 -0000
@@ -42,7 +42,7 @@
         eType="#//Import" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="extensions" eType="#//Extensions"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exitOnStandardFault" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exitOnStandardFault" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
         defaultValueLiteral="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageExchanges" eType="#//MessageExchanges"/>
   </eClassifiers>
@@ -55,7 +55,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="partnerRole" eType="ecore:EClass partnerlinktype.ecore#//Role"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="PartnerLinkType" eType="ecore:EClass partnerlinktype.ecore#//PartnerLinkType"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="initializePartnerRole"
-        eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
         unsettable="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FaultHandler" eSuperTypes="#//ExtensibleElement">
@@ -117,19 +117,19 @@
         eType="#//Target" eOpposite="#//Target/Link"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Catch" eSuperTypes="#//ExtensibleElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//QName"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="faultVariable" eType="#//Variable"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="activity" lowerBound="1"
         eType="#//Activity" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="faultMessageType" eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//Message"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="faultElement" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDElementDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="faultMessageType" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Message"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="faultElement" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDElementDeclaration"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Reply" eSuperTypes="#//PartnerActivity #//Activity">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel";>
       <details key="documentation" value="Allows a business process to send a message in reply to a message that was received through a Receive. The combination of a Receive and Reply forms a synchronous request-response operation on the WSDL portType for the process. The container for the replay activity provides the output message for the partner process invoke activity that invoked the corresponding receive activity.&#xD;&#xA;&#xD;&#xA;FaultName specifies the name of a fault and must match some Catch fault name in the Scope or Process's FaultHandler.&#xD;&#xA;&#xD;&#xA;A receive can have more than one corresponding reply, at most one without a faultName, and any mumber with different faults."/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//QName"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="toPart" upperBound="-1"
         eType="#//ToPart"/>
@@ -140,9 +140,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlations" eType="#//Correlations"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="portType" lowerBound="1"
-        eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//PortType"/>
+        eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//PortType"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"
-        eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//Operation"/>
+        eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Operation"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Receive" eSuperTypes="#//PartnerActivity">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel";>
@@ -164,7 +164,7 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel";>
       <details key="documentation" value="Generates a fault from inside the business process. The FaultHandler may be a proxy for an application or process-specific fault instead of a BPEL FaultHandler"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//QName"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="faultName" eType="ecore:EDataType platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//QName"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="faultVariable" eType="#//Variable"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Wait" eSuperTypes="#//Activity">
@@ -238,7 +238,7 @@
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="copy" lowerBound="1" upperBound="-1"
         eType="#//Copy" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="validate" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="validate" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
         defaultValueLiteral="false"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Copy" eSuperTypes="#//ExtensibleElement">
@@ -302,7 +302,7 @@
       <details key="documentation" value="Represents an l-value in an assignment activity. Can be used to query a node of a part of a container, a property of a container, or a service reference of a partner."/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//Part"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="part" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Part"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" eType="#//PartnerLink"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass messageproperties.ecore#//Property"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="query" eType="#//Query"
@@ -324,7 +324,7 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="serviceRef" eType="#//ServiceRef"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDTypeDefinition"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDTypeDefinition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="OnMessage" eSuperTypes="#//ExtensibleElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel";>
@@ -334,21 +334,21 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="activity" eType="#//Activity"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="portType" lowerBound="1"
-        eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//PortType"/>
+        eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//PortType"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="partnerLink" lowerBound="1"
         eType="#//PartnerLink"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlations" eType="#//Correlations"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"
-        eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//Operation"/>
+        eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Operation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="fromPart" upperBound="-1"
         eType="#//FromPart"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibilityElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="expressionLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString";
         unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaque" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaque" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
         unsettable="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BooleanExpression" eSuperTypes="#//Expression"/>
@@ -414,12 +414,12 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//ExtensibleElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messageType" eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//Message"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="XSDElement" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDElementDeclaration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDTypeDefinition"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="messageType" eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Message"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="XSDElement" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDElementDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDTypeDefinition"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="from" eType="#//From"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UnknownExtensibilityAttribute" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//UnknownExtensibilityElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="UnknownExtensibilityAttribute" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//UnknownExtensibilityElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="OnEvent" eSuperTypes="#//ExtensibleElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="activity" eType="#//Activity"
         containment="true"/>
@@ -430,15 +430,15 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlations" eType="#//Correlations"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"
-        eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//Operation"/>
+        eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Operation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="portType" lowerBound="1"
-        eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//PortType"/>
+        eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//PortType"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageType" lowerBound="1"
-        eType="ecore:EClass ../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//Message"/>
+        eType="ecore:EClass platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//Message"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="fromPart" upperBound="-1"
         eType="#//FromPart"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationSets" eType="#//CorrelationSets"
-        defaultValueLiteral="" containment="true"/>
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Import" eSuperTypes="#//ExtensibleElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -457,13 +457,13 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
         eType="#//Source" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Query" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//WSDLElement">
+  <eClassifiers xsi:type="ecore:EClass" name="Query" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//WSDLElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="queryLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ServiceRef" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//ExtensibleElement">
+  <eClassifiers xsi:type="ecore:EClass" name="ServiceRef" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibleElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceScheme" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Extensions" eSuperTypes="#//ExtensibleElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
@@ -471,11 +471,11 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ExtensionActivity" eSuperTypes="#//Activity"/>
   <eClassifiers xsi:type="ecore:EClass" name="FromPart" eSuperTypes="#//ExtensibleElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="part" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="part" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="to" eType="#//To"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ToPart" eSuperTypes="#//ExtensibleElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="part" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="part" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="from" eType="#//From"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="OpaqueActivity" eSuperTypes="#//Activity"/>
@@ -485,7 +485,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="finalCounterValue" lowerBound="1"
         eType="#//Expression" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="parallel" lowerBound="1"
-        eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="counterName" lowerBound="1"
         eType="#//Variable" containment="true"/>
@@ -529,21 +529,21 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CompletionCondition" eSuperTypes="#//ExtensibleElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="branches" eType="#//Branches"
-        defaultValueLiteral="" containment="true"/>
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Branches" eSuperTypes="#//Expression">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="countCompletedBranchesOnly"
-        eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBooleanObject"
         defaultValueLiteral="false" unsettable="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtensibleElement" eSuperTypes="../../../org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore#//ExtensibleElement">
+  <eClassifiers xsi:type="ecore:EClass" name="ExtensibleElement" eSuperTypes="platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.ecore#//ExtensibleElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="documentation" eType="#//Documentation"
         unsettable="true" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Documentation">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType ../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MessageExchanges" eSuperTypes="#//ExtensibleElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="children" lowerBound="1"
Index: src/org/eclipse/bpel/model/impl/RethrowImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/RethrowImpl.java,v
retrieving revision 1.3
diff -u -r1.3 RethrowImpl.java
--- src/org/eclipse/bpel/model/impl/RethrowImpl.java	9 Feb 2007 09:13:42 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/RethrowImpl.java	24 May 2007 13:06:30 -0000
@@ -53,155 +53,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getRethrow();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.RETHROW__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.RETHROW__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.RETHROW__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.RETHROW__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.RETHROW__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.RETHROW__ELEMENT:
-				return getElement();
-			case BPELPackage.RETHROW__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.RETHROW__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.RETHROW__NAME:
-				return getName();
-			case BPELPackage.RETHROW__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.RETHROW__TARGETS:
-				return getTargets();
-			case BPELPackage.RETHROW__SOURCES:
-				return getSources();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.RETHROW__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.RETHROW__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.RETHROW__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.RETHROW__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.RETHROW__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.RETHROW__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.RETHROW__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.RETHROW__SOURCES:
-				setSources((Sources)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.RETHROW__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.RETHROW__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.RETHROW__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.RETHROW__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.RETHROW__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.RETHROW__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.RETHROW__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.RETHROW__SOURCES:
-				setSources((Sources)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.RETHROW__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.RETHROW__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.RETHROW__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.RETHROW__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.RETHROW__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.RETHROW__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.RETHROW__TARGETS:
-				return targets != null;
-			case BPELPackage.RETHROW__SOURCES:
-				return sources != null;
-		}
-		return eDynamicIsSet(eFeature);
+		return BPELPackage.Literals.RETHROW;
 	}
 
 } //RethrowImpl
Index: src/org/eclipse/bpel/model/impl/OnMessageImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnMessageImpl.java,v
retrieving revision 1.5
diff -u -r1.5 OnMessageImpl.java
--- src/org/eclipse/bpel/model/impl/OnMessageImpl.java	9 Feb 2007 09:13:42 -0000	1.5
+++ src/org/eclipse/bpel/model/impl/OnMessageImpl.java	24 May 2007 13:06:29 -0000
@@ -67,7 +67,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable variable = null;
+	protected Variable variable;
 
 	/**
 	 * The cached value of the '{@link #getActivity() <em>Activity</em>}' containment reference.
@@ -77,7 +77,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * The cached value of the '{@link #getPortType() <em>Port Type</em>}' reference.
@@ -87,7 +87,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PortType portType = null;
+	protected PortType portType;
 
 	/**
 	 * The cached value of the '{@link #getPartnerLink() <em>Partner Link</em>}' reference.
@@ -97,7 +97,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PartnerLink partnerLink = null;
+	protected PartnerLink partnerLink;
 
 	/**
 	 * The cached value of the '{@link #getCorrelations() <em>Correlations</em>}' containment reference.
@@ -107,7 +107,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Correlations correlations = null;
+	protected Correlations correlations;
 
 	/**
 	 * The cached value of the '{@link #getOperation() <em>Operation</em>}' reference.
@@ -117,7 +117,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Operation operation = null;
+	protected Operation operation;
 
 	/**
 	 * The cached value of the '{@link #getFromPart() <em>From Part</em>}' reference list.
@@ -127,7 +127,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList fromPart = null;
+	protected EList fromPart;
 
     /**
      * The deserialized value of the operation name.
@@ -150,7 +150,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getOnMessage();
+		return BPELPackage.Literals.ON_MESSAGE;
 	}
 
 	/**
@@ -160,8 +160,8 @@
 	 */
 	public Variable getVariable() {
 		if (variable != null && variable.eIsProxy()) {
-			Variable oldVariable = variable;
-			variable = (Variable)eResolveProxy((InternalEObject)variable);
+			InternalEObject oldVariable = (InternalEObject)variable;
+			variable = (Variable)eResolveProxy(oldVariable);
 			if (variable != oldVariable) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.ON_MESSAGE__VARIABLE, oldVariable, variable));
@@ -263,8 +263,8 @@
 	 */
 	public PortType getPortTypeGen() {
 		if (portType != null && portType.eIsProxy()) {
-			PortType oldPortType = portType;
-			portType = (PortType)eResolveProxy((InternalEObject)portType);
+			InternalEObject oldPortType = (InternalEObject)portType;
+			portType = (PortType)eResolveProxy(oldPortType);
 			if (portType != oldPortType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.ON_MESSAGE__PORT_TYPE, oldPortType, portType));
@@ -301,8 +301,8 @@
 	 */
 	public PartnerLink getPartnerLink() {
 		if (partnerLink != null && partnerLink.eIsProxy()) {
-			PartnerLink oldPartnerLink = partnerLink;
-			partnerLink = (PartnerLink)eResolveProxy((InternalEObject)partnerLink);
+			InternalEObject oldPartnerLink = (InternalEObject)partnerLink;
+			partnerLink = (PartnerLink)eResolveProxy(oldPartnerLink);
 			if (partnerLink != oldPartnerLink) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.ON_MESSAGE__PARTNER_LINK, oldPartnerLink, partnerLink));
@@ -398,8 +398,8 @@
 	 */
 	public Operation getOperationGen() {
 		if (operation != null && operation.eIsProxy()) {
-			Operation oldOperation = operation;
-			operation = (Operation)eResolveProxy((InternalEObject)operation);
+			InternalEObject oldOperation = (InternalEObject)operation;
+			operation = (Operation)eResolveProxy(oldOperation);
 			if (operation != oldOperation) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.ON_MESSAGE__OPERATION, oldOperation, operation));
@@ -446,22 +446,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.ON_MESSAGE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.ON_MESSAGE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.ON_MESSAGE__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				case BPELPackage.ON_MESSAGE__CORRELATIONS:
-					return basicSetCorrelations(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.ON_MESSAGE__ACTIVITY:
+				return basicSetActivity(null, msgs);
+			case BPELPackage.ON_MESSAGE__CORRELATIONS:
+				return basicSetCorrelations(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -469,16 +461,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_MESSAGE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.ON_MESSAGE__ELEMENT:
-				return getElement();
-			case BPELPackage.ON_MESSAGE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.ON_MESSAGE__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.ON_MESSAGE__VARIABLE:
 				if (resolve) return getVariable();
 				return basicGetVariable();
@@ -498,7 +482,7 @@
 			case BPELPackage.ON_MESSAGE__FROM_PART:
 				return getFromPart();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -506,21 +490,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_MESSAGE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.ON_MESSAGE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.ON_MESSAGE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.ON_MESSAGE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.ON_MESSAGE__VARIABLE:
 				setVariable((Variable)newValue);
 				return;
@@ -544,7 +515,7 @@
 				getFromPart().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -552,20 +523,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_MESSAGE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ON_MESSAGE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ON_MESSAGE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.ON_MESSAGE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ON_MESSAGE__VARIABLE:
 				setVariable((Variable)null);
 				return;
@@ -588,7 +547,7 @@
 				getFromPart().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -596,16 +555,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_MESSAGE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.ON_MESSAGE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.ON_MESSAGE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.ON_MESSAGE__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ON_MESSAGE__VARIABLE:
 				return variable != null;
 			case BPELPackage.ON_MESSAGE__ACTIVITY:
@@ -621,10 +572,10 @@
 			case BPELPackage.ON_MESSAGE__FROM_PART:
 				return fromPart != null && !fromPart.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
-    /**
+	/**
      * Set the deserialized value of the operation name.
      * @customized
      */
Index: src/org/eclipse/bpel/model/impl/MessageExchangesImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/MessageExchangesImpl.java,v
retrieving revision 1.2
diff -u -r1.2 MessageExchangesImpl.java
--- src/org/eclipse/bpel/model/impl/MessageExchangesImpl.java	9 Feb 2007 09:13:42 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/MessageExchangesImpl.java	24 May 2007 13:06:29 -0000
@@ -43,7 +43,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList children = null;
+	protected EList children;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -60,7 +60,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getMessageExchanges();
+		return BPELPackage.Literals.MESSAGE_EXCHANGES;
 	}
 
 	/**
@@ -80,39 +80,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.MESSAGE_EXCHANGES__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.MESSAGE_EXCHANGES__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.MESSAGE_EXCHANGES__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.MESSAGE_EXCHANGES__ELEMENT:
-				return getElement();
-			case BPELPackage.MESSAGE_EXCHANGES__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.MESSAGE_EXCHANGES__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.MESSAGE_EXCHANGES__CHILDREN:
 				return getChildren();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -120,27 +93,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.MESSAGE_EXCHANGES__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGES__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGES__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGES__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.MESSAGE_EXCHANGES__CHILDREN:
 				getChildren().clear();
 				getChildren().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -148,25 +108,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.MESSAGE_EXCHANGES__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGES__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGES__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.MESSAGE_EXCHANGES__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.MESSAGE_EXCHANGES__CHILDREN:
 				getChildren().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -174,20 +122,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.MESSAGE_EXCHANGES__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.MESSAGE_EXCHANGES__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.MESSAGE_EXCHANGES__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.MESSAGE_EXCHANGES__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.MESSAGE_EXCHANGES__CHILDREN:
 				return children != null && !children.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //MessageExchangesImpl
Index: src/org/eclipse/bpel/model/impl/AssignImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/AssignImpl.java,v
retrieving revision 1.4
diff -u -r1.4 AssignImpl.java
--- src/org/eclipse/bpel/model/impl/AssignImpl.java	10 Feb 2006 16:12:48 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/AssignImpl.java	24 May 2007 13:06:26 -0000
@@ -56,7 +56,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList copy = null;
+	protected EList copy;
 
 	/**
 	 * The default value of the '{@link #getValidate() <em>Validate</em>}' attribute.
@@ -93,7 +93,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getAssign();
+		return BPELPackage.Literals.ASSIGN;
 	}
 
 	/**
@@ -134,24 +134,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.ASSIGN__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.ASSIGN__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.ASSIGN__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.ASSIGN__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.ASSIGN__COPY:
-					return ((InternalEList)getCopy()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.ASSIGN__COPY:
+				return ((InternalEList)getCopy()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -159,30 +147,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ASSIGN__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.ASSIGN__ELEMENT:
-				return getElement();
-			case BPELPackage.ASSIGN__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.ASSIGN__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.ASSIGN__NAME:
-				return getName();
-			case BPELPackage.ASSIGN__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.ASSIGN__TARGETS:
-				return getTargets();
-			case BPELPackage.ASSIGN__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.ASSIGN__COPY:
 				return getCopy();
 			case BPELPackage.ASSIGN__VALIDATE:
 				return getValidate();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -190,33 +162,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ASSIGN__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.ASSIGN__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.ASSIGN__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.ASSIGN__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.ASSIGN__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.ASSIGN__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.ASSIGN__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.ASSIGN__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.ASSIGN__COPY:
 				getCopy().clear();
 				getCopy().addAll((Collection)newValue);
@@ -225,7 +172,7 @@
 				setValidate((Boolean)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -233,32 +180,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ASSIGN__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ASSIGN__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ASSIGN__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.ASSIGN__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.ASSIGN__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.ASSIGN__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.ASSIGN__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.ASSIGN__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ASSIGN__COPY:
 				getCopy().clear();
 				return;
@@ -266,7 +189,7 @@
 				setValidate(VALIDATE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -274,30 +197,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ASSIGN__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.ASSIGN__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.ASSIGN__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.ASSIGN__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.ASSIGN__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.ASSIGN__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.ASSIGN__TARGETS:
-				return targets != null;
-			case BPELPackage.ASSIGN__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ASSIGN__COPY:
 				return copy != null && !copy.isEmpty();
 			case BPELPackage.ASSIGN__VALIDATE:
 				return VALIDATE_EDEFAULT == null ? validate != null : !VALIDATE_EDEFAULT.equals(validate);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/OpaqueActivityImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OpaqueActivityImpl.java,v
retrieving revision 1.4
diff -u -r1.4 OpaqueActivityImpl.java
--- src/org/eclipse/bpel/model/impl/OpaqueActivityImpl.java	9 Feb 2007 09:13:42 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/OpaqueActivityImpl.java	24 May 2007 13:06:29 -0000
@@ -45,155 +45,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getOpaqueActivity();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.OPAQUE_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.OPAQUE_ACTIVITY__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.OPAQUE_ACTIVITY__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.OPAQUE_ACTIVITY__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.OPAQUE_ACTIVITY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.OPAQUE_ACTIVITY__ELEMENT:
-				return getElement();
-			case BPELPackage.OPAQUE_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.OPAQUE_ACTIVITY__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.OPAQUE_ACTIVITY__NAME:
-				return getName();
-			case BPELPackage.OPAQUE_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.OPAQUE_ACTIVITY__TARGETS:
-				return getTargets();
-			case BPELPackage.OPAQUE_ACTIVITY__SOURCES:
-				return getSources();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.OPAQUE_ACTIVITY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__SOURCES:
-				setSources((Sources)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.OPAQUE_ACTIVITY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.OPAQUE_ACTIVITY__SOURCES:
-				setSources((Sources)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.OPAQUE_ACTIVITY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.OPAQUE_ACTIVITY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.OPAQUE_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.OPAQUE_ACTIVITY__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.OPAQUE_ACTIVITY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.OPAQUE_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.OPAQUE_ACTIVITY__TARGETS:
-				return targets != null;
-			case BPELPackage.OPAQUE_ACTIVITY__SOURCES:
-				return sources != null;
-		}
-		return eDynamicIsSet(eFeature);
+		return BPELPackage.Literals.OPAQUE_ACTIVITY;
 	}
 
 } //OpaqueActivityImpl
Index: src/org/eclipse/bpel/model/impl/TerminationHandlerImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TerminationHandlerImpl.java,v
retrieving revision 1.3
diff -u -r1.3 TerminationHandlerImpl.java
--- src/org/eclipse/bpel/model/impl/TerminationHandlerImpl.java	19 Jan 2006 21:08:47 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/TerminationHandlerImpl.java	24 May 2007 13:06:31 -0000
@@ -43,7 +43,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -60,7 +60,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getTerminationHandler();
+		return BPELPackage.Literals.TERMINATION_HANDLER;
 	}
 
 	/**
@@ -111,20 +111,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.TERMINATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.TERMINATION_HANDLER__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.TERMINATION_HANDLER__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.TERMINATION_HANDLER__ACTIVITY:
+				return basicSetActivity(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -132,20 +124,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TERMINATION_HANDLER__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.TERMINATION_HANDLER__ELEMENT:
-				return getElement();
-			case BPELPackage.TERMINATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.TERMINATION_HANDLER__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.TERMINATION_HANDLER__ACTIVITY:
 				return getActivity();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -153,26 +137,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TERMINATION_HANDLER__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.TERMINATION_HANDLER__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.TERMINATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.TERMINATION_HANDLER__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.TERMINATION_HANDLER__ACTIVITY:
 				setActivity((Activity)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -180,25 +151,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TERMINATION_HANDLER__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TERMINATION_HANDLER__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TERMINATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.TERMINATION_HANDLER__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TERMINATION_HANDLER__ACTIVITY:
 				setActivity((Activity)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -206,20 +165,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TERMINATION_HANDLER__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.TERMINATION_HANDLER__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.TERMINATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.TERMINATION_HANDLER__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TERMINATION_HANDLER__ACTIVITY:
 				return activity != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //TerminationHandlerImpl
Index: src/org/eclipse/bpel/model/impl/FromPartImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FromPartImpl.java,v
retrieving revision 1.4
diff -u -r1.4 FromPartImpl.java
--- src/org/eclipse/bpel/model/impl/FromPartImpl.java	20 Apr 2007 23:31:44 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/FromPartImpl.java	24 May 2007 13:06:29 -0000
@@ -70,7 +70,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected To to = null;
+	protected To to;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -87,7 +87,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getFromPart();
+		return BPELPackage.Literals.FROM_PART;
 	}
 
 	/**
@@ -118,8 +118,8 @@
 	 */
 	public To getTo() {
 		if (to != null && to.eIsProxy()) {
-			To oldTo = to;
-			to = (To)eResolveProxy((InternalEObject)to);
+			InternalEObject oldTo = (InternalEObject)to;
+			to = (To)eResolveProxy(oldTo);
 			if (to != oldTo) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.FROM_PART__TO, oldTo, to));
@@ -154,42 +154,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.FROM_PART__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.FROM_PART__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FROM_PART__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.FROM_PART__ELEMENT:
-				return getElement();
-			case BPELPackage.FROM_PART__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.FROM_PART__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.FROM_PART__PART:
 				return getPart();
 			case BPELPackage.FROM_PART__TO:
 				if (resolve) return getTo();
 				return basicGetTo();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -197,21 +170,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FROM_PART__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.FROM_PART__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.FROM_PART__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.FROM_PART__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.FROM_PART__PART:
 				setPart((String)newValue);
 				return;
@@ -219,7 +179,7 @@
 				setTo((To)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -227,20 +187,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FROM_PART__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FROM_PART__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FROM_PART__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.FROM_PART__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FROM_PART__PART:
 				setPart(PART_EDEFAULT);
 				return;
@@ -248,7 +196,7 @@
 				setTo((To)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -256,22 +204,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FROM_PART__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.FROM_PART__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.FROM_PART__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.FROM_PART__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FROM_PART__PART:
 				return PART_EDEFAULT == null ? part != null : !PART_EDEFAULT.equals(part);
 			case BPELPackage.FROM_PART__TO:
 				return to != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/LinksImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinksImpl.java,v
retrieving revision 1.2
diff -u -r1.2 LinksImpl.java
--- src/org/eclipse/bpel/model/impl/LinksImpl.java	19 Jan 2006 21:08:47 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/LinksImpl.java	24 May 2007 13:06:29 -0000
@@ -51,7 +51,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList children = null;
+	protected EList children;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getLinks();
+		return BPELPackage.Literals.LINKS;
 	}
 
 	/**
@@ -88,20 +88,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.LINKS__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.LINKS__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.LINKS__CHILDREN:
-					return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.LINKS__CHILDREN:
+				return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -109,20 +101,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.LINKS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.LINKS__ELEMENT:
-				return getElement();
-			case BPELPackage.LINKS__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.LINKS__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.LINKS__CHILDREN:
 				return getChildren();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -130,27 +114,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.LINKS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.LINKS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.LINKS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.LINKS__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.LINKS__CHILDREN:
 				getChildren().clear();
 				getChildren().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -158,25 +129,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.LINKS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.LINKS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.LINKS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.LINKS__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.LINKS__CHILDREN:
 				getChildren().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -184,20 +143,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.LINKS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.LINKS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.LINKS__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.LINKS__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.LINKS__CHILDREN:
 				return children != null && !children.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //LinksImpl
Index: src/org/eclipse/bpel/model/impl/OnEventImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java,v
retrieving revision 1.5
diff -u -r1.5 OnEventImpl.java
--- src/org/eclipse/bpel/model/impl/OnEventImpl.java	19 Jan 2006 21:08:48 -0000	1.5
+++ src/org/eclipse/bpel/model/impl/OnEventImpl.java	24 May 2007 13:06:29 -0000
@@ -71,7 +71,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * The cached value of the '{@link #getVariable() <em>Variable</em>}' containment reference.
@@ -81,7 +81,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable variable = null;
+	protected Variable variable;
 
 	/**
 	 * The cached value of the '{@link #getPartnerLink() <em>Partner Link</em>}' reference.
@@ -91,7 +91,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PartnerLink partnerLink = null;
+	protected PartnerLink partnerLink;
 
 	/**
 	 * The cached value of the '{@link #getCorrelations() <em>Correlations</em>}' containment reference.
@@ -101,7 +101,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Correlations correlations = null;
+	protected Correlations correlations;
 
 	/**
 	 * The cached value of the '{@link #getOperation() <em>Operation</em>}' reference.
@@ -111,7 +111,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Operation operation = null;
+	protected Operation operation;
 
 	/**
 	 * The cached value of the '{@link #getPortType() <em>Port Type</em>}' reference.
@@ -121,7 +121,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PortType portType = null;
+	protected PortType portType;
 
 	/**
 	 * The cached value of the '{@link #getMessageType() <em>Message Type</em>}' reference.
@@ -131,7 +131,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Message messageType = null;
+	protected Message messageType;
 
 	/**
 	 * The cached value of the '{@link #getFromPart() <em>From Part</em>}' reference list.
@@ -141,7 +141,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList fromPart = null;
+	protected EList fromPart;
 
 	/**
 	 * The cached value of the '{@link #getCorrelationSets() <em>Correlation Sets</em>}' containment reference.
@@ -151,7 +151,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected CorrelationSets correlationSets = null;
+	protected CorrelationSets correlationSets;
 
     /**
      * The deserialized value of the operation name.
@@ -174,7 +174,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getOnEvent();
+		return BPELPackage.Literals.ON_EVENT;
 	}
 
 	/**
@@ -270,8 +270,8 @@
 	 */
 	public PartnerLink getPartnerLink() {
 		if (partnerLink != null && partnerLink.eIsProxy()) {
-			PartnerLink oldPartnerLink = partnerLink;
-			partnerLink = (PartnerLink)eResolveProxy((InternalEObject)partnerLink);
+			InternalEObject oldPartnerLink = (InternalEObject)partnerLink;
+			partnerLink = (PartnerLink)eResolveProxy(oldPartnerLink);
 			if (partnerLink != oldPartnerLink) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.ON_EVENT__PARTNER_LINK, oldPartnerLink, partnerLink));
@@ -367,8 +367,8 @@
 	 */
 	public Operation getOperationGen() {
 		if (operation != null && operation.eIsProxy()) {
-			Operation oldOperation = operation;
-			operation = (Operation)eResolveProxy((InternalEObject)operation);
+			InternalEObject oldOperation = (InternalEObject)operation;
+			operation = (Operation)eResolveProxy(oldOperation);
 			if (operation != oldOperation) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.ON_EVENT__OPERATION, oldOperation, operation));
@@ -435,8 +435,8 @@
 	 */
 	public PortType getPortTypeGen() {
 		if (portType != null && portType.eIsProxy()) {
-			PortType oldPortType = portType;
-			portType = (PortType)eResolveProxy((InternalEObject)portType);
+			InternalEObject oldPortType = (InternalEObject)portType;
+			portType = (PortType)eResolveProxy(oldPortType);
 			if (portType != oldPortType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.ON_EVENT__PORT_TYPE, oldPortType, portType));
@@ -572,26 +572,18 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.ON_EVENT__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.ON_EVENT__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.ON_EVENT__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				case BPELPackage.ON_EVENT__VARIABLE:
-					return basicSetVariable(null, msgs);
-				case BPELPackage.ON_EVENT__CORRELATIONS:
-					return basicSetCorrelations(null, msgs);
-				case BPELPackage.ON_EVENT__CORRELATION_SETS:
-					return basicSetCorrelationSets(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.ON_EVENT__ACTIVITY:
+				return basicSetActivity(null, msgs);
+			case BPELPackage.ON_EVENT__VARIABLE:
+				return basicSetVariable(null, msgs);
+			case BPELPackage.ON_EVENT__CORRELATIONS:
+				return basicSetCorrelations(null, msgs);
+			case BPELPackage.ON_EVENT__CORRELATION_SETS:
+				return basicSetCorrelationSets(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -599,16 +591,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_EVENT__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.ON_EVENT__ELEMENT:
-				return getElement();
-			case BPELPackage.ON_EVENT__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.ON_EVENT__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.ON_EVENT__ACTIVITY:
 				return getActivity();
 			case BPELPackage.ON_EVENT__VARIABLE:
@@ -632,7 +616,7 @@
 			case BPELPackage.ON_EVENT__CORRELATION_SETS:
 				return getCorrelationSets();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -640,21 +624,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_EVENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.ON_EVENT__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.ON_EVENT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.ON_EVENT__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.ON_EVENT__ACTIVITY:
 				setActivity((Activity)newValue);
 				return;
@@ -684,7 +655,7 @@
 				setCorrelationSets((CorrelationSets)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -692,20 +663,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_EVENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ON_EVENT__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ON_EVENT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.ON_EVENT__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ON_EVENT__ACTIVITY:
 				setActivity((Activity)null);
 				return;
@@ -734,7 +693,7 @@
 				setCorrelationSets((CorrelationSets)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -742,16 +701,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_EVENT__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.ON_EVENT__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.ON_EVENT__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.ON_EVENT__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ON_EVENT__ACTIVITY:
 				return activity != null;
 			case BPELPackage.ON_EVENT__VARIABLE:
@@ -771,7 +722,7 @@
 			case BPELPackage.ON_EVENT__CORRELATION_SETS:
 				return correlationSets != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //OnEventImpl
Index: src/org/eclipse/bpel/model/impl/VariablesImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariablesImpl.java,v
retrieving revision 1.2
diff -u -r1.2 VariablesImpl.java
--- src/org/eclipse/bpel/model/impl/VariablesImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/VariablesImpl.java	24 May 2007 13:06:31 -0000
@@ -51,7 +51,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList children = null;
+	protected EList children;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getVariables();
+		return BPELPackage.Literals.VARIABLES;
 	}
 
 	/**
@@ -88,20 +88,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.VARIABLES__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.VARIABLES__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.VARIABLES__CHILDREN:
-					return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.VARIABLES__CHILDREN:
+				return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -109,20 +101,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VARIABLES__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.VARIABLES__ELEMENT:
-				return getElement();
-			case BPELPackage.VARIABLES__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.VARIABLES__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.VARIABLES__CHILDREN:
 				return getChildren();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -130,27 +114,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VARIABLES__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.VARIABLES__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.VARIABLES__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.VARIABLES__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.VARIABLES__CHILDREN:
 				getChildren().clear();
 				getChildren().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -158,25 +129,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VARIABLES__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.VARIABLES__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.VARIABLES__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.VARIABLES__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.VARIABLES__CHILDREN:
 				getChildren().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -184,20 +143,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VARIABLES__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.VARIABLES__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.VARIABLES__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.VARIABLES__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.VARIABLES__CHILDREN:
 				return children != null && !children.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //VariablesImpl
Index: src/org/eclipse/bpel/model/impl/CatchImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchImpl.java,v
retrieving revision 1.3
diff -u -r1.3 CatchImpl.java
--- src/org/eclipse/bpel/model/impl/CatchImpl.java	19 Jan 2006 21:08:48 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/CatchImpl.java	24 May 2007 13:06:28 -0000
@@ -80,7 +80,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable faultVariable = null;
+	protected Variable faultVariable;
 
 	/**
 	 * The cached value of the '{@link #getActivity() <em>Activity</em>}' containment reference.
@@ -90,7 +90,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * The cached value of the '{@link #getFaultMessageType() <em>Fault Message Type</em>}' reference.
@@ -100,7 +100,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Message faultMessageType = null;
+	protected Message faultMessageType;
 
 	/**
 	 * The cached value of the '{@link #getFaultElement() <em>Fault Element</em>}' reference.
@@ -110,7 +110,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected XSDElementDeclaration faultElement = null;
+	protected XSDElementDeclaration faultElement;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -127,7 +127,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCatch();
+		return BPELPackage.Literals.CATCH;
 	}
 
 	/**
@@ -332,22 +332,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.CATCH__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.CATCH__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.CATCH__FAULT_VARIABLE:
-					return basicSetFaultVariable(null, msgs);
-				case BPELPackage.CATCH__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.CATCH__FAULT_VARIABLE:
+				return basicSetFaultVariable(null, msgs);
+			case BPELPackage.CATCH__ACTIVITY:
+				return basicSetActivity(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -355,16 +347,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CATCH__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.CATCH__ELEMENT:
-				return getElement();
-			case BPELPackage.CATCH__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.CATCH__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.CATCH__FAULT_NAME:
 				return getFaultName();
 			case BPELPackage.CATCH__FAULT_VARIABLE:
@@ -378,7 +362,7 @@
 				if (resolve) return getFaultElement();
 				return basicGetFaultElement();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -386,21 +370,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CATCH__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.CATCH__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.CATCH__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.CATCH__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.CATCH__FAULT_NAME:
 				setFaultName((QName)newValue);
 				return;
@@ -417,7 +388,7 @@
 				setFaultElement((XSDElementDeclaration)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -425,20 +396,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CATCH__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CATCH__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CATCH__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.CATCH__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CATCH__FAULT_NAME:
 				setFaultName(FAULT_NAME_EDEFAULT);
 				return;
@@ -455,7 +414,7 @@
 				setFaultElement((XSDElementDeclaration)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -463,16 +422,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CATCH__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.CATCH__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.CATCH__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.CATCH__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CATCH__FAULT_NAME:
 				return FAULT_NAME_EDEFAULT == null ? faultName != null : !FAULT_NAME_EDEFAULT.equals(faultName);
 			case BPELPackage.CATCH__FAULT_VARIABLE:
@@ -484,7 +435,7 @@
 			case BPELPackage.CATCH__FAULT_ELEMENT:
 				return faultElement != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/ExtensionActivityImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionActivityImpl.java,v
retrieving revision 1.4
diff -u -r1.4 ExtensionActivityImpl.java
--- src/org/eclipse/bpel/model/impl/ExtensionActivityImpl.java	9 Feb 2007 09:13:42 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/ExtensionActivityImpl.java	24 May 2007 13:06:28 -0000
@@ -45,155 +45,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getExtensionActivity();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.EXTENSION_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.EXTENSION_ACTIVITY__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.EXTENSION_ACTIVITY__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.EXTENSION_ACTIVITY__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSION_ACTIVITY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.EXTENSION_ACTIVITY__ELEMENT:
-				return getElement();
-			case BPELPackage.EXTENSION_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.EXTENSION_ACTIVITY__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.EXTENSION_ACTIVITY__NAME:
-				return getName();
-			case BPELPackage.EXTENSION_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.EXTENSION_ACTIVITY__TARGETS:
-				return getTargets();
-			case BPELPackage.EXTENSION_ACTIVITY__SOURCES:
-				return getSources();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSION_ACTIVITY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__SOURCES:
-				setSources((Sources)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSION_ACTIVITY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.EXTENSION_ACTIVITY__SOURCES:
-				setSources((Sources)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSION_ACTIVITY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.EXTENSION_ACTIVITY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.EXTENSION_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.EXTENSION_ACTIVITY__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.EXTENSION_ACTIVITY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.EXTENSION_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.EXTENSION_ACTIVITY__TARGETS:
-				return targets != null;
-			case BPELPackage.EXTENSION_ACTIVITY__SOURCES:
-				return sources != null;
-		}
-		return eDynamicIsSet(eFeature);
+		return BPELPackage.Literals.EXTENSION_ACTIVITY;
 	}
 
 } //ExtensionActivityImpl
Index: src/org/eclipse/bpel/model/impl/IfImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/IfImpl.java,v
retrieving revision 1.3
diff -u -r1.3 IfImpl.java
--- src/org/eclipse/bpel/model/impl/IfImpl.java	9 Feb 2007 09:13:42 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/IfImpl.java	24 May 2007 13:06:29 -0000
@@ -53,7 +53,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Condition condition = null;
+	protected Condition condition;
 
 	/**
 	 * The cached value of the '{@link #getElseIf() <em>Else If</em>}' containment reference list.
@@ -63,7 +63,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList elseIf = null;
+	protected EList elseIf;
 
 	/**
 	 * The cached value of the '{@link #getElse() <em>Else</em>}' containment reference.
@@ -73,7 +73,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Else else_ = null;
+	protected Else else_;
 
 	/**
 	 * The cached value of the '{@link #getActivity() <em>Activity</em>}' containment reference.
@@ -83,7 +83,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -100,7 +100,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getIf();
+		return BPELPackage.Literals.IF;
 	}
 
 	/**
@@ -249,30 +249,18 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.IF__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.IF__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.IF__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.IF__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.IF__CONDITION:
-					return basicSetCondition(null, msgs);
-				case BPELPackage.IF__ELSE_IF:
-					return ((InternalEList)getElseIf()).basicRemove(otherEnd, msgs);
-				case BPELPackage.IF__ELSE:
-					return basicSetElse(null, msgs);
-				case BPELPackage.IF__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.IF__CONDITION:
+				return basicSetCondition(null, msgs);
+			case BPELPackage.IF__ELSE_IF:
+				return ((InternalEList)getElseIf()).basicRemove(otherEnd, msgs);
+			case BPELPackage.IF__ELSE:
+				return basicSetElse(null, msgs);
+			case BPELPackage.IF__ACTIVITY:
+				return basicSetActivity(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -280,24 +268,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.IF__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.IF__ELEMENT:
-				return getElement();
-			case BPELPackage.IF__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.IF__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.IF__NAME:
-				return getName();
-			case BPELPackage.IF__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.IF__TARGETS:
-				return getTargets();
-			case BPELPackage.IF__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.IF__CONDITION:
 				return getCondition();
 			case BPELPackage.IF__ELSE_IF:
@@ -307,7 +279,7 @@
 			case BPELPackage.IF__ACTIVITY:
 				return getActivity();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -315,33 +287,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.IF__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.IF__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.IF__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.IF__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.IF__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.IF__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.IF__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.IF__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.IF__CONDITION:
 				setCondition((Condition)newValue);
 				return;
@@ -356,7 +303,7 @@
 				setActivity((Activity)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -364,32 +311,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.IF__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.IF__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.IF__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.IF__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.IF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.IF__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.IF__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.IF__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.IF__CONDITION:
 				setCondition((Condition)null);
 				return;
@@ -403,7 +326,7 @@
 				setActivity((Activity)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -411,24 +334,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.IF__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.IF__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.IF__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.IF__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.IF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.IF__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.IF__TARGETS:
-				return targets != null;
-			case BPELPackage.IF__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.IF__CONDITION:
 				return condition != null;
 			case BPELPackage.IF__ELSE_IF:
@@ -438,7 +345,7 @@
 			case BPELPackage.IF__ACTIVITY:
 				return activity != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //IfImpl
Index: src/org/eclipse/bpel/model/impl/ElseIfImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ElseIfImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ElseIfImpl.java
--- src/org/eclipse/bpel/model/impl/ElseIfImpl.java	19 Jan 2006 21:08:48 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/ElseIfImpl.java	24 May 2007 13:06:28 -0000
@@ -45,7 +45,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Condition condition = null;
+	protected Condition condition;
 
 	/**
 	 * The cached value of the '{@link #getActivity() <em>Activity</em>}' containment reference.
@@ -55,7 +55,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -72,7 +72,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getElseIf();
+		return BPELPackage.Literals.ELSE_IF;
 	}
 
 	/**
@@ -166,22 +166,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.ELSE_IF__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.ELSE_IF__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.ELSE_IF__CONDITION:
-					return basicSetCondition(null, msgs);
-				case BPELPackage.ELSE_IF__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.ELSE_IF__CONDITION:
+				return basicSetCondition(null, msgs);
+			case BPELPackage.ELSE_IF__ACTIVITY:
+				return basicSetActivity(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -189,22 +181,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ELSE_IF__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.ELSE_IF__ELEMENT:
-				return getElement();
-			case BPELPackage.ELSE_IF__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.ELSE_IF__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.ELSE_IF__CONDITION:
 				return getCondition();
 			case BPELPackage.ELSE_IF__ACTIVITY:
 				return getActivity();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -212,21 +196,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ELSE_IF__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.ELSE_IF__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.ELSE_IF__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.ELSE_IF__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.ELSE_IF__CONDITION:
 				setCondition((Condition)newValue);
 				return;
@@ -234,7 +205,7 @@
 				setActivity((Activity)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -242,20 +213,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ELSE_IF__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ELSE_IF__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ELSE_IF__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.ELSE_IF__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ELSE_IF__CONDITION:
 				setCondition((Condition)null);
 				return;
@@ -263,7 +222,7 @@
 				setActivity((Activity)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -271,22 +230,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ELSE_IF__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.ELSE_IF__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.ELSE_IF__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.ELSE_IF__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ELSE_IF__CONDITION:
 				return condition != null;
 			case BPELPackage.ELSE_IF__ACTIVITY:
 				return activity != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //ElseIfImpl
Index: src/org/eclipse/bpel/model/impl/CatchAllImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchAllImpl.java,v
retrieving revision 1.2
diff -u -r1.2 CatchAllImpl.java
--- src/org/eclipse/bpel/model/impl/CatchAllImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/CatchAllImpl.java	24 May 2007 13:06:27 -0000
@@ -51,7 +51,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCatchAll();
+		return BPELPackage.Literals.CATCH_ALL;
 	}
 
 	/**
@@ -119,20 +119,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.CATCH_ALL__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.CATCH_ALL__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.CATCH_ALL__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.CATCH_ALL__ACTIVITY:
+				return basicSetActivity(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -140,20 +132,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CATCH_ALL__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.CATCH_ALL__ELEMENT:
-				return getElement();
-			case BPELPackage.CATCH_ALL__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.CATCH_ALL__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.CATCH_ALL__ACTIVITY:
 				return getActivity();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -161,26 +145,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CATCH_ALL__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.CATCH_ALL__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.CATCH_ALL__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.CATCH_ALL__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.CATCH_ALL__ACTIVITY:
 				setActivity((Activity)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -188,25 +159,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CATCH_ALL__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CATCH_ALL__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CATCH_ALL__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.CATCH_ALL__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CATCH_ALL__ACTIVITY:
 				setActivity((Activity)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -214,20 +173,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CATCH_ALL__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.CATCH_ALL__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.CATCH_ALL__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.CATCH_ALL__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CATCH_ALL__ACTIVITY:
 				return activity != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //CatchAllImpl
Index: src/org/eclipse/bpel/model/impl/CompensateScopeImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensateScopeImpl.java,v
retrieving revision 1.1
diff -u -r1.1 CompensateScopeImpl.java
--- src/org/eclipse/bpel/model/impl/CompensateScopeImpl.java	20 Apr 2007 23:31:44 -0000	1.1
+++ src/org/eclipse/bpel/model/impl/CompensateScopeImpl.java	24 May 2007 13:06:28 -0000
@@ -58,7 +58,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity target = null;
+	protected Activity target;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -75,7 +75,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCompensateScope();
+		return BPELPackage.Literals.COMPENSATE_SCOPE;
 	}
 
 	/**
@@ -85,8 +85,8 @@
 	 */
 	public Activity getTarget() {
 		if (target != null && target.eIsProxy()) {
-			Activity oldTarget = target;
-			target = (Activity)eResolveProxy((InternalEObject)target);
+			InternalEObject oldTarget = (InternalEObject)target;
+			target = (Activity)eResolveProxy(oldTarget);
 			if (target != oldTarget) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.COMPENSATE_SCOPE__TARGET, oldTarget, target));
@@ -121,52 +121,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.COMPENSATE_SCOPE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.COMPENSATE_SCOPE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.COMPENSATE_SCOPE__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.COMPENSATE_SCOPE__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATE_SCOPE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.COMPENSATE_SCOPE__ELEMENT:
-				return getElement();
-			case BPELPackage.COMPENSATE_SCOPE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.COMPENSATE_SCOPE__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.COMPENSATE_SCOPE__NAME:
-				return getName();
-			case BPELPackage.COMPENSATE_SCOPE__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.COMPENSATE_SCOPE__TARGETS:
-				return getTargets();
-			case BPELPackage.COMPENSATE_SCOPE__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.COMPENSATE_SCOPE__TARGET:
 				if (resolve) return getTarget();
 				return basicGetTarget();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -174,38 +135,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATE_SCOPE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.COMPENSATE_SCOPE__TARGET:
 				setTarget((Activity)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -213,37 +149,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATE_SCOPE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.COMPENSATE_SCOPE__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.COMPENSATE_SCOPE__TARGET:
 				setTarget((Activity)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -251,28 +163,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATE_SCOPE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.COMPENSATE_SCOPE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.COMPENSATE_SCOPE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.COMPENSATE_SCOPE__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.COMPENSATE_SCOPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.COMPENSATE_SCOPE__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.COMPENSATE_SCOPE__TARGETS:
-				return targets != null;
-			case BPELPackage.COMPENSATE_SCOPE__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.COMPENSATE_SCOPE__TARGET:
 				return target != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/** (non-Javadoc)
Index: src/org/eclipse/bpel/model/impl/InvokeImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/InvokeImpl.java,v
retrieving revision 1.3
diff -u -r1.3 InvokeImpl.java
--- src/org/eclipse/bpel/model/impl/InvokeImpl.java	19 Jan 2006 21:08:48 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/InvokeImpl.java	24 May 2007 13:06:29 -0000
@@ -68,7 +68,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable outputVariable = null;
+	protected Variable outputVariable;
 
 	/**
 	 * The cached value of the '{@link #getInputVariable() <em>Input Variable</em>}' reference.
@@ -78,7 +78,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable inputVariable = null;
+	protected Variable inputVariable;
 
 	/**
 	 * The cached value of the '{@link #getCompensationHandler() <em>Compensation Handler</em>}' containment reference.
@@ -88,7 +88,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected CompensationHandler compensationHandler = null;
+	protected CompensationHandler compensationHandler;
 
 	/**
 	 * The cached value of the '{@link #getFaultHandler() <em>Fault Handler</em>}' containment reference.
@@ -98,7 +98,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected FaultHandler faultHandler = null;
+	protected FaultHandler faultHandler;
 
 	/**
 	 * The cached value of the '{@link #getToPart() <em>To Part</em>}' reference list.
@@ -108,7 +108,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList toPart = null;
+	protected EList toPart;
 
 	/**
 	 * The cached value of the '{@link #getFromPart() <em>From Part</em>}' reference list.
@@ -118,7 +118,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList fromPart = null;
+	protected EList fromPart;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -135,7 +135,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getInvoke();
+		return BPELPackage.Literals.INVOKE;
 	}
 
 	/**
@@ -145,8 +145,8 @@
 	 */
 	public Variable getOutputVariable() {
 		if (outputVariable != null && outputVariable.eIsProxy()) {
-			Variable oldOutputVariable = outputVariable;
-			outputVariable = (Variable)eResolveProxy((InternalEObject)outputVariable);
+			InternalEObject oldOutputVariable = (InternalEObject)outputVariable;
+			outputVariable = (Variable)eResolveProxy(oldOutputVariable);
 			if (outputVariable != oldOutputVariable) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.INVOKE__OUTPUT_VARIABLE, oldOutputVariable, outputVariable));
@@ -183,8 +183,8 @@
 	 */
 	public Variable getInputVariable() {
 		if (inputVariable != null && inputVariable.eIsProxy()) {
-			Variable oldInputVariable = inputVariable;
-			inputVariable = (Variable)eResolveProxy((InternalEObject)inputVariable);
+			InternalEObject oldInputVariable = (InternalEObject)inputVariable;
+			inputVariable = (Variable)eResolveProxy(oldInputVariable);
 			if (inputVariable != oldInputVariable) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.INVOKE__INPUT_VARIABLE, oldInputVariable, inputVariable));
@@ -329,28 +329,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.INVOKE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.INVOKE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.INVOKE__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.INVOKE__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.INVOKE__CORRELATIONS:
-					return basicSetCorrelations(null, msgs);
-				case BPELPackage.INVOKE__COMPENSATION_HANDLER:
-					return basicSetCompensationHandler(null, msgs);
-				case BPELPackage.INVOKE__FAULT_HANDLER:
-					return basicSetFaultHandler(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.INVOKE__COMPENSATION_HANDLER:
+				return basicSetCompensationHandler(null, msgs);
+			case BPELPackage.INVOKE__FAULT_HANDLER:
+				return basicSetFaultHandler(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -358,35 +344,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.INVOKE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.INVOKE__ELEMENT:
-				return getElement();
-			case BPELPackage.INVOKE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.INVOKE__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.INVOKE__NAME:
-				return getName();
-			case BPELPackage.INVOKE__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.INVOKE__TARGETS:
-				return getTargets();
-			case BPELPackage.INVOKE__SOURCES:
-				return getSources();
-			case BPELPackage.INVOKE__PARTNER_LINK:
-				if (resolve) return getPartnerLink();
-				return basicGetPartnerLink();
-			case BPELPackage.INVOKE__CORRELATIONS:
-				return getCorrelations();
-			case BPELPackage.INVOKE__PORT_TYPE:
-				if (resolve) return getPortType();
-				return basicGetPortType();
-			case BPELPackage.INVOKE__OPERATION:
-				if (resolve) return getOperation();
-				return basicGetOperation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.INVOKE__OUTPUT_VARIABLE:
 				if (resolve) return getOutputVariable();
 				return basicGetOutputVariable();
@@ -402,7 +361,7 @@
 			case BPELPackage.INVOKE__FROM_PART:
 				return getFromPart();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -410,45 +369,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.INVOKE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.INVOKE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.INVOKE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.INVOKE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.INVOKE__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.INVOKE__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.INVOKE__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.INVOKE__SOURCES:
-				setSources((Sources)newValue);
-				return;
-			case BPELPackage.INVOKE__PARTNER_LINK:
-				setPartnerLink((PartnerLink)newValue);
-				return;
-			case BPELPackage.INVOKE__CORRELATIONS:
-				setCorrelations((Correlations)newValue);
-				return;
-			case BPELPackage.INVOKE__PORT_TYPE:
-				setPortType((PortType)newValue);
-				return;
-			case BPELPackage.INVOKE__OPERATION:
-				setOperation((Operation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.INVOKE__OUTPUT_VARIABLE:
 				setOutputVariable((Variable)newValue);
 				return;
@@ -470,7 +392,7 @@
 				getFromPart().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -478,44 +400,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.INVOKE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.INVOKE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.INVOKE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.INVOKE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.INVOKE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.INVOKE__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.INVOKE__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.INVOKE__SOURCES:
-				setSources((Sources)null);
-				return;
-			case BPELPackage.INVOKE__PARTNER_LINK:
-				setPartnerLink((PartnerLink)null);
-				return;
-			case BPELPackage.INVOKE__CORRELATIONS:
-				setCorrelations((Correlations)null);
-				return;
-			case BPELPackage.INVOKE__PORT_TYPE:
-				setPortType((PortType)null);
-				return;
-			case BPELPackage.INVOKE__OPERATION:
-				setOperation((Operation)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.INVOKE__OUTPUT_VARIABLE:
 				setOutputVariable((Variable)null);
 				return;
@@ -535,7 +421,7 @@
 				getFromPart().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -543,32 +429,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.INVOKE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.INVOKE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.INVOKE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.INVOKE__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.INVOKE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.INVOKE__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.INVOKE__TARGETS:
-				return targets != null;
-			case BPELPackage.INVOKE__SOURCES:
-				return sources != null;
-			case BPELPackage.INVOKE__PARTNER_LINK:
-				return partnerLink != null;
-			case BPELPackage.INVOKE__CORRELATIONS:
-				return correlations != null;
-			case BPELPackage.INVOKE__PORT_TYPE:
-				return portType != null;
-			case BPELPackage.INVOKE__OPERATION:
-				return operation != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.INVOKE__OUTPUT_VARIABLE:
 				return outputVariable != null;
 			case BPELPackage.INVOKE__INPUT_VARIABLE:
@@ -582,7 +444,7 @@
 			case BPELPackage.INVOKE__FROM_PART:
 				return fromPart != null && !fromPart.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //InvokeImpl
Index: src/org/eclipse/bpel/model/impl/PickImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PickImpl.java,v
retrieving revision 1.2
diff -u -r1.2 PickImpl.java
--- src/org/eclipse/bpel/model/impl/PickImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/PickImpl.java	24 May 2007 13:06:30 -0000
@@ -77,7 +77,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean createInstanceESet = false;
+	protected boolean createInstanceESet;
 
 	/**
 	 * The cached value of the '{@link #getMessages() <em>Messages</em>}' containment reference list.
@@ -87,7 +87,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList messages = null;
+	protected EList messages;
 
 	/**
 	 * The cached value of the '{@link #getAlarm() <em>Alarm</em>}' containment reference list.
@@ -97,7 +97,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList alarm = null;
+	protected EList alarm;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -114,7 +114,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getPick();
+		return BPELPackage.Literals.PICK;
 	}
 
 	/**
@@ -192,26 +192,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.PICK__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.PICK__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.PICK__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.PICK__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.PICK__MESSAGES:
-					return ((InternalEList)getMessages()).basicRemove(otherEnd, msgs);
-				case BPELPackage.PICK__ALARM:
-					return ((InternalEList)getAlarm()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.PICK__MESSAGES:
+				return ((InternalEList)getMessages()).basicRemove(otherEnd, msgs);
+			case BPELPackage.PICK__ALARM:
+				return ((InternalEList)getAlarm()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -219,24 +207,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PICK__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.PICK__ELEMENT:
-				return getElement();
-			case BPELPackage.PICK__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.PICK__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.PICK__NAME:
-				return getName();
-			case BPELPackage.PICK__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.PICK__TARGETS:
-				return getTargets();
-			case BPELPackage.PICK__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.PICK__CREATE_INSTANCE:
 				return getCreateInstance();
 			case BPELPackage.PICK__MESSAGES:
@@ -244,7 +216,7 @@
 			case BPELPackage.PICK__ALARM:
 				return getAlarm();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -252,33 +224,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PICK__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.PICK__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.PICK__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.PICK__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.PICK__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.PICK__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.PICK__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.PICK__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.PICK__CREATE_INSTANCE:
 				setCreateInstance((Boolean)newValue);
 				return;
@@ -291,7 +238,7 @@
 				getAlarm().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -299,32 +246,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PICK__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PICK__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PICK__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.PICK__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.PICK__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.PICK__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.PICK__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.PICK__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PICK__CREATE_INSTANCE:
 				unsetCreateInstance();
 				return;
@@ -335,7 +258,7 @@
 				getAlarm().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -343,24 +266,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PICK__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.PICK__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.PICK__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.PICK__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.PICK__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.PICK__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.PICK__TARGETS:
-				return targets != null;
-			case BPELPackage.PICK__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PICK__CREATE_INSTANCE:
 				return isSetCreateInstance();
 			case BPELPackage.PICK__MESSAGES:
@@ -368,7 +275,7 @@
 			case BPELPackage.PICK__ALARM:
 				return alarm != null && !alarm.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/ExitImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExitImpl.java,v
retrieving revision 1.4
diff -u -r1.4 ExitImpl.java
--- src/org/eclipse/bpel/model/impl/ExitImpl.java	9 Feb 2007 09:13:42 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/ExitImpl.java	24 May 2007 13:06:28 -0000
@@ -45,155 +45,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getExit();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.EXIT__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.EXIT__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.EXIT__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.EXIT__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXIT__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.EXIT__ELEMENT:
-				return getElement();
-			case BPELPackage.EXIT__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.EXIT__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.EXIT__NAME:
-				return getName();
-			case BPELPackage.EXIT__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.EXIT__TARGETS:
-				return getTargets();
-			case BPELPackage.EXIT__SOURCES:
-				return getSources();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXIT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.EXIT__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.EXIT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.EXIT__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.EXIT__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.EXIT__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.EXIT__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.EXIT__SOURCES:
-				setSources((Sources)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXIT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXIT__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXIT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.EXIT__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.EXIT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.EXIT__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.EXIT__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.EXIT__SOURCES:
-				setSources((Sources)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXIT__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.EXIT__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.EXIT__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.EXIT__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.EXIT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.EXIT__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.EXIT__TARGETS:
-				return targets != null;
-			case BPELPackage.EXIT__SOURCES:
-				return sources != null;
-		}
-		return eDynamicIsSet(eFeature);
+		return BPELPackage.Literals.EXIT;
 	}
 
 } //ExitImpl
Index: src/org/eclipse/bpel/model/impl/ExpressionImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExpressionImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ExpressionImpl.java
--- src/org/eclipse/bpel/model/impl/ExpressionImpl.java	19 Jan 2006 21:08:47 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/ExpressionImpl.java	24 May 2007 13:06:28 -0000
@@ -88,7 +88,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean expressionLanguageESet = false;
+	protected boolean expressionLanguageESet;
 
 	/**
 	 * The default value of the '{@link #getOpaque() <em>Opaque</em>}' attribute.
@@ -117,7 +117,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean opaqueESet = false;
+	protected boolean opaqueESet;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -134,7 +134,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getExpression();
+		return BPELPackage.Literals.EXPRESSION;
 	}
 
 	/**
@@ -255,16 +255,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXPRESSION__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.EXPRESSION__ELEMENT:
-				return getElement();
-			case BPELPackage.EXPRESSION__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case BPELPackage.EXPRESSION__ELEMENT_TYPE:
-				return getElementType();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.EXPRESSION__BODY:
 				return getBody();
 			case BPELPackage.EXPRESSION__EXPRESSION_LANGUAGE:
@@ -272,7 +264,7 @@
 			case BPELPackage.EXPRESSION__OPAQUE:
 				return getOpaque();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -280,22 +272,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXPRESSION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.EXPRESSION__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.EXPRESSION__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case BPELPackage.EXPRESSION__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.EXPRESSION__BODY:
-				setBody((Object)newValue);
+				setBody(newValue);
 				return;
 			case BPELPackage.EXPRESSION__EXPRESSION_LANGUAGE:
 				setExpressionLanguage((String)newValue);
@@ -304,7 +284,7 @@
 				setOpaque((Boolean)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -312,20 +292,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXPRESSION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXPRESSION__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXPRESSION__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case BPELPackage.EXPRESSION__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EXPRESSION__BODY:
 				setBody(BODY_EDEFAULT);
 				return;
@@ -336,7 +304,7 @@
 				unsetOpaque();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -344,16 +312,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXPRESSION__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.EXPRESSION__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.EXPRESSION__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case BPELPackage.EXPRESSION__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EXPRESSION__BODY:
 				return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT.equals(body);
 			case BPELPackage.EXPRESSION__EXPRESSION_LANGUAGE:
@@ -361,7 +321,7 @@
 			case BPELPackage.EXPRESSION__OPAQUE:
 				return isSetOpaque();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/UnknownExtensibilityAttributeImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/UnknownExtensibilityAttributeImpl.java,v
retrieving revision 1.2
diff -u -r1.2 UnknownExtensibilityAttributeImpl.java
--- src/org/eclipse/bpel/model/impl/UnknownExtensibilityAttributeImpl.java	13 Dec 2006 16:17:31 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/UnknownExtensibilityAttributeImpl.java	24 May 2007 13:06:31 -0000
@@ -53,119 +53,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getUnknownExtensibilityAttribute();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__CHILDREN:
-					return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__ELEMENT:
-				return getElement();
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__ELEMENT_TYPE:
-				return getElementType();
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__CHILDREN:
-				return getChildren();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__CHILDREN:
-				getChildren().clear();
-				getChildren().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__CHILDREN:
-				getChildren().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case BPELPackage.UNKNOWN_EXTENSIBILITY_ATTRIBUTE__CHILDREN:
-				return children != null && !children.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
+		return BPELPackage.Literals.UNKNOWN_EXTENSIBILITY_ATTRIBUTE;
 	}
 
 } //UnknownExtensibilityAttributeImpl
Index: src/org/eclipse/bpel/model/impl/EventHandlerImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EventHandlerImpl.java,v
retrieving revision 1.2
diff -u -r1.2 EventHandlerImpl.java
--- src/org/eclipse/bpel/model/impl/EventHandlerImpl.java	19 Jan 2006 21:08:47 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/EventHandlerImpl.java	24 May 2007 13:06:28 -0000
@@ -53,7 +53,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList alarm = null;
+	protected EList alarm;
 
 	/**
 	 * The cached value of the '{@link #getEvents() <em>Events</em>}' containment reference list.
@@ -63,7 +63,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList events = null;
+	protected EList events;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -80,7 +80,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getEventHandler();
+		return BPELPackage.Literals.EVENT_HANDLER;
 	}
 
 	/**
@@ -112,22 +112,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.EVENT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.EVENT_HANDLER__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.EVENT_HANDLER__ALARM:
-					return ((InternalEList)getAlarm()).basicRemove(otherEnd, msgs);
-				case BPELPackage.EVENT_HANDLER__EVENTS:
-					return ((InternalEList)getEvents()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.EVENT_HANDLER__ALARM:
+				return ((InternalEList)getAlarm()).basicRemove(otherEnd, msgs);
+			case BPELPackage.EVENT_HANDLER__EVENTS:
+				return ((InternalEList)getEvents()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -135,22 +127,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EVENT_HANDLER__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.EVENT_HANDLER__ELEMENT:
-				return getElement();
-			case BPELPackage.EVENT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.EVENT_HANDLER__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.EVENT_HANDLER__ALARM:
 				return getAlarm();
 			case BPELPackage.EVENT_HANDLER__EVENTS:
 				return getEvents();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -158,21 +142,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EVENT_HANDLER__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.EVENT_HANDLER__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.EVENT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.EVENT_HANDLER__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.EVENT_HANDLER__ALARM:
 				getAlarm().clear();
 				getAlarm().addAll((Collection)newValue);
@@ -182,7 +153,7 @@
 				getEvents().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -190,20 +161,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EVENT_HANDLER__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EVENT_HANDLER__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EVENT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.EVENT_HANDLER__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EVENT_HANDLER__ALARM:
 				getAlarm().clear();
 				return;
@@ -211,7 +170,7 @@
 				getEvents().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -219,22 +178,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EVENT_HANDLER__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.EVENT_HANDLER__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.EVENT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.EVENT_HANDLER__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EVENT_HANDLER__ALARM:
 				return alarm != null && !alarm.isEmpty();
 			case BPELPackage.EVENT_HANDLER__EVENTS:
 				return events != null && !events.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //EventHandlerImpl
Index: src/org/eclipse/bpel/model/impl/MessageExchangeImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/MessageExchangeImpl.java,v
retrieving revision 1.2
diff -u -r1.2 MessageExchangeImpl.java
--- src/org/eclipse/bpel/model/impl/MessageExchangeImpl.java	9 Feb 2007 09:13:42 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/MessageExchangeImpl.java	24 May 2007 13:06:29 -0000
@@ -69,7 +69,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getMessageExchange();
+		return BPELPackage.Literals.MESSAGE_EXCHANGE;
 	}
 
 	/**
@@ -98,39 +98,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.MESSAGE_EXCHANGE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.MESSAGE_EXCHANGE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.MESSAGE_EXCHANGE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.MESSAGE_EXCHANGE__ELEMENT:
-				return getElement();
-			case BPELPackage.MESSAGE_EXCHANGE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.MESSAGE_EXCHANGE__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.MESSAGE_EXCHANGE__NAME:
 				return getName();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -138,26 +111,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.MESSAGE_EXCHANGE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.MESSAGE_EXCHANGE__NAME:
 				setName((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -165,25 +125,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.MESSAGE_EXCHANGE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.MESSAGE_EXCHANGE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.MESSAGE_EXCHANGE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.MESSAGE_EXCHANGE__NAME:
 				setName(NAME_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -191,20 +139,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.MESSAGE_EXCHANGE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.MESSAGE_EXCHANGE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.MESSAGE_EXCHANGE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.MESSAGE_EXCHANGE__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.MESSAGE_EXCHANGE__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/OnAlarmImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnAlarmImpl.java,v
retrieving revision 1.2
diff -u -r1.2 OnAlarmImpl.java
--- src/org/eclipse/bpel/model/impl/OnAlarmImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/OnAlarmImpl.java	24 May 2007 13:06:29 -0000
@@ -55,7 +55,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * The cached value of the '{@link #getFor() <em>For</em>}' containment reference.
@@ -65,7 +65,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Expression for_ = null;
+	protected Expression for_;
 
 	/**
 	 * The cached value of the '{@link #getUntil() <em>Until</em>}' containment reference.
@@ -75,7 +75,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Expression until = null;
+	protected Expression until;
 
 	/**
 	 * The cached value of the '{@link #getRepeatEvery() <em>Repeat Every</em>}' containment reference.
@@ -85,7 +85,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Expression repeatEvery = null;
+	protected Expression repeatEvery;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -102,7 +102,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getOnAlarm();
+		return BPELPackage.Literals.ON_ALARM;
 	}
 
 	/**
@@ -282,26 +282,18 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.ON_ALARM__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.ON_ALARM__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.ON_ALARM__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				case BPELPackage.ON_ALARM__FOR:
-					return basicSetFor(null, msgs);
-				case BPELPackage.ON_ALARM__UNTIL:
-					return basicSetUntil(null, msgs);
-				case BPELPackage.ON_ALARM__REPEAT_EVERY:
-					return basicSetRepeatEvery(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.ON_ALARM__ACTIVITY:
+				return basicSetActivity(null, msgs);
+			case BPELPackage.ON_ALARM__FOR:
+				return basicSetFor(null, msgs);
+			case BPELPackage.ON_ALARM__UNTIL:
+				return basicSetUntil(null, msgs);
+			case BPELPackage.ON_ALARM__REPEAT_EVERY:
+				return basicSetRepeatEvery(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -309,16 +301,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_ALARM__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.ON_ALARM__ELEMENT:
-				return getElement();
-			case BPELPackage.ON_ALARM__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.ON_ALARM__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.ON_ALARM__ACTIVITY:
 				return getActivity();
 			case BPELPackage.ON_ALARM__FOR:
@@ -328,7 +312,7 @@
 			case BPELPackage.ON_ALARM__REPEAT_EVERY:
 				return getRepeatEvery();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -336,21 +320,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_ALARM__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.ON_ALARM__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.ON_ALARM__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.ON_ALARM__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.ON_ALARM__ACTIVITY:
 				setActivity((Activity)newValue);
 				return;
@@ -364,7 +335,7 @@
 				setRepeatEvery((Expression)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -372,20 +343,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_ALARM__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ON_ALARM__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ON_ALARM__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.ON_ALARM__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ON_ALARM__ACTIVITY:
 				setActivity((Activity)null);
 				return;
@@ -399,7 +358,7 @@
 				setRepeatEvery((Expression)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -407,16 +366,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ON_ALARM__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.ON_ALARM__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.ON_ALARM__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.ON_ALARM__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ON_ALARM__ACTIVITY:
 				return activity != null;
 			case BPELPackage.ON_ALARM__FOR:
@@ -426,7 +377,7 @@
 			case BPELPackage.ON_ALARM__REPEAT_EVERY:
 				return repeatEvery != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //OnAlarmImpl
Index: src/org/eclipse/bpel/model/impl/PartnerActivityImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerActivityImpl.java,v
retrieving revision 1.4
diff -u -r1.4 PartnerActivityImpl.java
--- src/org/eclipse/bpel/model/impl/PartnerActivityImpl.java	9 Feb 2007 09:13:42 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/PartnerActivityImpl.java	24 May 2007 13:06:29 -0000
@@ -65,7 +65,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PartnerLink partnerLink = null;
+	protected PartnerLink partnerLink;
 
 	/**
 	 * The cached value of the '{@link #getCorrelations() <em>Correlations</em>}' containment reference.
@@ -75,7 +75,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Correlations correlations = null;
+	protected Correlations correlations;
 
 	/**
 	 * The cached value of the '{@link #getPortType() <em>Port Type</em>}' reference.
@@ -85,7 +85,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PortType portType = null;
+	protected PortType portType;
 
 	/**
 	 * The cached value of the '{@link #getOperation() <em>Operation</em>}' reference.
@@ -95,7 +95,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Operation operation = null;
+	protected Operation operation;
 
     /**
      * The deserialized value of the operation name.
@@ -118,7 +118,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getPartnerActivity();
+		return BPELPackage.Literals.PARTNER_ACTIVITY;
 	}
 
 	/**
@@ -128,8 +128,8 @@
 	 */
 	public PartnerLink getPartnerLink() {
 		if (partnerLink != null && partnerLink.eIsProxy()) {
-			PartnerLink oldPartnerLink = partnerLink;
-			partnerLink = (PartnerLink)eResolveProxy((InternalEObject)partnerLink);
+			InternalEObject oldPartnerLink = (InternalEObject)partnerLink;
+			partnerLink = (PartnerLink)eResolveProxy(oldPartnerLink);
 			if (partnerLink != oldPartnerLink) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.PARTNER_ACTIVITY__PARTNER_LINK, oldPartnerLink, partnerLink));
@@ -236,8 +236,8 @@
 	 */
 	public PortType getPortTypeGen() {
 		if (portType != null && portType.eIsProxy()) {
-			PortType oldPortType = portType;
-			portType = (PortType)eResolveProxy((InternalEObject)portType);
+			InternalEObject oldPortType = (InternalEObject)portType;
+			portType = (PortType)eResolveProxy(oldPortType);
 			if (portType != oldPortType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.PARTNER_ACTIVITY__PORT_TYPE, oldPortType, portType));
@@ -293,8 +293,8 @@
 	 */
 	public Operation getOperationGen() {
 		if (operation != null && operation.eIsProxy()) {
-			Operation oldOperation = operation;
-			operation = (Operation)eResolveProxy((InternalEObject)operation);
+			InternalEObject oldOperation = (InternalEObject)operation;
+			operation = (Operation)eResolveProxy(oldOperation);
 			if (operation != oldOperation) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.PARTNER_ACTIVITY__OPERATION, oldOperation, operation));
@@ -329,24 +329,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.PARTNER_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.PARTNER_ACTIVITY__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.PARTNER_ACTIVITY__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.PARTNER_ACTIVITY__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.PARTNER_ACTIVITY__CORRELATIONS:
-					return basicSetCorrelations(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.PARTNER_ACTIVITY__CORRELATIONS:
+				return basicSetCorrelations(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -354,24 +342,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_ACTIVITY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.PARTNER_ACTIVITY__ELEMENT:
-				return getElement();
-			case BPELPackage.PARTNER_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.PARTNER_ACTIVITY__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.PARTNER_ACTIVITY__NAME:
-				return getName();
-			case BPELPackage.PARTNER_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.PARTNER_ACTIVITY__TARGETS:
-				return getTargets();
-			case BPELPackage.PARTNER_ACTIVITY__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_ACTIVITY__PARTNER_LINK:
 				if (resolve) return getPartnerLink();
 				return basicGetPartnerLink();
@@ -384,7 +356,7 @@
 				if (resolve) return getOperation();
 				return basicGetOperation();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -392,33 +364,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_ACTIVITY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_ACTIVITY__PARTNER_LINK:
 				setPartnerLink((PartnerLink)newValue);
 				return;
@@ -432,7 +379,7 @@
 				setOperation((Operation)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -440,32 +387,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_ACTIVITY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.PARTNER_ACTIVITY__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_ACTIVITY__PARTNER_LINK:
 				setPartnerLink((PartnerLink)null);
 				return;
@@ -479,7 +402,7 @@
 				setOperation((Operation)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -487,24 +410,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_ACTIVITY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.PARTNER_ACTIVITY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.PARTNER_ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.PARTNER_ACTIVITY__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.PARTNER_ACTIVITY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.PARTNER_ACTIVITY__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.PARTNER_ACTIVITY__TARGETS:
-				return targets != null;
-			case BPELPackage.PARTNER_ACTIVITY__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_ACTIVITY__PARTNER_LINK:
 				return partnerLink != null;
 			case BPELPackage.PARTNER_ACTIVITY__CORRELATIONS:
@@ -514,10 +421,10 @@
 			case BPELPackage.PARTNER_ACTIVITY__OPERATION:
 				return operation != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
-    /**
+	/**
      * Set the deserialized value of the operation name.
      * @customized
      */
Index: src/org/eclipse/bpel/model/impl/WaitImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WaitImpl.java,v
retrieving revision 1.2
diff -u -r1.2 WaitImpl.java
--- src/org/eclipse/bpel/model/impl/WaitImpl.java	19 Jan 2006 21:08:47 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/WaitImpl.java	24 May 2007 13:06:31 -0000
@@ -54,7 +54,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Expression for_ = null;
+	protected Expression for_;
 
 	/**
 	 * The cached value of the '{@link #getUntil() <em>Until</em>}' containment reference.
@@ -64,7 +64,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Expression until = null;
+	protected Expression until;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -81,7 +81,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getWait();
+		return BPELPackage.Literals.WAIT;
 	}
 
 	/**
@@ -175,26 +175,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.WAIT__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.WAIT__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.WAIT__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.WAIT__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.WAIT__FOR:
-					return basicSetFor(null, msgs);
-				case BPELPackage.WAIT__UNTIL:
-					return basicSetUntil(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.WAIT__FOR:
+				return basicSetFor(null, msgs);
+			case BPELPackage.WAIT__UNTIL:
+				return basicSetUntil(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -202,30 +190,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.WAIT__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.WAIT__ELEMENT:
-				return getElement();
-			case BPELPackage.WAIT__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.WAIT__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.WAIT__NAME:
-				return getName();
-			case BPELPackage.WAIT__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.WAIT__TARGETS:
-				return getTargets();
-			case BPELPackage.WAIT__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.WAIT__FOR:
 				return getFor();
 			case BPELPackage.WAIT__UNTIL:
 				return getUntil();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -233,33 +205,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.WAIT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.WAIT__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.WAIT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.WAIT__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.WAIT__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.WAIT__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.WAIT__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.WAIT__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.WAIT__FOR:
 				setFor((Expression)newValue);
 				return;
@@ -267,7 +214,7 @@
 				setUntil((Expression)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -275,32 +222,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.WAIT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.WAIT__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.WAIT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.WAIT__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.WAIT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.WAIT__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.WAIT__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.WAIT__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.WAIT__FOR:
 				setFor((Expression)null);
 				return;
@@ -308,7 +231,7 @@
 				setUntil((Expression)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -316,30 +239,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.WAIT__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.WAIT__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.WAIT__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.WAIT__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.WAIT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.WAIT__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.WAIT__TARGETS:
-				return targets != null;
-			case BPELPackage.WAIT__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.WAIT__FOR:
 				return for_ != null;
 			case BPELPackage.WAIT__UNTIL:
 				return until != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //WaitImpl
Index: src/org/eclipse/bpel/model/impl/ConditionImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ConditionImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ConditionImpl.java
--- src/org/eclipse/bpel/model/impl/ConditionImpl.java	9 Feb 2007 09:13:42 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/ConditionImpl.java	24 May 2007 13:06:28 -0000
@@ -47,121 +47,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCondition();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CONDITION__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.CONDITION__ELEMENT:
-				return getElement();
-			case BPELPackage.CONDITION__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case BPELPackage.CONDITION__ELEMENT_TYPE:
-				return getElementType();
-			case BPELPackage.CONDITION__BODY:
-				return getBody();
-			case BPELPackage.CONDITION__EXPRESSION_LANGUAGE:
-				return getExpressionLanguage();
-			case BPELPackage.CONDITION__OPAQUE:
-				return getOpaque();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CONDITION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.CONDITION__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.CONDITION__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case BPELPackage.CONDITION__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case BPELPackage.CONDITION__BODY:
-				setBody((Object)newValue);
-				return;
-			case BPELPackage.CONDITION__EXPRESSION_LANGUAGE:
-				setExpressionLanguage((String)newValue);
-				return;
-			case BPELPackage.CONDITION__OPAQUE:
-				setOpaque((Boolean)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CONDITION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CONDITION__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CONDITION__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case BPELPackage.CONDITION__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case BPELPackage.CONDITION__BODY:
-				setBody(BODY_EDEFAULT);
-				return;
-			case BPELPackage.CONDITION__EXPRESSION_LANGUAGE:
-				unsetExpressionLanguage();
-				return;
-			case BPELPackage.CONDITION__OPAQUE:
-				unsetOpaque();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CONDITION__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.CONDITION__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.CONDITION__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case BPELPackage.CONDITION__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case BPELPackage.CONDITION__BODY:
-				return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT.equals(body);
-			case BPELPackage.CONDITION__EXPRESSION_LANGUAGE:
-				return isSetExpressionLanguage();
-			case BPELPackage.CONDITION__OPAQUE:
-				return isSetOpaque();
-		}
-		return eDynamicIsSet(eFeature);
+		return BPELPackage.Literals.CONDITION;
 	}
 
 } //ConditionImpl
Index: src/org/eclipse/bpel/model/impl/CorrelationSetImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetImpl.java,v
retrieving revision 1.4
diff -u -r1.4 CorrelationSetImpl.java
--- src/org/eclipse/bpel/model/impl/CorrelationSetImpl.java	9 Feb 2007 09:13:42 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/CorrelationSetImpl.java	24 May 2007 13:06:28 -0000
@@ -74,7 +74,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList properties = null;
+	protected EList properties;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -91,7 +91,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCorrelationSet();
+		return BPELPackage.Literals.CORRELATION_SET;
 	}
 
 	/**
@@ -132,41 +132,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.CORRELATION_SET__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.CORRELATION_SET__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION_SET__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.CORRELATION_SET__ELEMENT:
-				return getElement();
-			case BPELPackage.CORRELATION_SET__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.CORRELATION_SET__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION_SET__NAME:
 				return getName();
 			case BPELPackage.CORRELATION_SET__PROPERTIES:
 				return getProperties();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -174,21 +147,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION_SET__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.CORRELATION_SET__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.CORRELATION_SET__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.CORRELATION_SET__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION_SET__NAME:
 				setName((String)newValue);
 				return;
@@ -197,7 +157,7 @@
 				getProperties().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -205,20 +165,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION_SET__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CORRELATION_SET__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CORRELATION_SET__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.CORRELATION_SET__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION_SET__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -226,7 +174,7 @@
 				getProperties().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -234,22 +182,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION_SET__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.CORRELATION_SET__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.CORRELATION_SET__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.CORRELATION_SET__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION_SET__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case BPELPackage.CORRELATION_SET__PROPERTIES:
 				return properties != null && !properties.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/CopyImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CopyImpl.java,v
retrieving revision 1.4
diff -u -r1.4 CopyImpl.java
--- src/org/eclipse/bpel/model/impl/CopyImpl.java	13 Dec 2006 16:17:31 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/CopyImpl.java	24 May 2007 13:06:28 -0000
@@ -55,7 +55,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected To to = null;
+	protected To to;
 
 	/**
 	 * The cached value of the '{@link #getFrom() <em>From</em>}' containment reference.
@@ -65,7 +65,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected From from = null;
+	protected From from;
 
 	/**
 	 * The default value of the '{@link #getKeepSrcElementName() <em>Keep Src Element Name</em>}' attribute.
@@ -94,7 +94,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean keepSrcElementNameESet = false;
+	protected boolean keepSrcElementNameESet;
 
 	/**
 	 * The default value of the '{@link #getIgnoreMissingFromData() <em>Ignore Missing From Data</em>}' attribute.
@@ -123,7 +123,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean ignoreMissingFromDataESet = false;
+	protected boolean ignoreMissingFromDataESet;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -140,7 +140,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCopy();
+		return BPELPackage.Literals.COPY;
 	}
 
 	/**
@@ -326,22 +326,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.COPY__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.COPY__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.COPY__TO:
-					return basicSetTo(null, msgs);
-				case BPELPackage.COPY__FROM:
-					return basicSetFrom(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.COPY__TO:
+				return basicSetTo(null, msgs);
+			case BPELPackage.COPY__FROM:
+				return basicSetFrom(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -349,16 +341,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COPY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.COPY__ELEMENT:
-				return getElement();
-			case BPELPackage.COPY__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.COPY__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.COPY__TO:
 				return getTo();
 			case BPELPackage.COPY__FROM:
@@ -368,7 +352,7 @@
 			case BPELPackage.COPY__IGNORE_MISSING_FROM_DATA:
 				return getIgnoreMissingFromData();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -376,21 +360,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COPY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.COPY__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.COPY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.COPY__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.COPY__TO:
 				setTo((To)newValue);
 				return;
@@ -404,7 +375,7 @@
 				setIgnoreMissingFromData((Boolean)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -412,20 +383,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COPY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COPY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COPY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.COPY__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.COPY__TO:
 				setTo((To)null);
 				return;
@@ -439,7 +398,7 @@
 				unsetIgnoreMissingFromData();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -447,16 +406,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COPY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.COPY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.COPY__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.COPY__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.COPY__TO:
 				return to != null;
 			case BPELPackage.COPY__FROM:
@@ -466,7 +417,7 @@
 			case BPELPackage.COPY__IGNORE_MISSING_FROM_DATA:
 				return isSetIgnoreMissingFromData();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/ReplyImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReplyImpl.java,v
retrieving revision 1.5
diff -u -r1.5 ReplyImpl.java
--- src/org/eclipse/bpel/model/impl/ReplyImpl.java	9 Feb 2007 09:13:42 -0000	1.5
+++ src/org/eclipse/bpel/model/impl/ReplyImpl.java	24 May 2007 13:06:30 -0000
@@ -84,7 +84,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable variable = null;
+	protected Variable variable;
 
 	/**
 	 * The cached value of the '{@link #getToPart() <em>To Part</em>}' reference list.
@@ -94,7 +94,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList toPart = null;
+	protected EList toPart;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -111,7 +111,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getReply();
+		return BPELPackage.Literals.REPLY;
 	}
 
 	/**
@@ -142,8 +142,8 @@
 	 */
 	public Variable getVariable() {
 		if (variable != null && variable.eIsProxy()) {
-			Variable oldVariable = variable;
-			variable = (Variable)eResolveProxy((InternalEObject)variable);
+			InternalEObject oldVariable = (InternalEObject)variable;
+			variable = (Variable)eResolveProxy(oldVariable);
 			if (variable != oldVariable) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.REPLY__VARIABLE, oldVariable, variable));
@@ -190,60 +190,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.REPLY__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.REPLY__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.REPLY__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.REPLY__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.REPLY__CORRELATIONS:
-					return basicSetCorrelations(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.REPLY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.REPLY__ELEMENT:
-				return getElement();
-			case BPELPackage.REPLY__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.REPLY__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.REPLY__NAME:
-				return getName();
-			case BPELPackage.REPLY__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.REPLY__TARGETS:
-				return getTargets();
-			case BPELPackage.REPLY__SOURCES:
-				return getSources();
-			case BPELPackage.REPLY__PARTNER_LINK:
-				if (resolve) return getPartnerLink();
-				return basicGetPartnerLink();
-			case BPELPackage.REPLY__CORRELATIONS:
-				return getCorrelations();
-			case BPELPackage.REPLY__PORT_TYPE:
-				if (resolve) return getPortType();
-				return basicGetPortType();
-			case BPELPackage.REPLY__OPERATION:
-				if (resolve) return getOperation();
-				return basicGetOperation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.REPLY__FAULT_NAME:
 				return getFaultName();
 			case BPELPackage.REPLY__VARIABLE:
@@ -252,7 +200,7 @@
 			case BPELPackage.REPLY__TO_PART:
 				return getToPart();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -260,45 +208,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.REPLY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.REPLY__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.REPLY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.REPLY__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.REPLY__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.REPLY__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.REPLY__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.REPLY__SOURCES:
-				setSources((Sources)newValue);
-				return;
-			case BPELPackage.REPLY__PARTNER_LINK:
-				setPartnerLink((PartnerLink)newValue);
-				return;
-			case BPELPackage.REPLY__CORRELATIONS:
-				setCorrelations((Correlations)newValue);
-				return;
-			case BPELPackage.REPLY__PORT_TYPE:
-				setPortType((PortType)newValue);
-				return;
-			case BPELPackage.REPLY__OPERATION:
-				setOperation((Operation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.REPLY__FAULT_NAME:
 				setFaultName((QName)newValue);
 				return;
@@ -310,7 +221,7 @@
 				getToPart().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -318,44 +229,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.REPLY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.REPLY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.REPLY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.REPLY__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.REPLY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.REPLY__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.REPLY__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.REPLY__SOURCES:
-				setSources((Sources)null);
-				return;
-			case BPELPackage.REPLY__PARTNER_LINK:
-				setPartnerLink((PartnerLink)null);
-				return;
-			case BPELPackage.REPLY__CORRELATIONS:
-				setCorrelations((Correlations)null);
-				return;
-			case BPELPackage.REPLY__PORT_TYPE:
-				setPortType((PortType)null);
-				return;
-			case BPELPackage.REPLY__OPERATION:
-				setOperation((Operation)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.REPLY__FAULT_NAME:
 				setFaultName(FAULT_NAME_EDEFAULT);
 				return;
@@ -366,7 +241,7 @@
 				getToPart().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -374,32 +249,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.REPLY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.REPLY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.REPLY__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.REPLY__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.REPLY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.REPLY__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.REPLY__TARGETS:
-				return targets != null;
-			case BPELPackage.REPLY__SOURCES:
-				return sources != null;
-			case BPELPackage.REPLY__PARTNER_LINK:
-				return partnerLink != null;
-			case BPELPackage.REPLY__CORRELATIONS:
-				return correlations != null;
-			case BPELPackage.REPLY__PORT_TYPE:
-				return portType != null;
-			case BPELPackage.REPLY__OPERATION:
-				return operation != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.REPLY__FAULT_NAME:
 				return FAULT_NAME_EDEFAULT == null ? faultName != null : !FAULT_NAME_EDEFAULT.equals(faultName);
 			case BPELPackage.REPLY__VARIABLE:
@@ -407,7 +258,7 @@
 			case BPELPackage.REPLY__TO_PART:
 				return toPart != null && !toPart.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/DocumentationImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/DocumentationImpl.java,v
retrieving revision 1.1
diff -u -r1.1 DocumentationImpl.java
--- src/org/eclipse/bpel/model/impl/DocumentationImpl.java	19 Jan 2006 21:08:48 -0000	1.1
+++ src/org/eclipse/bpel/model/impl/DocumentationImpl.java	24 May 2007 13:06:28 -0000
@@ -105,7 +105,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getDocumentation();
+		return BPELPackage.Literals.DOCUMENTATION;
 	}
 
 	/**
@@ -176,8 +176,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.DOCUMENTATION__LANG:
 				return getLang();
 			case BPELPackage.DOCUMENTATION__SOURCE:
@@ -185,7 +185,7 @@
 			case BPELPackage.DOCUMENTATION__VALUE:
 				return getValue();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -193,8 +193,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.DOCUMENTATION__LANG:
 				setLang((String)newValue);
 				return;
@@ -205,7 +205,7 @@
 				setValue((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -213,8 +213,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.DOCUMENTATION__LANG:
 				setLang(LANG_EDEFAULT);
 				return;
@@ -225,7 +225,7 @@
 				setValue(VALUE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -233,8 +233,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.DOCUMENTATION__LANG:
 				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
 			case BPELPackage.DOCUMENTATION__SOURCE:
@@ -242,7 +242,7 @@
 			case BPELPackage.DOCUMENTATION__VALUE:
 				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/WhileImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WhileImpl.java,v
retrieving revision 1.2
diff -u -r1.2 WhileImpl.java
--- src/org/eclipse/bpel/model/impl/WhileImpl.java	19 Jan 2006 21:08:47 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/WhileImpl.java	24 May 2007 13:06:31 -0000
@@ -55,7 +55,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
@@ -65,7 +65,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Condition condition = null;
+	protected Condition condition;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -82,7 +82,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getWhile();
+		return BPELPackage.Literals.WHILE;
 	}
 
 	/**
@@ -176,26 +176,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.WHILE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.WHILE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.WHILE__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.WHILE__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.WHILE__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				case BPELPackage.WHILE__CONDITION:
-					return basicSetCondition(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.WHILE__ACTIVITY:
+				return basicSetActivity(null, msgs);
+			case BPELPackage.WHILE__CONDITION:
+				return basicSetCondition(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -203,30 +191,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.WHILE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.WHILE__ELEMENT:
-				return getElement();
-			case BPELPackage.WHILE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.WHILE__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.WHILE__NAME:
-				return getName();
-			case BPELPackage.WHILE__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.WHILE__TARGETS:
-				return getTargets();
-			case BPELPackage.WHILE__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.WHILE__ACTIVITY:
 				return getActivity();
 			case BPELPackage.WHILE__CONDITION:
 				return getCondition();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -234,33 +206,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.WHILE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.WHILE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.WHILE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.WHILE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.WHILE__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.WHILE__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.WHILE__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.WHILE__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.WHILE__ACTIVITY:
 				setActivity((Activity)newValue);
 				return;
@@ -268,7 +215,7 @@
 				setCondition((Condition)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -276,32 +223,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.WHILE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.WHILE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.WHILE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.WHILE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.WHILE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.WHILE__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.WHILE__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.WHILE__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.WHILE__ACTIVITY:
 				setActivity((Activity)null);
 				return;
@@ -309,7 +232,7 @@
 				setCondition((Condition)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -317,30 +240,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.WHILE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.WHILE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.WHILE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.WHILE__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.WHILE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.WHILE__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.WHILE__TARGETS:
-				return targets != null;
-			case BPELPackage.WHILE__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.WHILE__ACTIVITY:
 				return activity != null;
 			case BPELPackage.WHILE__CONDITION:
 				return condition != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //WhileImpl
Index: src/org/eclipse/bpel/model/impl/ExtensionImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionImpl.java,v
retrieving revision 1.5
diff -u -r1.5 ExtensionImpl.java
--- src/org/eclipse/bpel/model/impl/ExtensionImpl.java	9 Feb 2007 09:13:42 -0000	1.5
+++ src/org/eclipse/bpel/model/impl/ExtensionImpl.java	24 May 2007 13:06:28 -0000
@@ -90,7 +90,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean mustUnderstandESet = false;
+	protected boolean mustUnderstandESet;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -107,7 +107,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getExtension();
+		return BPELPackage.Literals.EXTENSION;
 	}
 
 	/**
@@ -182,41 +182,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.EXTENSION__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.EXTENSION__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSION__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.EXTENSION__ELEMENT:
-				return getElement();
-			case BPELPackage.EXTENSION__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.EXTENSION__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.EXTENSION__NAMESPACE:
 				return getNamespace();
 			case BPELPackage.EXTENSION__MUST_UNDERSTAND:
 				return getMustUnderstand();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -224,21 +197,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.EXTENSION__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.EXTENSION__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.EXTENSION__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.EXTENSION__NAMESPACE:
 				setNamespace((String)newValue);
 				return;
@@ -246,7 +206,7 @@
 				setMustUnderstand((Boolean)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -254,20 +214,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXTENSION__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXTENSION__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.EXTENSION__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EXTENSION__NAMESPACE:
 				setNamespace(NAMESPACE_EDEFAULT);
 				return;
@@ -275,7 +223,7 @@
 				unsetMustUnderstand();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -283,22 +231,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSION__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.EXTENSION__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.EXTENSION__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.EXTENSION__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EXTENSION__NAMESPACE:
 				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);
 			case BPELPackage.EXTENSION__MUST_UNDERSTAND:
 				return isSetMustUnderstand();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/FlowImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FlowImpl.java,v
retrieving revision 1.3
diff -u -r1.3 FlowImpl.java
--- src/org/eclipse/bpel/model/impl/FlowImpl.java	19 Jan 2006 21:08:47 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/FlowImpl.java	24 May 2007 13:06:28 -0000
@@ -59,7 +59,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList activities = null;
+	protected EList activities;
 
 	/**
 	 * The cached value of the '{@link #getLinks() <em>Links</em>}' containment reference.
@@ -69,7 +69,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Links links = null;
+	protected Links links;
 
 	/**
 	 * The cached value of the '{@link #getCompletionCondition() <em>Completion Condition</em>}' containment reference.
@@ -79,7 +79,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected CompletionCondition completionCondition = null;
+	protected CompletionCondition completionCondition;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -96,7 +96,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getFlow();
+		return BPELPackage.Literals.FLOW;
 	}
 
 	/**
@@ -202,28 +202,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.FLOW__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.FLOW__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.FLOW__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.FLOW__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.FLOW__ACTIVITIES:
-					return ((InternalEList)getActivities()).basicRemove(otherEnd, msgs);
-				case BPELPackage.FLOW__LINKS:
-					return basicSetLinks(null, msgs);
-				case BPELPackage.FLOW__COMPLETION_CONDITION:
-					return basicSetCompletionCondition(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.FLOW__ACTIVITIES:
+				return ((InternalEList)getActivities()).basicRemove(otherEnd, msgs);
+			case BPELPackage.FLOW__LINKS:
+				return basicSetLinks(null, msgs);
+			case BPELPackage.FLOW__COMPLETION_CONDITION:
+				return basicSetCompletionCondition(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -231,24 +219,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FLOW__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.FLOW__ELEMENT:
-				return getElement();
-			case BPELPackage.FLOW__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.FLOW__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.FLOW__NAME:
-				return getName();
-			case BPELPackage.FLOW__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.FLOW__TARGETS:
-				return getTargets();
-			case BPELPackage.FLOW__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.FLOW__ACTIVITIES:
 				return getActivities();
 			case BPELPackage.FLOW__LINKS:
@@ -256,7 +228,7 @@
 			case BPELPackage.FLOW__COMPLETION_CONDITION:
 				return getCompletionCondition();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -264,33 +236,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FLOW__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.FLOW__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.FLOW__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.FLOW__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.FLOW__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.FLOW__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.FLOW__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.FLOW__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.FLOW__ACTIVITIES:
 				getActivities().clear();
 				getActivities().addAll((Collection)newValue);
@@ -302,7 +249,7 @@
 				setCompletionCondition((CompletionCondition)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -310,32 +257,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FLOW__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FLOW__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FLOW__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.FLOW__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.FLOW__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.FLOW__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.FLOW__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.FLOW__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FLOW__ACTIVITIES:
 				getActivities().clear();
 				return;
@@ -346,7 +269,7 @@
 				setCompletionCondition((CompletionCondition)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -354,24 +277,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FLOW__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.FLOW__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.FLOW__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.FLOW__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.FLOW__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.FLOW__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.FLOW__TARGETS:
-				return targets != null;
-			case BPELPackage.FLOW__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FLOW__ACTIVITIES:
 				return activities != null && !activities.isEmpty();
 			case BPELPackage.FLOW__LINKS:
@@ -379,7 +286,7 @@
 			case BPELPackage.FLOW__COMPLETION_CONDITION:
 				return completionCondition != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //FlowImpl
Index: src/org/eclipse/bpel/model/impl/ExtensionsImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionsImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ExtensionsImpl.java
--- src/org/eclipse/bpel/model/impl/ExtensionsImpl.java	19 Jan 2006 21:08:48 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/ExtensionsImpl.java	24 May 2007 13:06:28 -0000
@@ -43,7 +43,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList children = null;
+	protected EList children;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -60,7 +60,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getExtensions();
+		return BPELPackage.Literals.EXTENSIONS;
 	}
 
 	/**
@@ -80,20 +80,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.EXTENSIONS__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.EXTENSIONS__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.EXTENSIONS__CHILDREN:
-					return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.EXTENSIONS__CHILDREN:
+				return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -101,20 +93,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSIONS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.EXTENSIONS__ELEMENT:
-				return getElement();
-			case BPELPackage.EXTENSIONS__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.EXTENSIONS__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.EXTENSIONS__CHILDREN:
 				return getChildren();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -122,27 +106,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSIONS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.EXTENSIONS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.EXTENSIONS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.EXTENSIONS__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.EXTENSIONS__CHILDREN:
 				getChildren().clear();
 				getChildren().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -150,25 +121,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSIONS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXTENSIONS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXTENSIONS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.EXTENSIONS__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EXTENSIONS__CHILDREN:
 				getChildren().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -176,20 +135,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSIONS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.EXTENSIONS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.EXTENSIONS__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.EXTENSIONS__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EXTENSIONS__CHILDREN:
 				return children != null && !children.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //ExtensionsImpl
Index: src/org/eclipse/bpel/model/impl/CompensationHandlerImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensationHandlerImpl.java,v
retrieving revision 1.2
diff -u -r1.2 CompensationHandlerImpl.java
--- src/org/eclipse/bpel/model/impl/CompensationHandlerImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/CompensationHandlerImpl.java	24 May 2007 13:06:28 -0000
@@ -51,7 +51,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCompensationHandler();
+		return BPELPackage.Literals.COMPENSATION_HANDLER;
 	}
 
 	/**
@@ -119,20 +119,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.COMPENSATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.COMPENSATION_HANDLER__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.COMPENSATION_HANDLER__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.COMPENSATION_HANDLER__ACTIVITY:
+				return basicSetActivity(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -140,20 +132,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATION_HANDLER__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.COMPENSATION_HANDLER__ELEMENT:
-				return getElement();
-			case BPELPackage.COMPENSATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.COMPENSATION_HANDLER__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.COMPENSATION_HANDLER__ACTIVITY:
 				return getActivity();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -161,26 +145,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATION_HANDLER__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.COMPENSATION_HANDLER__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.COMPENSATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.COMPENSATION_HANDLER__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.COMPENSATION_HANDLER__ACTIVITY:
 				setActivity((Activity)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -188,25 +159,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATION_HANDLER__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COMPENSATION_HANDLER__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COMPENSATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.COMPENSATION_HANDLER__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.COMPENSATION_HANDLER__ACTIVITY:
 				setActivity((Activity)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -214,20 +173,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATION_HANDLER__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.COMPENSATION_HANDLER__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.COMPENSATION_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.COMPENSATION_HANDLER__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.COMPENSATION_HANDLER__ACTIVITY:
 				return activity != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //CompensationHandlerImpl
Index: src/org/eclipse/bpel/model/impl/BranchesImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BranchesImpl.java,v
retrieving revision 1.2
diff -u -r1.2 BranchesImpl.java
--- src/org/eclipse/bpel/model/impl/BranchesImpl.java	19 Jan 2006 21:08:47 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/BranchesImpl.java	24 May 2007 13:06:27 -0000
@@ -57,7 +57,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean countCompletedBranchesOnlyESet = false;
+	protected boolean countCompletedBranchesOnlyESet;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -74,7 +74,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getBranches();
+		return BPELPackage.Literals.BRANCHES;
 	}
 
 	/**
@@ -128,26 +128,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.BRANCHES__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.BRANCHES__ELEMENT:
-				return getElement();
-			case BPELPackage.BRANCHES__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case BPELPackage.BRANCHES__ELEMENT_TYPE:
-				return getElementType();
-			case BPELPackage.BRANCHES__BODY:
-				return getBody();
-			case BPELPackage.BRANCHES__EXPRESSION_LANGUAGE:
-				return getExpressionLanguage();
-			case BPELPackage.BRANCHES__OPAQUE:
-				return getOpaque();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.BRANCHES__COUNT_COMPLETED_BRANCHES_ONLY:
 				return getCountCompletedBranchesOnly();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -155,34 +141,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.BRANCHES__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.BRANCHES__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.BRANCHES__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case BPELPackage.BRANCHES__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case BPELPackage.BRANCHES__BODY:
-				setBody((Object)newValue);
-				return;
-			case BPELPackage.BRANCHES__EXPRESSION_LANGUAGE:
-				setExpressionLanguage((String)newValue);
-				return;
-			case BPELPackage.BRANCHES__OPAQUE:
-				setOpaque((Boolean)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.BRANCHES__COUNT_COMPLETED_BRANCHES_ONLY:
 				setCountCompletedBranchesOnly((Boolean)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -190,34 +155,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.BRANCHES__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.BRANCHES__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.BRANCHES__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case BPELPackage.BRANCHES__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case BPELPackage.BRANCHES__BODY:
-				setBody(BODY_EDEFAULT);
-				return;
-			case BPELPackage.BRANCHES__EXPRESSION_LANGUAGE:
-				unsetExpressionLanguage();
-				return;
-			case BPELPackage.BRANCHES__OPAQUE:
-				unsetOpaque();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.BRANCHES__COUNT_COMPLETED_BRANCHES_ONLY:
 				unsetCountCompletedBranchesOnly();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -225,26 +169,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.BRANCHES__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.BRANCHES__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.BRANCHES__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case BPELPackage.BRANCHES__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case BPELPackage.BRANCHES__BODY:
-				return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT.equals(body);
-			case BPELPackage.BRANCHES__EXPRESSION_LANGUAGE:
-				return isSetExpressionLanguage();
-			case BPELPackage.BRANCHES__OPAQUE:
-				return isSetOpaque();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.BRANCHES__COUNT_COMPLETED_BRANCHES_ONLY:
 				return isSetCountCompletedBranchesOnly();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/VariableImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariableImpl.java,v
retrieving revision 1.7
diff -u -r1.7 VariableImpl.java
--- src/org/eclipse/bpel/model/impl/VariableImpl.java	20 Apr 2007 23:31:44 -0000	1.7
+++ src/org/eclipse/bpel/model/impl/VariableImpl.java	24 May 2007 13:06:31 -0000
@@ -86,7 +86,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Message messageType = null;
+	protected Message messageType;
 
 	/**
 	 * The cached value of the '{@link #getXSDElement() <em>XSD Element</em>}' reference.
@@ -95,7 +95,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected XSDElementDeclaration xsdElement = null;
+	protected XSDElementDeclaration xsdElement;
 
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
@@ -104,7 +104,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected XSDTypeDefinition type = null;
+	protected XSDTypeDefinition type;
 
 	/**
 	 * The cached value of the '{@link #getFrom() <em>From</em>}' reference.
@@ -113,7 +113,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected From from = null;
+	protected From from;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -128,7 +128,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getVariable();
+		return BPELPackage.Literals.VARIABLE;
 	}
 
 	/**
@@ -156,8 +156,8 @@
 	 */
 	public Message getMessageType() {
 		if (messageType != null && messageType.eIsProxy()) {
-			Message oldMessageType = messageType;
-			messageType = (Message)eResolveProxy((InternalEObject)messageType);
+			InternalEObject oldMessageType = (InternalEObject)messageType;
+			messageType = (Message)eResolveProxy(oldMessageType);
 			if (messageType != oldMessageType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.VARIABLE__MESSAGE_TYPE, oldMessageType, messageType));
@@ -191,8 +191,8 @@
 	 */
 	public XSDElementDeclaration getXSDElement() {
 		if (xsdElement != null && xsdElement.eIsProxy()) {
-			XSDElementDeclaration oldXSDElement = xsdElement;
-			xsdElement = (XSDElementDeclaration)eResolveProxy((InternalEObject)xsdElement);
+			InternalEObject oldXSDElement = (InternalEObject)xsdElement;
+			xsdElement = (XSDElementDeclaration)eResolveProxy(oldXSDElement);
 			if (xsdElement != oldXSDElement) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.VARIABLE__XSD_ELEMENT, oldXSDElement, xsdElement));
@@ -226,8 +226,8 @@
 	 */
 	public XSDTypeDefinition getType() {
 		if (type != null && type.eIsProxy()) {
-			XSDTypeDefinition oldType = type;
-			type = (XSDTypeDefinition)eResolveProxy((InternalEObject)type);
+			InternalEObject oldType = (InternalEObject)type;
+			type = (XSDTypeDefinition)eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.VARIABLE__TYPE, oldType, type));
@@ -261,8 +261,8 @@
 	 */
 	public From getFrom() {
 		if (from != null && from.eIsProxy()) {
-			From oldFrom = from;
-			from = (From)eResolveProxy((InternalEObject)from);
+			InternalEObject oldFrom = (InternalEObject)from;
+			from = (From)eResolveProxy(oldFrom);
 			if (from != oldFrom) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.VARIABLE__FROM, oldFrom, from));
@@ -291,37 +291,12 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.VARIABLE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.VARIABLE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VARIABLE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.VARIABLE__ELEMENT:
-				return getElement();
-			case BPELPackage.VARIABLE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.VARIABLE__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.VARIABLE__NAME:
 				return getName();
 			case BPELPackage.VARIABLE__MESSAGE_TYPE:
@@ -337,28 +312,16 @@
 				if (resolve) return getFrom();
 				return basicGetFrom();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VARIABLE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.VARIABLE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.VARIABLE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.VARIABLE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.VARIABLE__NAME:
 				setName((String)newValue);
 				return;
@@ -375,27 +338,16 @@
 				setFrom((From)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VARIABLE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.VARIABLE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.VARIABLE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.VARIABLE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.VARIABLE__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -412,23 +364,16 @@
 				setFrom((From)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VARIABLE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.VARIABLE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.VARIABLE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.VARIABLE__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.VARIABLE__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case BPELPackage.VARIABLE__MESSAGE_TYPE:
@@ -440,7 +385,7 @@
 			case BPELPackage.VARIABLE__FROM:
 				return from != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/PartnerLinksImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinksImpl.java,v
retrieving revision 1.2
diff -u -r1.2 PartnerLinksImpl.java
--- src/org/eclipse/bpel/model/impl/PartnerLinksImpl.java	19 Jan 2006 21:08:47 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/PartnerLinksImpl.java	24 May 2007 13:06:30 -0000
@@ -51,7 +51,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList children = null;
+	protected EList children;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getPartnerLinks();
+		return BPELPackage.Literals.PARTNER_LINKS;
 	}
 
 	/**
@@ -88,20 +88,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.PARTNER_LINKS__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.PARTNER_LINKS__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.PARTNER_LINKS__CHILDREN:
-					return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.PARTNER_LINKS__CHILDREN:
+				return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -109,20 +101,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_LINKS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.PARTNER_LINKS__ELEMENT:
-				return getElement();
-			case BPELPackage.PARTNER_LINKS__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.PARTNER_LINKS__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_LINKS__CHILDREN:
 				return getChildren();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -130,27 +114,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_LINKS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.PARTNER_LINKS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.PARTNER_LINKS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.PARTNER_LINKS__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_LINKS__CHILDREN:
 				getChildren().clear();
 				getChildren().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -158,25 +129,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_LINKS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PARTNER_LINKS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PARTNER_LINKS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.PARTNER_LINKS__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_LINKS__CHILDREN:
 				getChildren().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -184,20 +143,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_LINKS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.PARTNER_LINKS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.PARTNER_LINKS__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.PARTNER_LINKS__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_LINKS__CHILDREN:
 				return children != null && !children.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //PartnerLinksImpl
Index: src/org/eclipse/bpel/model/impl/ToImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ToImpl.java,v
retrieving revision 1.2
diff -u -r1.2 ToImpl.java
--- src/org/eclipse/bpel/model/impl/ToImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/ToImpl.java	24 May 2007 13:06:31 -0000
@@ -61,7 +61,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable variable = null;
+	protected Variable variable;
 
 	/**
 	 * The cached value of the '{@link #getPart() <em>Part</em>}' reference.
@@ -71,7 +71,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Part part = null;
+	protected Part part;
 
     /**
      * The deserialized value of the part name.
@@ -87,7 +87,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PartnerLink partnerLink = null;
+	protected PartnerLink partnerLink;
 
 	/**
 	 * The cached value of the '{@link #getProperty() <em>Property</em>}' reference.
@@ -97,7 +97,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Property property = null;
+	protected Property property;
 
 	/**
 	 * The cached value of the '{@link #getQuery() <em>Query</em>}' containment reference.
@@ -107,7 +107,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Query query = null;
+	protected Query query;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -124,7 +124,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getTo();
+		return BPELPackage.Literals.TO;
 	}
 
 	/**
@@ -134,8 +134,8 @@
 	 */
 	public Variable getVariable() {
 		if (variable != null && variable.eIsProxy()) {
-			Variable oldVariable = variable;
-			variable = (Variable)eResolveProxy((InternalEObject)variable);
+			InternalEObject oldVariable = (InternalEObject)variable;
+			variable = (Variable)eResolveProxy(oldVariable);
 			if (variable != oldVariable) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.TO__VARIABLE, oldVariable, variable));
@@ -191,8 +191,8 @@
 	 */
 	public Part getPartGen() {
 		if (part != null && part.eIsProxy()) {
-			Part oldPart = part;
-			part = (Part)eResolveProxy((InternalEObject)part);
+			InternalEObject oldPart = (InternalEObject)part;
+			part = (Part)eResolveProxy(oldPart);
 			if (part != oldPart) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.TO__PART, oldPart, part));
@@ -237,8 +237,8 @@
 	 */
 	public PartnerLink getPartnerLink() {
 		if (partnerLink != null && partnerLink.eIsProxy()) {
-			PartnerLink oldPartnerLink = partnerLink;
-			partnerLink = (PartnerLink)eResolveProxy((InternalEObject)partnerLink);
+			InternalEObject oldPartnerLink = (InternalEObject)partnerLink;
+			partnerLink = (PartnerLink)eResolveProxy(oldPartnerLink);
 			if (partnerLink != oldPartnerLink) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.TO__PARTNER_LINK, oldPartnerLink, partnerLink));
@@ -275,8 +275,8 @@
 	 */
 	public Property getProperty() {
 		if (property != null && property.eIsProxy()) {
-			Property oldProperty = property;
-			property = (Property)eResolveProxy((InternalEObject)property);
+			InternalEObject oldProperty = (InternalEObject)property;
+			property = (Property)eResolveProxy(oldProperty);
 			if (property != oldProperty) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.TO__PROPERTY, oldProperty, property));
@@ -354,20 +354,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.TO__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.TO__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.TO__QUERY:
-					return basicSetQuery(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.TO__QUERY:
+				return basicSetQuery(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -375,16 +367,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TO__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.TO__ELEMENT:
-				return getElement();
-			case BPELPackage.TO__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.TO__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.TO__VARIABLE:
 				if (resolve) return getVariable();
 				return basicGetVariable();
@@ -400,7 +384,7 @@
 			case BPELPackage.TO__QUERY:
 				return getQuery();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -408,21 +392,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TO__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.TO__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.TO__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.TO__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.TO__VARIABLE:
 				setVariable((Variable)newValue);
 				return;
@@ -439,7 +410,7 @@
 				setQuery((Query)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -447,20 +418,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TO__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TO__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TO__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.TO__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TO__VARIABLE:
 				setVariable((Variable)null);
 				return;
@@ -477,7 +436,7 @@
 				setQuery((Query)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -485,16 +444,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TO__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.TO__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.TO__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.TO__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TO__VARIABLE:
 				return variable != null;
 			case BPELPackage.TO__PART:
@@ -506,7 +457,7 @@
 			case BPELPackage.TO__QUERY:
 				return query != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //ToImpl
Index: src/org/eclipse/bpel/model/impl/SourcesImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourcesImpl.java,v
retrieving revision 1.3
diff -u -r1.3 SourcesImpl.java
--- src/org/eclipse/bpel/model/impl/SourcesImpl.java	31 Jan 2006 15:43:26 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/SourcesImpl.java	24 May 2007 13:06:31 -0000
@@ -51,7 +51,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList children = null;
+	protected EList children;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getSources();
+		return BPELPackage.Literals.SOURCES;
 	}
 
 	/**
@@ -88,20 +88,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.SOURCES__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.SOURCES__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.SOURCES__CHILDREN:
-					return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.SOURCES__CHILDREN:
+				return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -109,20 +101,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SOURCES__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.SOURCES__ELEMENT:
-				return getElement();
-			case BPELPackage.SOURCES__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.SOURCES__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.SOURCES__CHILDREN:
 				return getChildren();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -130,27 +114,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SOURCES__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.SOURCES__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.SOURCES__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.SOURCES__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.SOURCES__CHILDREN:
 				getChildren().clear();
 				getChildren().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -158,25 +129,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SOURCES__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SOURCES__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SOURCES__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.SOURCES__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SOURCES__CHILDREN:
 				getChildren().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -184,20 +143,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SOURCES__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.SOURCES__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.SOURCES__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.SOURCES__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SOURCES__CHILDREN:
 				return children != null && !children.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //SourcesImpl
Index: src/org/eclipse/bpel/model/impl/EmptyImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EmptyImpl.java,v
retrieving revision 1.3
diff -u -r1.3 EmptyImpl.java
--- src/org/eclipse/bpel/model/impl/EmptyImpl.java	9 Feb 2007 09:13:42 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/EmptyImpl.java	24 May 2007 13:06:28 -0000
@@ -53,155 +53,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getEmpty();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.EMPTY__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.EMPTY__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.EMPTY__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.EMPTY__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EMPTY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.EMPTY__ELEMENT:
-				return getElement();
-			case BPELPackage.EMPTY__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.EMPTY__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.EMPTY__NAME:
-				return getName();
-			case BPELPackage.EMPTY__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.EMPTY__TARGETS:
-				return getTargets();
-			case BPELPackage.EMPTY__SOURCES:
-				return getSources();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EMPTY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.EMPTY__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.EMPTY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.EMPTY__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.EMPTY__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.EMPTY__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.EMPTY__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.EMPTY__SOURCES:
-				setSources((Sources)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EMPTY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EMPTY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EMPTY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.EMPTY__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.EMPTY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.EMPTY__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.EMPTY__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.EMPTY__SOURCES:
-				setSources((Sources)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EMPTY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.EMPTY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.EMPTY__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.EMPTY__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.EMPTY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.EMPTY__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.EMPTY__TARGETS:
-				return targets != null;
-			case BPELPackage.EMPTY__SOURCES:
-				return sources != null;
-		}
-		return eDynamicIsSet(eFeature);
+		return BPELPackage.Literals.EMPTY;
 	}
 
 } //EmptyImpl
Index: src/org/eclipse/bpel/model/impl/ThrowImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ThrowImpl.java,v
retrieving revision 1.4
diff -u -r1.4 ThrowImpl.java
--- src/org/eclipse/bpel/model/impl/ThrowImpl.java	9 Feb 2007 09:13:42 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/ThrowImpl.java	24 May 2007 13:06:31 -0000
@@ -76,7 +76,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable faultVariable = null;
+	protected Variable faultVariable;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -93,7 +93,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getThrow();
+		return BPELPackage.Literals.THROW;
 	}
 
 	/**
@@ -124,8 +124,8 @@
 	 */
 	public Variable getFaultVariable() {
 		if (faultVariable != null && faultVariable.eIsProxy()) {
-			Variable oldFaultVariable = faultVariable;
-			faultVariable = (Variable)eResolveProxy((InternalEObject)faultVariable);
+			InternalEObject oldFaultVariable = (InternalEObject)faultVariable;
+			faultVariable = (Variable)eResolveProxy(oldFaultVariable);
 			if (faultVariable != oldFaultVariable) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.THROW__FAULT_VARIABLE, oldFaultVariable, faultVariable));
@@ -160,54 +160,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.THROW__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.THROW__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.THROW__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.THROW__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.THROW__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.THROW__ELEMENT:
-				return getElement();
-			case BPELPackage.THROW__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.THROW__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.THROW__NAME:
-				return getName();
-			case BPELPackage.THROW__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.THROW__TARGETS:
-				return getTargets();
-			case BPELPackage.THROW__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.THROW__FAULT_NAME:
 				return getFaultName();
 			case BPELPackage.THROW__FAULT_VARIABLE:
 				if (resolve) return getFaultVariable();
 				return basicGetFaultVariable();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -215,33 +176,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.THROW__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.THROW__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.THROW__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.THROW__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.THROW__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.THROW__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.THROW__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.THROW__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.THROW__FAULT_NAME:
 				setFaultName((QName)newValue);
 				return;
@@ -249,7 +185,7 @@
 				setFaultVariable((Variable)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -257,32 +193,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.THROW__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.THROW__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.THROW__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.THROW__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.THROW__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.THROW__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.THROW__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.THROW__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.THROW__FAULT_NAME:
 				setFaultName(FAULT_NAME_EDEFAULT);
 				return;
@@ -290,7 +202,7 @@
 				setFaultVariable((Variable)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -298,30 +210,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.THROW__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.THROW__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.THROW__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.THROW__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.THROW__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.THROW__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.THROW__TARGETS:
-				return targets != null;
-			case BPELPackage.THROW__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.THROW__FAULT_NAME:
 				return FAULT_NAME_EDEFAULT == null ? faultName != null : !FAULT_NAME_EDEFAULT.equals(faultName);
 			case BPELPackage.THROW__FAULT_VARIABLE:
 				return faultVariable != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java,v
retrieving revision 1.29
diff -u -r1.29 BPELPackageImpl.java
--- src/org/eclipse/bpel/model/impl/BPELPackageImpl.java	20 Apr 2007 23:31:44 -0000	1.29
+++ src/org/eclipse/bpel/model/impl/BPELPackageImpl.java	24 May 2007 13:06:27 -0000
@@ -672,17 +672,23 @@
 		isInited = true;
 
 		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		MessagepropertiesPackageImpl.init();
-		PartnerlinktypePackageImpl.init();
-		WSDLPackageImpl.init();
-		XSDPackageImpl.init();
+		EcorePackage.eINSTANCE.eClass();
+		WSDLPackage.eINSTANCE.eClass();
+		XSDPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		PartnerlinktypePackageImpl thePartnerlinktypePackage = (PartnerlinktypePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PartnerlinktypePackage.eNS_URI) instanceof PartnerlinktypePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PartnerlinktypePackage.eNS_URI) : PartnerlinktypePackage.eINSTANCE);
+		MessagepropertiesPackageImpl theMessagepropertiesPackage = (MessagepropertiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(MessagepropertiesPackage.eNS_URI) instanceof MessagepropertiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(MessagepropertiesPackage.eNS_URI) : MessagepropertiesPackage.eINSTANCE);
 
 		// Create package meta-data objects
 		theBPELPackage.createPackageContents();
+		thePartnerlinktypePackage.createPackageContents();
+		theMessagepropertiesPackage.createPackageContents();
 
 		// Initialize created meta-data
 		theBPELPackage.initializePackageContents();
+		thePartnerlinktypePackage.initializePackageContents();
+		theMessagepropertiesPackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
 		theBPELPackage.freeze();
@@ -3161,7 +3167,8 @@
 		createEReference(scopeEClass, SCOPE__MESSAGE_EXCHANGES);
 		createEAttribute(scopeEClass, SCOPE__EXIT_ON_STANDARD_FAULT);
 
-		compensateEClass = createEClass(COMPENSATE);
+		compensateScopeEClass = createEClass(COMPENSATE_SCOPE);
+		createEReference(compensateScopeEClass, COMPENSATE_SCOPE__TARGET);
 
 		compensationHandlerEClass = createEClass(COMPENSATION_HANDLER);
 		createEReference(compensationHandlerEClass, COMPENSATION_HANDLER__ACTIVITY);
@@ -3344,8 +3351,7 @@
 		messageExchangeEClass = createEClass(MESSAGE_EXCHANGE);
 		createEAttribute(messageExchangeEClass, MESSAGE_EXCHANGE__NAME);
 
-		compensateScopeEClass = createEClass(COMPENSATE_SCOPE);
-		createEReference(compensateScopeEClass, COMPENSATE_SCOPE__TARGET);
+		compensateEClass = createEClass(COMPENSATE);
 
 		// Create enums
 		correlationPatternEEnum = createEEnum(CORRELATION_PATTERN);
@@ -3376,11 +3382,11 @@
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		EcorePackageImpl theEcorePackage = (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		PartnerlinktypePackageImpl thePartnerlinktypePackage = (PartnerlinktypePackageImpl)EPackage.Registry.INSTANCE.getEPackage(PartnerlinktypePackage.eNS_URI);
-		MessagepropertiesPackageImpl theMessagepropertiesPackage = (MessagepropertiesPackageImpl)EPackage.Registry.INSTANCE.getEPackage(MessagepropertiesPackage.eNS_URI);
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-		XSDPackageImpl theXSDPackage = (XSDPackageImpl)EPackage.Registry.INSTANCE.getEPackage(XSDPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		PartnerlinktypePackage thePartnerlinktypePackage = (PartnerlinktypePackage)EPackage.Registry.INSTANCE.getEPackage(PartnerlinktypePackage.eNS_URI);
+		MessagepropertiesPackage theMessagepropertiesPackage = (MessagepropertiesPackage)EPackage.Registry.INSTANCE.getEPackage(MessagepropertiesPackage.eNS_URI);
+		WSDLPackage theWSDLPackage = (WSDLPackage)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
+		XSDPackage theXSDPackage = (XSDPackage)EPackage.Registry.INSTANCE.getEPackage(XSDPackage.eNS_URI);
 
 		// Add supertypes to classes
 		processEClass.getESuperTypes().add(this.getExtensibleElement());
@@ -3408,7 +3414,7 @@
 		copyEClass.getESuperTypes().add(this.getExtensibleElement());
 		extensionEClass.getESuperTypes().add(this.getExtensibleElement());
 		scopeEClass.getESuperTypes().add(this.getActivity());
-		compensateEClass.getESuperTypes().add(this.getActivity());
+		compensateScopeEClass.getESuperTypes().add(this.getActivity());
 		compensationHandlerEClass.getESuperTypes().add(this.getExtensibleElement());
 		toEClass.getESuperTypes().add(this.getExtensibleElement());
 		fromEClass.getESuperTypes().add(this.getTo());
@@ -3453,7 +3459,7 @@
 		extensibleElementEClass.getESuperTypes().add(theWSDLPackage.getExtensibleElement());
 		messageExchangesEClass.getESuperTypes().add(this.getExtensibleElement());
 		messageExchangeEClass.getESuperTypes().add(this.getExtensibleElement());
-		compensateScopeEClass.getESuperTypes().add(this.getActivity());
+		compensateEClass.getESuperTypes().add(this.getActivity());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(processEClass, org.eclipse.bpel.model.Process.class, "Process", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -3593,7 +3599,8 @@
 		initEReference(getScope_MessageExchanges(), this.getMessageExchanges(), null, "messageExchanges", null, 0, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getScope_ExitOnStandardFault(), ecorePackage.getEBooleanObject(), "exitOnStandardFault", "false", 0, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(compensateEClass, Compensate.class, "Compensate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(compensateScopeEClass, CompensateScope.class, "CompensateScope", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCompensateScope_Target(), this.getActivity(), null, "target", null, 0, 1, CompensateScope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(compensationHandlerEClass, CompensationHandler.class, "CompensationHandler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getCompensationHandler_Activity(), this.getActivity(), null, "activity", null, 1, 1, CompensationHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3684,7 +3691,7 @@
 		initEReference(getOnEvent_PortType(), theWSDLPackage.getPortType(), null, "portType", null, 1, 1, OnEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getOnEvent_MessageType(), theWSDLPackage.getMessage(), null, "messageType", null, 1, 1, OnEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getOnEvent_FromPart(), this.getFromPart(), null, "fromPart", null, 0, -1, OnEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getOnEvent_CorrelationSets(), this.getCorrelationSets(), null, "correlationSets", "", 0, 1, OnEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getOnEvent_CorrelationSets(), this.getCorrelationSets(), null, "correlationSets", null, 0, 1, OnEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getImport_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3757,7 +3764,7 @@
 		initEReference(getElse_Activity(), this.getActivity(), null, "activity", null, 1, 1, Else.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(completionConditionEClass, CompletionCondition.class, "CompletionCondition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCompletionCondition_Branches(), this.getBranches(), null, "branches", "", 0, 1, CompletionCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCompletionCondition_Branches(), this.getBranches(), null, "branches", null, 0, 1, CompletionCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(branchesEClass, Branches.class, "Branches", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getBranches_CountCompletedBranchesOnly(), theEcorePackage.getEBooleanObject(), "countCompletedBranchesOnly", "false", 0, 1, Branches.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3776,8 +3783,7 @@
 		initEClass(messageExchangeEClass, MessageExchange.class, "MessageExchange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getMessageExchange_Name(), ecorePackage.getEString(), "name", null, 1, 1, MessageExchange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(compensateScopeEClass, CompensateScope.class, "CompensateScope", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCompensateScope_Target(), this.getActivity(), null, "target", null, 0, 1, CompensateScope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(compensateEClass, Compensate.class, "Compensate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		// Initialize enums and add enum literals
 		initEEnum(correlationPatternEEnum, CorrelationPattern.class, "CorrelationPattern");
Index: src/org/eclipse/bpel/model/impl/ServiceRefImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ServiceRefImpl.java,v
retrieving revision 1.4
diff -u -r1.4 ServiceRefImpl.java
--- src/org/eclipse/bpel/model/impl/ServiceRefImpl.java	20 Apr 2007 23:31:44 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/ServiceRefImpl.java	24 May 2007 13:06:30 -0000
@@ -106,7 +106,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getServiceRef();
+		return BPELPackage.Literals.SERVICE_REF;
 	}
 
 	/**
@@ -156,37 +156,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.SERVICE_REF__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SERVICE_REF__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.SERVICE_REF__ELEMENT:
-				return getElement();
-			case BPELPackage.SERVICE_REF__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.SERVICE_REF__REFERENCE_SCHEME:
 				return getReferenceScheme();
 			case BPELPackage.SERVICE_REF__VALUE:
 				return getValue();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -194,26 +171,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SERVICE_REF__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.SERVICE_REF__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.SERVICE_REF__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.SERVICE_REF__REFERENCE_SCHEME:
 				setReferenceScheme((String)newValue);
 				return;
 			case BPELPackage.SERVICE_REF__VALUE:
-				setValue((Object)newValue);
+				setValue(newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -221,17 +188,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SERVICE_REF__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SERVICE_REF__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SERVICE_REF__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SERVICE_REF__REFERENCE_SCHEME:
 				setReferenceScheme(REFERENCE_SCHEME_EDEFAULT);
 				return;
@@ -239,7 +197,7 @@
 				setValue(VALUE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -247,20 +205,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SERVICE_REF__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.SERVICE_REF__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.SERVICE_REF__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SERVICE_REF__REFERENCE_SCHEME:
 				return REFERENCE_SCHEME_EDEFAULT == null ? referenceScheme != null : !REFERENCE_SCHEME_EDEFAULT.equals(referenceScheme);
 			case BPELPackage.SERVICE_REF__VALUE:
 				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/RepeatUntilImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/RepeatUntilImpl.java,v
retrieving revision 1.3
diff -u -r1.3 RepeatUntilImpl.java
--- src/org/eclipse/bpel/model/impl/RepeatUntilImpl.java	19 Jan 2006 21:08:47 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/RepeatUntilImpl.java	24 May 2007 13:06:30 -0000
@@ -47,7 +47,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
@@ -57,7 +57,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Condition condition = null;
+	protected Condition condition;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -74,7 +74,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getRepeatUntil();
+		return BPELPackage.Literals.REPEAT_UNTIL;
 	}
 
 	/**
@@ -168,26 +168,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.REPEAT_UNTIL__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.REPEAT_UNTIL__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.REPEAT_UNTIL__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.REPEAT_UNTIL__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.REPEAT_UNTIL__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				case BPELPackage.REPEAT_UNTIL__CONDITION:
-					return basicSetCondition(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.REPEAT_UNTIL__ACTIVITY:
+				return basicSetActivity(null, msgs);
+			case BPELPackage.REPEAT_UNTIL__CONDITION:
+				return basicSetCondition(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -195,30 +183,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.REPEAT_UNTIL__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.REPEAT_UNTIL__ELEMENT:
-				return getElement();
-			case BPELPackage.REPEAT_UNTIL__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.REPEAT_UNTIL__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.REPEAT_UNTIL__NAME:
-				return getName();
-			case BPELPackage.REPEAT_UNTIL__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.REPEAT_UNTIL__TARGETS:
-				return getTargets();
-			case BPELPackage.REPEAT_UNTIL__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.REPEAT_UNTIL__ACTIVITY:
 				return getActivity();
 			case BPELPackage.REPEAT_UNTIL__CONDITION:
 				return getCondition();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -226,33 +198,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.REPEAT_UNTIL__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.REPEAT_UNTIL__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.REPEAT_UNTIL__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.REPEAT_UNTIL__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.REPEAT_UNTIL__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.REPEAT_UNTIL__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.REPEAT_UNTIL__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.REPEAT_UNTIL__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.REPEAT_UNTIL__ACTIVITY:
 				setActivity((Activity)newValue);
 				return;
@@ -260,7 +207,7 @@
 				setCondition((Condition)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -268,32 +215,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.REPEAT_UNTIL__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.REPEAT_UNTIL__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.REPEAT_UNTIL__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.REPEAT_UNTIL__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.REPEAT_UNTIL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.REPEAT_UNTIL__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.REPEAT_UNTIL__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.REPEAT_UNTIL__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.REPEAT_UNTIL__ACTIVITY:
 				setActivity((Activity)null);
 				return;
@@ -301,7 +224,7 @@
 				setCondition((Condition)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -309,30 +232,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.REPEAT_UNTIL__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.REPEAT_UNTIL__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.REPEAT_UNTIL__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.REPEAT_UNTIL__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.REPEAT_UNTIL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.REPEAT_UNTIL__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.REPEAT_UNTIL__TARGETS:
-				return targets != null;
-			case BPELPackage.REPEAT_UNTIL__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.REPEAT_UNTIL__ACTIVITY:
 				return activity != null;
 			case BPELPackage.REPEAT_UNTIL__CONDITION:
 				return condition != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //RepeatUntilImpl
Index: src/org/eclipse/bpel/model/impl/TargetsImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetsImpl.java,v
retrieving revision 1.3
diff -u -r1.3 TargetsImpl.java
--- src/org/eclipse/bpel/model/impl/TargetsImpl.java	31 Jan 2006 15:43:26 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/TargetsImpl.java	24 May 2007 13:06:31 -0000
@@ -55,7 +55,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList children = null;
+	protected EList children;
 
 	/**
 	 * The cached value of the '{@link #getJoinCondition() <em>Join Condition</em>}' containment reference.
@@ -65,7 +65,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Condition joinCondition = null;
+	protected Condition joinCondition;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -82,7 +82,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getTargets();
+		return BPELPackage.Literals.TARGETS;
 	}
 
 	/**
@@ -145,22 +145,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.TARGETS__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.TARGETS__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.TARGETS__CHILDREN:
-					return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-				case BPELPackage.TARGETS__JOIN_CONDITION:
-					return basicSetJoinCondition(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.TARGETS__CHILDREN:
+				return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
+			case BPELPackage.TARGETS__JOIN_CONDITION:
+				return basicSetJoinCondition(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -168,22 +160,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TARGETS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.TARGETS__ELEMENT:
-				return getElement();
-			case BPELPackage.TARGETS__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.TARGETS__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.TARGETS__CHILDREN:
 				return getChildren();
 			case BPELPackage.TARGETS__JOIN_CONDITION:
 				return getJoinCondition();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -191,21 +175,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TARGETS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.TARGETS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.TARGETS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.TARGETS__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.TARGETS__CHILDREN:
 				getChildren().clear();
 				getChildren().addAll((Collection)newValue);
@@ -214,7 +185,7 @@
 				setJoinCondition((Condition)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -222,20 +193,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TARGETS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TARGETS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TARGETS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.TARGETS__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TARGETS__CHILDREN:
 				getChildren().clear();
 				return;
@@ -243,7 +202,7 @@
 				setJoinCondition((Condition)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -251,22 +210,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TARGETS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.TARGETS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.TARGETS__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.TARGETS__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TARGETS__CHILDREN:
 				return children != null && !children.isEmpty();
 			case BPELPackage.TARGETS__JOIN_CONDITION:
 				return joinCondition != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //TargetsImpl
Index: src/org/eclipse/bpel/model/impl/CompensateImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensateImpl.java,v
retrieving revision 1.5
diff -u -r1.5 CompensateImpl.java
--- src/org/eclipse/bpel/model/impl/CompensateImpl.java	20 Apr 2007 23:31:44 -0000	1.5
+++ src/org/eclipse/bpel/model/impl/CompensateImpl.java	24 May 2007 13:06:28 -0000
@@ -64,155 +64,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCompensate();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.COMPENSATE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.COMPENSATE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.COMPENSATE__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.COMPENSATE__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.COMPENSATE__ELEMENT:
-				return getElement();
-			case BPELPackage.COMPENSATE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.COMPENSATE__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.COMPENSATE__NAME:
-				return getName();
-			case BPELPackage.COMPENSATE__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.COMPENSATE__TARGETS:
-				return getTargets();
-			case BPELPackage.COMPENSATE__SOURCES:
-				return getSources();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.COMPENSATE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.COMPENSATE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.COMPENSATE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.COMPENSATE__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.COMPENSATE__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.COMPENSATE__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.COMPENSATE__SOURCES:
-				setSources((Sources)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COMPENSATE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COMPENSATE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.COMPENSATE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.COMPENSATE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.COMPENSATE__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.COMPENSATE__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.COMPENSATE__SOURCES:
-				setSources((Sources)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPENSATE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.COMPENSATE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.COMPENSATE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.COMPENSATE__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.COMPENSATE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.COMPENSATE__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.COMPENSATE__TARGETS:
-				return targets != null;
-			case BPELPackage.COMPENSATE__SOURCES:
-				return sources != null;
-		}
-		return eDynamicIsSet(eFeature);
+		return BPELPackage.Literals.COMPENSATE;
 	}
 
 } //CompensateImpl
Index: src/org/eclipse/bpel/model/impl/LinkImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinkImpl.java,v
retrieving revision 1.2
diff -u -r1.2 LinkImpl.java
--- src/org/eclipse/bpel/model/impl/LinkImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/LinkImpl.java	24 May 2007 13:06:29 -0000
@@ -76,7 +76,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList sources = null;
+	protected EList sources;
 
 	/**
 	 * The cached value of the '{@link #getTargets() <em>Targets</em>}' reference list.
@@ -86,7 +86,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList targets = null;
+	protected EList targets;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -103,7 +103,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getLink();
+		return BPELPackage.Literals.LINK;
 	}
 
 	/**
@@ -156,20 +156,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.LINK__SOURCES:
-					return ((InternalEList)getSources()).basicAdd(otherEnd, msgs);
-				case BPELPackage.LINK__TARGETS:
-					return ((InternalEList)getTargets()).basicAdd(otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.LINK__SOURCES:
+				return ((InternalEList)getSources()).basicAdd(otherEnd, msgs);
+			case BPELPackage.LINK__TARGETS:
+				return ((InternalEList)getTargets()).basicAdd(otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -177,22 +171,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.LINK__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.LINK__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.LINK__SOURCES:
-					return ((InternalEList)getSources()).basicRemove(otherEnd, msgs);
-				case BPELPackage.LINK__TARGETS:
-					return ((InternalEList)getTargets()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.LINK__SOURCES:
+				return ((InternalEList)getSources()).basicRemove(otherEnd, msgs);
+			case BPELPackage.LINK__TARGETS:
+				return ((InternalEList)getTargets()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -200,16 +186,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.LINK__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.LINK__ELEMENT:
-				return getElement();
-			case BPELPackage.LINK__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.LINK__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.LINK__NAME:
 				return getName();
 			case BPELPackage.LINK__SOURCES:
@@ -217,7 +195,7 @@
 			case BPELPackage.LINK__TARGETS:
 				return getTargets();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -225,21 +203,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.LINK__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.LINK__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.LINK__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.LINK__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.LINK__NAME:
 				setName((String)newValue);
 				return;
@@ -252,7 +217,7 @@
 				getTargets().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -260,20 +225,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.LINK__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.LINK__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.LINK__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.LINK__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.LINK__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -284,7 +237,7 @@
 				getTargets().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -292,16 +245,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.LINK__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.LINK__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.LINK__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.LINK__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.LINK__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case BPELPackage.LINK__SOURCES:
@@ -309,7 +254,7 @@
 			case BPELPackage.LINK__TARGETS:
 				return targets != null && !targets.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/CorrelationImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationImpl.java,v
retrieving revision 1.4
diff -u -r1.4 CorrelationImpl.java
--- src/org/eclipse/bpel/model/impl/CorrelationImpl.java	9 Feb 2007 09:13:42 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/CorrelationImpl.java	24 May 2007 13:06:28 -0000
@@ -73,7 +73,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean initiateESet = false;
+	protected boolean initiateESet;
 
 	/**
 	 * The default value of the '{@link #getPattern() <em>Pattern</em>}' attribute.
@@ -102,7 +102,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean patternESet = false;
+	protected boolean patternESet;
 
 	/**
 	 * The cached value of the '{@link #getSet() <em>Set</em>}' reference.
@@ -112,7 +112,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected CorrelationSet set = null;
+	protected CorrelationSet set;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -129,7 +129,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCorrelation();
+		return BPELPackage.Literals.CORRELATION;
 	}
 
 	/**
@@ -231,8 +231,8 @@
 	 */
 	public CorrelationSet getSet() {
 		if (set != null && set.eIsProxy()) {
-			CorrelationSet oldSet = set;
-			set = (CorrelationSet)eResolveProxy((InternalEObject)set);
+			InternalEObject oldSet = (InternalEObject)set;
+			set = (CorrelationSet)eResolveProxy(oldSet);
 			if (set != oldSet) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.CORRELATION__SET, oldSet, set));
@@ -267,35 +267,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.CORRELATION__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.CORRELATION__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.CORRELATION__ELEMENT:
-				return getElement();
-			case BPELPackage.CORRELATION__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.CORRELATION__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION__INITIATE:
 				return getInitiate();
 			case BPELPackage.CORRELATION__PATTERN:
@@ -304,7 +277,7 @@
 				if (resolve) return getSet();
 				return basicGetSet();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -312,21 +285,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.CORRELATION__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.CORRELATION__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.CORRELATION__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION__INITIATE:
 				setInitiate((String)newValue);
 				return;
@@ -337,7 +297,7 @@
 				setSet((CorrelationSet)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -345,20 +305,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CORRELATION__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CORRELATION__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.CORRELATION__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION__INITIATE:
 				unsetInitiate();
 				return;
@@ -369,7 +317,7 @@
 				setSet((CorrelationSet)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -377,16 +325,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.CORRELATION__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.CORRELATION__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.CORRELATION__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION__INITIATE:
 				return isSetInitiate();
 			case BPELPackage.CORRELATION__PATTERN:
@@ -394,7 +334,7 @@
 			case BPELPackage.CORRELATION__SET:
 				return set != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/ExtensibleElementImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensibleElementImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ExtensibleElementImpl.java
--- src/org/eclipse/bpel/model/impl/ExtensibleElementImpl.java	10 May 2007 23:11:06 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/ExtensibleElementImpl.java	24 May 2007 13:06:28 -0000
@@ -43,7 +43,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Documentation documentation = null;
+	protected Documentation documentation;
 
 	/**
 	 * This is true if the Documentation containment reference has been set.
@@ -52,7 +52,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean documentationESet = false;
+	protected boolean documentationESet;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -69,7 +69,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getExtensibleElement();
+		return BPELPackage.Literals.EXTENSIBLE_ELEMENT;
 	}
 
 	/**
@@ -118,7 +118,7 @@
 			documentationESet = true;
 			if (eNotificationRequired())
 				eNotify(new ENotificationImpl(this, Notification.SET, BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION, newDocumentation, newDocumentation, !oldDocumentationESet));
-    	}
+		}
 	}
 
 	/**
@@ -155,7 +155,7 @@
 			documentationESet = false;
 			if (eNotificationRequired())
 				eNotify(new ENotificationImpl(this, Notification.UNSET, BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION, null, null, oldDocumentationESet));
-    	}
+		}
 	}
 
 	/**
@@ -172,18 +172,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION:
+				return basicUnsetDocumentation(msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -191,18 +185,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-				return getElement();
-			case BPELPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION:
 				return getDocumentation();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -210,23 +198,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION:
 				setDocumentation((Documentation)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -234,22 +212,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION:
 				unsetDocumentation();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -257,18 +226,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION:
 				return isSetDocumentation();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/TargetImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetImpl.java,v
retrieving revision 1.2
diff -u -r1.2 TargetImpl.java
--- src/org/eclipse/bpel/model/impl/TargetImpl.java	19 Jan 2006 21:08:47 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/TargetImpl.java	24 May 2007 13:06:31 -0000
@@ -56,7 +56,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Link link = null;
+	protected Link link;
 
 	/**
 	 * The cached value of the '{@link #getActivity() <em>Activity</em>}' reference.
@@ -66,7 +66,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -83,7 +83,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getTarget();
+		return BPELPackage.Literals.TARGET;
 	}
 
 	/**
@@ -93,8 +93,8 @@
 	 */
 	public Link getLink() {
 		if (link != null && link.eIsProxy()) {
-			Link oldLink = link;
-			link = (Link)eResolveProxy((InternalEObject)link);
+			InternalEObject oldLink = (InternalEObject)link;
+			link = (Link)eResolveProxy(oldLink);
 			if (link != oldLink) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.TARGET__LINK, oldLink, link));
@@ -187,20 +187,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.TARGET__LINK:
-					if (link != null)
-						msgs = ((InternalEObject)link).eInverseRemove(this, BPELPackage.LINK__TARGETS, Link.class, msgs);
-					return basicSetLink((Link)otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.TARGET__LINK:
+				if (link != null)
+					msgs = ((InternalEObject)link).eInverseRemove(this, BPELPackage.LINK__TARGETS, Link.class, msgs);
+				return basicSetLink((Link)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -208,20 +202,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.TARGET__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.TARGET__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.TARGET__LINK:
-					return basicSetLink(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.TARGET__LINK:
+				return basicSetLink(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -229,16 +215,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TARGET__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.TARGET__ELEMENT:
-				return getElement();
-			case BPELPackage.TARGET__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.TARGET__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.TARGET__LINK:
 				if (resolve) return getLink();
 				return basicGetLink();
@@ -246,7 +224,7 @@
 				if (resolve) return getActivity();
 				return basicGetActivity();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -254,21 +232,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TARGET__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.TARGET__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.TARGET__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.TARGET__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.TARGET__LINK:
 				setLink((Link)newValue);
 				return;
@@ -276,7 +241,7 @@
 				setActivity((Activity)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -284,20 +249,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TARGET__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TARGET__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TARGET__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.TARGET__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TARGET__LINK:
 				setLink((Link)null);
 				return;
@@ -305,7 +258,7 @@
 				setActivity((Activity)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -313,22 +266,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TARGET__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.TARGET__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.TARGET__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.TARGET__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TARGET__LINK:
 				return link != null;
 			case BPELPackage.TARGET__ACTIVITY:
 				return activity != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //TargetImpl
Index: src/org/eclipse/bpel/model/impl/FromImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FromImpl.java,v
retrieving revision 1.2
diff -u -r1.2 FromImpl.java
--- src/org/eclipse/bpel/model/impl/FromImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/FromImpl.java	24 May 2007 13:06:29 -0000
@@ -84,7 +84,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean opaqueESet = false;
+	protected boolean opaqueESet;
 
 	/**
 	 * The default value of the '{@link #getEndpointReference() <em>Endpoint Reference</em>}' attribute.
@@ -113,7 +113,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean endpointReferenceESet = false;
+	protected boolean endpointReferenceESet;
 
 	/**
 	 * The default value of the '{@link #getLiteral() <em>Literal</em>}' attribute.
@@ -142,7 +142,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean literalESet = false;
+	protected boolean literalESet;
 
 	/**
 	 * The default value of the '{@link #getUnsafeLiteral() <em>Unsafe Literal</em>}' attribute.
@@ -172,7 +172,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Expression expression = null;
+	protected Expression expression;
 
 	/**
 	 * The cached value of the '{@link #getServiceRef() <em>Service Ref</em>}' containment reference.
@@ -182,7 +182,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected ServiceRef serviceRef = null;
+	protected ServiceRef serviceRef;
 
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
@@ -192,7 +192,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected XSDTypeDefinition type = null;
+	protected XSDTypeDefinition type;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -209,7 +209,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getFrom();
+		return BPELPackage.Literals.FROM;
 	}
 
 	/**
@@ -464,8 +464,8 @@
 	 */
 	public XSDTypeDefinition getType() {
 		if (type != null && type.eIsProxy()) {
-			XSDTypeDefinition oldType = type;
-			type = (XSDTypeDefinition)eResolveProxy((InternalEObject)type);
+			InternalEObject oldType = (InternalEObject)type;
+			type = (XSDTypeDefinition)eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.FROM__TYPE, oldType, type));
@@ -500,24 +500,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.FROM__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.FROM__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.FROM__QUERY:
-					return basicSetQuery(null, msgs);
-				case BPELPackage.FROM__EXPRESSION:
-					return basicSetExpression(null, msgs);
-				case BPELPackage.FROM__SERVICE_REF:
-					return basicSetServiceRef(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.FROM__EXPRESSION:
+				return basicSetExpression(null, msgs);
+			case BPELPackage.FROM__SERVICE_REF:
+				return basicSetServiceRef(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -525,30 +515,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FROM__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.FROM__ELEMENT:
-				return getElement();
-			case BPELPackage.FROM__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.FROM__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.FROM__VARIABLE:
-				if (resolve) return getVariable();
-				return basicGetVariable();
-			case BPELPackage.FROM__PART:
-				if (resolve) return getPart();
-				return basicGetPart();
-			case BPELPackage.FROM__PARTNER_LINK:
-				if (resolve) return getPartnerLink();
-				return basicGetPartnerLink();
-			case BPELPackage.FROM__PROPERTY:
-				if (resolve) return getProperty();
-				return basicGetProperty();
-			case BPELPackage.FROM__QUERY:
-				return getQuery();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.FROM__OPAQUE:
 				return getOpaque();
 			case BPELPackage.FROM__ENDPOINT_REFERENCE:
@@ -565,7 +533,7 @@
 				if (resolve) return getType();
 				return basicGetType();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -573,36 +541,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FROM__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.FROM__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.FROM__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.FROM__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.FROM__VARIABLE:
-				setVariable((Variable)newValue);
-				return;
-			case BPELPackage.FROM__PART:
-				setPart((Part)newValue);
-				return;
-			case BPELPackage.FROM__PARTNER_LINK:
-				setPartnerLink((PartnerLink)newValue);
-				return;
-			case BPELPackage.FROM__PROPERTY:
-				setProperty((Property)newValue);
-				return;
-			case BPELPackage.FROM__QUERY:
-				setQuery((Query)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.FROM__OPAQUE:
 				setOpaque((Boolean)newValue);
 				return;
@@ -625,7 +565,7 @@
 				setType((XSDTypeDefinition)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -633,35 +573,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FROM__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FROM__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FROM__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.FROM__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.FROM__VARIABLE:
-				setVariable((Variable)null);
-				return;
-			case BPELPackage.FROM__PART:
-				setPart((Part)null);
-				return;
-			case BPELPackage.FROM__PARTNER_LINK:
-				setPartnerLink((PartnerLink)null);
-				return;
-			case BPELPackage.FROM__PROPERTY:
-				setProperty((Property)null);
-				return;
-			case BPELPackage.FROM__QUERY:
-				setQuery((Query)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FROM__OPAQUE:
 				unsetOpaque();
 				return;
@@ -684,7 +597,7 @@
 				setType((XSDTypeDefinition)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -692,26 +605,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FROM__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.FROM__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.FROM__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.FROM__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.FROM__VARIABLE:
-				return variable != null;
-			case BPELPackage.FROM__PART:
-				return part != null;
-			case BPELPackage.FROM__PARTNER_LINK:
-				return partnerLink != null;
-			case BPELPackage.FROM__PROPERTY:
-				return property != null;
-			case BPELPackage.FROM__QUERY:
-				return query != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FROM__OPAQUE:
 				return isSetOpaque();
 			case BPELPackage.FROM__ENDPOINT_REFERENCE:
@@ -727,7 +622,7 @@
 			case BPELPackage.FROM__TYPE:
 				return type != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/PartnerLinkImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinkImpl.java,v
retrieving revision 1.5
diff -u -r1.5 PartnerLinkImpl.java
--- src/org/eclipse/bpel/model/impl/PartnerLinkImpl.java	9 Feb 2007 09:13:42 -0000	1.5
+++ src/org/eclipse/bpel/model/impl/PartnerLinkImpl.java	24 May 2007 13:06:29 -0000
@@ -76,7 +76,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Role myRole = null;
+	protected Role myRole;
 
 	/**
 	 * The cached value of the '{@link #getPartnerRole() <em>Partner Role</em>}' reference.
@@ -86,7 +86,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Role partnerRole = null;
+	protected Role partnerRole;
 
 	/**
 	 * The cached value of the '{@link #getPartnerLinkType() <em>Partner Link Type</em>}' reference.
@@ -96,7 +96,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PartnerLinkType partnerLinkType = null;
+	protected PartnerLinkType partnerLinkType;
 
 	/**
 	 * The default value of the '{@link #getInitializePartnerRole() <em>Initialize Partner Role</em>}' attribute.
@@ -125,7 +125,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean initializePartnerRoleESet = false;
+	protected boolean initializePartnerRoleESet;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -142,7 +142,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getPartnerLink();
+		return BPELPackage.Literals.PARTNER_LINK;
 	}
 
 	/**
@@ -173,8 +173,8 @@
 	 */
 	public Role getMyRole() {
 		if (myRole != null && myRole.eIsProxy()) {
-			Role oldMyRole = myRole;
-			myRole = (Role)eResolveProxy((InternalEObject)myRole);
+			InternalEObject oldMyRole = (InternalEObject)myRole;
+			myRole = (Role)eResolveProxy(oldMyRole);
 			if (myRole != oldMyRole) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.PARTNER_LINK__MY_ROLE, oldMyRole, myRole));
@@ -211,8 +211,8 @@
 	 */
 	public Role getPartnerRole() {
 		if (partnerRole != null && partnerRole.eIsProxy()) {
-			Role oldPartnerRole = partnerRole;
-			partnerRole = (Role)eResolveProxy((InternalEObject)partnerRole);
+			InternalEObject oldPartnerRole = (InternalEObject)partnerRole;
+			partnerRole = (Role)eResolveProxy(oldPartnerRole);
 			if (partnerRole != oldPartnerRole) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.PARTNER_LINK__PARTNER_ROLE, oldPartnerRole, partnerRole));
@@ -249,8 +249,8 @@
 	 */
 	public PartnerLinkType getPartnerLinkType() {
 		if (partnerLinkType != null && partnerLinkType.eIsProxy()) {
-			PartnerLinkType oldPartnerLinkType = partnerLinkType;
-			partnerLinkType = (PartnerLinkType)eResolveProxy((InternalEObject)partnerLinkType);
+			InternalEObject oldPartnerLinkType = (InternalEObject)partnerLinkType;
+			partnerLinkType = (PartnerLinkType)eResolveProxy(oldPartnerLinkType);
 			if (partnerLinkType != oldPartnerLinkType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.PARTNER_LINK__PARTNER_LINK_TYPE, oldPartnerLinkType, partnerLinkType));
@@ -331,35 +331,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.PARTNER_LINK__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.PARTNER_LINK__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_LINK__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.PARTNER_LINK__ELEMENT:
-				return getElement();
-			case BPELPackage.PARTNER_LINK__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.PARTNER_LINK__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_LINK__NAME:
 				return getName();
 			case BPELPackage.PARTNER_LINK__MY_ROLE:
@@ -374,7 +347,7 @@
 			case BPELPackage.PARTNER_LINK__INITIALIZE_PARTNER_ROLE:
 				return getInitializePartnerRole();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -382,21 +355,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_LINK__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.PARTNER_LINK__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.PARTNER_LINK__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.PARTNER_LINK__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_LINK__NAME:
 				setName((String)newValue);
 				return;
@@ -413,7 +373,7 @@
 				setInitializePartnerRole((Boolean)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -421,20 +381,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_LINK__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PARTNER_LINK__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PARTNER_LINK__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.PARTNER_LINK__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_LINK__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -451,7 +399,7 @@
 				unsetInitializePartnerRole();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -459,16 +407,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PARTNER_LINK__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.PARTNER_LINK__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.PARTNER_LINK__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.PARTNER_LINK__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PARTNER_LINK__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case BPELPackage.PARTNER_LINK__MY_ROLE:
@@ -480,7 +420,7 @@
 			case BPELPackage.PARTNER_LINK__INITIALIZE_PARTNER_ROLE:
 				return isSetInitializePartnerRole();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/ScopeImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ScopeImpl.java,v
retrieving revision 1.5
diff -u -r1.5 ScopeImpl.java
--- src/org/eclipse/bpel/model/impl/ScopeImpl.java	13 Dec 2006 16:17:31 -0000	1.5
+++ src/org/eclipse/bpel/model/impl/ScopeImpl.java	24 May 2007 13:06:30 -0000
@@ -90,7 +90,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean isolatedESet = false;
+	protected boolean isolatedESet;
 
 	/**
 	 * The cached value of the '{@link #getFaultHandlers() <em>Fault Handlers</em>}' containment reference.
@@ -100,7 +100,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected FaultHandler faultHandlers = null;
+	protected FaultHandler faultHandlers;
 
 	/**
 	 * The cached value of the '{@link #getCompensationHandler() <em>Compensation Handler</em>}' containment reference.
@@ -110,7 +110,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected CompensationHandler compensationHandler = null;
+	protected CompensationHandler compensationHandler;
 
 	/**
 	 * The cached value of the '{@link #getActivity() <em>Activity</em>}' containment reference.
@@ -120,7 +120,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference.
@@ -130,7 +130,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variables variables = null;
+	protected Variables variables;
 
 	/**
 	 * The cached value of the '{@link #getCorrelationSets() <em>Correlation Sets</em>}' containment reference.
@@ -140,7 +140,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected CorrelationSets correlationSets = null;
+	protected CorrelationSets correlationSets;
 
 	/**
 	 * The cached value of the '{@link #getEventHandlers() <em>Event Handlers</em>}' containment reference.
@@ -150,7 +150,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EventHandler eventHandlers = null;
+	protected EventHandler eventHandlers;
 
 	/**
 	 * The cached value of the '{@link #getPartnerLinks() <em>Partner Links</em>}' containment reference.
@@ -160,7 +160,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PartnerLinks partnerLinks = null;
+	protected PartnerLinks partnerLinks;
 
 	/**
 	 * The cached value of the '{@link #getTerminationHandler() <em>Termination Handler</em>}' containment reference.
@@ -170,7 +170,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected TerminationHandler terminationHandler = null;
+	protected TerminationHandler terminationHandler;
 
 	/**
 	 * The cached value of the '{@link #getMessageExchanges() <em>Message Exchanges</em>}' reference.
@@ -180,7 +180,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected MessageExchanges messageExchanges = null;
+	protected MessageExchanges messageExchanges;
 
 	/**
 	 * The default value of the '{@link #getExitOnStandardFault() <em>Exit On Standard Fault</em>}' attribute.
@@ -209,7 +209,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean exitOnStandardFaultESet = false;
+	protected boolean exitOnStandardFaultESet;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getScope();
+		return BPELPackage.Literals.SCOPE;
 	}
 
 	/**
@@ -626,8 +626,8 @@
 	 */
 	public MessageExchanges getMessageExchanges() {
 		if (messageExchanges != null && messageExchanges.eIsProxy()) {
-			MessageExchanges oldMessageExchanges = messageExchanges;
-			messageExchanges = (MessageExchanges)eResolveProxy((InternalEObject)messageExchanges);
+			InternalEObject oldMessageExchanges = (InternalEObject)messageExchanges;
+			messageExchanges = (MessageExchanges)eResolveProxy(oldMessageExchanges);
 			if (messageExchanges != oldMessageExchanges) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.SCOPE__MESSAGE_EXCHANGES, oldMessageExchanges, messageExchanges));
@@ -708,38 +708,26 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.SCOPE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.SCOPE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.SCOPE__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.SCOPE__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.SCOPE__FAULT_HANDLERS:
-					return basicSetFaultHandlers(null, msgs);
-				case BPELPackage.SCOPE__COMPENSATION_HANDLER:
-					return basicSetCompensationHandler(null, msgs);
-				case BPELPackage.SCOPE__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				case BPELPackage.SCOPE__VARIABLES:
-					return basicSetVariables(null, msgs);
-				case BPELPackage.SCOPE__CORRELATION_SETS:
-					return basicSetCorrelationSets(null, msgs);
-				case BPELPackage.SCOPE__EVENT_HANDLERS:
-					return basicSetEventHandlers(null, msgs);
-				case BPELPackage.SCOPE__PARTNER_LINKS:
-					return basicSetPartnerLinks(null, msgs);
-				case BPELPackage.SCOPE__TERMINATION_HANDLER:
-					return basicSetTerminationHandler(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.SCOPE__FAULT_HANDLERS:
+				return basicSetFaultHandlers(null, msgs);
+			case BPELPackage.SCOPE__COMPENSATION_HANDLER:
+				return basicSetCompensationHandler(null, msgs);
+			case BPELPackage.SCOPE__ACTIVITY:
+				return basicSetActivity(null, msgs);
+			case BPELPackage.SCOPE__VARIABLES:
+				return basicSetVariables(null, msgs);
+			case BPELPackage.SCOPE__CORRELATION_SETS:
+				return basicSetCorrelationSets(null, msgs);
+			case BPELPackage.SCOPE__EVENT_HANDLERS:
+				return basicSetEventHandlers(null, msgs);
+			case BPELPackage.SCOPE__PARTNER_LINKS:
+				return basicSetPartnerLinks(null, msgs);
+			case BPELPackage.SCOPE__TERMINATION_HANDLER:
+				return basicSetTerminationHandler(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -747,24 +735,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SCOPE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.SCOPE__ELEMENT:
-				return getElement();
-			case BPELPackage.SCOPE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.SCOPE__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.SCOPE__NAME:
-				return getName();
-			case BPELPackage.SCOPE__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.SCOPE__TARGETS:
-				return getTargets();
-			case BPELPackage.SCOPE__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.SCOPE__ISOLATED:
 				return getIsolated();
 			case BPELPackage.SCOPE__FAULT_HANDLERS:
@@ -789,7 +761,7 @@
 			case BPELPackage.SCOPE__EXIT_ON_STANDARD_FAULT:
 				return getExitOnStandardFault();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -797,33 +769,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SCOPE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.SCOPE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.SCOPE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.SCOPE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.SCOPE__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.SCOPE__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.SCOPE__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.SCOPE__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.SCOPE__ISOLATED:
 				setIsolated((Boolean)newValue);
 				return;
@@ -858,7 +805,7 @@
 				setExitOnStandardFault((Boolean)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -866,32 +813,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SCOPE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SCOPE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SCOPE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.SCOPE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.SCOPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.SCOPE__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.SCOPE__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.SCOPE__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SCOPE__ISOLATED:
 				unsetIsolated();
 				return;
@@ -926,7 +849,7 @@
 				unsetExitOnStandardFault();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -934,24 +857,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SCOPE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.SCOPE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.SCOPE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.SCOPE__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.SCOPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.SCOPE__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.SCOPE__TARGETS:
-				return targets != null;
-			case BPELPackage.SCOPE__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SCOPE__ISOLATED:
 				return isSetIsolated();
 			case BPELPackage.SCOPE__FAULT_HANDLERS:
@@ -975,7 +882,7 @@
 			case BPELPackage.SCOPE__EXIT_ON_STANDARD_FAULT:
 				return isSetExitOnStandardFault();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/CompletionConditionImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompletionConditionImpl.java,v
retrieving revision 1.6
diff -u -r1.6 CompletionConditionImpl.java
--- src/org/eclipse/bpel/model/impl/CompletionConditionImpl.java	20 Apr 2007 23:31:44 -0000	1.6
+++ src/org/eclipse/bpel/model/impl/CompletionConditionImpl.java	24 May 2007 13:06:28 -0000
@@ -50,7 +50,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Branches branches = null;
+	protected Branches branches;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -67,7 +67,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCompletionCondition();
+		return BPELPackage.Literals.COMPLETION_CONDITION;
 	}
 
 	/**
@@ -118,20 +118,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.COMPLETION_CONDITION__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.COMPLETION_CONDITION__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.COMPLETION_CONDITION__BRANCHES:
-					return basicSetBranches(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.COMPLETION_CONDITION__BRANCHES:
+				return basicSetBranches(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -139,20 +131,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPLETION_CONDITION__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.COMPLETION_CONDITION__ELEMENT:
-				return getElement();
-			case BPELPackage.COMPLETION_CONDITION__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.COMPLETION_CONDITION__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.COMPLETION_CONDITION__BRANCHES:
 				return getBranches();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -160,26 +144,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPLETION_CONDITION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.COMPLETION_CONDITION__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.COMPLETION_CONDITION__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.COMPLETION_CONDITION__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.COMPLETION_CONDITION__BRANCHES:
 				setBranches((Branches)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -187,25 +158,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPLETION_CONDITION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COMPLETION_CONDITION__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.COMPLETION_CONDITION__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.COMPLETION_CONDITION__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.COMPLETION_CONDITION__BRANCHES:
 				setBranches((Branches)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -213,20 +172,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.COMPLETION_CONDITION__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.COMPLETION_CONDITION__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.COMPLETION_CONDITION__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.COMPLETION_CONDITION__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.COMPLETION_CONDITION__BRANCHES:
 				return branches != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //CompletionConditionImpl
Index: src/org/eclipse/bpel/model/impl/ToPartImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ToPartImpl.java,v
retrieving revision 1.4
diff -u -r1.4 ToPartImpl.java
--- src/org/eclipse/bpel/model/impl/ToPartImpl.java	20 Apr 2007 23:31:44 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/ToPartImpl.java	24 May 2007 13:06:31 -0000
@@ -70,7 +70,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected From from = null;
+	protected From from;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -87,7 +87,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getToPart();
+		return BPELPackage.Literals.TO_PART;
 	}
 
 	/**
@@ -118,8 +118,8 @@
 	 */
 	public From getFrom() {
 		if (from != null && from.eIsProxy()) {
-			From oldFrom = from;
-			from = (From)eResolveProxy((InternalEObject)from);
+			InternalEObject oldFrom = (InternalEObject)from;
+			from = (From)eResolveProxy(oldFrom);
 			if (from != oldFrom) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.TO_PART__FROM, oldFrom, from));
@@ -154,42 +154,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.TO_PART__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.TO_PART__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TO_PART__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.TO_PART__ELEMENT:
-				return getElement();
-			case BPELPackage.TO_PART__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.TO_PART__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.TO_PART__PART:
 				return getPart();
 			case BPELPackage.TO_PART__FROM:
 				if (resolve) return getFrom();
 				return basicGetFrom();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -197,21 +170,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TO_PART__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.TO_PART__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.TO_PART__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.TO_PART__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.TO_PART__PART:
 				setPart((String)newValue);
 				return;
@@ -219,7 +179,7 @@
 				setFrom((From)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -227,20 +187,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TO_PART__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TO_PART__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.TO_PART__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.TO_PART__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TO_PART__PART:
 				setPart(PART_EDEFAULT);
 				return;
@@ -248,7 +196,7 @@
 				setFrom((From)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -256,22 +204,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.TO_PART__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.TO_PART__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.TO_PART__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.TO_PART__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.TO_PART__PART:
 				return PART_EDEFAULT == null ? part != null : !PART_EDEFAULT.equals(part);
 			case BPELPackage.TO_PART__FROM:
 				return from != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/ProcessImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ProcessImpl.java,v
retrieving revision 1.8
diff -u -r1.8 ProcessImpl.java
--- src/org/eclipse/bpel/model/impl/ProcessImpl.java	20 Apr 2007 23:31:44 -0000	1.8
+++ src/org/eclipse/bpel/model/impl/ProcessImpl.java	24 May 2007 13:06:30 -0000
@@ -136,7 +136,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean queryLanguageESet = false;
+	protected boolean queryLanguageESet;
 
 	/**
 	 * The default value of the '{@link #getExpressionLanguage() <em>Expression Language</em>}' attribute.
@@ -165,7 +165,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean expressionLanguageESet = false;
+	protected boolean expressionLanguageESet;
 
 	/**
 	 * The default value of the '{@link #getSuppressJoinFailure() <em>Suppress Join Failure</em>}' attribute.
@@ -194,7 +194,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean suppressJoinFailureESet = false;
+	protected boolean suppressJoinFailureESet;
 
 	/**
 	 * The default value of the '{@link #getVariableAccessSerializable() <em>Variable Access Serializable</em>}' attribute.
@@ -223,7 +223,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean variableAccessSerializableESet = false;
+	protected boolean variableAccessSerializableESet;
 
 	/**
 	 * The cached value of the '{@link #getPartnerLinks() <em>Partner Links</em>}' containment reference.
@@ -233,7 +233,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected PartnerLinks partnerLinks = null;
+	protected PartnerLinks partnerLinks;
 
 	/**
 	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference.
@@ -243,7 +243,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variables variables = null;
+	protected Variables variables;
 
 	/**
 	 * The cached value of the '{@link #getActivity() <em>Activity</em>}' containment reference.
@@ -253,7 +253,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * The cached value of the '{@link #getFaultHandlers() <em>Fault Handlers</em>}' containment reference.
@@ -263,7 +263,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected FaultHandler faultHandlers = null;
+	protected FaultHandler faultHandlers;
 
 	/**
 	 * The cached value of the '{@link #getEventHandlers() <em>Event Handlers</em>}' containment reference.
@@ -273,7 +273,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EventHandler eventHandlers = null;
+	protected EventHandler eventHandlers;
 
 	/**
 	 * The cached value of the '{@link #getCorrelationSets() <em>Correlation Sets</em>}' containment reference.
@@ -283,7 +283,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected CorrelationSets correlationSets = null;
+	protected CorrelationSets correlationSets;
 
 	/**
 	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.
@@ -293,7 +293,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList imports = null;
+	protected EList imports;
 
 	/**
 	 * The cached value of the '{@link #getExtensions() <em>Extensions</em>}' containment reference.
@@ -303,7 +303,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Extensions extensions = null;
+	protected Extensions extensions;
 
 	/**
 	 * The default value of the '{@link #getExitOnStandardFault() <em>Exit On Standard Fault</em>}' attribute.
@@ -333,7 +333,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected MessageExchanges messageExchanges = null;
+	protected MessageExchanges messageExchanges;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -350,7 +350,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getProcess();
+		return BPELPackage.Literals.PROCESS;
 	}
 
 	/**
@@ -822,8 +822,8 @@
 	 */
 	public MessageExchanges getMessageExchanges() {
 		if (messageExchanges != null && messageExchanges.eIsProxy()) {
-			MessageExchanges oldMessageExchanges = messageExchanges;
-			messageExchanges = (MessageExchanges)eResolveProxy((InternalEObject)messageExchanges);
+			InternalEObject oldMessageExchanges = (InternalEObject)messageExchanges;
+			messageExchanges = (MessageExchanges)eResolveProxy(oldMessageExchanges);
 			if (messageExchanges != oldMessageExchanges) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.PROCESS__MESSAGE_EXCHANGES, oldMessageExchanges, messageExchanges));
@@ -858,34 +858,26 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.PROCESS__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.PROCESS__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.PROCESS__PARTNER_LINKS:
-					return basicSetPartnerLinks(null, msgs);
-				case BPELPackage.PROCESS__VARIABLES:
-					return basicSetVariables(null, msgs);
-				case BPELPackage.PROCESS__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				case BPELPackage.PROCESS__FAULT_HANDLERS:
-					return basicSetFaultHandlers(null, msgs);
-				case BPELPackage.PROCESS__EVENT_HANDLERS:
-					return basicSetEventHandlers(null, msgs);
-				case BPELPackage.PROCESS__CORRELATION_SETS:
-					return basicSetCorrelationSets(null, msgs);
-				case BPELPackage.PROCESS__IMPORTS:
-					return ((InternalEList)getImports()).basicRemove(otherEnd, msgs);
-				case BPELPackage.PROCESS__EXTENSIONS:
-					return basicSetExtensions(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.PROCESS__PARTNER_LINKS:
+				return basicSetPartnerLinks(null, msgs);
+			case BPELPackage.PROCESS__VARIABLES:
+				return basicSetVariables(null, msgs);
+			case BPELPackage.PROCESS__ACTIVITY:
+				return basicSetActivity(null, msgs);
+			case BPELPackage.PROCESS__FAULT_HANDLERS:
+				return basicSetFaultHandlers(null, msgs);
+			case BPELPackage.PROCESS__EVENT_HANDLERS:
+				return basicSetEventHandlers(null, msgs);
+			case BPELPackage.PROCESS__CORRELATION_SETS:
+				return basicSetCorrelationSets(null, msgs);
+			case BPELPackage.PROCESS__IMPORTS:
+				return ((InternalEList)getImports()).basicRemove(otherEnd, msgs);
+			case BPELPackage.PROCESS__EXTENSIONS:
+				return basicSetExtensions(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -893,16 +885,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PROCESS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.PROCESS__ELEMENT:
-				return getElement();
-			case BPELPackage.PROCESS__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.PROCESS__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.PROCESS__NAME:
 				return getName();
 			case BPELPackage.PROCESS__TARGET_NAMESPACE:
@@ -937,7 +921,7 @@
 				if (resolve) return getMessageExchanges();
 				return basicGetMessageExchanges();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -945,21 +929,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PROCESS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.PROCESS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.PROCESS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.PROCESS__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.PROCESS__NAME:
 				setName((String)newValue);
 				return;
@@ -1010,7 +981,7 @@
 				setMessageExchanges((MessageExchanges)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -1018,20 +989,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PROCESS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PROCESS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.PROCESS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.PROCESS__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PROCESS__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -1081,7 +1040,7 @@
 				setMessageExchanges((MessageExchanges)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -1089,16 +1048,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.PROCESS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.PROCESS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.PROCESS__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.PROCESS__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.PROCESS__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case BPELPackage.PROCESS__TARGET_NAMESPACE:
@@ -1132,7 +1083,7 @@
 			case BPELPackage.PROCESS__MESSAGE_EXCHANGES:
 				return messageExchanges != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/ForEachImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ForEachImpl.java,v
retrieving revision 1.6
diff -u -r1.6 ForEachImpl.java
--- src/org/eclipse/bpel/model/impl/ForEachImpl.java	9 Feb 2007 09:13:42 -0000	1.6
+++ src/org/eclipse/bpel/model/impl/ForEachImpl.java	24 May 2007 13:06:29 -0000
@@ -53,7 +53,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Expression startCounterValue = null;
+	protected Expression startCounterValue;
 
 	/**
 	 * The cached value of the '{@link #getFinalCounterValue() <em>Final Counter Value</em>}' containment reference.
@@ -63,7 +63,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Expression finalCounterValue = null;
+	protected Expression finalCounterValue;
 
 	/**
 	 * The default value of the '{@link #getParallel() <em>Parallel</em>}' attribute.
@@ -93,7 +93,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable counterName = null;
+	protected Variable counterName;
 
 	/**
 	 * The cached value of the '{@link #getCompletionCondition() <em>Completion Condition</em>}' containment reference.
@@ -103,7 +103,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected CompletionCondition completionCondition = null;
+	protected CompletionCondition completionCondition;
 
 	/**
 	 * The cached value of the '{@link #getActivity() <em>Activity</em>}' containment reference.
@@ -113,7 +113,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -130,7 +130,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getForEach();
+		return BPELPackage.Literals.FOR_EACH;
 	}
 
 	/**
@@ -374,32 +374,20 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.FOR_EACH__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.FOR_EACH__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.FOR_EACH__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.FOR_EACH__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.FOR_EACH__START_COUNTER_VALUE:
-					return basicSetStartCounterValue(null, msgs);
-				case BPELPackage.FOR_EACH__FINAL_COUNTER_VALUE:
-					return basicSetFinalCounterValue(null, msgs);
-				case BPELPackage.FOR_EACH__COUNTER_NAME:
-					return basicSetCounterName(null, msgs);
-				case BPELPackage.FOR_EACH__COMPLETION_CONDITION:
-					return basicSetCompletionCondition(null, msgs);
-				case BPELPackage.FOR_EACH__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.FOR_EACH__START_COUNTER_VALUE:
+				return basicSetStartCounterValue(null, msgs);
+			case BPELPackage.FOR_EACH__FINAL_COUNTER_VALUE:
+				return basicSetFinalCounterValue(null, msgs);
+			case BPELPackage.FOR_EACH__COUNTER_NAME:
+				return basicSetCounterName(null, msgs);
+			case BPELPackage.FOR_EACH__COMPLETION_CONDITION:
+				return basicSetCompletionCondition(null, msgs);
+			case BPELPackage.FOR_EACH__ACTIVITY:
+				return basicSetActivity(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -407,24 +395,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FOR_EACH__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.FOR_EACH__ELEMENT:
-				return getElement();
-			case BPELPackage.FOR_EACH__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.FOR_EACH__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.FOR_EACH__NAME:
-				return getName();
-			case BPELPackage.FOR_EACH__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.FOR_EACH__TARGETS:
-				return getTargets();
-			case BPELPackage.FOR_EACH__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.FOR_EACH__START_COUNTER_VALUE:
 				return getStartCounterValue();
 			case BPELPackage.FOR_EACH__FINAL_COUNTER_VALUE:
@@ -438,7 +410,7 @@
 			case BPELPackage.FOR_EACH__ACTIVITY:
 				return getActivity();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -446,33 +418,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FOR_EACH__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.FOR_EACH__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.FOR_EACH__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.FOR_EACH__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.FOR_EACH__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.FOR_EACH__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.FOR_EACH__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.FOR_EACH__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.FOR_EACH__START_COUNTER_VALUE:
 				setStartCounterValue((Expression)newValue);
 				return;
@@ -492,7 +439,7 @@
 				setActivity((Activity)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -500,32 +447,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FOR_EACH__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FOR_EACH__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FOR_EACH__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.FOR_EACH__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.FOR_EACH__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.FOR_EACH__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.FOR_EACH__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.FOR_EACH__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FOR_EACH__START_COUNTER_VALUE:
 				setStartCounterValue((Expression)null);
 				return;
@@ -545,7 +468,7 @@
 				setActivity((Activity)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -553,24 +476,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FOR_EACH__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.FOR_EACH__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.FOR_EACH__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.FOR_EACH__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.FOR_EACH__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.FOR_EACH__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.FOR_EACH__TARGETS:
-				return targets != null;
-			case BPELPackage.FOR_EACH__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FOR_EACH__START_COUNTER_VALUE:
 				return startCounterValue != null;
 			case BPELPackage.FOR_EACH__FINAL_COUNTER_VALUE:
@@ -584,7 +491,7 @@
 			case BPELPackage.FOR_EACH__ACTIVITY:
 				return activity != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/ReceiveImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReceiveImpl.java,v
retrieving revision 1.5
diff -u -r1.5 ReceiveImpl.java
--- src/org/eclipse/bpel/model/impl/ReceiveImpl.java	9 Feb 2007 09:13:42 -0000	1.5
+++ src/org/eclipse/bpel/model/impl/ReceiveImpl.java	24 May 2007 13:06:30 -0000
@@ -81,7 +81,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean createInstanceESet = false;
+	protected boolean createInstanceESet;
 
 	/**
 	 * The cached value of the '{@link #getVariable() <em>Variable</em>}' reference.
@@ -91,7 +91,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Variable variable = null;
+	protected Variable variable;
 
 	/**
 	 * The cached value of the '{@link #getFromPart() <em>From Part</em>}' reference list.
@@ -101,7 +101,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList fromPart = null;
+	protected EList fromPart;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -118,7 +118,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getReceive();
+		return BPELPackage.Literals.RECEIVE;
 	}
 
 	/**
@@ -174,8 +174,8 @@
 	 */
 	public Variable getVariable() {
 		if (variable != null && variable.eIsProxy()) {
-			Variable oldVariable = variable;
-			variable = (Variable)eResolveProxy((InternalEObject)variable);
+			InternalEObject oldVariable = (InternalEObject)variable;
+			variable = (Variable)eResolveProxy(oldVariable);
 			if (variable != oldVariable) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.RECEIVE__VARIABLE, oldVariable, variable));
@@ -222,60 +222,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.RECEIVE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.RECEIVE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.RECEIVE__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.RECEIVE__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.RECEIVE__CORRELATIONS:
-					return basicSetCorrelations(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.RECEIVE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.RECEIVE__ELEMENT:
-				return getElement();
-			case BPELPackage.RECEIVE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.RECEIVE__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.RECEIVE__NAME:
-				return getName();
-			case BPELPackage.RECEIVE__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.RECEIVE__TARGETS:
-				return getTargets();
-			case BPELPackage.RECEIVE__SOURCES:
-				return getSources();
-			case BPELPackage.RECEIVE__PARTNER_LINK:
-				if (resolve) return getPartnerLink();
-				return basicGetPartnerLink();
-			case BPELPackage.RECEIVE__CORRELATIONS:
-				return getCorrelations();
-			case BPELPackage.RECEIVE__PORT_TYPE:
-				if (resolve) return getPortType();
-				return basicGetPortType();
-			case BPELPackage.RECEIVE__OPERATION:
-				if (resolve) return getOperation();
-				return basicGetOperation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.RECEIVE__CREATE_INSTANCE:
 				return getCreateInstance();
 			case BPELPackage.RECEIVE__VARIABLE:
@@ -284,7 +232,7 @@
 			case BPELPackage.RECEIVE__FROM_PART:
 				return getFromPart();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -292,45 +240,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.RECEIVE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.RECEIVE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.RECEIVE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.RECEIVE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.RECEIVE__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.RECEIVE__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.RECEIVE__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.RECEIVE__SOURCES:
-				setSources((Sources)newValue);
-				return;
-			case BPELPackage.RECEIVE__PARTNER_LINK:
-				setPartnerLink((PartnerLink)newValue);
-				return;
-			case BPELPackage.RECEIVE__CORRELATIONS:
-				setCorrelations((Correlations)newValue);
-				return;
-			case BPELPackage.RECEIVE__PORT_TYPE:
-				setPortType((PortType)newValue);
-				return;
-			case BPELPackage.RECEIVE__OPERATION:
-				setOperation((Operation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.RECEIVE__CREATE_INSTANCE:
 				setCreateInstance((Boolean)newValue);
 				return;
@@ -342,7 +253,7 @@
 				getFromPart().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -350,44 +261,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.RECEIVE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.RECEIVE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.RECEIVE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.RECEIVE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.RECEIVE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.RECEIVE__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.RECEIVE__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.RECEIVE__SOURCES:
-				setSources((Sources)null);
-				return;
-			case BPELPackage.RECEIVE__PARTNER_LINK:
-				setPartnerLink((PartnerLink)null);
-				return;
-			case BPELPackage.RECEIVE__CORRELATIONS:
-				setCorrelations((Correlations)null);
-				return;
-			case BPELPackage.RECEIVE__PORT_TYPE:
-				setPortType((PortType)null);
-				return;
-			case BPELPackage.RECEIVE__OPERATION:
-				setOperation((Operation)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.RECEIVE__CREATE_INSTANCE:
 				unsetCreateInstance();
 				return;
@@ -398,7 +273,7 @@
 				getFromPart().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -406,32 +281,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.RECEIVE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.RECEIVE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.RECEIVE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.RECEIVE__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.RECEIVE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.RECEIVE__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.RECEIVE__TARGETS:
-				return targets != null;
-			case BPELPackage.RECEIVE__SOURCES:
-				return sources != null;
-			case BPELPackage.RECEIVE__PARTNER_LINK:
-				return partnerLink != null;
-			case BPELPackage.RECEIVE__CORRELATIONS:
-				return correlations != null;
-			case BPELPackage.RECEIVE__PORT_TYPE:
-				return portType != null;
-			case BPELPackage.RECEIVE__OPERATION:
-				return operation != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.RECEIVE__CREATE_INSTANCE:
 				return isSetCreateInstance();
 			case BPELPackage.RECEIVE__VARIABLE:
@@ -439,7 +290,7 @@
 			case BPELPackage.RECEIVE__FROM_PART:
 				return fromPart != null && !fromPart.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/QueryImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/QueryImpl.java,v
retrieving revision 1.3
diff -u -r1.3 QueryImpl.java
--- src/org/eclipse/bpel/model/impl/QueryImpl.java	11 Apr 2007 20:45:15 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/QueryImpl.java	24 May 2007 13:06:30 -0000
@@ -96,7 +96,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getQuery();
+		return BPELPackage.Literals.QUERY;
 	}
 
 	/**
@@ -146,18 +146,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.QUERY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.QUERY__ELEMENT:
-				return getElement();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.QUERY__VALUE:
 				return getValue();
 			case BPELPackage.QUERY__QUERY_LANGUAGE:
 				return getQueryLanguage();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -165,14 +161,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.QUERY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.QUERY__ELEMENT:
-				setElement((Element)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.QUERY__VALUE:
 				setValue((String)newValue);
 				return;
@@ -180,7 +170,7 @@
 				setQueryLanguage((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -188,14 +178,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.QUERY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.QUERY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.QUERY__VALUE:
 				setValue(VALUE_EDEFAULT);
 				return;
@@ -203,7 +187,7 @@
 				setQueryLanguage(QUERY_LANGUAGE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -211,18 +195,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.QUERY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.QUERY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.QUERY__VALUE:
 				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 			case BPELPackage.QUERY__QUERY_LANGUAGE:
 				return QUERY_LANGUAGE_EDEFAULT == null ? queryLanguage != null : !QUERY_LANGUAGE_EDEFAULT.equals(queryLanguage);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/BooleanExpressionImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BooleanExpressionImpl.java,v
retrieving revision 1.3
diff -u -r1.3 BooleanExpressionImpl.java
--- src/org/eclipse/bpel/model/impl/BooleanExpressionImpl.java	9 Feb 2007 09:13:42 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/BooleanExpressionImpl.java	24 May 2007 13:06:27 -0000
@@ -47,121 +47,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getBooleanExpression();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.BOOLEAN_EXPRESSION__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.BOOLEAN_EXPRESSION__ELEMENT:
-				return getElement();
-			case BPELPackage.BOOLEAN_EXPRESSION__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case BPELPackage.BOOLEAN_EXPRESSION__ELEMENT_TYPE:
-				return getElementType();
-			case BPELPackage.BOOLEAN_EXPRESSION__BODY:
-				return getBody();
-			case BPELPackage.BOOLEAN_EXPRESSION__EXPRESSION_LANGUAGE:
-				return getExpressionLanguage();
-			case BPELPackage.BOOLEAN_EXPRESSION__OPAQUE:
-				return getOpaque();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.BOOLEAN_EXPRESSION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__BODY:
-				setBody((Object)newValue);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__EXPRESSION_LANGUAGE:
-				setExpressionLanguage((String)newValue);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__OPAQUE:
-				setOpaque((Boolean)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.BOOLEAN_EXPRESSION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__BODY:
-				setBody(BODY_EDEFAULT);
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__EXPRESSION_LANGUAGE:
-				unsetExpressionLanguage();
-				return;
-			case BPELPackage.BOOLEAN_EXPRESSION__OPAQUE:
-				unsetOpaque();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.BOOLEAN_EXPRESSION__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.BOOLEAN_EXPRESSION__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.BOOLEAN_EXPRESSION__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case BPELPackage.BOOLEAN_EXPRESSION__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case BPELPackage.BOOLEAN_EXPRESSION__BODY:
-				return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT.equals(body);
-			case BPELPackage.BOOLEAN_EXPRESSION__EXPRESSION_LANGUAGE:
-				return isSetExpressionLanguage();
-			case BPELPackage.BOOLEAN_EXPRESSION__OPAQUE:
-				return isSetOpaque();
-		}
-		return eDynamicIsSet(eFeature);
+		return BPELPackage.Literals.BOOLEAN_EXPRESSION;
 	}
 
 } //BooleanExpressionImpl
Index: src/org/eclipse/bpel/model/impl/CorrelationsImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationsImpl.java,v
retrieving revision 1.2
diff -u -r1.2 CorrelationsImpl.java
--- src/org/eclipse/bpel/model/impl/CorrelationsImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/CorrelationsImpl.java	24 May 2007 13:06:28 -0000
@@ -51,7 +51,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList children = null;
+	protected EList children;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCorrelations();
+		return BPELPackage.Literals.CORRELATIONS;
 	}
 
 	/**
@@ -88,20 +88,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.CORRELATIONS__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.CORRELATIONS__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.CORRELATIONS__CHILDREN:
-					return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.CORRELATIONS__CHILDREN:
+				return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -109,20 +101,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATIONS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.CORRELATIONS__ELEMENT:
-				return getElement();
-			case BPELPackage.CORRELATIONS__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.CORRELATIONS__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.CORRELATIONS__CHILDREN:
 				return getChildren();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -130,27 +114,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATIONS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.CORRELATIONS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.CORRELATIONS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.CORRELATIONS__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.CORRELATIONS__CHILDREN:
 				getChildren().clear();
 				getChildren().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -158,25 +129,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATIONS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CORRELATIONS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CORRELATIONS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.CORRELATIONS__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CORRELATIONS__CHILDREN:
 				getChildren().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -184,20 +143,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATIONS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.CORRELATIONS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.CORRELATIONS__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.CORRELATIONS__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CORRELATIONS__CHILDREN:
 				return children != null && !children.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //CorrelationsImpl
Index: src/org/eclipse/bpel/model/impl/ElseImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ElseImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ElseImpl.java
--- src/org/eclipse/bpel/model/impl/ElseImpl.java	19 Jan 2006 21:08:47 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/ElseImpl.java	24 May 2007 13:06:28 -0000
@@ -43,7 +43,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -60,7 +60,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getElse();
+		return BPELPackage.Literals.ELSE;
 	}
 
 	/**
@@ -111,20 +111,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.ELSE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.ELSE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.ELSE__ACTIVITY:
-					return basicSetActivity(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.ELSE__ACTIVITY:
+				return basicSetActivity(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -132,20 +124,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ELSE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.ELSE__ELEMENT:
-				return getElement();
-			case BPELPackage.ELSE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.ELSE__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.ELSE__ACTIVITY:
 				return getActivity();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -153,26 +137,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ELSE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.ELSE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.ELSE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.ELSE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.ELSE__ACTIVITY:
 				setActivity((Activity)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -180,25 +151,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ELSE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ELSE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ELSE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.ELSE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ELSE__ACTIVITY:
 				setActivity((Activity)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -206,20 +165,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ELSE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.ELSE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.ELSE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.ELSE__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ELSE__ACTIVITY:
 				return activity != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //ElseImpl
Index: src/org/eclipse/bpel/model/impl/CorrelationSetsImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetsImpl.java,v
retrieving revision 1.2
diff -u -r1.2 CorrelationSetsImpl.java
--- src/org/eclipse/bpel/model/impl/CorrelationSetsImpl.java	19 Jan 2006 21:08:47 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/CorrelationSetsImpl.java	24 May 2007 13:06:28 -0000
@@ -51,7 +51,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList children = null;
+	protected EList children;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getCorrelationSets();
+		return BPELPackage.Literals.CORRELATION_SETS;
 	}
 
 	/**
@@ -88,20 +88,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.CORRELATION_SETS__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.CORRELATION_SETS__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.CORRELATION_SETS__CHILDREN:
-					return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.CORRELATION_SETS__CHILDREN:
+				return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -109,20 +101,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION_SETS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.CORRELATION_SETS__ELEMENT:
-				return getElement();
-			case BPELPackage.CORRELATION_SETS__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.CORRELATION_SETS__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION_SETS__CHILDREN:
 				return getChildren();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -130,27 +114,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION_SETS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.CORRELATION_SETS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.CORRELATION_SETS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.CORRELATION_SETS__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION_SETS__CHILDREN:
 				getChildren().clear();
 				getChildren().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -158,25 +129,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION_SETS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CORRELATION_SETS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.CORRELATION_SETS__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.CORRELATION_SETS__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION_SETS__CHILDREN:
 				getChildren().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -184,20 +143,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.CORRELATION_SETS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.CORRELATION_SETS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.CORRELATION_SETS__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.CORRELATION_SETS__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.CORRELATION_SETS__CHILDREN:
 				return children != null && !children.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //CorrelationSetsImpl
Index: src/org/eclipse/bpel/model/impl/ActivityImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ActivityImpl.java,v
retrieving revision 1.2
diff -u -r1.2 ActivityImpl.java
--- src/org/eclipse/bpel/model/impl/ActivityImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/ActivityImpl.java	24 May 2007 13:06:26 -0000
@@ -94,7 +94,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean suppressJoinFailureESet = false;
+	protected boolean suppressJoinFailureESet;
 
 	/**
 	 * The cached value of the '{@link #getTargets() <em>Targets</em>}' containment reference.
@@ -104,7 +104,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Targets targets = null;
+	protected Targets targets;
 
 	/**
 	 * The cached value of the '{@link #getSources() <em>Sources</em>}' containment reference.
@@ -114,7 +114,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Sources sources = null;
+	protected Sources sources;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -131,7 +131,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getActivity();
+		return BPELPackage.Literals.ACTIVITY;
 	}
 
 	/**
@@ -292,22 +292,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.ACTIVITY__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.ACTIVITY__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.ACTIVITY__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.ACTIVITY__TARGETS:
+				return basicSetTargets(null, msgs);
+			case BPELPackage.ACTIVITY__SOURCES:
+				return basicSetSources(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -315,16 +307,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ACTIVITY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.ACTIVITY__ELEMENT:
-				return getElement();
-			case BPELPackage.ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.ACTIVITY__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.ACTIVITY__NAME:
 				return getName();
 			case BPELPackage.ACTIVITY__SUPPRESS_JOIN_FAILURE:
@@ -334,7 +318,7 @@
 			case BPELPackage.ACTIVITY__SOURCES:
 				return getSources();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -342,21 +326,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ACTIVITY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.ACTIVITY__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.ACTIVITY__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.ACTIVITY__NAME:
 				setName((String)newValue);
 				return;
@@ -370,7 +341,7 @@
 				setSources((Sources)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -378,20 +349,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ACTIVITY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ACTIVITY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.ACTIVITY__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ACTIVITY__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -405,7 +364,7 @@
 				setSources((Sources)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -413,16 +372,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.ACTIVITY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.ACTIVITY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.ACTIVITY__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.ACTIVITY__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.ACTIVITY__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case BPELPackage.ACTIVITY__SUPPRESS_JOIN_FAILURE:
@@ -432,7 +383,7 @@
 			case BPELPackage.ACTIVITY__SOURCES:
 				return sources != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/ImportImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ImportImpl.java,v
retrieving revision 1.4
diff -u -r1.4 ImportImpl.java
--- src/org/eclipse/bpel/model/impl/ImportImpl.java	20 Apr 2007 23:31:44 -0000	1.4
+++ src/org/eclipse/bpel/model/impl/ImportImpl.java	24 May 2007 13:06:29 -0000
@@ -127,7 +127,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getImport();
+		return BPELPackage.Literals.IMPORT;
 	}
 
 	/**
@@ -198,35 +198,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.IMPORT__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.IMPORT__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.IMPORT__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.IMPORT__ELEMENT:
-				return getElement();
-			case BPELPackage.IMPORT__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.IMPORT__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.IMPORT__NAMESPACE:
 				return getNamespace();
 			case BPELPackage.IMPORT__LOCATION:
@@ -234,7 +207,7 @@
 			case BPELPackage.IMPORT__IMPORT_TYPE:
 				return getImportType();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -242,21 +215,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.IMPORT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.IMPORT__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.IMPORT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.IMPORT__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.IMPORT__NAMESPACE:
 				setNamespace((String)newValue);
 				return;
@@ -267,7 +227,7 @@
 				setImportType((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -275,20 +235,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.IMPORT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.IMPORT__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.IMPORT__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.IMPORT__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.IMPORT__NAMESPACE:
 				setNamespace(NAMESPACE_EDEFAULT);
 				return;
@@ -299,7 +247,7 @@
 				setImportType(IMPORT_TYPE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -307,16 +255,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.IMPORT__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.IMPORT__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.IMPORT__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.IMPORT__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.IMPORT__NAMESPACE:
 				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);
 			case BPELPackage.IMPORT__LOCATION:
@@ -324,7 +264,7 @@
 			case BPELPackage.IMPORT__IMPORT_TYPE:
 				return IMPORT_TYPE_EDEFAULT == null ? importType != null : !IMPORT_TYPE_EDEFAULT.equals(importType);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/impl/FaultHandlerImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FaultHandlerImpl.java,v
retrieving revision 1.2
diff -u -r1.2 FaultHandlerImpl.java
--- src/org/eclipse/bpel/model/impl/FaultHandlerImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/FaultHandlerImpl.java	24 May 2007 13:06:28 -0000
@@ -55,7 +55,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList catch_ = null;
+	protected EList catch_;
 
 	/**
 	 * The cached value of the '{@link #getCatchAll() <em>Catch All</em>}' containment reference.
@@ -65,7 +65,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected CatchAll catchAll = null;
+	protected CatchAll catchAll;
 
 	/**
 	 * This is true if the Catch All containment reference has been set.
@@ -74,7 +74,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean catchAllESet = false;
+	protected boolean catchAllESet;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -91,7 +91,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getFaultHandler();
+		return BPELPackage.Literals.FAULT_HANDLER;
 	}
 
 	/**
@@ -152,7 +152,7 @@
 			catchAllESet = true;
 			if (eNotificationRequired())
 				eNotify(new ENotificationImpl(this, Notification.SET, BPELPackage.FAULT_HANDLER__CATCH_ALL, newCatchAll, newCatchAll, !oldCatchAllESet));
-    	}
+		}
 	}
 
 	/**
@@ -189,7 +189,7 @@
 			catchAllESet = false;
 			if (eNotificationRequired())
 				eNotify(new ENotificationImpl(this, Notification.UNSET, BPELPackage.FAULT_HANDLER__CATCH_ALL, null, null, oldCatchAllESet));
-    	}
+		}
 	}
 
 	/**
@@ -206,22 +206,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.FAULT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.FAULT_HANDLER__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.FAULT_HANDLER__CATCH:
-					return ((InternalEList)getCatch()).basicRemove(otherEnd, msgs);
-				case BPELPackage.FAULT_HANDLER__CATCH_ALL:
-					return basicUnsetCatchAll(msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.FAULT_HANDLER__CATCH:
+				return ((InternalEList)getCatch()).basicRemove(otherEnd, msgs);
+			case BPELPackage.FAULT_HANDLER__CATCH_ALL:
+				return basicUnsetCatchAll(msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -229,22 +221,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FAULT_HANDLER__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.FAULT_HANDLER__ELEMENT:
-				return getElement();
-			case BPELPackage.FAULT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.FAULT_HANDLER__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.FAULT_HANDLER__CATCH:
 				return getCatch();
 			case BPELPackage.FAULT_HANDLER__CATCH_ALL:
 				return getCatchAll();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -252,21 +236,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FAULT_HANDLER__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.FAULT_HANDLER__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.FAULT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.FAULT_HANDLER__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.FAULT_HANDLER__CATCH:
 				getCatch().clear();
 				getCatch().addAll((Collection)newValue);
@@ -275,7 +246,7 @@
 				setCatchAll((CatchAll)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -283,20 +254,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FAULT_HANDLER__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FAULT_HANDLER__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.FAULT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.FAULT_HANDLER__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FAULT_HANDLER__CATCH:
 				getCatch().clear();
 				return;
@@ -304,7 +263,7 @@
 				unsetCatchAll();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -312,22 +271,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.FAULT_HANDLER__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.FAULT_HANDLER__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.FAULT_HANDLER__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.FAULT_HANDLER__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.FAULT_HANDLER__CATCH:
 				return catch_ != null && !catch_.isEmpty();
 			case BPELPackage.FAULT_HANDLER__CATCH_ALL:
 				return isSetCatchAll();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //FaultHandlerImpl
Index: src/org/eclipse/bpel/model/impl/BPELFactoryImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELFactoryImpl.java,v
retrieving revision 1.19
diff -u -r1.19 BPELFactoryImpl.java
--- src/org/eclipse/bpel/model/impl/BPELFactoryImpl.java	20 Apr 2007 23:31:44 -0000	1.19
+++ src/org/eclipse/bpel/model/impl/BPELFactoryImpl.java	24 May 2007 13:06:26 -0000
@@ -104,6 +104,25 @@
  */
 public class BPELFactoryImpl extends EFactoryImpl implements BPELFactory {
 	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static BPELFactory init() {
+		try {
+			BPELFactory theBPELFactory = (BPELFactory)EPackage.Registry.INSTANCE.getEFactory("http://docs.oasis-open.org/wsbpel/2.0/process/executable";); 
+			if (theBPELFactory != null) {
+				return theBPELFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new BPELFactoryImpl();
+	}
+
+	/**
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -144,7 +163,7 @@
 			case BPELPackage.COPY: return createCopy();
 			case BPELPackage.EXTENSION: return createExtension();
 			case BPELPackage.SCOPE: return createScope();
-			case BPELPackage.COMPENSATE: return createCompensate();
+			case BPELPackage.COMPENSATE_SCOPE: return createCompensateScope();
 			case BPELPackage.COMPENSATION_HANDLER: return createCompensationHandler();
 			case BPELPackage.TO: return createTo();
 			case BPELPackage.FROM: return createFrom();
@@ -189,7 +208,7 @@
 			case BPELPackage.DOCUMENTATION: return createDocumentation();
 			case BPELPackage.MESSAGE_EXCHANGES: return createMessageExchanges();
 			case BPELPackage.MESSAGE_EXCHANGE: return createMessageExchange();
-			case BPELPackage.COMPENSATE_SCOPE: return createCompensateScope();
+			case BPELPackage.COMPENSATE: return createCompensate();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -202,16 +221,10 @@
 	 */
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case BPELPackage.CORRELATION_PATTERN: {
-				CorrelationPattern result = CorrelationPattern.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case BPELPackage.ENDPOINT_REFERENCE_ROLE: {
-				EndpointReferenceRole result = EndpointReferenceRole.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
+			case BPELPackage.CORRELATION_PATTERN:
+				return createCorrelationPatternFromString(eDataType, initialValue);
+			case BPELPackage.ENDPOINT_REFERENCE_ROLE:
+				return createEndpointReferenceRoleFromString(eDataType, initialValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
@@ -225,9 +238,9 @@
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
 			case BPELPackage.CORRELATION_PATTERN:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertCorrelationPatternToString(eDataType, instanceValue);
 			case BPELPackage.ENDPOINT_REFERENCE_ROLE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertEndpointReferenceRoleToString(eDataType, instanceValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
@@ -478,6 +491,46 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CorrelationPattern createCorrelationPatternFromString(EDataType eDataType, String initialValue) {
+		CorrelationPattern result = CorrelationPattern.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCorrelationPatternToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EndpointReferenceRole createEndpointReferenceRoleFromString(EDataType eDataType, String initialValue) {
+		EndpointReferenceRole result = EndpointReferenceRole.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertEndpointReferenceRoleToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CompensationHandler createCompensationHandler() {
 		CompensationHandlerImpl compensationHandler = new CompensationHandlerImpl();
 		return compensationHandler;
Index: src/org/eclipse/bpel/model/impl/SequenceImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SequenceImpl.java,v
retrieving revision 1.2
diff -u -r1.2 SequenceImpl.java
--- src/org/eclipse/bpel/model/impl/SequenceImpl.java	19 Jan 2006 21:08:48 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/SequenceImpl.java	24 May 2007 13:06:30 -0000
@@ -53,7 +53,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList activities = null;
+	protected EList activities;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -70,7 +70,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getSequence();
+		return BPELPackage.Literals.SEQUENCE;
 	}
 
 	/**
@@ -90,24 +90,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.SEQUENCE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.SEQUENCE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.SEQUENCE__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.SEQUENCE__SOURCES:
-					return basicSetSources(null, msgs);
-				case BPELPackage.SEQUENCE__ACTIVITIES:
-					return ((InternalEList)getActivities()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.SEQUENCE__ACTIVITIES:
+				return ((InternalEList)getActivities()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -115,28 +103,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SEQUENCE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.SEQUENCE__ELEMENT:
-				return getElement();
-			case BPELPackage.SEQUENCE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.SEQUENCE__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.SEQUENCE__NAME:
-				return getName();
-			case BPELPackage.SEQUENCE__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.SEQUENCE__TARGETS:
-				return getTargets();
-			case BPELPackage.SEQUENCE__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.SEQUENCE__ACTIVITIES:
 				return getActivities();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -144,39 +116,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SEQUENCE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.SEQUENCE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.SEQUENCE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.SEQUENCE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.SEQUENCE__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.SEQUENCE__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.SEQUENCE__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.SEQUENCE__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.SEQUENCE__ACTIVITIES:
 				getActivities().clear();
 				getActivities().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -184,37 +131,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SEQUENCE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SEQUENCE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SEQUENCE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.SEQUENCE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.SEQUENCE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.SEQUENCE__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.SEQUENCE__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.SEQUENCE__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SEQUENCE__ACTIVITIES:
 				getActivities().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -222,28 +145,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SEQUENCE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.SEQUENCE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.SEQUENCE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.SEQUENCE__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.SEQUENCE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.SEQUENCE__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.SEQUENCE__TARGETS:
-				return targets != null;
-			case BPELPackage.SEQUENCE__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SEQUENCE__ACTIVITIES:
 				return activities != null && !activities.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //SequenceImpl
Index: src/org/eclipse/bpel/model/impl/ValidateImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ValidateImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ValidateImpl.java
--- src/org/eclipse/bpel/model/impl/ValidateImpl.java	9 Feb 2007 09:13:42 -0000	1.3
+++ src/org/eclipse/bpel/model/impl/ValidateImpl.java	24 May 2007 13:06:31 -0000
@@ -45,7 +45,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList variables = null;
+	protected EList variables;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -62,7 +62,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getValidate();
+		return BPELPackage.Literals.VALIDATE;
 	}
 
 	/**
@@ -82,51 +82,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.VALIDATE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.VALIDATE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.VALIDATE__TARGETS:
-					return basicSetTargets(null, msgs);
-				case BPELPackage.VALIDATE__SOURCES:
-					return basicSetSources(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VALIDATE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.VALIDATE__ELEMENT:
-				return getElement();
-			case BPELPackage.VALIDATE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.VALIDATE__DOCUMENTATION:
-				return getDocumentation();
-			case BPELPackage.VALIDATE__NAME:
-				return getName();
-			case BPELPackage.VALIDATE__SUPPRESS_JOIN_FAILURE:
-				return getSuppressJoinFailure();
-			case BPELPackage.VALIDATE__TARGETS:
-				return getTargets();
-			case BPELPackage.VALIDATE__SOURCES:
-				return getSources();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.VALIDATE__VARIABLES:
 				return getVariables();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -134,39 +95,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VALIDATE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.VALIDATE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.VALIDATE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.VALIDATE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
-			case BPELPackage.VALIDATE__NAME:
-				setName((String)newValue);
-				return;
-			case BPELPackage.VALIDATE__SUPPRESS_JOIN_FAILURE:
-				setSuppressJoinFailure((Boolean)newValue);
-				return;
-			case BPELPackage.VALIDATE__TARGETS:
-				setTargets((Targets)newValue);
-				return;
-			case BPELPackage.VALIDATE__SOURCES:
-				setSources((Sources)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.VALIDATE__VARIABLES:
 				getVariables().clear();
 				getVariables().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -174,37 +110,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VALIDATE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.VALIDATE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.VALIDATE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.VALIDATE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
-			case BPELPackage.VALIDATE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BPELPackage.VALIDATE__SUPPRESS_JOIN_FAILURE:
-				unsetSuppressJoinFailure();
-				return;
-			case BPELPackage.VALIDATE__TARGETS:
-				setTargets((Targets)null);
-				return;
-			case BPELPackage.VALIDATE__SOURCES:
-				setSources((Sources)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.VALIDATE__VARIABLES:
 				getVariables().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -212,28 +124,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.VALIDATE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.VALIDATE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.VALIDATE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.VALIDATE__DOCUMENTATION:
-				return isSetDocumentation();
-			case BPELPackage.VALIDATE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BPELPackage.VALIDATE__SUPPRESS_JOIN_FAILURE:
-				return isSetSuppressJoinFailure();
-			case BPELPackage.VALIDATE__TARGETS:
-				return targets != null;
-			case BPELPackage.VALIDATE__SOURCES:
-				return sources != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.VALIDATE__VARIABLES:
 				return variables != null && !variables.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //ValidateImpl
Index: src/org/eclipse/bpel/model/impl/SourceImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourceImpl.java,v
retrieving revision 1.2
diff -u -r1.2 SourceImpl.java
--- src/org/eclipse/bpel/model/impl/SourceImpl.java	19 Jan 2006 21:08:47 -0000	1.2
+++ src/org/eclipse/bpel/model/impl/SourceImpl.java	24 May 2007 13:06:31 -0000
@@ -58,7 +58,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Link link = null;
+	protected Link link;
 
 	/**
 	 * The cached value of the '{@link #getActivity() <em>Activity</em>}' reference.
@@ -68,7 +68,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Activity activity = null;
+	protected Activity activity;
 
 	/**
 	 * The cached value of the '{@link #getTransitionCondition() <em>Transition Condition</em>}' containment reference.
@@ -78,7 +78,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Condition transitionCondition = null;
+	protected Condition transitionCondition;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -95,7 +95,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return BPELPackage.eINSTANCE.getSource();
+		return BPELPackage.Literals.SOURCE;
 	}
 
 	/**
@@ -105,8 +105,8 @@
 	 */
 	public Link getLink() {
 		if (link != null && link.eIsProxy()) {
-			Link oldLink = link;
-			link = (Link)eResolveProxy((InternalEObject)link);
+			InternalEObject oldLink = (InternalEObject)link;
+			link = (Link)eResolveProxy(oldLink);
 			if (link != oldLink) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPELPackage.SOURCE__LINK, oldLink, link));
@@ -242,20 +242,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.SOURCE__LINK:
-					if (link != null)
-						msgs = ((InternalEObject)link).eInverseRemove(this, BPELPackage.LINK__SOURCES, Link.class, msgs);
-					return basicSetLink((Link)otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.SOURCE__LINK:
+				if (link != null)
+					msgs = ((InternalEObject)link).eInverseRemove(this, BPELPackage.LINK__SOURCES, Link.class, msgs);
+				return basicSetLink((Link)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -263,22 +257,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case BPELPackage.SOURCE__EEXTENSIBILITY_ELEMENTS:
-					return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-				case BPELPackage.SOURCE__DOCUMENTATION:
-					return basicUnsetDocumentation(msgs);
-				case BPELPackage.SOURCE__LINK:
-					return basicSetLink(null, msgs);
-				case BPELPackage.SOURCE__TRANSITION_CONDITION:
-					return basicSetTransitionCondition(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case BPELPackage.SOURCE__LINK:
+				return basicSetLink(null, msgs);
+			case BPELPackage.SOURCE__TRANSITION_CONDITION:
+				return basicSetTransitionCondition(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -286,16 +272,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SOURCE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case BPELPackage.SOURCE__ELEMENT:
-				return getElement();
-			case BPELPackage.SOURCE__EEXTENSIBILITY_ELEMENTS:
-				return getEExtensibilityElements();
-			case BPELPackage.SOURCE__DOCUMENTATION:
-				return getDocumentation();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case BPELPackage.SOURCE__LINK:
 				if (resolve) return getLink();
 				return basicGetLink();
@@ -305,7 +283,7 @@
 			case BPELPackage.SOURCE__TRANSITION_CONDITION:
 				return getTransitionCondition();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -313,21 +291,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SOURCE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case BPELPackage.SOURCE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case BPELPackage.SOURCE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				getEExtensibilityElements().addAll((Collection)newValue);
-				return;
-			case BPELPackage.SOURCE__DOCUMENTATION:
-				setDocumentation((Documentation)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case BPELPackage.SOURCE__LINK:
 				setLink((Link)newValue);
 				return;
@@ -338,7 +303,7 @@
 				setTransitionCondition((Condition)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -346,20 +311,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SOURCE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SOURCE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case BPELPackage.SOURCE__EEXTENSIBILITY_ELEMENTS:
-				getEExtensibilityElements().clear();
-				return;
-			case BPELPackage.SOURCE__DOCUMENTATION:
-				unsetDocumentation();
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SOURCE__LINK:
 				setLink((Link)null);
 				return;
@@ -370,7 +323,7 @@
 				setTransitionCondition((Condition)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -378,16 +331,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BPELPackage.SOURCE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case BPELPackage.SOURCE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case BPELPackage.SOURCE__EEXTENSIBILITY_ELEMENTS:
-				return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-			case BPELPackage.SOURCE__DOCUMENTATION:
-				return isSetDocumentation();
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case BPELPackage.SOURCE__LINK:
 				return link != null;
 			case BPELPackage.SOURCE__ACTIVITY:
@@ -395,7 +340,7 @@
 			case BPELPackage.SOURCE__TRANSITION_CONDITION:
 				return transitionCondition != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //SourceImpl
Index: src/org/eclipse/bpel/model/partnerlinktype/PartnerLinkType.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerLinkType.java,v
retrieving revision 1.1
diff -u -r1.1 PartnerLinkType.java
--- src/org/eclipse/bpel/model/partnerlinktype/PartnerLinkType.java	29 Nov 2005 18:50:28 -0000	1.1
+++ src/org/eclipse/bpel/model/partnerlinktype/PartnerLinkType.java	24 May 2007 13:06:32 -0000
@@ -48,7 +48,7 @@
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.bpel.model.partnerlinktype.PartnerlinktypePackage#getPartnerLinkType_Name()
-	 * @model id="true"
+	 * @model
 	 * @generated
 	 */
 	String getName();
Index: src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypePackage.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypePackage.java,v
retrieving revision 1.3
diff -u -r1.3 PartnerlinktypePackage.java
--- src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypePackage.java	11 Apr 2007 20:57:11 -0000	1.3
+++ src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypePackage.java	24 May 2007 13:06:32 -0000
@@ -143,7 +143,7 @@
 	int PARTNER_LINK_TYPE__ROLE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Partner Link Type</em>' class.
+	 * The number of structural features of the '<em>Partner Link Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -225,7 +225,7 @@
 	int ROLE__PORT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Role</em>' class.
+	 * The number of structural features of the '<em>Role</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -329,4 +329,87 @@
 	 */
 	PartnerlinktypeFactory getPartnerlinktypeFactory();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.partnerlinktype.impl.PartnerLinkTypeImpl <em>Partner Link Type</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.partnerlinktype.impl.PartnerLinkTypeImpl
+		 * @see org.eclipse.bpel.model.partnerlinktype.impl.PartnerlinktypePackageImpl#getPartnerLinkType()
+		 * @generated
+		 */
+		EClass PARTNER_LINK_TYPE = eINSTANCE.getPartnerLinkType();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PARTNER_LINK_TYPE__NAME = eINSTANCE.getPartnerLinkType_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>ID</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PARTNER_LINK_TYPE__ID = eINSTANCE.getPartnerLinkType_ID();
+
+		/**
+		 * The meta object literal for the '<em><b>Role</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARTNER_LINK_TYPE__ROLE = eINSTANCE.getPartnerLinkType_Role();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.partnerlinktype.impl.RoleImpl <em>Role</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.partnerlinktype.impl.RoleImpl
+		 * @see org.eclipse.bpel.model.partnerlinktype.impl.PartnerlinktypePackageImpl#getRole()
+		 * @generated
+		 */
+		EClass ROLE = eINSTANCE.getRole();
+
+		/**
+		 * The meta object literal for the '<em><b>ID</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ROLE__ID = eINSTANCE.getRole_ID();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ROLE__NAME = eINSTANCE.getRole_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Port Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ROLE__PORT_TYPE = eINSTANCE.getRole_PortType();
+
+	}
+
 } //PartnerlinktypePackage
Index: src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypeFactory.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypeFactory.java,v
retrieving revision 1.2
diff -u -r1.2 PartnerlinktypeFactory.java
--- src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypeFactory.java	12 Dec 2005 15:55:41 -0000	1.2
+++ src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypeFactory.java	24 May 2007 13:06:32 -0000
@@ -31,7 +31,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	PartnerlinktypeFactory eINSTANCE = new org.eclipse.bpel.model.partnerlinktype.impl.PartnerlinktypeFactoryImpl();
+	PartnerlinktypeFactory eINSTANCE = org.eclipse.bpel.model.partnerlinktype.impl.PartnerlinktypeFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Partner Link Type</em>'.
Index: src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerLinkTypeImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerLinkTypeImpl.java,v
retrieving revision 1.2
diff -u -r1.2 PartnerLinkTypeImpl.java
--- src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerLinkTypeImpl.java	16 Aug 2006 22:11:16 -0000	1.2
+++ src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerLinkTypeImpl.java	24 May 2007 13:06:32 -0000
@@ -100,7 +100,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList role = null;
+	protected EList role;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -117,7 +117,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return PartnerlinktypePackage.eINSTANCE.getPartnerLinkType();
+		return PartnerlinktypePackage.Literals.PARTNER_LINK_TYPE;
 	}
 
 	/**
@@ -168,16 +168,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case PartnerlinktypePackage.PARTNER_LINK_TYPE__ROLE:
-					return ((InternalEList)getRole()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ROLE:
+				return ((InternalEList)getRole()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -185,16 +181,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ELEMENT:
-				return getElement();
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ELEMENT_TYPE:
-				return getElementType();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case PartnerlinktypePackage.PARTNER_LINK_TYPE__NAME:
 				return getName();
 			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ID:
@@ -202,7 +190,7 @@
 			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ROLE:
 				return getRole();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -210,20 +198,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case PartnerlinktypePackage.PARTNER_LINK_TYPE__NAME:
 				setName((String)newValue);
 				return;
@@ -232,7 +208,7 @@
 				getRole().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -240,20 +216,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case PartnerlinktypePackage.PARTNER_LINK_TYPE__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -261,7 +225,7 @@
 				getRole().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -269,16 +233,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case PartnerlinktypePackage.PARTNER_LINK_TYPE__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ID:
@@ -286,7 +242,7 @@
 			case PartnerlinktypePackage.PARTNER_LINK_TYPE__ROLE:
 				return role != null && !role.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypePackageImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypePackageImpl.java,v
retrieving revision 1.3
diff -u -r1.3 PartnerlinktypePackageImpl.java
--- src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypePackageImpl.java	11 Apr 2007 20:57:11 -0000	1.3
+++ src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypePackageImpl.java	24 May 2007 13:06:32 -0000
@@ -14,6 +14,10 @@
  */
 package org.eclipse.bpel.model.partnerlinktype.impl;
 
+import org.eclipse.bpel.model.BPELPackage;
+import org.eclipse.bpel.model.impl.BPELPackageImpl;
+import org.eclipse.bpel.model.messageproperties.MessagepropertiesPackage;
+import org.eclipse.bpel.model.messageproperties.impl.MessagepropertiesPackageImpl;
 import org.eclipse.bpel.model.partnerlinktype.PartnerLinkType;
 import org.eclipse.bpel.model.partnerlinktype.PartnerlinktypeFactory;
 import org.eclipse.bpel.model.partnerlinktype.PartnerlinktypePackage;
@@ -28,6 +32,7 @@
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.impl.EcorePackageImpl;
 import org.eclipse.wst.wsdl.WSDLPackage;
+import org.eclipse.xsd.XSDPackage;
 import org.eclipse.wst.wsdl.WSDLPlugin;
 import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
 import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
@@ -112,15 +117,23 @@
 		isInited = true;
 
 		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		WSDLPackageImpl.init();
-		XSDPackageImpl.init();
+		EcorePackage.eINSTANCE.eClass();
+		WSDLPackage.eINSTANCE.eClass();
+		XSDPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		BPELPackageImpl theBPELPackage = (BPELPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BPELPackage.eNS_URI) instanceof BPELPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BPELPackage.eNS_URI) : BPELPackage.eINSTANCE);
+		MessagepropertiesPackageImpl theMessagepropertiesPackage = (MessagepropertiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(MessagepropertiesPackage.eNS_URI) instanceof MessagepropertiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(MessagepropertiesPackage.eNS_URI) : MessagepropertiesPackage.eINSTANCE);
 
 		// Create package meta-data objects
 		thePartnerlinktypePackage.createPackageContents();
+		theBPELPackage.createPackageContents();
+		theMessagepropertiesPackage.createPackageContents();
 
 		// Initialize created meta-data
 		thePartnerlinktypePackage.initializePackageContents();
+		theBPELPackage.initializePackageContents();
+		theMessagepropertiesPackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
 		thePartnerlinktypePackage.freeze();
@@ -289,8 +302,8 @@
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-		EcorePackageImpl theEcorePackage = (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		WSDLPackage theWSDLPackage = (WSDLPackage)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
 		// Add supertypes to classes
 		partnerLinkTypeEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
@@ -298,7 +311,7 @@
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(partnerLinkTypeEClass, PartnerLinkType.class, "PartnerLinkType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPartnerLinkType_Name(), ecorePackage.getEString(), "name", null, 0, 1, PartnerLinkType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPartnerLinkType_Name(), ecorePackage.getEString(), "name", null, 0, 1, PartnerLinkType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getPartnerLinkType_ID(), ecorePackage.getEString(), "ID", null, 0, 1, PartnerLinkType.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEReference(getPartnerLinkType_Role(), this.getRole(), null, "role", null, 0, -1, PartnerLinkType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
Index: src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypeFactoryImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypeFactoryImpl.java,v
retrieving revision 1.2
diff -u -r1.2 PartnerlinktypeFactoryImpl.java
--- src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypeFactoryImpl.java	12 Dec 2005 15:55:41 -0000	1.2
+++ src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypeFactoryImpl.java	24 May 2007 13:06:32 -0000
@@ -19,7 +19,9 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,6 +31,25 @@
  */
 public class PartnerlinktypeFactoryImpl extends EFactoryImpl implements PartnerlinktypeFactory {
 	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static PartnerlinktypeFactory init() {
+		try {
+			PartnerlinktypeFactory thePartnerlinktypeFactory = (PartnerlinktypeFactory)EPackage.Registry.INSTANCE.getEFactory("http://docs.oasis-open.org/wsbpel/2.0/plnktype";); 
+			if (thePartnerlinktypeFactory != null) {
+				return thePartnerlinktypeFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new PartnerlinktypeFactoryImpl();
+	}
+
+	/**
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
Index: src/org/eclipse/bpel/model/partnerlinktype/impl/RoleImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/RoleImpl.java,v
retrieving revision 1.4
diff -u -r1.4 RoleImpl.java
--- src/org/eclipse/bpel/model/partnerlinktype/impl/RoleImpl.java	16 Aug 2006 22:11:16 -0000	1.4
+++ src/org/eclipse/bpel/model/partnerlinktype/impl/RoleImpl.java	24 May 2007 13:06:32 -0000
@@ -115,7 +115,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return PartnerlinktypePackage.eINSTANCE.getRole();
+		return PartnerlinktypePackage.Literals.ROLE;
 	}
 
     /**
@@ -187,16 +187,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case PartnerlinktypePackage.ROLE__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case PartnerlinktypePackage.ROLE__ELEMENT:
-				return getElement();
-			case PartnerlinktypePackage.ROLE__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case PartnerlinktypePackage.ROLE__ELEMENT_TYPE:
-				return getElementType();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case PartnerlinktypePackage.ROLE__ID:
 				return getID();
 			case PartnerlinktypePackage.ROLE__NAME:
@@ -204,7 +196,7 @@
 			case PartnerlinktypePackage.ROLE__PORT_TYPE:
 				return getPortType();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -212,28 +204,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case PartnerlinktypePackage.ROLE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case PartnerlinktypePackage.ROLE__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case PartnerlinktypePackage.ROLE__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case PartnerlinktypePackage.ROLE__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case PartnerlinktypePackage.ROLE__NAME:
 				setName((String)newValue);
 				return;
 			case PartnerlinktypePackage.ROLE__PORT_TYPE:
-				setPortType((Object)newValue);
+				setPortType(newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -241,20 +221,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case PartnerlinktypePackage.ROLE__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case PartnerlinktypePackage.ROLE__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case PartnerlinktypePackage.ROLE__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case PartnerlinktypePackage.ROLE__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case PartnerlinktypePackage.ROLE__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -262,7 +230,7 @@
 				setPortType(PORT_TYPE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -270,16 +238,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case PartnerlinktypePackage.ROLE__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case PartnerlinktypePackage.ROLE__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case PartnerlinktypePackage.ROLE__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case PartnerlinktypePackage.ROLE__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case PartnerlinktypePackage.ROLE__ID:
 				return ID_EDEFAULT == null ? getID() != null : !ID_EDEFAULT.equals(getID());
 			case PartnerlinktypePackage.ROLE__NAME:
@@ -287,7 +247,7 @@
 			case PartnerlinktypePackage.ROLE__PORT_TYPE:
 				return PORT_TYPE_EDEFAULT == null ? portType != null : !PORT_TYPE_EDEFAULT.equals(portType);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/CorrelationPattern.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationPattern.java,v
retrieving revision 1.3
diff -u -r1.3 CorrelationPattern.java
--- src/org/eclipse/bpel/model/CorrelationPattern.java	13 Dec 2006 16:17:31 -0000	1.3
+++ src/org/eclipse/bpel/model/CorrelationPattern.java	24 May 2007 13:06:26 -0000
@@ -83,7 +83,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final CorrelationPattern IN_LITERAL = new CorrelationPattern(IN, "in");
+	public static final CorrelationPattern IN_LITERAL = new CorrelationPattern(IN, "in", "in");
 
 	/**
 	 * The '<em><b>Out</b></em>' literal object.
@@ -93,7 +93,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final CorrelationPattern OUT_LITERAL = new CorrelationPattern(OUT, "out");
+	public static final CorrelationPattern OUT_LITERAL = new CorrelationPattern(OUT, "out", "out");
 
 	/**
 	 * The '<em><b>Outin</b></em>' literal object.
@@ -103,7 +103,7 @@
 	 * @customized
 	 * @ordered
 	 */
-	public static final CorrelationPattern OUTIN_LITERAL = new CorrelationPattern(OUTIN, "out-in");
+	public static final CorrelationPattern OUTIN_LITERAL = new CorrelationPattern(OUTIN, "out-in", "out-in");
 
 	/**
 	 * An array of all the '<em><b>Correlation Pattern</b></em>' enumerators.
@@ -127,15 +127,31 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
+	 * Returns the '<em><b>Correlation Pattern</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static CorrelationPattern get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			CorrelationPattern result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
 	 * Returns the '<em><b>Correlation Pattern</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static CorrelationPattern get(String name) {
+	public static CorrelationPattern getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			CorrelationPattern result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -143,7 +159,7 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Correlation Pattern</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Correlation Pattern</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -154,7 +170,7 @@
 			case OUT: return OUT_LITERAL;
 			case OUTIN: return OUTIN_LITERAL;
 		}
-		return null;	
+		return null;
 	}
 
 	/**
@@ -163,8 +179,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private CorrelationPattern(int value, String name) {
-		super(value, name);
+	private CorrelationPattern(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //CorrelationPattern
Index: src/org/eclipse/bpel/model/CompletionCondition.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CompletionCondition.java,v
retrieving revision 1.4
diff -u -r1.4 CompletionCondition.java
--- src/org/eclipse/bpel/model/CompletionCondition.java	20 Apr 2007 23:31:44 -0000	1.4
+++ src/org/eclipse/bpel/model/CompletionCondition.java	24 May 2007 13:06:26 -0000
@@ -29,7 +29,6 @@
 public interface CompletionCondition extends ExtensibleElement {
 	/**
 	 * Returns the value of the '<em><b>Branches</b></em>' containment reference.
-	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Branches</em>' containment reference isn't clear,
Index: src/org/eclipse/bpel/model/EndpointReferenceRole.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/EndpointReferenceRole.java,v
retrieving revision 1.2
diff -u -r1.2 EndpointReferenceRole.java
--- src/org/eclipse/bpel/model/EndpointReferenceRole.java	13 Dec 2006 16:17:31 -0000	1.2
+++ src/org/eclipse/bpel/model/EndpointReferenceRole.java	24 May 2007 13:06:26 -0000
@@ -68,7 +68,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final EndpointReferenceRole MY_ROLE_LITERAL = new EndpointReferenceRole(MY_ROLE, "myRole");
+	public static final EndpointReferenceRole MY_ROLE_LITERAL = new EndpointReferenceRole(MY_ROLE, "myRole", "myRole");
 
 	/**
 	 * The '<em><b>Partner Role</b></em>' literal object.
@@ -78,7 +78,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final EndpointReferenceRole PARTNER_ROLE_LITERAL = new EndpointReferenceRole(PARTNER_ROLE, "partnerRole");
+	public static final EndpointReferenceRole PARTNER_ROLE_LITERAL = new EndpointReferenceRole(PARTNER_ROLE, "partnerRole", "partnerRole");
 
 	/**
 	 * An array of all the '<em><b>Endpoint Reference Role</b></em>' enumerators.
@@ -101,15 +101,31 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
+	 * Returns the '<em><b>Endpoint Reference Role</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static EndpointReferenceRole get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			EndpointReferenceRole result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
 	 * Returns the '<em><b>Endpoint Reference Role</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static EndpointReferenceRole get(String name) {
+	public static EndpointReferenceRole getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			EndpointReferenceRole result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -117,7 +133,7 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Endpoint Reference Role</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Endpoint Reference Role</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -127,7 +143,7 @@
 			case MY_ROLE: return MY_ROLE_LITERAL;
 			case PARTNER_ROLE: return PARTNER_ROLE_LITERAL;
 		}
-		return null;	
+		return null;
 	}
 
 	/**
@@ -136,8 +152,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EndpointReferenceRole(int value, String name) {
-		super(value, name);
+	private EndpointReferenceRole(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //EndpointReferenceRole
Index: src/org/eclipse/bpel/model/OnEvent.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java,v
retrieving revision 1.4
diff -u -r1.4 OnEvent.java
--- src/org/eclipse/bpel/model/OnEvent.java	19 Jan 2006 21:08:47 -0000	1.4
+++ src/org/eclipse/bpel/model/OnEvent.java	24 May 2007 13:06:26 -0000
@@ -244,7 +244,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Correlation Sets</b></em>' containment reference.
-	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Correlation Sets</em>' containment reference isn't clear,
Index: src/org/eclipse/bpel/model/BPELPackage.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java,v
retrieving revision 1.29
diff -u -r1.29 BPELPackage.java
--- src/org/eclipse/bpel/model/BPELPackage.java	20 Apr 2007 23:31:44 -0000	1.29
+++ src/org/eclipse/bpel/model/BPELPackage.java	24 May 2007 13:06:26 -0000
@@ -307,7 +307,7 @@
 	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCompensate()
 	 * @generated
 	 */
-	int COMPENSATE = 24;
+	int COMPENSATE = 69;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.CompensationHandlerImpl <em>Compensation Handler</em>}' class.
@@ -756,7 +756,7 @@
 	int EXTENSIBLE_ELEMENT__DOCUMENTATION = WSDLPackage.EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Extensible Element</em>' class.
+	 * The number of structural features of the '<em>Extensible Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -945,7 +945,7 @@
 	int PROCESS__MESSAGE_EXCHANGES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 15;
 
 	/**
-	 * The number of structural features of the the '<em>Process</em>' class.
+	 * The number of structural features of the '<em>Process</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1035,7 +1035,7 @@
 	int PARTNER_LINK__INITIALIZE_PARTNER_ROLE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the the '<em>Partner Link</em>' class.
+	 * The number of structural features of the '<em>Partner Link</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1098,7 +1098,7 @@
 	int FAULT_HANDLER__CATCH_ALL = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Fault Handler</em>' class.
+	 * The number of structural features of the '<em>Fault Handler</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1179,7 +1179,7 @@
 	int ACTIVITY__SOURCES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>Activity</em>' class.
+	 * The number of structural features of the '<em>Activity</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1242,7 +1242,7 @@
 	int CORRELATION_SET__PROPERTIES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Correlation Set</em>' class.
+	 * The number of structural features of the '<em>Correlation Set</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1359,7 +1359,7 @@
 	int PARTNER_ACTIVITY__OPERATION = ACTIVITY_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>Partner Activity</em>' class.
+	 * The number of structural features of the '<em>Partner Activity</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1530,7 +1530,7 @@
 	int INVOKE__FROM_PART = PARTNER_ACTIVITY_FEATURE_COUNT + 5;
 
 	/**
-	 * The number of structural features of the the '<em>Invoke</em>' class.
+	 * The number of structural features of the '<em>Invoke</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1602,7 +1602,7 @@
 	int LINK__TARGETS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Link</em>' class.
+	 * The number of structural features of the '<em>Link</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1692,7 +1692,7 @@
 	int CATCH__FAULT_ELEMENT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the the '<em>Catch</em>' class.
+	 * The number of structural features of the '<em>Catch</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1836,7 +1836,7 @@
 	int REPLY__TO_PART = PARTNER_ACTIVITY_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Reply</em>' class.
+	 * The number of structural features of the '<em>Reply</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1980,7 +1980,7 @@
 	int RECEIVE__FROM_PART = PARTNER_ACTIVITY_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Receive</em>' class.
+	 * The number of structural features of the '<em>Receive</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2061,7 +2061,7 @@
 	int EXIT__SOURCES = ACTIVITY__SOURCES;
 
 	/**
-	 * The number of structural features of the the '<em>Exit</em>' class.
+	 * The number of structural features of the '<em>Exit</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2160,7 +2160,7 @@
 	int THROW__FAULT_VARIABLE = ACTIVITY_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Throw</em>' class.
+	 * The number of structural features of the '<em>Throw</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2259,7 +2259,7 @@
 	int WAIT__UNTIL = ACTIVITY_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Wait</em>' class.
+	 * The number of structural features of the '<em>Wait</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2340,7 +2340,7 @@
 	int EMPTY__SOURCES = ACTIVITY__SOURCES;
 
 	/**
-	 * The number of structural features of the the '<em>Empty</em>' class.
+	 * The number of structural features of the '<em>Empty</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2430,7 +2430,7 @@
 	int SEQUENCE__ACTIVITIES = ACTIVITY_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Sequence</em>' class.
+	 * The number of structural features of the '<em>Sequence</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2529,7 +2529,7 @@
 	int WHILE__CONDITION = ACTIVITY_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>While</em>' class.
+	 * The number of structural features of the '<em>While</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2637,7 +2637,7 @@
 	int PICK__ALARM = ACTIVITY_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Pick</em>' class.
+	 * The number of structural features of the '<em>Pick</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2745,7 +2745,7 @@
 	int FLOW__COMPLETION_CONDITION = ACTIVITY_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Flow</em>' class.
+	 * The number of structural features of the '<em>Flow</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2826,7 +2826,7 @@
 	int ON_ALARM__REPEAT_EVERY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>On Alarm</em>' class.
+	 * The number of structural features of the '<em>On Alarm</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2925,7 +2925,7 @@
 	int ASSIGN__VALIDATE = ACTIVITY_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Assign</em>' class.
+	 * The number of structural features of the '<em>Assign</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3006,7 +3006,7 @@
 	int COPY__IGNORE_MISSING_FROM_DATA = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>Copy</em>' class.
+	 * The number of structural features of the '<em>Copy</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3069,7 +3069,7 @@
 	int EXTENSION__MUST_UNDERSTAND = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Extension</em>' class.
+	 * The number of structural features of the '<em>Extension</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3249,7 +3249,7 @@
 	int SCOPE__EXIT_ON_STANDARD_FAULT = ACTIVITY_FEATURE_COUNT + 10;
 
 	/**
-	 * The number of structural features of the the '<em>Scope</em>' class.
+	 * The number of structural features of the '<em>Scope</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3258,13 +3258,63 @@
 	int SCOPE_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 11;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.ValidateImpl <em>Validate</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.bpel.model.impl.ValidateImpl
+	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getValidate()
+	 * @generated
+	 */
+	int VALIDATE = 59;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.DocumentationImpl <em>Documentation</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.bpel.model.impl.DocumentationImpl
+	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getDocumentation()
+	 * @generated
+	 */
+	int DOCUMENTATION = 66;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.MessageExchangesImpl <em>Message Exchanges</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.bpel.model.impl.MessageExchangesImpl
+	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getMessageExchanges()
+	 * @generated
+	 */
+	int MESSAGE_EXCHANGES = 67;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.MessageExchangeImpl <em>Message Exchange</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.bpel.model.impl.MessageExchangeImpl
+	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getMessageExchange()
+	 * @generated
+	 */
+	int MESSAGE_EXCHANGE = 68;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.CompensateScopeImpl <em>Compensate Scope</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.bpel.model.impl.CompensateScopeImpl
+	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCompensateScope()
+	 * @generated
+	 */
+	int COMPENSATE_SCOPE = 24;
+
+	/**
 	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE__DOCUMENTATION_ELEMENT = ACTIVITY__DOCUMENTATION_ELEMENT;
+	int COMPENSATE_SCOPE__DOCUMENTATION_ELEMENT = ACTIVITY__DOCUMENTATION_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Element</b></em>' attribute.
@@ -3273,7 +3323,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE__ELEMENT = ACTIVITY__ELEMENT;
+	int COMPENSATE_SCOPE__ELEMENT = ACTIVITY__ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
@@ -3282,7 +3332,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE__EEXTENSIBILITY_ELEMENTS = ACTIVITY__EEXTENSIBILITY_ELEMENTS;
+	int COMPENSATE_SCOPE__EEXTENSIBILITY_ELEMENTS = ACTIVITY__EEXTENSIBILITY_ELEMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Documentation</b></em>' containment reference.
@@ -3291,7 +3341,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE__DOCUMENTATION = ACTIVITY__DOCUMENTATION;
+	int COMPENSATE_SCOPE__DOCUMENTATION = ACTIVITY__DOCUMENTATION;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -3300,7 +3350,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE__NAME = ACTIVITY__NAME;
+	int COMPENSATE_SCOPE__NAME = ACTIVITY__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Suppress Join Failure</b></em>' attribute.
@@ -3309,7 +3359,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE__SUPPRESS_JOIN_FAILURE = ACTIVITY__SUPPRESS_JOIN_FAILURE;
+	int COMPENSATE_SCOPE__SUPPRESS_JOIN_FAILURE = ACTIVITY__SUPPRESS_JOIN_FAILURE;
 
 	/**
 	 * The feature id for the '<em><b>Targets</b></em>' containment reference.
@@ -3318,7 +3368,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE__TARGETS = ACTIVITY__TARGETS;
+	int COMPENSATE_SCOPE__TARGETS = ACTIVITY__TARGETS;
 
 	/**
 	 * The feature id for the '<em><b>Sources</b></em>' containment reference.
@@ -3327,16 +3377,25 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE__SOURCES = ACTIVITY__SOURCES;
+	int COMPENSATE_SCOPE__SOURCES = ACTIVITY__SOURCES;
 
 	/**
-	 * The number of structural features of the the '<em>Compensate</em>' class.
+	 * The feature id for the '<em><b>Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 0;
+	int COMPENSATE_SCOPE__TARGET = ACTIVITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Compensate Scope</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPENSATE_SCOPE_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
@@ -3384,7 +3443,7 @@
 	int COMPENSATION_HANDLER__ACTIVITY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Compensation Handler</em>' class.
+	 * The number of structural features of the '<em>Compensation Handler</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3474,7 +3533,7 @@
 	int TO__QUERY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the the '<em>To</em>' class.
+	 * The number of structural features of the '<em>To</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3627,7 +3686,7 @@
 	int FROM__TYPE = TO_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of structural features of the the '<em>From</em>' class.
+	 * The number of structural features of the '<em>From</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3735,7 +3794,7 @@
 	int ON_MESSAGE__FROM_PART = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of structural features of the the '<em>On Message</em>' class.
+	 * The number of structural features of the '<em>On Message</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3807,7 +3866,7 @@
 	int EXPRESSION__OPAQUE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Expression</em>' class.
+	 * The number of structural features of the '<em>Expression</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3879,7 +3938,7 @@
 	int BOOLEAN_EXPRESSION__OPAQUE = EXPRESSION__OPAQUE;
 
 	/**
-	 * The number of structural features of the the '<em>Boolean Expression</em>' class.
+	 * The number of structural features of the '<em>Boolean Expression</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -3951,7 +4010,7 @@
 	int CORRELATION__SET = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Correlation</em>' class.
+	 * The number of structural features of the '<em>Correlation</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4014,7 +4073,7 @@
 	int EVENT_HANDLER__EVENTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Event Handler</em>' class.
+	 * The number of structural features of the '<em>Event Handler</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4086,7 +4145,7 @@
 	int SOURCE__TRANSITION_CONDITION = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Source</em>' class.
+	 * The number of structural features of the '<em>Source</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4149,7 +4208,7 @@
 	int TARGET__ACTIVITY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Target</em>' class.
+	 * The number of structural features of the '<em>Target</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4203,7 +4262,7 @@
 	int PARTNER_LINKS__CHILDREN = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Partner Links</em>' class.
+	 * The number of structural features of the '<em>Partner Links</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4257,7 +4316,7 @@
 	int VARIABLES__CHILDREN = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Variables</em>' class.
+	 * The number of structural features of the '<em>Variables</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4311,7 +4370,7 @@
 	int CORRELATION_SETS__CHILDREN = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Correlation Sets</em>' class.
+	 * The number of structural features of the '<em>Correlation Sets</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4365,7 +4424,7 @@
 	int LINKS__CHILDREN = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Links</em>' class.
+	 * The number of structural features of the '<em>Links</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4419,7 +4478,7 @@
 	int CATCH_ALL__ACTIVITY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Catch All</em>' class.
+	 * The number of structural features of the '<em>Catch All</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4473,7 +4532,7 @@
 	int CORRELATIONS__CHILDREN = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Correlations</em>' class.
+	 * The number of structural features of the '<em>Correlations</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4563,7 +4622,7 @@
 	int VARIABLE__FROM = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the the '<em>Variable</em>' class.
+	 * The number of structural features of the '<em>Variable</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4617,7 +4676,7 @@
 	int UNKNOWN_EXTENSIBILITY_ATTRIBUTE__CHILDREN = WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN;
 
 	/**
-	 * The number of structural features of the the '<em>Unknown Extensibility Attribute</em>' class.
+	 * The number of structural features of the '<em>Unknown Extensibility Attribute</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4743,7 +4802,7 @@
 	int ON_EVENT__CORRELATION_SETS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
-	 * The number of structural features of the the '<em>On Event</em>' class.
+	 * The number of structural features of the '<em>On Event</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4815,7 +4874,7 @@
 	int IMPORT__IMPORT_TYPE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>Import</em>' class.
+	 * The number of structural features of the '<em>Import</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4896,7 +4955,7 @@
 	int RETHROW__SOURCES = ACTIVITY__SOURCES;
 
 	/**
-	 * The number of structural features of the the '<em>Rethrow</em>' class.
+	 * The number of structural features of the '<em>Rethrow</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4968,7 +5027,7 @@
 	int CONDITION__OPAQUE = EXPRESSION__OPAQUE;
 
 	/**
-	 * The number of structural features of the the '<em>Condition</em>' class.
+	 * The number of structural features of the '<em>Condition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5031,7 +5090,7 @@
 	int TARGETS__JOIN_CONDITION = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Targets</em>' class.
+	 * The number of structural features of the '<em>Targets</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5085,7 +5144,7 @@
 	int SOURCES__CHILDREN = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Sources</em>' class.
+	 * The number of structural features of the '<em>Sources</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5130,7 +5189,7 @@
 	int QUERY__QUERY_LANGUAGE = WSDLPackage.WSDL_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Query</em>' class.
+	 * The number of structural features of the '<em>Query</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5184,7 +5243,7 @@
 	int SERVICE_REF__VALUE = WSDLPackage.EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Service Ref</em>' class.
+	 * The number of structural features of the '<em>Service Ref</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5238,7 +5297,7 @@
 	int EXTENSIONS__CHILDREN = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Extensions</em>' class.
+	 * The number of structural features of the '<em>Extensions</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5319,7 +5378,7 @@
 	int EXTENSION_ACTIVITY__SOURCES = ACTIVITY__SOURCES;
 
 	/**
-	 * The number of structural features of the the '<em>Extension Activity</em>' class.
+	 * The number of structural features of the '<em>Extension Activity</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5382,7 +5441,7 @@
 	int FROM_PART__TO = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>From Part</em>' class.
+	 * The number of structural features of the '<em>From Part</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5445,7 +5504,7 @@
 	int TO_PART__FROM = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>To Part</em>' class.
+	 * The number of structural features of the '<em>To Part</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5526,7 +5585,7 @@
 	int OPAQUE_ACTIVITY__SOURCES = ACTIVITY__SOURCES;
 
 	/**
-	 * The number of structural features of the the '<em>Opaque Activity</em>' class.
+	 * The number of structural features of the '<em>Opaque Activity</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5661,7 +5720,7 @@
 	int FOR_EACH__ACTIVITY = ACTIVITY_FEATURE_COUNT + 5;
 
 	/**
-	 * The number of structural features of the the '<em>For Each</em>' class.
+	 * The number of structural features of the '<em>For Each</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5760,7 +5819,7 @@
 	int REPEAT_UNTIL__CONDITION = ACTIVITY_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Repeat Until</em>' class.
+	 * The number of structural features of the '<em>Repeat Until</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5814,7 +5873,7 @@
 	int TERMINATION_HANDLER__ACTIVITY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Termination Handler</em>' class.
+	 * The number of structural features of the '<em>Termination Handler</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -5823,16 +5882,6 @@
 	int TERMINATION_HANDLER_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.ValidateImpl <em>Validate</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.bpel.model.impl.ValidateImpl
-	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getValidate()
-	 * @generated
-	 */
-	int VALIDATE = 59;
-
-	/**
 	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -5914,7 +5963,7 @@
 	int VALIDATE__VARIABLES = ACTIVITY_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Validate</em>' class.
+	 * The number of structural features of the '<em>Validate</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -6031,7 +6080,7 @@
 	int IF__ACTIVITY = ACTIVITY_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>If</em>' class.
+	 * The number of structural features of the '<em>If</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -6094,7 +6143,7 @@
 	int ELSE_IF__ACTIVITY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>Else If</em>' class.
+	 * The number of structural features of the '<em>Else If</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -6148,7 +6197,7 @@
 	int ELSE__ACTIVITY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Else</em>' class.
+	 * The number of structural features of the '<em>Else</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -6202,7 +6251,7 @@
 	int COMPLETION_CONDITION__BRANCHES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Completion Condition</em>' class.
+	 * The number of structural features of the '<em>Completion Condition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -6283,7 +6332,7 @@
 	int BRANCHES__COUNT_COMPLETED_BRANCHES_ONLY = EXPRESSION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Branches</em>' class.
+	 * The number of structural features of the '<em>Branches</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -6292,16 +6341,6 @@
 	int BRANCHES_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.DocumentationImpl <em>Documentation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.bpel.model.impl.DocumentationImpl
-	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getDocumentation()
-	 * @generated
-	 */
-	int DOCUMENTATION = 66;
-
-	/**
 	 * The feature id for the '<em><b>Lang</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -6329,7 +6368,7 @@
 	int DOCUMENTATION__VALUE = 2;
 
 	/**
-	 * The number of structural features of the the '<em>Documentation</em>' class.
+	 * The number of structural features of the '<em>Documentation</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -6338,16 +6377,6 @@
 	int DOCUMENTATION_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.MessageExchangesImpl <em>Message Exchanges</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.bpel.model.impl.MessageExchangesImpl
-	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getMessageExchanges()
-	 * @generated
-	 */
-	int MESSAGE_EXCHANGES = 67;
-
-	/**
 	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -6393,7 +6422,7 @@
 	int MESSAGE_EXCHANGES__CHILDREN = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Message Exchanges</em>' class.
+	 * The number of structural features of the '<em>Message Exchanges</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -6402,16 +6431,6 @@
 	int MESSAGE_EXCHANGES_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.MessageExchangeImpl <em>Message Exchange</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.bpel.model.impl.MessageExchangeImpl
-	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getMessageExchange()
-	 * @generated
-	 */
-	int MESSAGE_EXCHANGE = 68;
-
-	/**
 	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -6457,7 +6476,7 @@
 	int MESSAGE_EXCHANGE__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>Message Exchange</em>' class.
+	 * The number of structural features of the '<em>Message Exchange</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -6466,23 +6485,13 @@
 	int MESSAGE_EXCHANGE_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.bpel.model.impl.CompensateScopeImpl <em>Compensate Scope</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.bpel.model.impl.CompensateScopeImpl
-	 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCompensateScope()
-	 * @generated
-	 */
-	int COMPENSATE_SCOPE = 69;
-
-	/**
 	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_SCOPE__DOCUMENTATION_ELEMENT = ACTIVITY__DOCUMENTATION_ELEMENT;
+	int COMPENSATE__DOCUMENTATION_ELEMENT = ACTIVITY__DOCUMENTATION_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Element</b></em>' attribute.
@@ -6491,7 +6500,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_SCOPE__ELEMENT = ACTIVITY__ELEMENT;
+	int COMPENSATE__ELEMENT = ACTIVITY__ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
@@ -6500,7 +6509,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_SCOPE__EEXTENSIBILITY_ELEMENTS = ACTIVITY__EEXTENSIBILITY_ELEMENTS;
+	int COMPENSATE__EEXTENSIBILITY_ELEMENTS = ACTIVITY__EEXTENSIBILITY_ELEMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Documentation</b></em>' containment reference.
@@ -6509,7 +6518,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_SCOPE__DOCUMENTATION = ACTIVITY__DOCUMENTATION;
+	int COMPENSATE__DOCUMENTATION = ACTIVITY__DOCUMENTATION;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -6518,7 +6527,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_SCOPE__NAME = ACTIVITY__NAME;
+	int COMPENSATE__NAME = ACTIVITY__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Suppress Join Failure</b></em>' attribute.
@@ -6527,7 +6536,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_SCOPE__SUPPRESS_JOIN_FAILURE = ACTIVITY__SUPPRESS_JOIN_FAILURE;
+	int COMPENSATE__SUPPRESS_JOIN_FAILURE = ACTIVITY__SUPPRESS_JOIN_FAILURE;
 
 	/**
 	 * The feature id for the '<em><b>Targets</b></em>' containment reference.
@@ -6536,7 +6545,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_SCOPE__TARGETS = ACTIVITY__TARGETS;
+	int COMPENSATE__TARGETS = ACTIVITY__TARGETS;
 
 	/**
 	 * The feature id for the '<em><b>Sources</b></em>' containment reference.
@@ -6545,25 +6554,16 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_SCOPE__SOURCES = ACTIVITY__SOURCES;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPENSATE_SCOPE__TARGET = ACTIVITY_FEATURE_COUNT + 0;
+	int COMPENSATE__SOURCES = ACTIVITY__SOURCES;
 
 	/**
-	 * The number of structural features of the the '<em>Compensate Scope</em>' class.
+	 * The number of structural features of the '<em>Compensate</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int COMPENSATE_SCOPE_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 1;
+	int COMPENSATE_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.bpel.model.CorrelationPattern <em>Correlation Pattern</em>}' enum.
@@ -9328,4 +9328,2203 @@
 	 */
 	BPELFactory getBPELFactory();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ProcessImpl <em>Process</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ProcessImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getProcess()
+		 * @generated
+		 */
+		EClass PROCESS = eINSTANCE.getProcess();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROCESS__NAME = eINSTANCE.getProcess_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Target Namespace</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROCESS__TARGET_NAMESPACE = eINSTANCE.getProcess_TargetNamespace();
+
+		/**
+		 * The meta object literal for the '<em><b>Query Language</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROCESS__QUERY_LANGUAGE = eINSTANCE.getProcess_QueryLanguage();
+
+		/**
+		 * The meta object literal for the '<em><b>Expression Language</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROCESS__EXPRESSION_LANGUAGE = eINSTANCE.getProcess_ExpressionLanguage();
+
+		/**
+		 * The meta object literal for the '<em><b>Suppress Join Failure</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROCESS__SUPPRESS_JOIN_FAILURE = eINSTANCE.getProcess_SuppressJoinFailure();
+
+		/**
+		 * The meta object literal for the '<em><b>Variable Access Serializable</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROCESS__VARIABLE_ACCESS_SERIALIZABLE = eINSTANCE.getProcess_VariableAccessSerializable();
+
+		/**
+		 * The meta object literal for the '<em><b>Partner Links</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROCESS__PARTNER_LINKS = eINSTANCE.getProcess_PartnerLinks();
+
+		/**
+		 * The meta object literal for the '<em><b>Variables</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROCESS__VARIABLES = eINSTANCE.getProcess_Variables();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROCESS__ACTIVITY = eINSTANCE.getProcess_Activity();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Handlers</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROCESS__FAULT_HANDLERS = eINSTANCE.getProcess_FaultHandlers();
+
+		/**
+		 * The meta object literal for the '<em><b>Event Handlers</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROCESS__EVENT_HANDLERS = eINSTANCE.getProcess_EventHandlers();
+
+		/**
+		 * The meta object literal for the '<em><b>Correlation Sets</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROCESS__CORRELATION_SETS = eINSTANCE.getProcess_CorrelationSets();
+
+		/**
+		 * The meta object literal for the '<em><b>Imports</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROCESS__IMPORTS = eINSTANCE.getProcess_Imports();
+
+		/**
+		 * The meta object literal for the '<em><b>Extensions</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROCESS__EXTENSIONS = eINSTANCE.getProcess_Extensions();
+
+		/**
+		 * The meta object literal for the '<em><b>Exit On Standard Fault</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROCESS__EXIT_ON_STANDARD_FAULT = eINSTANCE.getProcess_ExitOnStandardFault();
+
+		/**
+		 * The meta object literal for the '<em><b>Message Exchanges</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROCESS__MESSAGE_EXCHANGES = eINSTANCE.getProcess_MessageExchanges();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.PartnerLinkImpl <em>Partner Link</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.PartnerLinkImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getPartnerLink()
+		 * @generated
+		 */
+		EClass PARTNER_LINK = eINSTANCE.getPartnerLink();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PARTNER_LINK__NAME = eINSTANCE.getPartnerLink_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>My Role</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARTNER_LINK__MY_ROLE = eINSTANCE.getPartnerLink_MyRole();
+
+		/**
+		 * The meta object literal for the '<em><b>Partner Role</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARTNER_LINK__PARTNER_ROLE = eINSTANCE.getPartnerLink_PartnerRole();
+
+		/**
+		 * The meta object literal for the '<em><b>Partner Link Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARTNER_LINK__PARTNER_LINK_TYPE = eINSTANCE.getPartnerLink_PartnerLinkType();
+
+		/**
+		 * The meta object literal for the '<em><b>Initialize Partner Role</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PARTNER_LINK__INITIALIZE_PARTNER_ROLE = eINSTANCE.getPartnerLink_InitializePartnerRole();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.FaultHandlerImpl <em>Fault Handler</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.FaultHandlerImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getFaultHandler()
+		 * @generated
+		 */
+		EClass FAULT_HANDLER = eINSTANCE.getFaultHandler();
+
+		/**
+		 * The meta object literal for the '<em><b>Catch</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FAULT_HANDLER__CATCH = eINSTANCE.getFaultHandler_Catch();
+
+		/**
+		 * The meta object literal for the '<em><b>Catch All</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FAULT_HANDLER__CATCH_ALL = eINSTANCE.getFaultHandler_CatchAll();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ActivityImpl <em>Activity</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ActivityImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getActivity()
+		 * @generated
+		 */
+		EClass ACTIVITY = eINSTANCE.getActivity();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ACTIVITY__NAME = eINSTANCE.getActivity_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Suppress Join Failure</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ACTIVITY__SUPPRESS_JOIN_FAILURE = eINSTANCE.getActivity_SuppressJoinFailure();
+
+		/**
+		 * The meta object literal for the '<em><b>Targets</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ACTIVITY__TARGETS = eINSTANCE.getActivity_Targets();
+
+		/**
+		 * The meta object literal for the '<em><b>Sources</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ACTIVITY__SOURCES = eINSTANCE.getActivity_Sources();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CorrelationSetImpl <em>Correlation Set</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CorrelationSetImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCorrelationSet()
+		 * @generated
+		 */
+		EClass CORRELATION_SET = eINSTANCE.getCorrelationSet();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CORRELATION_SET__NAME = eINSTANCE.getCorrelationSet_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CORRELATION_SET__PROPERTIES = eINSTANCE.getCorrelationSet_Properties();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.InvokeImpl <em>Invoke</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.InvokeImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getInvoke()
+		 * @generated
+		 */
+		EClass INVOKE = eINSTANCE.getInvoke();
+
+		/**
+		 * The meta object literal for the '<em><b>Output Variable</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INVOKE__OUTPUT_VARIABLE = eINSTANCE.getInvoke_OutputVariable();
+
+		/**
+		 * The meta object literal for the '<em><b>Input Variable</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INVOKE__INPUT_VARIABLE = eINSTANCE.getInvoke_InputVariable();
+
+		/**
+		 * The meta object literal for the '<em><b>Compensation Handler</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INVOKE__COMPENSATION_HANDLER = eINSTANCE.getInvoke_CompensationHandler();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Handler</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INVOKE__FAULT_HANDLER = eINSTANCE.getInvoke_FaultHandler();
+
+		/**
+		 * The meta object literal for the '<em><b>To Part</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INVOKE__TO_PART = eINSTANCE.getInvoke_ToPart();
+
+		/**
+		 * The meta object literal for the '<em><b>From Part</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INVOKE__FROM_PART = eINSTANCE.getInvoke_FromPart();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.LinkImpl <em>Link</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.LinkImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getLink()
+		 * @generated
+		 */
+		EClass LINK = eINSTANCE.getLink();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute LINK__NAME = eINSTANCE.getLink_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Sources</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LINK__SOURCES = eINSTANCE.getLink_Sources();
+
+		/**
+		 * The meta object literal for the '<em><b>Targets</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LINK__TARGETS = eINSTANCE.getLink_Targets();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CatchImpl <em>Catch</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CatchImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCatch()
+		 * @generated
+		 */
+		EClass CATCH = eINSTANCE.getCatch();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CATCH__FAULT_NAME = eINSTANCE.getCatch_FaultName();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Variable</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CATCH__FAULT_VARIABLE = eINSTANCE.getCatch_FaultVariable();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CATCH__ACTIVITY = eINSTANCE.getCatch_Activity();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Message Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CATCH__FAULT_MESSAGE_TYPE = eINSTANCE.getCatch_FaultMessageType();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CATCH__FAULT_ELEMENT = eINSTANCE.getCatch_FaultElement();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ReplyImpl <em>Reply</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ReplyImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getReply()
+		 * @generated
+		 */
+		EClass REPLY = eINSTANCE.getReply();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute REPLY__FAULT_NAME = eINSTANCE.getReply_FaultName();
+
+		/**
+		 * The meta object literal for the '<em><b>Variable</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference REPLY__VARIABLE = eINSTANCE.getReply_Variable();
+
+		/**
+		 * The meta object literal for the '<em><b>To Part</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference REPLY__TO_PART = eINSTANCE.getReply_ToPart();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.PartnerActivityImpl <em>Partner Activity</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.PartnerActivityImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getPartnerActivity()
+		 * @generated
+		 */
+		EClass PARTNER_ACTIVITY = eINSTANCE.getPartnerActivity();
+
+		/**
+		 * The meta object literal for the '<em><b>Partner Link</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARTNER_ACTIVITY__PARTNER_LINK = eINSTANCE.getPartnerActivity_PartnerLink();
+
+		/**
+		 * The meta object literal for the '<em><b>Correlations</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARTNER_ACTIVITY__CORRELATIONS = eINSTANCE.getPartnerActivity_Correlations();
+
+		/**
+		 * The meta object literal for the '<em><b>Port Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARTNER_ACTIVITY__PORT_TYPE = eINSTANCE.getPartnerActivity_PortType();
+
+		/**
+		 * The meta object literal for the '<em><b>Operation</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARTNER_ACTIVITY__OPERATION = eINSTANCE.getPartnerActivity_Operation();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ReceiveImpl <em>Receive</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ReceiveImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getReceive()
+		 * @generated
+		 */
+		EClass RECEIVE = eINSTANCE.getReceive();
+
+		/**
+		 * The meta object literal for the '<em><b>Create Instance</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute RECEIVE__CREATE_INSTANCE = eINSTANCE.getReceive_CreateInstance();
+
+		/**
+		 * The meta object literal for the '<em><b>Variable</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RECEIVE__VARIABLE = eINSTANCE.getReceive_Variable();
+
+		/**
+		 * The meta object literal for the '<em><b>From Part</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RECEIVE__FROM_PART = eINSTANCE.getReceive_FromPart();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ExitImpl <em>Exit</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ExitImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getExit()
+		 * @generated
+		 */
+		EClass EXIT = eINSTANCE.getExit();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ThrowImpl <em>Throw</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ThrowImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getThrow()
+		 * @generated
+		 */
+		EClass THROW = eINSTANCE.getThrow();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute THROW__FAULT_NAME = eINSTANCE.getThrow_FaultName();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Variable</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference THROW__FAULT_VARIABLE = eINSTANCE.getThrow_FaultVariable();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.WaitImpl <em>Wait</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.WaitImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getWait()
+		 * @generated
+		 */
+		EClass WAIT = eINSTANCE.getWait();
+
+		/**
+		 * The meta object literal for the '<em><b>For</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference WAIT__FOR = eINSTANCE.getWait_For();
+
+		/**
+		 * The meta object literal for the '<em><b>Until</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference WAIT__UNTIL = eINSTANCE.getWait_Until();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.EmptyImpl <em>Empty</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.EmptyImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getEmpty()
+		 * @generated
+		 */
+		EClass EMPTY = eINSTANCE.getEmpty();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.SequenceImpl <em>Sequence</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.SequenceImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getSequence()
+		 * @generated
+		 */
+		EClass SEQUENCE = eINSTANCE.getSequence();
+
+		/**
+		 * The meta object literal for the '<em><b>Activities</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SEQUENCE__ACTIVITIES = eINSTANCE.getSequence_Activities();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.WhileImpl <em>While</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.WhileImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getWhile()
+		 * @generated
+		 */
+		EClass WHILE = eINSTANCE.getWhile();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference WHILE__ACTIVITY = eINSTANCE.getWhile_Activity();
+
+		/**
+		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference WHILE__CONDITION = eINSTANCE.getWhile_Condition();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.PickImpl <em>Pick</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.PickImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getPick()
+		 * @generated
+		 */
+		EClass PICK = eINSTANCE.getPick();
+
+		/**
+		 * The meta object literal for the '<em><b>Create Instance</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PICK__CREATE_INSTANCE = eINSTANCE.getPick_CreateInstance();
+
+		/**
+		 * The meta object literal for the '<em><b>Messages</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PICK__MESSAGES = eINSTANCE.getPick_Messages();
+
+		/**
+		 * The meta object literal for the '<em><b>Alarm</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PICK__ALARM = eINSTANCE.getPick_Alarm();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.FlowImpl <em>Flow</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.FlowImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getFlow()
+		 * @generated
+		 */
+		EClass FLOW = eINSTANCE.getFlow();
+
+		/**
+		 * The meta object literal for the '<em><b>Activities</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FLOW__ACTIVITIES = eINSTANCE.getFlow_Activities();
+
+		/**
+		 * The meta object literal for the '<em><b>Links</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FLOW__LINKS = eINSTANCE.getFlow_Links();
+
+		/**
+		 * The meta object literal for the '<em><b>Completion Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FLOW__COMPLETION_CONDITION = eINSTANCE.getFlow_CompletionCondition();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.OnAlarmImpl <em>On Alarm</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.OnAlarmImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getOnAlarm()
+		 * @generated
+		 */
+		EClass ON_ALARM = eINSTANCE.getOnAlarm();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_ALARM__ACTIVITY = eINSTANCE.getOnAlarm_Activity();
+
+		/**
+		 * The meta object literal for the '<em><b>For</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_ALARM__FOR = eINSTANCE.getOnAlarm_For();
+
+		/**
+		 * The meta object literal for the '<em><b>Until</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_ALARM__UNTIL = eINSTANCE.getOnAlarm_Until();
+
+		/**
+		 * The meta object literal for the '<em><b>Repeat Every</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_ALARM__REPEAT_EVERY = eINSTANCE.getOnAlarm_RepeatEvery();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.AssignImpl <em>Assign</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.AssignImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getAssign()
+		 * @generated
+		 */
+		EClass ASSIGN = eINSTANCE.getAssign();
+
+		/**
+		 * The meta object literal for the '<em><b>Copy</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ASSIGN__COPY = eINSTANCE.getAssign_Copy();
+
+		/**
+		 * The meta object literal for the '<em><b>Validate</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ASSIGN__VALIDATE = eINSTANCE.getAssign_Validate();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CopyImpl <em>Copy</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CopyImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCopy()
+		 * @generated
+		 */
+		EClass COPY = eINSTANCE.getCopy();
+
+		/**
+		 * The meta object literal for the '<em><b>To</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COPY__TO = eINSTANCE.getCopy_To();
+
+		/**
+		 * The meta object literal for the '<em><b>From</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COPY__FROM = eINSTANCE.getCopy_From();
+
+		/**
+		 * The meta object literal for the '<em><b>Keep Src Element Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COPY__KEEP_SRC_ELEMENT_NAME = eINSTANCE.getCopy_KeepSrcElementName();
+
+		/**
+		 * The meta object literal for the '<em><b>Ignore Missing From Data</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COPY__IGNORE_MISSING_FROM_DATA = eINSTANCE.getCopy_IgnoreMissingFromData();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ExtensionImpl <em>Extension</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ExtensionImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getExtension()
+		 * @generated
+		 */
+		EClass EXTENSION = eINSTANCE.getExtension();
+
+		/**
+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTENSION__NAMESPACE = eINSTANCE.getExtension_Namespace();
+
+		/**
+		 * The meta object literal for the '<em><b>Must Understand</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTENSION__MUST_UNDERSTAND = eINSTANCE.getExtension_MustUnderstand();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ScopeImpl <em>Scope</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ScopeImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getScope()
+		 * @generated
+		 */
+		EClass SCOPE = eINSTANCE.getScope();
+
+		/**
+		 * The meta object literal for the '<em><b>Isolated</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SCOPE__ISOLATED = eINSTANCE.getScope_Isolated();
+
+		/**
+		 * The meta object literal for the '<em><b>Fault Handlers</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SCOPE__FAULT_HANDLERS = eINSTANCE.getScope_FaultHandlers();
+
+		/**
+		 * The meta object literal for the '<em><b>Compensation Handler</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SCOPE__COMPENSATION_HANDLER = eINSTANCE.getScope_CompensationHandler();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SCOPE__ACTIVITY = eINSTANCE.getScope_Activity();
+
+		/**
+		 * The meta object literal for the '<em><b>Variables</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SCOPE__VARIABLES = eINSTANCE.getScope_Variables();
+
+		/**
+		 * The meta object literal for the '<em><b>Correlation Sets</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SCOPE__CORRELATION_SETS = eINSTANCE.getScope_CorrelationSets();
+
+		/**
+		 * The meta object literal for the '<em><b>Event Handlers</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SCOPE__EVENT_HANDLERS = eINSTANCE.getScope_EventHandlers();
+
+		/**
+		 * The meta object literal for the '<em><b>Partner Links</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SCOPE__PARTNER_LINKS = eINSTANCE.getScope_PartnerLinks();
+
+		/**
+		 * The meta object literal for the '<em><b>Termination Handler</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SCOPE__TERMINATION_HANDLER = eINSTANCE.getScope_TerminationHandler();
+
+		/**
+		 * The meta object literal for the '<em><b>Message Exchanges</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SCOPE__MESSAGE_EXCHANGES = eINSTANCE.getScope_MessageExchanges();
+
+		/**
+		 * The meta object literal for the '<em><b>Exit On Standard Fault</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SCOPE__EXIT_ON_STANDARD_FAULT = eINSTANCE.getScope_ExitOnStandardFault();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CompensateScopeImpl <em>Compensate Scope</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CompensateScopeImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCompensateScope()
+		 * @generated
+		 */
+		EClass COMPENSATE_SCOPE = eINSTANCE.getCompensateScope();
+
+		/**
+		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COMPENSATE_SCOPE__TARGET = eINSTANCE.getCompensateScope_Target();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CompensationHandlerImpl <em>Compensation Handler</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CompensationHandlerImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCompensationHandler()
+		 * @generated
+		 */
+		EClass COMPENSATION_HANDLER = eINSTANCE.getCompensationHandler();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COMPENSATION_HANDLER__ACTIVITY = eINSTANCE.getCompensationHandler_Activity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ToImpl <em>To</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ToImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getTo()
+		 * @generated
+		 */
+		EClass TO = eINSTANCE.getTo();
+
+		/**
+		 * The meta object literal for the '<em><b>Variable</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TO__VARIABLE = eINSTANCE.getTo_Variable();
+
+		/**
+		 * The meta object literal for the '<em><b>Part</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TO__PART = eINSTANCE.getTo_Part();
+
+		/**
+		 * The meta object literal for the '<em><b>Partner Link</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TO__PARTNER_LINK = eINSTANCE.getTo_PartnerLink();
+
+		/**
+		 * The meta object literal for the '<em><b>Property</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TO__PROPERTY = eINSTANCE.getTo_Property();
+
+		/**
+		 * The meta object literal for the '<em><b>Query</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TO__QUERY = eINSTANCE.getTo_Query();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.FromImpl <em>From</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.FromImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getFrom()
+		 * @generated
+		 */
+		EClass FROM = eINSTANCE.getFrom();
+
+		/**
+		 * The meta object literal for the '<em><b>Opaque</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FROM__OPAQUE = eINSTANCE.getFrom_Opaque();
+
+		/**
+		 * The meta object literal for the '<em><b>Endpoint Reference</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FROM__ENDPOINT_REFERENCE = eINSTANCE.getFrom_EndpointReference();
+
+		/**
+		 * The meta object literal for the '<em><b>Literal</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FROM__LITERAL = eINSTANCE.getFrom_Literal();
+
+		/**
+		 * The meta object literal for the '<em><b>Unsafe Literal</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FROM__UNSAFE_LITERAL = eINSTANCE.getFrom_UnsafeLiteral();
+
+		/**
+		 * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FROM__EXPRESSION = eINSTANCE.getFrom_Expression();
+
+		/**
+		 * The meta object literal for the '<em><b>Service Ref</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FROM__SERVICE_REF = eINSTANCE.getFrom_ServiceRef();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FROM__TYPE = eINSTANCE.getFrom_Type();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.OnMessageImpl <em>On Message</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.OnMessageImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getOnMessage()
+		 * @generated
+		 */
+		EClass ON_MESSAGE = eINSTANCE.getOnMessage();
+
+		/**
+		 * The meta object literal for the '<em><b>Variable</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_MESSAGE__VARIABLE = eINSTANCE.getOnMessage_Variable();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_MESSAGE__ACTIVITY = eINSTANCE.getOnMessage_Activity();
+
+		/**
+		 * The meta object literal for the '<em><b>Port Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_MESSAGE__PORT_TYPE = eINSTANCE.getOnMessage_PortType();
+
+		/**
+		 * The meta object literal for the '<em><b>Partner Link</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_MESSAGE__PARTNER_LINK = eINSTANCE.getOnMessage_PartnerLink();
+
+		/**
+		 * The meta object literal for the '<em><b>Correlations</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_MESSAGE__CORRELATIONS = eINSTANCE.getOnMessage_Correlations();
+
+		/**
+		 * The meta object literal for the '<em><b>Operation</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_MESSAGE__OPERATION = eINSTANCE.getOnMessage_Operation();
+
+		/**
+		 * The meta object literal for the '<em><b>From Part</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_MESSAGE__FROM_PART = eINSTANCE.getOnMessage_FromPart();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ExpressionImpl <em>Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ExpressionImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getExpression()
+		 * @generated
+		 */
+		EClass EXPRESSION = eINSTANCE.getExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Body</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXPRESSION__BODY = eINSTANCE.getExpression_Body();
+
+		/**
+		 * The meta object literal for the '<em><b>Expression Language</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXPRESSION__EXPRESSION_LANGUAGE = eINSTANCE.getExpression_ExpressionLanguage();
+
+		/**
+		 * The meta object literal for the '<em><b>Opaque</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXPRESSION__OPAQUE = eINSTANCE.getExpression_Opaque();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.BooleanExpressionImpl <em>Boolean Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.BooleanExpressionImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getBooleanExpression()
+		 * @generated
+		 */
+		EClass BOOLEAN_EXPRESSION = eINSTANCE.getBooleanExpression();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CorrelationImpl <em>Correlation</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CorrelationImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCorrelation()
+		 * @generated
+		 */
+		EClass CORRELATION = eINSTANCE.getCorrelation();
+
+		/**
+		 * The meta object literal for the '<em><b>Initiate</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CORRELATION__INITIATE = eINSTANCE.getCorrelation_Initiate();
+
+		/**
+		 * The meta object literal for the '<em><b>Pattern</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CORRELATION__PATTERN = eINSTANCE.getCorrelation_Pattern();
+
+		/**
+		 * The meta object literal for the '<em><b>Set</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CORRELATION__SET = eINSTANCE.getCorrelation_Set();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.EventHandlerImpl <em>Event Handler</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.EventHandlerImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getEventHandler()
+		 * @generated
+		 */
+		EClass EVENT_HANDLER = eINSTANCE.getEventHandler();
+
+		/**
+		 * The meta object literal for the '<em><b>Alarm</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EVENT_HANDLER__ALARM = eINSTANCE.getEventHandler_Alarm();
+
+		/**
+		 * The meta object literal for the '<em><b>Events</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EVENT_HANDLER__EVENTS = eINSTANCE.getEventHandler_Events();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.SourceImpl <em>Source</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.SourceImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getSource()
+		 * @generated
+		 */
+		EClass SOURCE = eINSTANCE.getSource();
+
+		/**
+		 * The meta object literal for the '<em><b>Link</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SOURCE__LINK = eINSTANCE.getSource_Link();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SOURCE__ACTIVITY = eINSTANCE.getSource_Activity();
+
+		/**
+		 * The meta object literal for the '<em><b>Transition Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SOURCE__TRANSITION_CONDITION = eINSTANCE.getSource_TransitionCondition();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.TargetImpl <em>Target</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.TargetImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getTarget()
+		 * @generated
+		 */
+		EClass TARGET = eINSTANCE.getTarget();
+
+		/**
+		 * The meta object literal for the '<em><b>Link</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TARGET__LINK = eINSTANCE.getTarget_Link();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TARGET__ACTIVITY = eINSTANCE.getTarget_Activity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.PartnerLinksImpl <em>Partner Links</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.PartnerLinksImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getPartnerLinks()
+		 * @generated
+		 */
+		EClass PARTNER_LINKS = eINSTANCE.getPartnerLinks();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARTNER_LINKS__CHILDREN = eINSTANCE.getPartnerLinks_Children();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.VariablesImpl <em>Variables</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.VariablesImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getVariables()
+		 * @generated
+		 */
+		EClass VARIABLES = eINSTANCE.getVariables();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference VARIABLES__CHILDREN = eINSTANCE.getVariables_Children();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CorrelationSetsImpl <em>Correlation Sets</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CorrelationSetsImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCorrelationSets()
+		 * @generated
+		 */
+		EClass CORRELATION_SETS = eINSTANCE.getCorrelationSets();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CORRELATION_SETS__CHILDREN = eINSTANCE.getCorrelationSets_Children();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.LinksImpl <em>Links</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.LinksImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getLinks()
+		 * @generated
+		 */
+		EClass LINKS = eINSTANCE.getLinks();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LINKS__CHILDREN = eINSTANCE.getLinks_Children();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CatchAllImpl <em>Catch All</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CatchAllImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCatchAll()
+		 * @generated
+		 */
+		EClass CATCH_ALL = eINSTANCE.getCatchAll();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CATCH_ALL__ACTIVITY = eINSTANCE.getCatchAll_Activity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CorrelationsImpl <em>Correlations</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CorrelationsImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCorrelations()
+		 * @generated
+		 */
+		EClass CORRELATIONS = eINSTANCE.getCorrelations();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CORRELATIONS__CHILDREN = eINSTANCE.getCorrelations_Children();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.VariableImpl <em>Variable</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.VariableImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getVariable()
+		 * @generated
+		 */
+		EClass VARIABLE = eINSTANCE.getVariable();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute VARIABLE__NAME = eINSTANCE.getVariable_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Message Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference VARIABLE__MESSAGE_TYPE = eINSTANCE.getVariable_MessageType();
+
+		/**
+		 * The meta object literal for the '<em><b>XSD Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference VARIABLE__XSD_ELEMENT = eINSTANCE.getVariable_XSDElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference VARIABLE__TYPE = eINSTANCE.getVariable_Type();
+
+		/**
+		 * The meta object literal for the '<em><b>From</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference VARIABLE__FROM = eINSTANCE.getVariable_From();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.UnknownExtensibilityAttributeImpl <em>Unknown Extensibility Attribute</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.UnknownExtensibilityAttributeImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getUnknownExtensibilityAttribute()
+		 * @generated
+		 */
+		EClass UNKNOWN_EXTENSIBILITY_ATTRIBUTE = eINSTANCE.getUnknownExtensibilityAttribute();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.OnEventImpl <em>On Event</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.OnEventImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getOnEvent()
+		 * @generated
+		 */
+		EClass ON_EVENT = eINSTANCE.getOnEvent();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_EVENT__ACTIVITY = eINSTANCE.getOnEvent_Activity();
+
+		/**
+		 * The meta object literal for the '<em><b>Variable</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_EVENT__VARIABLE = eINSTANCE.getOnEvent_Variable();
+
+		/**
+		 * The meta object literal for the '<em><b>Partner Link</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_EVENT__PARTNER_LINK = eINSTANCE.getOnEvent_PartnerLink();
+
+		/**
+		 * The meta object literal for the '<em><b>Correlations</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_EVENT__CORRELATIONS = eINSTANCE.getOnEvent_Correlations();
+
+		/**
+		 * The meta object literal for the '<em><b>Operation</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_EVENT__OPERATION = eINSTANCE.getOnEvent_Operation();
+
+		/**
+		 * The meta object literal for the '<em><b>Port Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_EVENT__PORT_TYPE = eINSTANCE.getOnEvent_PortType();
+
+		/**
+		 * The meta object literal for the '<em><b>Message Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_EVENT__MESSAGE_TYPE = eINSTANCE.getOnEvent_MessageType();
+
+		/**
+		 * The meta object literal for the '<em><b>From Part</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_EVENT__FROM_PART = eINSTANCE.getOnEvent_FromPart();
+
+		/**
+		 * The meta object literal for the '<em><b>Correlation Sets</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ON_EVENT__CORRELATION_SETS = eINSTANCE.getOnEvent_CorrelationSets();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ImportImpl <em>Import</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ImportImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getImport()
+		 * @generated
+		 */
+		EClass IMPORT = eINSTANCE.getImport();
+
+		/**
+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute IMPORT__NAMESPACE = eINSTANCE.getImport_Namespace();
+
+		/**
+		 * The meta object literal for the '<em><b>Location</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute IMPORT__LOCATION = eINSTANCE.getImport_Location();
+
+		/**
+		 * The meta object literal for the '<em><b>Import Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute IMPORT__IMPORT_TYPE = eINSTANCE.getImport_ImportType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.RethrowImpl <em>Rethrow</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.RethrowImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getRethrow()
+		 * @generated
+		 */
+		EClass RETHROW = eINSTANCE.getRethrow();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ConditionImpl <em>Condition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ConditionImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCondition()
+		 * @generated
+		 */
+		EClass CONDITION = eINSTANCE.getCondition();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.TargetsImpl <em>Targets</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.TargetsImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getTargets()
+		 * @generated
+		 */
+		EClass TARGETS = eINSTANCE.getTargets();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TARGETS__CHILDREN = eINSTANCE.getTargets_Children();
+
+		/**
+		 * The meta object literal for the '<em><b>Join Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TARGETS__JOIN_CONDITION = eINSTANCE.getTargets_JoinCondition();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.SourcesImpl <em>Sources</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.SourcesImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getSources()
+		 * @generated
+		 */
+		EClass SOURCES = eINSTANCE.getSources();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SOURCES__CHILDREN = eINSTANCE.getSources_Children();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.QueryImpl <em>Query</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.QueryImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getQuery()
+		 * @generated
+		 */
+		EClass QUERY = eINSTANCE.getQuery();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY__VALUE = eINSTANCE.getQuery_Value();
+
+		/**
+		 * The meta object literal for the '<em><b>Query Language</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY__QUERY_LANGUAGE = eINSTANCE.getQuery_QueryLanguage();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ServiceRefImpl <em>Service Ref</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ServiceRefImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getServiceRef()
+		 * @generated
+		 */
+		EClass SERVICE_REF = eINSTANCE.getServiceRef();
+
+		/**
+		 * The meta object literal for the '<em><b>Reference Scheme</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SERVICE_REF__REFERENCE_SCHEME = eINSTANCE.getServiceRef_ReferenceScheme();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SERVICE_REF__VALUE = eINSTANCE.getServiceRef_Value();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ExtensionsImpl <em>Extensions</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ExtensionsImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getExtensions()
+		 * @generated
+		 */
+		EClass EXTENSIONS = eINSTANCE.getExtensions();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXTENSIONS__CHILDREN = eINSTANCE.getExtensions_Children();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ExtensionActivityImpl <em>Extension Activity</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ExtensionActivityImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getExtensionActivity()
+		 * @generated
+		 */
+		EClass EXTENSION_ACTIVITY = eINSTANCE.getExtensionActivity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.FromPartImpl <em>From Part</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.FromPartImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getFromPart()
+		 * @generated
+		 */
+		EClass FROM_PART = eINSTANCE.getFromPart();
+
+		/**
+		 * The meta object literal for the '<em><b>Part</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FROM_PART__PART = eINSTANCE.getFromPart_Part();
+
+		/**
+		 * The meta object literal for the '<em><b>To</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FROM_PART__TO = eINSTANCE.getFromPart_To();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ToPartImpl <em>To Part</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ToPartImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getToPart()
+		 * @generated
+		 */
+		EClass TO_PART = eINSTANCE.getToPart();
+
+		/**
+		 * The meta object literal for the '<em><b>Part</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TO_PART__PART = eINSTANCE.getToPart_Part();
+
+		/**
+		 * The meta object literal for the '<em><b>From</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TO_PART__FROM = eINSTANCE.getToPart_From();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.OpaqueActivityImpl <em>Opaque Activity</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.OpaqueActivityImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getOpaqueActivity()
+		 * @generated
+		 */
+		EClass OPAQUE_ACTIVITY = eINSTANCE.getOpaqueActivity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ForEachImpl <em>For Each</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ForEachImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getForEach()
+		 * @generated
+		 */
+		EClass FOR_EACH = eINSTANCE.getForEach();
+
+		/**
+		 * The meta object literal for the '<em><b>Start Counter Value</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FOR_EACH__START_COUNTER_VALUE = eINSTANCE.getForEach_StartCounterValue();
+
+		/**
+		 * The meta object literal for the '<em><b>Final Counter Value</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FOR_EACH__FINAL_COUNTER_VALUE = eINSTANCE.getForEach_FinalCounterValue();
+
+		/**
+		 * The meta object literal for the '<em><b>Parallel</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FOR_EACH__PARALLEL = eINSTANCE.getForEach_Parallel();
+
+		/**
+		 * The meta object literal for the '<em><b>Counter Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FOR_EACH__COUNTER_NAME = eINSTANCE.getForEach_CounterName();
+
+		/**
+		 * The meta object literal for the '<em><b>Completion Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FOR_EACH__COMPLETION_CONDITION = eINSTANCE.getForEach_CompletionCondition();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FOR_EACH__ACTIVITY = eINSTANCE.getForEach_Activity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.RepeatUntilImpl <em>Repeat Until</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.RepeatUntilImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getRepeatUntil()
+		 * @generated
+		 */
+		EClass REPEAT_UNTIL = eINSTANCE.getRepeatUntil();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference REPEAT_UNTIL__ACTIVITY = eINSTANCE.getRepeatUntil_Activity();
+
+		/**
+		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference REPEAT_UNTIL__CONDITION = eINSTANCE.getRepeatUntil_Condition();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.TerminationHandlerImpl <em>Termination Handler</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.TerminationHandlerImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getTerminationHandler()
+		 * @generated
+		 */
+		EClass TERMINATION_HANDLER = eINSTANCE.getTerminationHandler();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TERMINATION_HANDLER__ACTIVITY = eINSTANCE.getTerminationHandler_Activity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ValidateImpl <em>Validate</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ValidateImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getValidate()
+		 * @generated
+		 */
+		EClass VALIDATE = eINSTANCE.getValidate();
+
+		/**
+		 * The meta object literal for the '<em><b>Variables</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference VALIDATE__VARIABLES = eINSTANCE.getValidate_Variables();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.IfImpl <em>If</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.IfImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getIf()
+		 * @generated
+		 */
+		EClass IF = eINSTANCE.getIf();
+
+		/**
+		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IF__CONDITION = eINSTANCE.getIf_Condition();
+
+		/**
+		 * The meta object literal for the '<em><b>Else If</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IF__ELSE_IF = eINSTANCE.getIf_ElseIf();
+
+		/**
+		 * The meta object literal for the '<em><b>Else</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IF__ELSE = eINSTANCE.getIf_Else();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IF__ACTIVITY = eINSTANCE.getIf_Activity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ElseIfImpl <em>Else If</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ElseIfImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getElseIf()
+		 * @generated
+		 */
+		EClass ELSE_IF = eINSTANCE.getElseIf();
+
+		/**
+		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ELSE_IF__CONDITION = eINSTANCE.getElseIf_Condition();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ELSE_IF__ACTIVITY = eINSTANCE.getElseIf_Activity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ElseImpl <em>Else</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ElseImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getElse()
+		 * @generated
+		 */
+		EClass ELSE = eINSTANCE.getElse();
+
+		/**
+		 * The meta object literal for the '<em><b>Activity</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ELSE__ACTIVITY = eINSTANCE.getElse_Activity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CompletionConditionImpl <em>Completion Condition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CompletionConditionImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCompletionCondition()
+		 * @generated
+		 */
+		EClass COMPLETION_CONDITION = eINSTANCE.getCompletionCondition();
+
+		/**
+		 * The meta object literal for the '<em><b>Branches</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COMPLETION_CONDITION__BRANCHES = eINSTANCE.getCompletionCondition_Branches();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.BranchesImpl <em>Branches</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.BranchesImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getBranches()
+		 * @generated
+		 */
+		EClass BRANCHES = eINSTANCE.getBranches();
+
+		/**
+		 * The meta object literal for the '<em><b>Count Completed Branches Only</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute BRANCHES__COUNT_COMPLETED_BRANCHES_ONLY = eINSTANCE.getBranches_CountCompletedBranchesOnly();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.ExtensibleElementImpl <em>Extensible Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.ExtensibleElementImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getExtensibleElement()
+		 * @generated
+		 */
+		EClass EXTENSIBLE_ELEMENT = eINSTANCE.getExtensibleElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Documentation</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXTENSIBLE_ELEMENT__DOCUMENTATION = eINSTANCE.getExtensibleElement_Documentation();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.DocumentationImpl <em>Documentation</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.DocumentationImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getDocumentation()
+		 * @generated
+		 */
+		EClass DOCUMENTATION = eINSTANCE.getDocumentation();
+
+		/**
+		 * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DOCUMENTATION__LANG = eINSTANCE.getDocumentation_Lang();
+
+		/**
+		 * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DOCUMENTATION__SOURCE = eINSTANCE.getDocumentation_Source();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DOCUMENTATION__VALUE = eINSTANCE.getDocumentation_Value();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.MessageExchangesImpl <em>Message Exchanges</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.MessageExchangesImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getMessageExchanges()
+		 * @generated
+		 */
+		EClass MESSAGE_EXCHANGES = eINSTANCE.getMessageExchanges();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MESSAGE_EXCHANGES__CHILDREN = eINSTANCE.getMessageExchanges_Children();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.MessageExchangeImpl <em>Message Exchange</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.MessageExchangeImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getMessageExchange()
+		 * @generated
+		 */
+		EClass MESSAGE_EXCHANGE = eINSTANCE.getMessageExchange();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute MESSAGE_EXCHANGE__NAME = eINSTANCE.getMessageExchange_Name();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.impl.CompensateImpl <em>Compensate</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.impl.CompensateImpl
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCompensate()
+		 * @generated
+		 */
+		EClass COMPENSATE = eINSTANCE.getCompensate();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.CorrelationPattern <em>Correlation Pattern</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.CorrelationPattern
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getCorrelationPattern()
+		 * @generated
+		 */
+		EEnum CORRELATION_PATTERN = eINSTANCE.getCorrelationPattern();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.EndpointReferenceRole <em>Endpoint Reference Role</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.EndpointReferenceRole
+		 * @see org.eclipse.bpel.model.impl.BPELPackageImpl#getEndpointReferenceRole()
+		 * @generated
+		 */
+		EEnum ENDPOINT_REFERENCE_ROLE = eINSTANCE.getEndpointReferenceRole();
+
+	}
+
 } //BPELPackage
Index: src/org/eclipse/bpel/model/BPELFactory.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELFactory.java,v
retrieving revision 1.18
diff -u -r1.18 BPELFactory.java
--- src/org/eclipse/bpel/model/BPELFactory.java	20 Apr 2007 23:31:44 -0000	1.18
+++ src/org/eclipse/bpel/model/BPELFactory.java	24 May 2007 13:06:24 -0000
@@ -31,7 +31,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	BPELFactory eINSTANCE = new org.eclipse.bpel.model.impl.BPELFactoryImpl();
+	BPELFactory eINSTANCE = org.eclipse.bpel.model.impl.BPELFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Process</em>'.
Index: src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesPackageImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesPackageImpl.java,v
retrieving revision 1.3
diff -u -r1.3 MessagepropertiesPackageImpl.java
--- src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesPackageImpl.java	11 Apr 2007 20:55:29 -0000	1.3
+++ src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesPackageImpl.java	24 May 2007 13:06:31 -0000
@@ -14,11 +14,15 @@
  */
 package org.eclipse.bpel.model.messageproperties.impl;
 
+import org.eclipse.bpel.model.BPELPackage;
+import org.eclipse.bpel.model.impl.BPELPackageImpl;
 import org.eclipse.bpel.model.messageproperties.MessagepropertiesFactory;
 import org.eclipse.bpel.model.messageproperties.MessagepropertiesPackage;
 import org.eclipse.bpel.model.messageproperties.Property;
 import org.eclipse.bpel.model.messageproperties.PropertyAlias;
 import org.eclipse.bpel.model.messageproperties.Query;
+import org.eclipse.bpel.model.partnerlinktype.PartnerlinktypePackage;
+import org.eclipse.bpel.model.partnerlinktype.impl.PartnerlinktypePackageImpl;
 import org.eclipse.bpel.model.messageproperties.util.MessagepropertiesConstants;
 import org.eclipse.bpel.model.messageproperties.util.MessagepropertiesExtensibilityElementFactory;
 
@@ -32,6 +36,7 @@
 import org.eclipse.emf.ecore.impl.EcorePackageImpl;
 
 import org.eclipse.wst.wsdl.WSDLPackage;
+import org.eclipse.xsd.XSDPackage;
 import org.eclipse.wst.wsdl.WSDLPlugin;
 
 import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
@@ -392,8 +397,8 @@
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-		EcorePackageImpl theEcorePackage = (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		WSDLPackage theWSDLPackage = (WSDLPackage)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
 		// Add supertypes to classes
 		propertyEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
Index: src/org/eclipse/bpel/model/messageproperties/impl/PropertyAliasImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyAliasImpl.java,v
retrieving revision 1.3
diff -u -r1.3 PropertyAliasImpl.java
--- src/org/eclipse/bpel/model/messageproperties/impl/PropertyAliasImpl.java	16 Aug 2006 22:11:16 -0000	1.3
+++ src/org/eclipse/bpel/model/messageproperties/impl/PropertyAliasImpl.java	24 May 2007 13:06:31 -0000
@@ -142,7 +142,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Part wsdlPart = null;
+	protected Part wsdlPart;
 
 	/**
 	 * The cached value of the '{@link #getQuery() <em>Query</em>}' containment reference.
@@ -152,7 +152,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected Query query = null;
+	protected Query query;
 
 	/**
 	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
@@ -209,7 +209,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return MessagepropertiesPackage.eINSTANCE.getPropertyAlias();
+		return MessagepropertiesPackage.Literals.PROPERTY_ALIAS;
 	}
 
 	/**
@@ -297,8 +297,8 @@
 	 */
 	public Part getWsdlPart() {
 		if (wsdlPart != null && wsdlPart.eIsProxy()) {
-			Part oldWsdlPart = wsdlPart;
-			wsdlPart = (Part)eResolveProxy((InternalEObject)wsdlPart);
+			InternalEObject oldWsdlPart = (InternalEObject)wsdlPart;
+			wsdlPart = (Part)eResolveProxy(oldWsdlPart);
 			if (wsdlPart != oldWsdlPart) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MessagepropertiesPackage.PROPERTY_ALIAS__WSDL_PART, oldWsdlPart, wsdlPart));
@@ -431,16 +431,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MessagepropertiesPackage.PROPERTY_ALIAS__QUERY:
-					return basicSetQuery(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MessagepropertiesPackage.PROPERTY_ALIAS__QUERY:
+				return basicSetQuery(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -448,16 +444,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.PROPERTY_ALIAS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MessagepropertiesPackage.PROPERTY_ALIAS__ELEMENT:
-				return getElement();
-			case MessagepropertiesPackage.PROPERTY_ALIAS__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MessagepropertiesPackage.PROPERTY_ALIAS__ELEMENT_TYPE:
-				return getElementType();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case MessagepropertiesPackage.PROPERTY_ALIAS__MESSAGE_TYPE:
 				return getMessageType();
 			case MessagepropertiesPackage.PROPERTY_ALIAS__PART:
@@ -476,7 +464,7 @@
 			case MessagepropertiesPackage.PROPERTY_ALIAS__XSD_ELEMENT:
 				return getXSDElement();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -484,28 +472,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.PROPERTY_ALIAS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MessagepropertiesPackage.PROPERTY_ALIAS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MessagepropertiesPackage.PROPERTY_ALIAS__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MessagepropertiesPackage.PROPERTY_ALIAS__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case MessagepropertiesPackage.PROPERTY_ALIAS__MESSAGE_TYPE:
-				setMessageType((Object)newValue);
+				setMessageType(newValue);
 				return;
 			case MessagepropertiesPackage.PROPERTY_ALIAS__PART:
 				setPart((String)newValue);
 				return;
 			case MessagepropertiesPackage.PROPERTY_ALIAS__PROPERTY_NAME:
-				setPropertyName((Object)newValue);
+				setPropertyName(newValue);
 				return;
 			case MessagepropertiesPackage.PROPERTY_ALIAS__WSDL_PART:
 				setWsdlPart((Part)newValue);
@@ -514,13 +490,13 @@
 				setQuery((Query)newValue);
 				return;
 			case MessagepropertiesPackage.PROPERTY_ALIAS__TYPE:
-				setType((Object)newValue);
+				setType(newValue);
 				return;
 			case MessagepropertiesPackage.PROPERTY_ALIAS__XSD_ELEMENT:
-				setXSDElement((Object)newValue);
+				setXSDElement(newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -528,20 +504,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.PROPERTY_ALIAS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MessagepropertiesPackage.PROPERTY_ALIAS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MessagepropertiesPackage.PROPERTY_ALIAS__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MessagepropertiesPackage.PROPERTY_ALIAS__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case MessagepropertiesPackage.PROPERTY_ALIAS__MESSAGE_TYPE:
 				setMessageType(MESSAGE_TYPE_EDEFAULT);
 				return;
@@ -564,7 +528,7 @@
 				setXSDElement(XSD_ELEMENT_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -572,16 +536,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.PROPERTY_ALIAS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MessagepropertiesPackage.PROPERTY_ALIAS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MessagepropertiesPackage.PROPERTY_ALIAS__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MessagepropertiesPackage.PROPERTY_ALIAS__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case MessagepropertiesPackage.PROPERTY_ALIAS__MESSAGE_TYPE:
 				return MESSAGE_TYPE_EDEFAULT == null ? messageType != null : !MESSAGE_TYPE_EDEFAULT.equals(messageType);
 			case MessagepropertiesPackage.PROPERTY_ALIAS__PART:
@@ -599,7 +555,7 @@
 			case MessagepropertiesPackage.PROPERTY_ALIAS__XSD_ELEMENT:
 				return XSD_ELEMENT_EDEFAULT == null ? xsdElement != null : !XSD_ELEMENT_EDEFAULT.equals(xsdElement);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesFactoryImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 MessagepropertiesFactoryImpl.java
--- src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesFactoryImpl.java	29 Nov 2005 18:50:27 -0000	1.1
+++ src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesFactoryImpl.java	24 May 2007 13:06:31 -0000
@@ -19,7 +19,9 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,6 +31,25 @@
  */
 public class MessagepropertiesFactoryImpl extends EFactoryImpl implements MessagepropertiesFactory {
 	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static MessagepropertiesFactory init() {
+		try {
+			MessagepropertiesFactory theMessagepropertiesFactory = (MessagepropertiesFactory)EPackage.Registry.INSTANCE.getEFactory("http://docs.oasis-open.org/wsbpel/2.0/varprop";); 
+			if (theMessagepropertiesFactory != null) {
+				return theMessagepropertiesFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new MessagepropertiesFactoryImpl();
+	}
+
+	/**
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
Index: src/org/eclipse/bpel/model/messageproperties/impl/PropertyImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyImpl.java,v
retrieving revision 1.3
diff -u -r1.3 PropertyImpl.java
--- src/org/eclipse/bpel/model/messageproperties/impl/PropertyImpl.java	11 Apr 2007 20:55:29 -0000	1.3
+++ src/org/eclipse/bpel/model/messageproperties/impl/PropertyImpl.java	24 May 2007 13:06:31 -0000
@@ -140,7 +140,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return MessagepropertiesPackage.eINSTANCE.getProperty();
+		return MessagepropertiesPackage.Literals.PROPERTY;
 	}
 
     /**
@@ -223,16 +223,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.PROPERTY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MessagepropertiesPackage.PROPERTY__ELEMENT:
-				return getElement();
-			case MessagepropertiesPackage.PROPERTY__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MessagepropertiesPackage.PROPERTY__ELEMENT_TYPE:
-				return getElementType();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case MessagepropertiesPackage.PROPERTY__QNAME:
 				return getQName();
 			case MessagepropertiesPackage.PROPERTY__NAME:
@@ -242,28 +234,16 @@
 			case MessagepropertiesPackage.PROPERTY__ID:
 				return getID();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
-	/**
+				/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.PROPERTY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MessagepropertiesPackage.PROPERTY__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MessagepropertiesPackage.PROPERTY__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MessagepropertiesPackage.PROPERTY__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case MessagepropertiesPackage.PROPERTY__QNAME:
 				setQName((QName)newValue);
 				return;
@@ -271,31 +251,19 @@
 				setName((String)newValue);
 				return;
 			case MessagepropertiesPackage.PROPERTY__TYPE:
-				setType((Object)newValue);
+				setType(newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
-	/**
+				/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.PROPERTY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MessagepropertiesPackage.PROPERTY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MessagepropertiesPackage.PROPERTY__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MessagepropertiesPackage.PROPERTY__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case MessagepropertiesPackage.PROPERTY__QNAME:
 				setQName(QNAME_EDEFAULT);
 				return;
@@ -306,24 +274,16 @@
 				setType(TYPE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
-	/**
+				/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.PROPERTY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MessagepropertiesPackage.PROPERTY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MessagepropertiesPackage.PROPERTY__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MessagepropertiesPackage.PROPERTY__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case MessagepropertiesPackage.PROPERTY__QNAME:
 				return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
 			case MessagepropertiesPackage.PROPERTY__NAME:
@@ -333,7 +293,7 @@
 			case MessagepropertiesPackage.PROPERTY__ID:
 				return ID_EDEFAULT == null ? getID() != null : !ID_EDEFAULT.equals(getID());
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 QueryImpl.java
--- src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java	29 Nov 2005 18:50:26 -0000	1.1
+++ src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java	24 May 2007 13:06:31 -0000
@@ -108,7 +108,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return MessagepropertiesPackage.eINSTANCE.getQuery();
+		return MessagepropertiesPackage.Literals.QUERY;
 	}
 
 	/**
@@ -158,22 +158,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.QUERY__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MessagepropertiesPackage.QUERY__ELEMENT:
-				return getElement();
-			case MessagepropertiesPackage.QUERY__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MessagepropertiesPackage.QUERY__ELEMENT_TYPE:
-				return getElementType();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case MessagepropertiesPackage.QUERY__QUERY_LANGUAGE:
 				return getQueryLanguage();
 			case MessagepropertiesPackage.QUERY__VALUE:
 				return getValue();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -181,20 +173,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.QUERY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MessagepropertiesPackage.QUERY__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MessagepropertiesPackage.QUERY__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MessagepropertiesPackage.QUERY__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case MessagepropertiesPackage.QUERY__QUERY_LANGUAGE:
 				setQueryLanguage((String)newValue);
 				return;
@@ -202,7 +182,7 @@
 				setValue((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -210,20 +190,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.QUERY__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MessagepropertiesPackage.QUERY__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MessagepropertiesPackage.QUERY__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MessagepropertiesPackage.QUERY__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case MessagepropertiesPackage.QUERY__QUERY_LANGUAGE:
 				setQueryLanguage(QUERY_LANGUAGE_EDEFAULT);
 				return;
@@ -231,7 +199,7 @@
 				setValue(VALUE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -239,22 +207,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MessagepropertiesPackage.QUERY__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MessagepropertiesPackage.QUERY__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MessagepropertiesPackage.QUERY__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MessagepropertiesPackage.QUERY__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case MessagepropertiesPackage.QUERY__QUERY_LANGUAGE:
 				return QUERY_LANGUAGE_EDEFAULT == null ? queryLanguage != null : !QUERY_LANGUAGE_EDEFAULT.equals(queryLanguage);
 			case MessagepropertiesPackage.QUERY__VALUE:
 				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
Index: src/org/eclipse/bpel/model/messageproperties/MessagepropertiesPackage.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesPackage.java,v
retrieving revision 1.2
diff -u -r1.2 MessagepropertiesPackage.java
--- src/org/eclipse/bpel/model/messageproperties/MessagepropertiesPackage.java	14 Mar 2006 20:10:52 -0000	1.2
+++ src/org/eclipse/bpel/model/messageproperties/MessagepropertiesPackage.java	24 May 2007 13:06:31 -0000
@@ -51,7 +51,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://schemas.xmlsoap.org/ws/2003/03/business-process/";;
+	String eNS_URI = "http://docs.oasis-open.org/wsbpel/2.0/varprop";;
 
 	/**
 	 * The package namespace name.
@@ -59,7 +59,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "bpws";
+	String eNS_PREFIX = "vprop";
 
 	/**
 	 * The singleton instance of the package.
@@ -554,4 +554,161 @@
 	 */
 	MessagepropertiesFactory getMessagepropertiesFactory();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.messageproperties.impl.PropertyImpl <em>Property</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.messageproperties.impl.PropertyImpl
+		 * @see org.eclipse.bpel.model.messageproperties.impl.MessagepropertiesPackageImpl#getProperty()
+		 * @generated
+		 */
+		EClass PROPERTY = eINSTANCE.getProperty();
+
+		/**
+		 * The meta object literal for the '<em><b>QName</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY__QNAME = eINSTANCE.getProperty_QName();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY__TYPE = eINSTANCE.getProperty_Type();
+
+		/**
+		 * The meta object literal for the '<em><b>ID</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY__ID = eINSTANCE.getProperty_ID();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.messageproperties.impl.PropertyAliasImpl <em>Property Alias</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.messageproperties.impl.PropertyAliasImpl
+		 * @see org.eclipse.bpel.model.messageproperties.impl.MessagepropertiesPackageImpl#getPropertyAlias()
+		 * @generated
+		 */
+		EClass PROPERTY_ALIAS = eINSTANCE.getPropertyAlias();
+
+		/**
+		 * The meta object literal for the '<em><b>Message Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY_ALIAS__MESSAGE_TYPE = eINSTANCE.getPropertyAlias_MessageType();
+
+		/**
+		 * The meta object literal for the '<em><b>Part</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY_ALIAS__PART = eINSTANCE.getPropertyAlias_Part();
+
+		/**
+		 * The meta object literal for the '<em><b>Property Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY_ALIAS__PROPERTY_NAME = eINSTANCE.getPropertyAlias_PropertyName();
+
+		/**
+		 * The meta object literal for the '<em><b>ID</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY_ALIAS__ID = eINSTANCE.getPropertyAlias_ID();
+
+		/**
+		 * The meta object literal for the '<em><b>Wsdl Part</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROPERTY_ALIAS__WSDL_PART = eINSTANCE.getPropertyAlias_WsdlPart();
+
+		/**
+		 * The meta object literal for the '<em><b>Query</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROPERTY_ALIAS__QUERY = eINSTANCE.getPropertyAlias_Query();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY_ALIAS__TYPE = eINSTANCE.getPropertyAlias_Type();
+
+		/**
+		 * The meta object literal for the '<em><b>XSD Element</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROPERTY_ALIAS__XSD_ELEMENT = eINSTANCE.getPropertyAlias_XSDElement();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.bpel.model.messageproperties.impl.QueryImpl <em>Query</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.bpel.model.messageproperties.impl.QueryImpl
+		 * @see org.eclipse.bpel.model.messageproperties.impl.MessagepropertiesPackageImpl#getQuery()
+		 * @generated
+		 */
+		EClass QUERY = eINSTANCE.getQuery();
+
+		/**
+		 * The meta object literal for the '<em><b>Query Language</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY__QUERY_LANGUAGE = eINSTANCE.getQuery_QueryLanguage();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY__VALUE = eINSTANCE.getQuery_Value();
+
+	}
+
 } //MessagepropertiesPackage
Index: src/org/eclipse/bpel/model/messageproperties/MessagepropertiesFactory.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesFactory.java,v
retrieving revision 1.1
diff -u -r1.1 MessagepropertiesFactory.java
--- src/org/eclipse/bpel/model/messageproperties/MessagepropertiesFactory.java	29 Nov 2005 18:50:26 -0000	1.1
+++ src/org/eclipse/bpel/model/messageproperties/MessagepropertiesFactory.java	24 May 2007 13:06:31 -0000
@@ -31,7 +31,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	MessagepropertiesFactory eINSTANCE = new org.eclipse.bpel.model.messageproperties.impl.MessagepropertiesFactoryImpl();
+	MessagepropertiesFactory eINSTANCE = org.eclipse.bpel.model.messageproperties.impl.MessagepropertiesFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Property</em>'.
Index: src/org/eclipse/bpel/model/util/BPELSwitch.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELSwitch.java,v
retrieving revision 1.20
diff -u -r1.20 BPELSwitch.java
--- src/org/eclipse/bpel/model/util/BPELSwitch.java	20 Apr 2007 23:31:44 -0000	1.20
+++ src/org/eclipse/bpel/model/util/BPELSwitch.java	24 May 2007 13:06:33 -0000
@@ -172,7 +172,7 @@
 				org.eclipse.bpel.model.Process process = (org.eclipse.bpel.model.Process)theEObject;
 				Object result = caseProcess(process);
 				if (result == null) result = caseExtensibleElement(process);
-				if (result == null) result = caseWSDL_ExtensibleElement(process);
+				if (result == null) result = caseExtensibleElement_1(process);
 				if (result == null) result = caseWSDLElement(process);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -181,7 +181,7 @@
 				PartnerLink partnerLink = (PartnerLink)theEObject;
 				Object result = casePartnerLink(partnerLink);
 				if (result == null) result = caseExtensibleElement(partnerLink);
-				if (result == null) result = caseWSDL_ExtensibleElement(partnerLink);
+				if (result == null) result = caseExtensibleElement_1(partnerLink);
 				if (result == null) result = caseWSDLElement(partnerLink);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -190,7 +190,7 @@
 				FaultHandler faultHandler = (FaultHandler)theEObject;
 				Object result = caseFaultHandler(faultHandler);
 				if (result == null) result = caseExtensibleElement(faultHandler);
-				if (result == null) result = caseWSDL_ExtensibleElement(faultHandler);
+				if (result == null) result = caseExtensibleElement_1(faultHandler);
 				if (result == null) result = caseWSDLElement(faultHandler);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -199,7 +199,7 @@
 				Activity activity = (Activity)theEObject;
 				Object result = caseActivity(activity);
 				if (result == null) result = caseExtensibleElement(activity);
-				if (result == null) result = caseWSDL_ExtensibleElement(activity);
+				if (result == null) result = caseExtensibleElement_1(activity);
 				if (result == null) result = caseWSDLElement(activity);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -208,7 +208,7 @@
 				CorrelationSet correlationSet = (CorrelationSet)theEObject;
 				Object result = caseCorrelationSet(correlationSet);
 				if (result == null) result = caseExtensibleElement(correlationSet);
-				if (result == null) result = caseWSDL_ExtensibleElement(correlationSet);
+				if (result == null) result = caseExtensibleElement_1(correlationSet);
 				if (result == null) result = caseWSDLElement(correlationSet);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -219,7 +219,7 @@
 				if (result == null) result = casePartnerActivity(invoke);
 				if (result == null) result = caseActivity(invoke);
 				if (result == null) result = caseExtensibleElement(invoke);
-				if (result == null) result = caseWSDL_ExtensibleElement(invoke);
+				if (result == null) result = caseExtensibleElement_1(invoke);
 				if (result == null) result = caseWSDLElement(invoke);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -228,7 +228,7 @@
 				Link link = (Link)theEObject;
 				Object result = caseLink(link);
 				if (result == null) result = caseExtensibleElement(link);
-				if (result == null) result = caseWSDL_ExtensibleElement(link);
+				if (result == null) result = caseExtensibleElement_1(link);
 				if (result == null) result = caseWSDLElement(link);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -237,7 +237,7 @@
 				Catch catch_ = (Catch)theEObject;
 				Object result = caseCatch(catch_);
 				if (result == null) result = caseExtensibleElement(catch_);
-				if (result == null) result = caseWSDL_ExtensibleElement(catch_);
+				if (result == null) result = caseExtensibleElement_1(catch_);
 				if (result == null) result = caseWSDLElement(catch_);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -248,7 +248,7 @@
 				if (result == null) result = casePartnerActivity(reply);
 				if (result == null) result = caseActivity(reply);
 				if (result == null) result = caseExtensibleElement(reply);
-				if (result == null) result = caseWSDL_ExtensibleElement(reply);
+				if (result == null) result = caseExtensibleElement_1(reply);
 				if (result == null) result = caseWSDLElement(reply);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -258,7 +258,7 @@
 				Object result = casePartnerActivity(partnerActivity);
 				if (result == null) result = caseActivity(partnerActivity);
 				if (result == null) result = caseExtensibleElement(partnerActivity);
-				if (result == null) result = caseWSDL_ExtensibleElement(partnerActivity);
+				if (result == null) result = caseExtensibleElement_1(partnerActivity);
 				if (result == null) result = caseWSDLElement(partnerActivity);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -269,7 +269,7 @@
 				if (result == null) result = casePartnerActivity(receive);
 				if (result == null) result = caseActivity(receive);
 				if (result == null) result = caseExtensibleElement(receive);
-				if (result == null) result = caseWSDL_ExtensibleElement(receive);
+				if (result == null) result = caseExtensibleElement_1(receive);
 				if (result == null) result = caseWSDLElement(receive);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -279,7 +279,7 @@
 				Object result = caseExit(exit);
 				if (result == null) result = caseActivity(exit);
 				if (result == null) result = caseExtensibleElement(exit);
-				if (result == null) result = caseWSDL_ExtensibleElement(exit);
+				if (result == null) result = caseExtensibleElement_1(exit);
 				if (result == null) result = caseWSDLElement(exit);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -289,7 +289,7 @@
 				Object result = caseThrow(throw_);
 				if (result == null) result = caseActivity(throw_);
 				if (result == null) result = caseExtensibleElement(throw_);
-				if (result == null) result = caseWSDL_ExtensibleElement(throw_);
+				if (result == null) result = caseExtensibleElement_1(throw_);
 				if (result == null) result = caseWSDLElement(throw_);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -299,7 +299,7 @@
 				Object result = caseWait(wait);
 				if (result == null) result = caseActivity(wait);
 				if (result == null) result = caseExtensibleElement(wait);
-				if (result == null) result = caseWSDL_ExtensibleElement(wait);
+				if (result == null) result = caseExtensibleElement_1(wait);
 				if (result == null) result = caseWSDLElement(wait);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -309,7 +309,7 @@
 				Object result = caseEmpty(empty);
 				if (result == null) result = caseActivity(empty);
 				if (result == null) result = caseExtensibleElement(empty);
-				if (result == null) result = caseWSDL_ExtensibleElement(empty);
+				if (result == null) result = caseExtensibleElement_1(empty);
 				if (result == null) result = caseWSDLElement(empty);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -319,7 +319,7 @@
 				Object result = caseSequence(sequence);
 				if (result == null) result = caseActivity(sequence);
 				if (result == null) result = caseExtensibleElement(sequence);
-				if (result == null) result = caseWSDL_ExtensibleElement(sequence);
+				if (result == null) result = caseExtensibleElement_1(sequence);
 				if (result == null) result = caseWSDLElement(sequence);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -329,7 +329,7 @@
 				Object result = caseWhile(while_);
 				if (result == null) result = caseActivity(while_);
 				if (result == null) result = caseExtensibleElement(while_);
-				if (result == null) result = caseWSDL_ExtensibleElement(while_);
+				if (result == null) result = caseExtensibleElement_1(while_);
 				if (result == null) result = caseWSDLElement(while_);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -339,7 +339,7 @@
 				Object result = casePick(pick);
 				if (result == null) result = caseActivity(pick);
 				if (result == null) result = caseExtensibleElement(pick);
-				if (result == null) result = caseWSDL_ExtensibleElement(pick);
+				if (result == null) result = caseExtensibleElement_1(pick);
 				if (result == null) result = caseWSDLElement(pick);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -349,7 +349,7 @@
 				Object result = caseFlow(flow);
 				if (result == null) result = caseActivity(flow);
 				if (result == null) result = caseExtensibleElement(flow);
-				if (result == null) result = caseWSDL_ExtensibleElement(flow);
+				if (result == null) result = caseExtensibleElement_1(flow);
 				if (result == null) result = caseWSDLElement(flow);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -358,7 +358,7 @@
 				OnAlarm onAlarm = (OnAlarm)theEObject;
 				Object result = caseOnAlarm(onAlarm);
 				if (result == null) result = caseExtensibleElement(onAlarm);
-				if (result == null) result = caseWSDL_ExtensibleElement(onAlarm);
+				if (result == null) result = caseExtensibleElement_1(onAlarm);
 				if (result == null) result = caseWSDLElement(onAlarm);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -368,7 +368,7 @@
 				Object result = caseAssign(assign);
 				if (result == null) result = caseActivity(assign);
 				if (result == null) result = caseExtensibleElement(assign);
-				if (result == null) result = caseWSDL_ExtensibleElement(assign);
+				if (result == null) result = caseExtensibleElement_1(assign);
 				if (result == null) result = caseWSDLElement(assign);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -377,7 +377,7 @@
 				Copy copy = (Copy)theEObject;
 				Object result = caseCopy(copy);
 				if (result == null) result = caseExtensibleElement(copy);
-				if (result == null) result = caseWSDL_ExtensibleElement(copy);
+				if (result == null) result = caseExtensibleElement_1(copy);
 				if (result == null) result = caseWSDLElement(copy);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -386,7 +386,7 @@
 				Extension extension = (Extension)theEObject;
 				Object result = caseExtension(extension);
 				if (result == null) result = caseExtensibleElement(extension);
-				if (result == null) result = caseWSDL_ExtensibleElement(extension);
+				if (result == null) result = caseExtensibleElement_1(extension);
 				if (result == null) result = caseWSDLElement(extension);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -396,18 +396,18 @@
 				Object result = caseScope(scope);
 				if (result == null) result = caseActivity(scope);
 				if (result == null) result = caseExtensibleElement(scope);
-				if (result == null) result = caseWSDL_ExtensibleElement(scope);
+				if (result == null) result = caseExtensibleElement_1(scope);
 				if (result == null) result = caseWSDLElement(scope);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case BPELPackage.COMPENSATE: {
-				Compensate compensate = (Compensate)theEObject;
-				Object result = caseCompensate(compensate);
-				if (result == null) result = caseActivity(compensate);
-				if (result == null) result = caseExtensibleElement(compensate);
-				if (result == null) result = caseWSDL_ExtensibleElement(compensate);
-				if (result == null) result = caseWSDLElement(compensate);
+			case BPELPackage.COMPENSATE_SCOPE: {
+				CompensateScope compensateScope = (CompensateScope)theEObject;
+				Object result = caseCompensateScope(compensateScope);
+				if (result == null) result = caseActivity(compensateScope);
+				if (result == null) result = caseExtensibleElement(compensateScope);
+				if (result == null) result = caseExtensibleElement_1(compensateScope);
+				if (result == null) result = caseWSDLElement(compensateScope);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -415,7 +415,7 @@
 				CompensationHandler compensationHandler = (CompensationHandler)theEObject;
 				Object result = caseCompensationHandler(compensationHandler);
 				if (result == null) result = caseExtensibleElement(compensationHandler);
-				if (result == null) result = caseWSDL_ExtensibleElement(compensationHandler);
+				if (result == null) result = caseExtensibleElement_1(compensationHandler);
 				if (result == null) result = caseWSDLElement(compensationHandler);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -424,7 +424,7 @@
 				To to = (To)theEObject;
 				Object result = caseTo(to);
 				if (result == null) result = caseExtensibleElement(to);
-				if (result == null) result = caseWSDL_ExtensibleElement(to);
+				if (result == null) result = caseExtensibleElement_1(to);
 				if (result == null) result = caseWSDLElement(to);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -434,7 +434,7 @@
 				Object result = caseFrom(from);
 				if (result == null) result = caseTo(from);
 				if (result == null) result = caseExtensibleElement(from);
-				if (result == null) result = caseWSDL_ExtensibleElement(from);
+				if (result == null) result = caseExtensibleElement_1(from);
 				if (result == null) result = caseWSDLElement(from);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -443,7 +443,7 @@
 				OnMessage onMessage = (OnMessage)theEObject;
 				Object result = caseOnMessage(onMessage);
 				if (result == null) result = caseExtensibleElement(onMessage);
-				if (result == null) result = caseWSDL_ExtensibleElement(onMessage);
+				if (result == null) result = caseExtensibleElement_1(onMessage);
 				if (result == null) result = caseWSDLElement(onMessage);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -471,7 +471,7 @@
 				Correlation correlation = (Correlation)theEObject;
 				Object result = caseCorrelation(correlation);
 				if (result == null) result = caseExtensibleElement(correlation);
-				if (result == null) result = caseWSDL_ExtensibleElement(correlation);
+				if (result == null) result = caseExtensibleElement_1(correlation);
 				if (result == null) result = caseWSDLElement(correlation);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -480,7 +480,7 @@
 				EventHandler eventHandler = (EventHandler)theEObject;
 				Object result = caseEventHandler(eventHandler);
 				if (result == null) result = caseExtensibleElement(eventHandler);
-				if (result == null) result = caseWSDL_ExtensibleElement(eventHandler);
+				if (result == null) result = caseExtensibleElement_1(eventHandler);
 				if (result == null) result = caseWSDLElement(eventHandler);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -489,7 +489,7 @@
 				Source source = (Source)theEObject;
 				Object result = caseSource(source);
 				if (result == null) result = caseExtensibleElement(source);
-				if (result == null) result = caseWSDL_ExtensibleElement(source);
+				if (result == null) result = caseExtensibleElement_1(source);
 				if (result == null) result = caseWSDLElement(source);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -498,7 +498,7 @@
 				Target target = (Target)theEObject;
 				Object result = caseTarget(target);
 				if (result == null) result = caseExtensibleElement(target);
-				if (result == null) result = caseWSDL_ExtensibleElement(target);
+				if (result == null) result = caseExtensibleElement_1(target);
 				if (result == null) result = caseWSDLElement(target);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -507,7 +507,7 @@
 				PartnerLinks partnerLinks = (PartnerLinks)theEObject;
 				Object result = casePartnerLinks(partnerLinks);
 				if (result == null) result = caseExtensibleElement(partnerLinks);
-				if (result == null) result = caseWSDL_ExtensibleElement(partnerLinks);
+				if (result == null) result = caseExtensibleElement_1(partnerLinks);
 				if (result == null) result = caseWSDLElement(partnerLinks);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -516,7 +516,7 @@
 				Variables variables = (Variables)theEObject;
 				Object result = caseVariables(variables);
 				if (result == null) result = caseExtensibleElement(variables);
-				if (result == null) result = caseWSDL_ExtensibleElement(variables);
+				if (result == null) result = caseExtensibleElement_1(variables);
 				if (result == null) result = caseWSDLElement(variables);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -525,7 +525,7 @@
 				CorrelationSets correlationSets = (CorrelationSets)theEObject;
 				Object result = caseCorrelationSets(correlationSets);
 				if (result == null) result = caseExtensibleElement(correlationSets);
-				if (result == null) result = caseWSDL_ExtensibleElement(correlationSets);
+				if (result == null) result = caseExtensibleElement_1(correlationSets);
 				if (result == null) result = caseWSDLElement(correlationSets);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -534,7 +534,7 @@
 				Links links = (Links)theEObject;
 				Object result = caseLinks(links);
 				if (result == null) result = caseExtensibleElement(links);
-				if (result == null) result = caseWSDL_ExtensibleElement(links);
+				if (result == null) result = caseExtensibleElement_1(links);
 				if (result == null) result = caseWSDLElement(links);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -543,7 +543,7 @@
 				CatchAll catchAll = (CatchAll)theEObject;
 				Object result = caseCatchAll(catchAll);
 				if (result == null) result = caseExtensibleElement(catchAll);
-				if (result == null) result = caseWSDL_ExtensibleElement(catchAll);
+				if (result == null) result = caseExtensibleElement_1(catchAll);
 				if (result == null) result = caseWSDLElement(catchAll);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -552,7 +552,7 @@
 				Correlations correlations = (Correlations)theEObject;
 				Object result = caseCorrelations(correlations);
 				if (result == null) result = caseExtensibleElement(correlations);
-				if (result == null) result = caseWSDL_ExtensibleElement(correlations);
+				if (result == null) result = caseExtensibleElement_1(correlations);
 				if (result == null) result = caseWSDLElement(correlations);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -561,7 +561,7 @@
 				Variable variable = (Variable)theEObject;
 				Object result = caseVariable(variable);
 				if (result == null) result = caseExtensibleElement(variable);
-				if (result == null) result = caseWSDL_ExtensibleElement(variable);
+				if (result == null) result = caseExtensibleElement_1(variable);
 				if (result == null) result = caseWSDLElement(variable);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -580,7 +580,7 @@
 				OnEvent onEvent = (OnEvent)theEObject;
 				Object result = caseOnEvent(onEvent);
 				if (result == null) result = caseExtensibleElement(onEvent);
-				if (result == null) result = caseWSDL_ExtensibleElement(onEvent);
+				if (result == null) result = caseExtensibleElement_1(onEvent);
 				if (result == null) result = caseWSDLElement(onEvent);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -589,7 +589,7 @@
 				Import import_ = (Import)theEObject;
 				Object result = caseImport(import_);
 				if (result == null) result = caseExtensibleElement(import_);
-				if (result == null) result = caseWSDL_ExtensibleElement(import_);
+				if (result == null) result = caseExtensibleElement_1(import_);
 				if (result == null) result = caseWSDLElement(import_);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -599,7 +599,7 @@
 				Object result = caseRethrow(rethrow);
 				if (result == null) result = caseActivity(rethrow);
 				if (result == null) result = caseExtensibleElement(rethrow);
-				if (result == null) result = caseWSDL_ExtensibleElement(rethrow);
+				if (result == null) result = caseExtensibleElement_1(rethrow);
 				if (result == null) result = caseWSDLElement(rethrow);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -618,7 +618,7 @@
 				Targets targets = (Targets)theEObject;
 				Object result = caseTargets(targets);
 				if (result == null) result = caseExtensibleElement(targets);
-				if (result == null) result = caseWSDL_ExtensibleElement(targets);
+				if (result == null) result = caseExtensibleElement_1(targets);
 				if (result == null) result = caseWSDLElement(targets);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -627,7 +627,7 @@
 				Sources sources = (Sources)theEObject;
 				Object result = caseSources(sources);
 				if (result == null) result = caseExtensibleElement(sources);
-				if (result == null) result = caseWSDL_ExtensibleElement(sources);
+				if (result == null) result = caseExtensibleElement_1(sources);
 				if (result == null) result = caseWSDLElement(sources);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -642,7 +642,7 @@
 			case BPELPackage.SERVICE_REF: {
 				ServiceRef serviceRef = (ServiceRef)theEObject;
 				Object result = caseServiceRef(serviceRef);
-				if (result == null) result = caseWSDL_ExtensibleElement(serviceRef);
+				if (result == null) result = caseExtensibleElement_1(serviceRef);
 				if (result == null) result = caseWSDLElement(serviceRef);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -651,7 +651,7 @@
 				Extensions extensions = (Extensions)theEObject;
 				Object result = caseExtensions(extensions);
 				if (result == null) result = caseExtensibleElement(extensions);
-				if (result == null) result = caseWSDL_ExtensibleElement(extensions);
+				if (result == null) result = caseExtensibleElement_1(extensions);
 				if (result == null) result = caseWSDLElement(extensions);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -661,7 +661,7 @@
 				Object result = caseExtensionActivity(extensionActivity);
 				if (result == null) result = caseActivity(extensionActivity);
 				if (result == null) result = caseExtensibleElement(extensionActivity);
-				if (result == null) result = caseWSDL_ExtensibleElement(extensionActivity);
+				if (result == null) result = caseExtensibleElement_1(extensionActivity);
 				if (result == null) result = caseWSDLElement(extensionActivity);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -670,7 +670,7 @@
 				FromPart fromPart = (FromPart)theEObject;
 				Object result = caseFromPart(fromPart);
 				if (result == null) result = caseExtensibleElement(fromPart);
-				if (result == null) result = caseWSDL_ExtensibleElement(fromPart);
+				if (result == null) result = caseExtensibleElement_1(fromPart);
 				if (result == null) result = caseWSDLElement(fromPart);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -679,7 +679,7 @@
 				ToPart toPart = (ToPart)theEObject;
 				Object result = caseToPart(toPart);
 				if (result == null) result = caseExtensibleElement(toPart);
-				if (result == null) result = caseWSDL_ExtensibleElement(toPart);
+				if (result == null) result = caseExtensibleElement_1(toPart);
 				if (result == null) result = caseWSDLElement(toPart);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -689,7 +689,7 @@
 				Object result = caseOpaqueActivity(opaqueActivity);
 				if (result == null) result = caseActivity(opaqueActivity);
 				if (result == null) result = caseExtensibleElement(opaqueActivity);
-				if (result == null) result = caseWSDL_ExtensibleElement(opaqueActivity);
+				if (result == null) result = caseExtensibleElement_1(opaqueActivity);
 				if (result == null) result = caseWSDLElement(opaqueActivity);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -699,7 +699,7 @@
 				Object result = caseForEach(forEach);
 				if (result == null) result = caseActivity(forEach);
 				if (result == null) result = caseExtensibleElement(forEach);
-				if (result == null) result = caseWSDL_ExtensibleElement(forEach);
+				if (result == null) result = caseExtensibleElement_1(forEach);
 				if (result == null) result = caseWSDLElement(forEach);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -709,7 +709,7 @@
 				Object result = caseRepeatUntil(repeatUntil);
 				if (result == null) result = caseActivity(repeatUntil);
 				if (result == null) result = caseExtensibleElement(repeatUntil);
-				if (result == null) result = caseWSDL_ExtensibleElement(repeatUntil);
+				if (result == null) result = caseExtensibleElement_1(repeatUntil);
 				if (result == null) result = caseWSDLElement(repeatUntil);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -718,7 +718,7 @@
 				TerminationHandler terminationHandler = (TerminationHandler)theEObject;
 				Object result = caseTerminationHandler(terminationHandler);
 				if (result == null) result = caseExtensibleElement(terminationHandler);
-				if (result == null) result = caseWSDL_ExtensibleElement(terminationHandler);
+				if (result == null) result = caseExtensibleElement_1(terminationHandler);
 				if (result == null) result = caseWSDLElement(terminationHandler);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -728,7 +728,7 @@
 				Object result = caseValidate(validate);
 				if (result == null) result = caseActivity(validate);
 				if (result == null) result = caseExtensibleElement(validate);
-				if (result == null) result = caseWSDL_ExtensibleElement(validate);
+				if (result == null) result = caseExtensibleElement_1(validate);
 				if (result == null) result = caseWSDLElement(validate);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -738,7 +738,7 @@
 				Object result = caseIf(if_);
 				if (result == null) result = caseActivity(if_);
 				if (result == null) result = caseExtensibleElement(if_);
-				if (result == null) result = caseWSDL_ExtensibleElement(if_);
+				if (result == null) result = caseExtensibleElement_1(if_);
 				if (result == null) result = caseWSDLElement(if_);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -747,7 +747,7 @@
 				ElseIf elseIf = (ElseIf)theEObject;
 				Object result = caseElseIf(elseIf);
 				if (result == null) result = caseExtensibleElement(elseIf);
-				if (result == null) result = caseWSDL_ExtensibleElement(elseIf);
+				if (result == null) result = caseExtensibleElement_1(elseIf);
 				if (result == null) result = caseWSDLElement(elseIf);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -756,7 +756,7 @@
 				Else else_ = (Else)theEObject;
 				Object result = caseElse(else_);
 				if (result == null) result = caseExtensibleElement(else_);
-				if (result == null) result = caseWSDL_ExtensibleElement(else_);
+				if (result == null) result = caseExtensibleElement_1(else_);
 				if (result == null) result = caseWSDLElement(else_);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -765,7 +765,7 @@
 				CompletionCondition completionCondition = (CompletionCondition)theEObject;
 				Object result = caseCompletionCondition(completionCondition);
 				if (result == null) result = caseExtensibleElement(completionCondition);
-				if (result == null) result = caseWSDL_ExtensibleElement(completionCondition);
+				if (result == null) result = caseExtensibleElement_1(completionCondition);
 				if (result == null) result = caseWSDLElement(completionCondition);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -783,7 +783,7 @@
 			case BPELPackage.EXTENSIBLE_ELEMENT: {
 				ExtensibleElement extensibleElement = (ExtensibleElement)theEObject;
 				Object result = caseExtensibleElement(extensibleElement);
-				if (result == null) result = caseWSDL_ExtensibleElement(extensibleElement);
+				if (result == null) result = caseExtensibleElement_1(extensibleElement);
 				if (result == null) result = caseWSDLElement(extensibleElement);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -798,7 +798,7 @@
 				MessageExchanges messageExchanges = (MessageExchanges)theEObject;
 				Object result = caseMessageExchanges(messageExchanges);
 				if (result == null) result = caseExtensibleElement(messageExchanges);
-				if (result == null) result = caseWSDL_ExtensibleElement(messageExchanges);
+				if (result == null) result = caseExtensibleElement_1(messageExchanges);
 				if (result == null) result = caseWSDLElement(messageExchanges);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -807,18 +807,18 @@
 				MessageExchange messageExchange = (MessageExchange)theEObject;
 				Object result = caseMessageExchange(messageExchange);
 				if (result == null) result = caseExtensibleElement(messageExchange);
-				if (result == null) result = caseWSDL_ExtensibleElement(messageExchange);
+				if (result == null) result = caseExtensibleElement_1(messageExchange);
 				if (result == null) result = caseWSDLElement(messageExchange);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case BPELPackage.COMPENSATE_SCOPE: {
-				CompensateScope compensateScope = (CompensateScope)theEObject;
-				Object result = caseCompensateScope(compensateScope);
-				if (result == null) result = caseActivity(compensateScope);
-				if (result == null) result = caseExtensibleElement(compensateScope);
-				if (result == null) result = caseWSDL_ExtensibleElement(compensateScope);
-				if (result == null) result = caseWSDLElement(compensateScope);
+			case BPELPackage.COMPENSATE: {
+				Compensate compensate = (Compensate)theEObject;
+				Object result = caseCompensate(compensate);
+				if (result == null) result = caseActivity(compensate);
+				if (result == null) result = caseExtensibleElement(compensate);
+				if (result == null) result = caseExtensibleElement_1(compensate);
+				if (result == null) result = caseWSDLElement(compensate);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -1812,6 +1812,21 @@
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
+	public Object caseExtensibleElement_1(org.eclipse.wst.wsdl.ExtensibleElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Extensible Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Extensible Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
 	public Object caseExtensibleElement(ExtensibleElement object) {
 		return null;
 	}
@@ -1937,21 +1952,6 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extensible Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extensible Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWSDL_ExtensibleElement(org.eclipse.wst.wsdl.ExtensibleElement object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
Index: src/org/eclipse/bpel/model/util/BPELAdapterFactory.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELAdapterFactory.java,v
retrieving revision 1.18
diff -u -r1.18 BPELAdapterFactory.java
--- src/org/eclipse/bpel/model/util/BPELAdapterFactory.java	20 Apr 2007 23:31:44 -0000	1.18
+++ src/org/eclipse/bpel/model/util/BPELAdapterFactory.java	24 May 2007 13:06:32 -0000
@@ -221,8 +221,8 @@
 			public Object caseScope(Scope object) {
 				return createScopeAdapter();
 			}
-			public Object caseCompensate(Compensate object) {
-				return createCompensateAdapter();
+			public Object caseCompensateScope(CompensateScope object) {
+				return createCompensateScopeAdapter();
 			}
 			public Object caseCompensationHandler(CompensationHandler object) {
 				return createCompensationHandlerAdapter();
@@ -356,14 +356,14 @@
 			public Object caseMessageExchange(MessageExchange object) {
 				return createMessageExchangeAdapter();
 			}
-			public Object caseCompensateScope(CompensateScope object) {
-				return createCompensateScopeAdapter();
+			public Object caseCompensate(Compensate object) {
+				return createCompensateAdapter();
 			}
 			public Object caseWSDLElement(WSDLElement object) {
 				return createWSDLElementAdapter();
 			}
-			public Object caseWSDL_ExtensibleElement(org.eclipse.wst.wsdl.ExtensibleElement object) {
-				return createWSDL_ExtensibleElementAdapter();
+			public Object caseExtensibleElement_1(org.eclipse.wst.wsdl.ExtensibleElement object) {
+				return createExtensibleElement_1Adapter();
 			}
 			public Object caseIExtensibilityElement(ExtensibilityElement object) {
 				return createIExtensibilityElementAdapter();
@@ -1303,6 +1303,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.ExtensibleElement <em>Extensible Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.wst.wsdl.ExtensibleElement
+	 * @generated
+	 */
+	public Adapter createExtensibleElement_1Adapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.bpel.model.ExtensibleElement <em>Extensible Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -1429,20 +1443,6 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.ExtensibleElement <em>Extensible Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.ExtensibleElement
-	 * @generated
-	 */
-	public Adapter createWSDL_ExtensibleElementAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF,v
retrieving revision 1.7
diff -u -r1.7 MANIFEST.MF
--- META-INF/MANIFEST.MF	13 Apr 2007 19:09:30 -0000	1.7
+++ META-INF/MANIFEST.MF	24 May 2007 13:06:23 -0000
@@ -11,8 +11,8 @@
  org.eclipse.emf.ecore.xmi,
  org.eclipse.xsd,
  org.eclipse.wst.wsdl,
- org.wsdl4j,
- org.apache.xerces
+ org.apache.xerces,
+ javax.wsdl
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.bpel.model,
  org.eclipse.bpel.model.adapters,
#P org.eclipse.bpel.ui
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF,v
retrieving revision 1.9
diff -u -r1.9 MANIFEST.MF
--- META-INF/MANIFEST.MF	13 Apr 2007 19:09:31 -0000	1.9
+++ META-INF/MANIFEST.MF	24 May 2007 13:06:37 -0000
@@ -17,12 +17,12 @@
  org.eclipse.xsd,
  org.eclipse.bpel.common.ui,
  org.eclipse.wst.wsdl,
- org.wsdl4j,
  org.eclipse.bpel.common.ui,
  org.eclipse.bpel.common.model,
  org.eclipse.bpel.model,
  org.eclipse.wst.xml.core,
- org.eclipse.bpel.wsil.model
+ org.eclipse.bpel.wsil.model,
+ javax.wsdl
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.bpel.ui,
  org.eclipse.bpel.ui.actions,

Back to the top