[jbosstools-commits] JBoss Tools SVN: r24463 - in branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model: src/org/jboss/tools/smooks/model/core and 1 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Thu Aug 26 06:13:57 EDT 2010


Author: DartPeng
Date: 2010-08-26 06:13:56 -0400 (Thu, 26 Aug 2010)
New Revision: 24463

Modified:
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/Bean.java
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IBean.java
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IJavaBeanPackage.java
   branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/JavaBeanPackage.java
Log:


Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore	2010-08-26 10:13:56 UTC (rev 24463)
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    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="core"
-    nsURI="http://www.milyn.org/smooks-core/core/1.0.0" nsPrefix="smooks.core">
-  <eClassifiers xsi:type="ecore:EClass" name="Param">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" 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"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Params">
-    <eOperations name="setParam" lowerBound="1" eType="#//Params">
-      <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="setParam" eType="#//Params">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getParam" eType="#//Param">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getParam" eType="#//Param">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getParamValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"
-        eType="#//Param"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GlobalParams" eSuperTypes="#//Params">
-    <eOperations name="setFilterType" eType="#//GlobalParams">
-      <eParameters name="filterType" eType="#//StreamFilterType"/>
-    </eOperations>
-    <eOperations name="getFilterType" eType="#//StreamFilterType"/>
-    <eOperations name="isDefaultSerializationOn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="setDefaultSerializationOn" eType="#//GlobalParams">
-      <eParameters name="defaultSerializationOn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="StreamFilterType" instanceClassName="org.milyn.StreamFilterType"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Component" abstract="true" interface="true"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    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="core"
+    nsURI="http://www.milyn.org/smooks-core/core/1.0.0" nsPrefix="smooks.core">
+  <eClassifiers xsi:type="ecore:EClass" name="Param">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" 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"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Params">
+    <eOperations name="setParam" lowerBound="1" eType="#//Params">
+      <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eOperations>
+    <eOperations name="setParam" eType="#//Params">
+      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eParameters name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eOperations>
+    <eOperations name="getParam" eType="#//Param">
+      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eOperations>
+    <eOperations name="getParam" eType="#//Param">
+      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eParameters name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eOperations>
+    <eOperations name="getParamValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"
+        eType="#//Param" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GlobalParams" eSuperTypes="#//Params">
+    <eOperations name="setFilterType" eType="#//GlobalParams">
+      <eParameters name="filterType" eType="#//StreamFilterType"/>
+    </eOperations>
+    <eOperations name="getFilterType" eType="#//StreamFilterType"/>
+    <eOperations name="isDefaultSerializationOn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eOperations name="setDefaultSerializationOn" eType="#//GlobalParams">
+      <eParameters name="defaultSerializationOn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    </eOperations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="StreamFilterType" instanceClassName="org.milyn.StreamFilterType"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Component" abstract="true" interface="true"/>
+</ecore:EPackage>

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore	2010-08-26 10:13:56 UTC (rev 24463)
@@ -51,10 +51,10 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="createOnElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="createOnElementNS" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="valueBindings" upperBound="-1"
-        eType="#//Value"/>
+        eType="#//Value" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="wireBindings" upperBound="-1"
-        eType="#//Wiring"/>
+        eType="#//Wiring" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="expressionBindings" upperBound="-1"
-        eType="#//Expression"/>
+        eType="#//Expression" containment="true"/>
   </eClassifiers>
 </ecore:EPackage>

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel	2010-08-26 10:13:56 UTC (rev 24463)
@@ -19,19 +19,35 @@
     </genClasses>
     <genClasses ecoreClass="smooks-core.ecore#//Params">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-core.ecore#//Params/params"/>
-      <genOperations ecoreOperation="smooks-core.ecore#//Params/getParam">
-        <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam/name"/>
-      </genOperations>
       <genOperations ecoreOperation="smooks-core.ecore#//Params/setParam">
         <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam/name"/>
         <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam/value"/>
       </genOperations>
+      <genOperations ecoreOperation="smooks-core.ecore#//Params/setParam.1">
+        <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam.1/name"/>
+        <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam.1/value"/>
+        <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam.1/type"/>
+      </genOperations>
+      <genOperations ecoreOperation="smooks-core.ecore#//Params/getParam">
+        <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam/name"/>
+      </genOperations>
+      <genOperations ecoreOperation="smooks-core.ecore#//Params/getParam.1">
+        <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam.1/name"/>
+        <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam.1/type"/>
+      </genOperations>
+      <genOperations ecoreOperation="smooks-core.ecore#//Params/getParamValue">
+        <genParameters ecoreParameter="smooks-core.ecore#//Params/getParamValue/name"/>
+      </genOperations>
     </genClasses>
     <genClasses ecoreClass="smooks-core.ecore#//GlobalParams">
       <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/setFilterType">
         <genParameters ecoreParameter="smooks-core.ecore#//GlobalParams/setFilterType/filterType"/>
       </genOperations>
       <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/getFilterType"/>
+      <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/isDefaultSerializationOn"/>
+      <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/setDefaultSerializationOn">
+        <genParameters ecoreParameter="smooks-core.ecore#//GlobalParams/setDefaultSerializationOn/defaultSerializationOn"/>
+      </genOperations>
     </genClasses>
     <genClasses image="false" ecoreClass="smooks-core.ecore#//Component"/>
   </genPackages>

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java	2010-08-26 10:13:56 UTC (rev 24463)
@@ -290,7 +290,7 @@
 		initEAttribute(getParam_Type(), ecorePackage.getEString(), "type", null, 0, 1, IParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(paramsEClass, IParams.class, "Params", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getParams_Params(), this.getParam(), null, "params", null, 0, -1, IParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getParams_Params(), this.getParam(), null, "params", null, 0, -1, IParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		EOperation op = addEOperation(paramsEClass, this.getParams(), "setParam", 1, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED);

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java	2010-08-26 10:13:56 UTC (rev 24463)
@@ -117,7 +117,7 @@
 	int PARAMS = 1;
 
 	/**
-	 * The feature id for the '<em><b>Params</b></em>' reference list.
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -145,7 +145,7 @@
 	int GLOBAL_PARAMS = 2;
 
 	/**
-	 * The feature id for the '<em><b>Params</b></em>' reference list.
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -246,10 +246,10 @@
 	EClass getParams();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.jboss.tools.smooks.model.core.IParams#getParams <em>Params</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.core.IParams#getParams <em>Params</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Params</em>'.
+	 * @return the meta object for the containment reference list '<em>Params</em>'.
 	 * @see org.jboss.tools.smooks.model.core.IParams#getParams()
 	 * @see #getParams()
 	 * @generated
@@ -354,7 +354,7 @@
 		EClass PARAMS = eINSTANCE.getParams();
 
 		/**
-		 * The meta object literal for the '<em><b>Params</b></em>' reference list feature.
+		 * The meta object literal for the '<em><b>Params</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java	2010-08-26 10:13:56 UTC (rev 24463)
@@ -28,7 +28,7 @@
  */
 public interface IParams extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Params</b></em>' reference list.
+	 * Returns the value of the '<em><b>Params</b></em>' containment reference list.
 	 * The list contents are of type {@link org.jboss.tools.smooks.model.core.IParam}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -36,9 +36,9 @@
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Params</em>' reference list.
+	 * @return the value of the '<em>Params</em>' containment reference list.
 	 * @see org.jboss.tools.smooks.model.core.ICorePackage#getParams_Params()
-	 * @model
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IParam> getParams();

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java	2010-08-26 10:13:56 UTC (rev 24463)
@@ -7,6 +7,7 @@
 package org.jboss.tools.smooks.model.core;
 
 import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
 import java.util.Iterator;
 
 import org.eclipse.emf.common.util.BasicEList;
@@ -14,8 +15,11 @@
 
 import org.eclipse.emf.ecore.EClass;
 
+import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
 /**
@@ -33,7 +37,7 @@
  */
 public class Params extends EObjectImpl implements IParams {
 	/**
-	 * The cached value of the '{@link #getParams() <em>Params</em>}' reference list.
+	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getParams()
@@ -68,7 +72,7 @@
 	 */
 	public EList<IParam> getParams() {
 		if (params == null) {
-			params = new EObjectResolvingEList<IParam>(IParam.class, this, ICorePackage.PARAMS__PARAMS);
+			params = new EObjectContainmentEList<IParam>(IParam.class, this, ICorePackage.PARAMS__PARAMS);
 		}
 		return params;
 	}
@@ -124,6 +128,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ICorePackage.PARAMS__PARAMS:
+				return ((InternalEList<?>)getParams()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
 	public IParams setParam(String name, String value) {

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/Bean.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/Bean.java	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/Bean.java	2010-08-26 10:13:56 UTC (rev 24463)
@@ -10,13 +10,17 @@
 
 import org.eclipse.emf.common.notify.Notification;
 
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
 
+import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
 /**
@@ -120,7 +124,7 @@
 	protected String createOnElementNS = CREATE_ON_ELEMENT_NS_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getValueBindings() <em>Value Bindings</em>}' reference list.
+	 * The cached value of the '{@link #getValueBindings() <em>Value Bindings</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getValueBindings()
@@ -130,7 +134,7 @@
 	protected EList<IValue> valueBindings;
 
 	/**
-	 * The cached value of the '{@link #getWireBindings() <em>Wire Bindings</em>}' reference list.
+	 * The cached value of the '{@link #getWireBindings() <em>Wire Bindings</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getWireBindings()
@@ -140,7 +144,7 @@
 	protected EList<IWiring> wireBindings;
 
 	/**
-	 * The cached value of the '{@link #getExpressionBindings() <em>Expression Bindings</em>}' reference list.
+	 * The cached value of the '{@link #getExpressionBindings() <em>Expression Bindings</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getExpressionBindings()
@@ -259,7 +263,7 @@
 	 */
 	public EList<IValue> getValueBindings() {
 		if (valueBindings == null) {
-			valueBindings = new EObjectResolvingEList<IValue>(IValue.class, this, IJavaBeanPackage.BEAN__VALUE_BINDINGS);
+			valueBindings = new EObjectContainmentEList<IValue>(IValue.class, this, IJavaBeanPackage.BEAN__VALUE_BINDINGS);
 		}
 		return valueBindings;
 	}
@@ -271,7 +275,7 @@
 	 */
 	public EList<IWiring> getWireBindings() {
 		if (wireBindings == null) {
-			wireBindings = new EObjectResolvingEList<IWiring>(IWiring.class, this, IJavaBeanPackage.BEAN__WIRE_BINDINGS);
+			wireBindings = new EObjectContainmentEList<IWiring>(IWiring.class, this, IJavaBeanPackage.BEAN__WIRE_BINDINGS);
 		}
 		return wireBindings;
 	}
@@ -283,7 +287,7 @@
 	 */
 	public EList<IExpression> getExpressionBindings() {
 		if (expressionBindings == null) {
-			expressionBindings = new EObjectResolvingEList<IExpression>(IExpression.class, this, IJavaBeanPackage.BEAN__EXPRESSION_BINDINGS);
+			expressionBindings = new EObjectContainmentEList<IExpression>(IExpression.class, this, IJavaBeanPackage.BEAN__EXPRESSION_BINDINGS);
 		}
 		return expressionBindings;
 	}
@@ -294,6 +298,24 @@
 	 * @generated
 	 */
 	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case IJavaBeanPackage.BEAN__VALUE_BINDINGS:
+				return ((InternalEList<?>)getValueBindings()).basicRemove(otherEnd, msgs);
+			case IJavaBeanPackage.BEAN__WIRE_BINDINGS:
+				return ((InternalEList<?>)getWireBindings()).basicRemove(otherEnd, msgs);
+			case IJavaBeanPackage.BEAN__EXPRESSION_BINDINGS:
+				return ((InternalEList<?>)getExpressionBindings()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case IJavaBeanPackage.BEAN__BEAN_ID:

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IBean.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IBean.java	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IBean.java	2010-08-26 10:13:56 UTC (rev 24463)
@@ -138,7 +138,7 @@
 	void setCreateOnElementNS(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Value Bindings</b></em>' reference list.
+	 * Returns the value of the '<em><b>Value Bindings</b></em>' containment reference list.
 	 * The list contents are of type {@link org.jboss.tools.smooks.model.javabean.IValue}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -146,15 +146,15 @@
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value Bindings</em>' reference list.
+	 * @return the value of the '<em>Value Bindings</em>' containment reference list.
 	 * @see org.jboss.tools.smooks.model.javabean.IJavaBeanPackage#getBean_ValueBindings()
-	 * @model
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IValue> getValueBindings();
 
 	/**
-	 * Returns the value of the '<em><b>Wire Bindings</b></em>' reference list.
+	 * Returns the value of the '<em><b>Wire Bindings</b></em>' containment reference list.
 	 * The list contents are of type {@link org.jboss.tools.smooks.model.javabean.IWiring}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -162,15 +162,15 @@
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wire Bindings</em>' reference list.
+	 * @return the value of the '<em>Wire Bindings</em>' containment reference list.
 	 * @see org.jboss.tools.smooks.model.javabean.IJavaBeanPackage#getBean_WireBindings()
-	 * @model
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IWiring> getWireBindings();
 
 	/**
-	 * Returns the value of the '<em><b>Expression Bindings</b></em>' reference list.
+	 * Returns the value of the '<em><b>Expression Bindings</b></em>' containment reference list.
 	 * The list contents are of type {@link org.jboss.tools.smooks.model.javabean.IExpression}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -178,9 +178,9 @@
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Expression Bindings</em>' reference list.
+	 * @return the value of the '<em>Expression Bindings</em>' containment reference list.
 	 * @see org.jboss.tools.smooks.model.javabean.IJavaBeanPackage#getBean_ExpressionBindings()
-	 * @model
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IExpression> getExpressionBindings();

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IJavaBeanPackage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IJavaBeanPackage.java	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IJavaBeanPackage.java	2010-08-26 10:13:56 UTC (rev 24463)
@@ -355,7 +355,7 @@
 	int BEAN__CREATE_ON_ELEMENT_NS = ICorePackage.COMPONENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Value Bindings</b></em>' reference list.
+	 * The feature id for the '<em><b>Value Bindings</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -364,7 +364,7 @@
 	int BEAN__VALUE_BINDINGS = ICorePackage.COMPONENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Wire Bindings</b></em>' reference list.
+	 * The feature id for the '<em><b>Wire Bindings</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -373,7 +373,7 @@
 	int BEAN__WIRE_BINDINGS = ICorePackage.COMPONENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Expression Bindings</b></em>' reference list.
+	 * The feature id for the '<em><b>Expression Bindings</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -695,10 +695,10 @@
 	EAttribute getBean_CreateOnElementNS();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getValueBindings <em>Value Bindings</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getValueBindings <em>Value Bindings</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Value Bindings</em>'.
+	 * @return the meta object for the containment reference list '<em>Value Bindings</em>'.
 	 * @see org.jboss.tools.smooks.model.javabean.IBean#getValueBindings()
 	 * @see #getBean()
 	 * @generated
@@ -706,10 +706,10 @@
 	EReference getBean_ValueBindings();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getWireBindings <em>Wire Bindings</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getWireBindings <em>Wire Bindings</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Wire Bindings</em>'.
+	 * @return the meta object for the containment reference list '<em>Wire Bindings</em>'.
 	 * @see org.jboss.tools.smooks.model.javabean.IBean#getWireBindings()
 	 * @see #getBean()
 	 * @generated
@@ -717,10 +717,10 @@
 	EReference getBean_WireBindings();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getExpressionBindings <em>Expression Bindings</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getExpressionBindings <em>Expression Bindings</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Expression Bindings</em>'.
+	 * @return the meta object for the containment reference list '<em>Expression Bindings</em>'.
 	 * @see org.jboss.tools.smooks.model.javabean.IBean#getExpressionBindings()
 	 * @see #getBean()
 	 * @generated
@@ -984,7 +984,7 @@
 		EAttribute BEAN__CREATE_ON_ELEMENT_NS = eINSTANCE.getBean_CreateOnElementNS();
 
 		/**
-		 * The meta object literal for the '<em><b>Value Bindings</b></em>' reference list feature.
+		 * The meta object literal for the '<em><b>Value Bindings</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
@@ -992,7 +992,7 @@
 		EReference BEAN__VALUE_BINDINGS = eINSTANCE.getBean_ValueBindings();
 
 		/**
-		 * The meta object literal for the '<em><b>Wire Bindings</b></em>' reference list feature.
+		 * The meta object literal for the '<em><b>Wire Bindings</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
@@ -1000,7 +1000,7 @@
 		EReference BEAN__WIRE_BINDINGS = eINSTANCE.getBean_WireBindings();
 
 		/**
-		 * The meta object literal for the '<em><b>Expression Bindings</b></em>' reference list feature.
+		 * The meta object literal for the '<em><b>Expression Bindings</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated

Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/JavaBeanPackage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/JavaBeanPackage.java	2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/JavaBeanPackage.java	2010-08-26 10:13:56 UTC (rev 24463)
@@ -534,9 +534,9 @@
 		initEAttribute(getBean_BeanClass(), ecorePackage.getEString(), "beanClass", null, 0, 1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getBean_CreateOnElement(), ecorePackage.getEString(), "createOnElement", null, 0, 1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getBean_CreateOnElementNS(), ecorePackage.getEString(), "createOnElementNS", null, 0, 1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBean_ValueBindings(), this.getValue(), null, "valueBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBean_WireBindings(), this.getWiring(), null, "wireBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBean_ExpressionBindings(), this.getExpression(), null, "expressionBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getBean_ValueBindings(), this.getValue(), null, "valueBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getBean_WireBindings(), this.getWiring(), null, "wireBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getBean_ExpressionBindings(), this.getExpression(), null, "expressionBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);



More information about the jbosstools-commits mailing list