[173482] Regenerated org.eclipse.datatools.modelbase.sql.xml.query to work with current version of EMF and base SQL model.
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/META-INF/MANIFEST.MF
index e6674af..c3ce166 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.modelbase.sql.xml.query; singleton:=true
-Bundle-Version: 1.0.0.200609291
+Bundle-Version: 1.0.0.200702071
 Bundle-ClassPath: sqlxmlquerymodel.jar
 Bundle-Activator: org.eclipse.datatools.modelbase.sql.xml.query.util.SQLXMLQueryModelPlugin
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/SQLXMLQueryModelFactory.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/SQLXMLQueryModelFactory.java
index 20a57ca..f3d3e4a 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/SQLXMLQueryModelFactory.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/SQLXMLQueryModelFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SQLXMLQueryFactory.java,v 1.1 2005/12/16 13:16:53 bpayton Exp $
+ * $Id: SQLXMLQueryModelFactory.java,v 1.1 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -16,14 +16,14 @@
  * @see org.eclipse.datatools.modelbase.sql.xml.query.SQLXMLQueryModelPackage
  * @generated
  */
-public interface SQLXMLQueryModelFactory extends EFactory{
+public interface SQLXMLQueryModelFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
 	 */
-    SQLXMLQueryModelFactory eINSTANCE = new org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelFactoryImpl();
+    SQLXMLQueryModelFactory eINSTANCE = org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>XML Value Function Concat</em>'.
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/SQLXMLQueryModelPackage.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/SQLXMLQueryModelPackage.java
index 5105d61..c1d0fa0 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/SQLXMLQueryModelPackage.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/SQLXMLQueryModelPackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SQLXMLQueryPackage.java,v 1.3 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: SQLXMLQueryModelPackage.java,v 1.1 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -33,7 +33,7 @@
  * @model kind="package"
  * @generated
  */
-public interface SQLXMLQueryModelPackage extends EPackage{
+public interface SQLXMLQueryModelPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
@@ -122,6 +122,15 @@
     int XML_VALUE_FUNCTION__LABEL = SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION__COMMENTS = SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -464,7 +473,7 @@
     int XML_VALUE_FUNCTION__FUNCTION = SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__FUNCTION;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function</em>' class.
+	 * The number of structural features of the '<em>XML Value Function</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -528,6 +537,15 @@
     int XML_VALUE_FUNCTION_CONCAT__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_CONCAT__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -888,7 +906,7 @@
     int XML_VALUE_FUNCTION_CONCAT__CONCAT_CONTENT_LIST = XML_VALUE_FUNCTION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Concat</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Concat</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -952,6 +970,15 @@
     int XML_NAMESPACE_DECLARATION_ITEM__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_NAMESPACE_DECLARATION_ITEM__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Uri</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -970,7 +997,7 @@
     int XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Namespace Declaration Item</em>' class.
+	 * The number of structural features of the '<em>XML Namespace Declaration Item</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -1034,6 +1061,15 @@
     int XML_NAMESPACE_DECLARATION_PREFIX__LABEL = XML_NAMESPACE_DECLARATION_ITEM__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_NAMESPACE_DECLARATION_PREFIX__COMMENTS = XML_NAMESPACE_DECLARATION_ITEM__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Uri</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1061,7 +1097,7 @@
     int XML_NAMESPACE_DECLARATION_PREFIX__PREFIX = XML_NAMESPACE_DECLARATION_ITEM_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>XML Namespace Declaration Prefix</em>' class.
+	 * The number of structural features of the '<em>XML Namespace Declaration Prefix</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -1125,6 +1161,15 @@
     int XML_NAMESPACE_DECLARATION_DEFAULT__LABEL = XML_NAMESPACE_DECLARATION_ITEM__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_NAMESPACE_DECLARATION_DEFAULT__COMMENTS = XML_NAMESPACE_DECLARATION_ITEM__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Uri</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1152,7 +1197,7 @@
     int XML_NAMESPACE_DECLARATION_DEFAULT__NO_DEFAULT = XML_NAMESPACE_DECLARATION_ITEM_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>XML Namespace Declaration Default</em>' class.
+	 * The number of structural features of the '<em>XML Namespace Declaration Default</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -1216,6 +1261,15 @@
     int XML_ATTRIBUTE_DECLARATION_ITEM__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_ATTRIBUTE_DECLARATION_ITEM__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1531,7 +1585,7 @@
     int XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Attribute Declaration Item</em>' class.
+	 * The number of structural features of the '<em>XML Attribute Declaration Item</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -1595,6 +1649,15 @@
     int XML_VALUE_FUNCTION_ELEMENT__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_ELEMENT__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1982,7 +2045,7 @@
     int XML_VALUE_FUNCTION_ELEMENT__ELEMENT_CONTENT_LIST = XML_VALUE_FUNCTION_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Element</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Element</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -2046,6 +2109,15 @@
     int XML_VALUE_FUNCTION_ELEMENT_CONTENT_ITEM__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_ELEMENT_CONTENT_ITEM__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -2361,7 +2433,7 @@
     int XML_VALUE_FUNCTION_ELEMENT_CONTENT_ITEM__ELEMENT_CONTENT_LIST = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Element Content Item</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Element Content Item</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -2425,6 +2497,15 @@
     int XML_VALUE_FUNCTION_FOREST__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_FOREST__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -2803,7 +2884,7 @@
     int XML_VALUE_FUNCTION_FOREST__NAMESPACES_DECL = XML_VALUE_FUNCTION_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Forest</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Forest</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -2867,6 +2948,15 @@
     int XML_VALUE_FUNCTION_COMMENT__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_COMMENT__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -3227,7 +3317,7 @@
     int XML_VALUE_FUNCTION_COMMENT__COMMENT_CONTENT = XML_VALUE_FUNCTION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Comment</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Comment</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -3291,6 +3381,15 @@
     int XML_VALUE_FUNCTION_DOCUMENT__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_DOCUMENT__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -3651,7 +3750,7 @@
     int XML_VALUE_FUNCTION_DOCUMENT__DOCUMENT_CONTENT = XML_VALUE_FUNCTION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Document</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Document</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -3715,6 +3814,15 @@
     int XML_VALUE_FUNCTION_PARSE__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_PARSE__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -4084,7 +4192,7 @@
     int XML_VALUE_FUNCTION_PARSE__PARSE_CONTENT = XML_VALUE_FUNCTION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Parse</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Parse</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -4148,6 +4256,15 @@
     int XML_VALUE_FUNCTION_PI__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_PI__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -4517,7 +4634,7 @@
     int XML_VALUE_FUNCTION_PI__PI_CONTENT = XML_VALUE_FUNCTION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function PI</em>' class.
+	 * The number of structural features of the '<em>XML Value Function PI</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -4581,6 +4698,15 @@
     int XML_VALUE_FUNCTION_QUERY__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_QUERY__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -4959,7 +5085,7 @@
     int XML_VALUE_FUNCTION_QUERY__QUERY_RETURNING = XML_VALUE_FUNCTION_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Query</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Query</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -5023,6 +5149,15 @@
     int XML_VALUE_FUNCTION_TEXT__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_TEXT__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -5383,7 +5518,7 @@
     int XML_VALUE_FUNCTION_TEXT__TEXT_CONTENT = XML_VALUE_FUNCTION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Text</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Text</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -5447,6 +5582,15 @@
     int XML_VALUE_FUNCTION_VALIDATE__LABEL = XML_VALUE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_VALIDATE__COMMENTS = XML_VALUE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -5816,7 +5960,7 @@
     int XML_VALUE_FUNCTION_VALIDATE__VALIDATE_ACCORDING_TO = XML_VALUE_FUNCTION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Validate</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Validate</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -5880,6 +6024,15 @@
     int XML_VALUE_EXPRESSION_CAST__LABEL = SQLQueryModelPackage.VALUE_EXPRESSION_CAST__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_EXPRESSION_CAST__COMMENTS = SQLQueryModelPackage.VALUE_EXPRESSION_CAST__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -6195,7 +6348,7 @@
     int XML_VALUE_EXPRESSION_CAST__PASSING_MECHANISM = SQLQueryModelPackage.VALUE_EXPRESSION_CAST_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Expression Cast</em>' class.
+	 * The number of structural features of the '<em>XML Value Expression Cast</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -6259,6 +6412,15 @@
     int XML_PREDICATE__LABEL = SQLQueryModelPackage.PREDICATE__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_PREDICATE__COMMENTS = SQLQueryModelPackage.PREDICATE__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Negated Condition</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -6376,7 +6538,7 @@
     int XML_PREDICATE__SELECTIVITY_VALUE = SQLQueryModelPackage.PREDICATE__SELECTIVITY_VALUE;
 
 	/**
-	 * The number of structural features of the the '<em>XML Predicate</em>' class.
+	 * The number of structural features of the '<em>XML Predicate</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -6440,6 +6602,15 @@
     int XML_PREDICATE_CONTENT__LABEL = XML_PREDICATE__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_PREDICATE_CONTENT__COMMENTS = XML_PREDICATE__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Negated Condition</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -6557,7 +6728,7 @@
     int XML_PREDICATE_CONTENT__SELECTIVITY_VALUE = XML_PREDICATE__SELECTIVITY_VALUE;
 
 	/**
-	 * The number of structural features of the the '<em>XML Predicate Content</em>' class.
+	 * The number of structural features of the '<em>XML Predicate Content</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -6621,6 +6792,15 @@
     int XML_PREDICATE_DOCUMENT__LABEL = XML_PREDICATE__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_PREDICATE_DOCUMENT__COMMENTS = XML_PREDICATE__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Negated Condition</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -6738,7 +6918,7 @@
     int XML_PREDICATE_DOCUMENT__SELECTIVITY_VALUE = XML_PREDICATE__SELECTIVITY_VALUE;
 
 	/**
-	 * The number of structural features of the the '<em>XML Predicate Document</em>' class.
+	 * The number of structural features of the '<em>XML Predicate Document</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -6802,6 +6982,15 @@
     int XML_PREDICATE_EXISTS__LABEL = XML_PREDICATE__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_PREDICATE_EXISTS__COMMENTS = XML_PREDICATE__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Negated Condition</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -6937,7 +7126,7 @@
     int XML_PREDICATE_EXISTS__XQUERY_ARG_LIST = XML_PREDICATE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Predicate Exists</em>' class.
+	 * The number of structural features of the '<em>XML Predicate Exists</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -7001,6 +7190,15 @@
     int XML_PREDICATE_VALID__LABEL = XML_PREDICATE__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_PREDICATE_VALID__COMMENTS = XML_PREDICATE__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Negated Condition</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -7118,7 +7316,7 @@
     int XML_PREDICATE_VALID__SELECTIVITY_VALUE = XML_PREDICATE__SELECTIVITY_VALUE;
 
 	/**
-	 * The number of structural features of the the '<em>XML Predicate Valid</em>' class.
+	 * The number of structural features of the '<em>XML Predicate Valid</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -7182,6 +7380,15 @@
     int XML_QUERY_EXPRESSION__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_QUERY_EXPRESSION__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Xquery Expr Content</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -7209,7 +7416,7 @@
     int XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Query Expression</em>' class.
+	 * The number of structural features of the '<em>XML Query Expression</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -7273,6 +7480,15 @@
     int XML_QUERY_ARGUMENT_LIST__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_QUERY_ARGUMENT_LIST__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Passing Mechanism</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -7318,7 +7534,7 @@
     int XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the the '<em>XML Query Argument List</em>' class.
+	 * The number of structural features of the '<em>XML Query Argument List</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -7382,6 +7598,15 @@
     int XML_QUERY_ARGUMENT_ITEM__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_QUERY_ARGUMENT_ITEM__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -7706,7 +7931,7 @@
     int XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Query Argument Item</em>' class.
+	 * The number of structural features of the '<em>XML Query Argument Item</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -7770,6 +7995,15 @@
     int XML_SERIALIZE_FUNCTION__LABEL = SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_SERIALIZE_FUNCTION__COMMENTS = SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -8157,7 +8391,7 @@
     int XML_SERIALIZE_FUNCTION__SERIALIZE_ENCODING = SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the the '<em>XML Serialize Function</em>' class.
+	 * The number of structural features of the '<em>XML Serialize Function</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -8221,6 +8455,15 @@
     int XML_SERIALIZE_FUNCTION_TARGET__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_SERIALIZE_FUNCTION_TARGET__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -8536,7 +8779,7 @@
     int XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Serialize Function Target</em>' class.
+	 * The number of structural features of the '<em>XML Serialize Function Target</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -8600,6 +8843,15 @@
     int XML_AGGREGATE_FUNCTION__LABEL = SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_AGGREGATE_FUNCTION__COMMENTS = SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -8960,7 +9212,7 @@
     int XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST = SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Aggregate Function</em>' class.
+	 * The number of structural features of the '<em>XML Aggregate Function</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -9024,6 +9276,15 @@
     int XML_VALUE_FUNCTION_CONCAT_CONTENT_ITEM__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_CONCAT_CONTENT_ITEM__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -9339,7 +9600,7 @@
     int XML_VALUE_FUNCTION_CONCAT_CONTENT_ITEM__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Concat Content Item</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Concat Content Item</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -9403,6 +9664,15 @@
     int XML_VALUE_FUNCTION_COMMENT_CONTENT__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_COMMENT_CONTENT__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -9718,7 +9988,7 @@
     int XML_VALUE_FUNCTION_COMMENT_CONTENT__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Comment Content</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Comment Content</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -9782,6 +10052,15 @@
     int XML_VALUE_FUNCTION_DOCUMENT_CONTENT__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_DOCUMENT_CONTENT__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -10097,7 +10376,7 @@
     int XML_VALUE_FUNCTION_DOCUMENT_CONTENT__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Document Content</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Document Content</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -10161,6 +10440,15 @@
     int XML_AGGREGATE_SORT_SPECIFICATION__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_AGGREGATE_SORT_SPECIFICATION__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Aggregate Function</b></em>' container reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -10179,7 +10467,7 @@
     int XML_AGGREGATE_SORT_SPECIFICATION__ORDER_BY_SPEC = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Aggregate Sort Specification</em>' class.
+	 * The number of structural features of the '<em>XML Aggregate Sort Specification</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -10243,6 +10531,15 @@
     int XML_VALUE_FUNCTION_FOREST_CONTENT_ITEM__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_FOREST_CONTENT_ITEM__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -10558,7 +10855,7 @@
     int XML_VALUE_FUNCTION_FOREST_CONTENT_ITEM__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Forest Content Item</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Forest Content Item</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -10622,6 +10919,15 @@
     int XML_VALUE_FUNCTION_PARSE_CONTENT__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_PARSE_CONTENT__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -10937,7 +11243,7 @@
     int XML_VALUE_FUNCTION_PARSE_CONTENT__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Parse Content</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Parse Content</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -11001,6 +11307,15 @@
     int XML_VALUE_FUNCTION_PI_CONTENT__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_PI_CONTENT__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -11316,7 +11631,7 @@
     int XML_VALUE_FUNCTION_PI_CONTENT__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function PI Content</em>' class.
+	 * The number of structural features of the '<em>XML Value Function PI Content</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -11380,6 +11695,15 @@
     int XML_TABLE_FUNCTION__LABEL = SQLQueryModelPackage.TABLE_FUNCTION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_TABLE_FUNCTION__COMMENTS = SQLQueryModelPackage.TABLE_FUNCTION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Table Joined Right</b></em>' container reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -11488,7 +11812,7 @@
     int XML_TABLE_FUNCTION__NAMESPACES_DECL = SQLQueryModelPackage.TABLE_FUNCTION_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>XML Table Function</em>' class.
+	 * The number of structural features of the '<em>XML Table Function</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -11552,6 +11876,15 @@
     int XML_VALUE_FUNCTION_TEXT_CONTENT__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_TEXT_CONTENT__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -11867,7 +12200,7 @@
     int XML_VALUE_FUNCTION_TEXT_CONTENT__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Text Content</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Text Content</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -11931,6 +12264,15 @@
     int XML_VALUE_FUNCTION_VALIDATE_CONTENT__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_VALIDATE_CONTENT__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -12246,7 +12588,7 @@
     int XML_VALUE_FUNCTION_VALIDATE_CONTENT__VALUE_EXPR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Validate Content</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Validate Content</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -12310,6 +12652,15 @@
     int XML_TABLE_COLUMN_DEFINITION_ITEM__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_TABLE_COLUMN_DEFINITION_ITEM__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Table Function</b></em>' container reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -12319,7 +12670,7 @@
     int XML_TABLE_COLUMN_DEFINITION_ITEM__TABLE_FUNCTION = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>XML Table Column Definition Item</em>' class.
+	 * The number of structural features of the '<em>XML Table Column Definition Item</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -12383,6 +12734,15 @@
     int XML_TABLE_COLUMN_DEFINITION_REGULAR__LABEL = XML_TABLE_COLUMN_DEFINITION_ITEM__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_TABLE_COLUMN_DEFINITION_REGULAR__COMMENTS = XML_TABLE_COLUMN_DEFINITION_ITEM__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Table Function</b></em>' container reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -12428,7 +12788,7 @@
     int XML_TABLE_COLUMN_DEFINITION_REGULAR__COLUMN_DEFINITION_DEFAULT = XML_TABLE_COLUMN_DEFINITION_ITEM_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>XML Table Column Definition Regular</em>' class.
+	 * The number of structural features of the '<em>XML Table Column Definition Regular</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -12492,6 +12852,15 @@
     int XML_TABLE_COLUMN_DEFINITION_ORDINALITY__LABEL = XML_TABLE_COLUMN_DEFINITION_ITEM__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_TABLE_COLUMN_DEFINITION_ORDINALITY__COMMENTS = XML_TABLE_COLUMN_DEFINITION_ITEM__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Table Function</b></em>' container reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -12501,7 +12870,7 @@
     int XML_TABLE_COLUMN_DEFINITION_ORDINALITY__TABLE_FUNCTION = XML_TABLE_COLUMN_DEFINITION_ITEM__TABLE_FUNCTION;
 
 	/**
-	 * The number of structural features of the the '<em>XML Table Column Definition Ordinality</em>' class.
+	 * The number of structural features of the '<em>XML Table Column Definition Ordinality</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -12565,6 +12934,15 @@
     int XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Value Function Validate</b></em>' container reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -12583,7 +12961,7 @@
     int XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO__VALIDATE_ELEMENT = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Validate According To</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Validate According To</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -12647,6 +13025,15 @@
     int XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_URI__LABEL = XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_URI__COMMENTS = XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Value Function Validate</b></em>' container reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -12692,7 +13079,7 @@
     int XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_URI__SCHEMA_LOCATION_URI = XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Validate According To URI</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Validate According To URI</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -12756,6 +13143,15 @@
     int XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_IDENTIFIER__LABEL = XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_IDENTIFIER__COMMENTS = XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Value Function Validate</b></em>' container reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -12792,7 +13188,7 @@
     int XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_IDENTIFIER__REGISTERED_XML_SCHEMA_NAME = XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Validate According To Identifier</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Validate According To Identifier</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -12856,6 +13252,15 @@
     int XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAME__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAME__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Validate Element</b></em>' container reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -12865,7 +13270,7 @@
     int XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAME__VALIDATE_ELEMENT = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Validate Element Name</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Validate Element Name</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -12929,6 +13334,15 @@
     int XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAMESPACE__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAMESPACE__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>No Namespace</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -12956,7 +13370,7 @@
     int XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAMESPACE__VALIDATE_ELEMENT = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Validate Element Namespace</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Validate Element Namespace</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -13020,6 +13434,15 @@
     int XML_NAMESPACES_DECLARATION__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_NAMESPACES_DECLARATION__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Namespace Decltem List</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -13056,7 +13479,7 @@
     int XML_NAMESPACES_DECLARATION__TABLE_FUNCTION = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the the '<em>XML Namespaces Declaration</em>' class.
+	 * The number of structural features of the '<em>XML Namespaces Declaration</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -13093,7 +13516,7 @@
     int XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM = 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Attributes Declaration</em>' class.
+	 * The number of structural features of the '<em>XML Attributes Declaration</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -13157,6 +13580,15 @@
     int XML_VALUE_FUNCTION_ELEMENT_CONTENT_LIST__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_ELEMENT_CONTENT_LIST__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Null Handling Option</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -13184,7 +13616,7 @@
     int XML_VALUE_FUNCTION_ELEMENT_CONTENT_LIST__ELEMENT_CONTENT_LIST_CHILDREN = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Element Content List</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Element Content List</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -13248,6 +13680,15 @@
     int XML_VALUE_FUNCTION_QUERY_RETURNING__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_QUERY_RETURNING__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Returning Option</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -13275,7 +13716,7 @@
     int XML_VALUE_FUNCTION_QUERY_RETURNING__VALUE_FUNCTION_QUERY = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Query Returning</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Query Returning</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -13339,6 +13780,15 @@
     int XML_VALUE_FUNCTION_VALIDATE_ELEMENT__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_VALUE_FUNCTION_VALIDATE_ELEMENT__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Validate Element Namespace</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -13366,7 +13816,7 @@
     int XML_VALUE_FUNCTION_VALIDATE_ELEMENT__VALIDATE_ACCORDING_TO = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the the '<em>XML Value Function Validate Element</em>' class.
+	 * The number of structural features of the '<em>XML Value Function Validate Element</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -13430,6 +13880,15 @@
     int XML_TABLE_COLUMN_DEFINITION_DEFAULT__LABEL = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_TABLE_COLUMN_DEFINITION_DEFAULT__COMMENTS = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Unary Operator</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -13745,7 +14204,7 @@
     int XML_TABLE_COLUMN_DEFINITION_DEFAULT__COLUMN_DEFINITION_REGULAR = SQLQueryModelPackage.QUERY_VALUE_EXPRESSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the the '<em>XML Table Column Definition Default</em>' class.
+	 * The number of structural features of the '<em>XML Table Column Definition Default</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -13809,6 +14268,15 @@
     int XML_SERIALIZE_FUNCTION_ENCODING__LABEL = SQLQueryModelPackage.SQL_QUERY_OBJECT__LABEL;
 
 	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XML_SERIALIZE_FUNCTION_ENCODING__COMMENTS = SQLQueryModelPackage.SQL_QUERY_OBJECT__COMMENTS;
+
+	/**
 	 * The feature id for the '<em><b>Encoding Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -13818,7 +14286,7 @@
     int XML_SERIALIZE_FUNCTION_ENCODING__ENCODING_NAME = SQLQueryModelPackage.SQL_QUERY_OBJECT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the the '<em>XML Serialize Function Encoding</em>' class.
+	 * The number of structural features of the '<em>XML Serialize Function Encoding</em>' class.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -15813,4 +16281,1565 @@
 	 */
 	SQLXMLQueryModelFactory getSQLXMLQueryModelFactory();
 
+	/**
+	 * <!-- 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.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionConcatImpl <em>XML Value Function Concat</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionConcatImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionConcat()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_CONCAT = eINSTANCE.getXMLValueFunctionConcat();
+
+		/**
+		 * The meta object literal for the '<em><b>Returning Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_CONCAT__RETURNING_OPTION = eINSTANCE.getXMLValueFunctionConcat_ReturningOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Concat Content List</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_CONCAT__CONCAT_CONTENT_LIST = eINSTANCE.getXMLValueFunctionConcat_ConcatContentList();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionImpl <em>XML Value Function</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunction()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION = eINSTANCE.getXMLValueFunction();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLNamespaceDeclarationPrefixImpl <em>XML Namespace Declaration Prefix</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLNamespaceDeclarationPrefixImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLNamespaceDeclarationPrefix()
+		 * @generated
+		 */
+		EClass XML_NAMESPACE_DECLARATION_PREFIX = eINSTANCE.getXMLNamespaceDeclarationPrefix();
+
+		/**
+		 * The meta object literal for the '<em><b>Prefix</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_NAMESPACE_DECLARATION_PREFIX__PREFIX = eINSTANCE.getXMLNamespaceDeclarationPrefix_Prefix();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLNamespaceDeclarationDefaultImpl <em>XML Namespace Declaration Default</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLNamespaceDeclarationDefaultImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLNamespaceDeclarationDefault()
+		 * @generated
+		 */
+		EClass XML_NAMESPACE_DECLARATION_DEFAULT = eINSTANCE.getXMLNamespaceDeclarationDefault();
+
+		/**
+		 * The meta object literal for the '<em><b>No Default</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_NAMESPACE_DECLARATION_DEFAULT__NO_DEFAULT = eINSTANCE.getXMLNamespaceDeclarationDefault_NoDefault();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLAttributeDeclarationItemImpl <em>XML Attribute Declaration Item</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLAttributeDeclarationItemImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLAttributeDeclarationItem()
+		 * @generated
+		 */
+		EClass XML_ATTRIBUTE_DECLARATION_ITEM = eINSTANCE.getXMLAttributeDeclarationItem();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR = eINSTANCE.getXMLAttributeDeclarationItem_ValueExpr();
+
+		/**
+		 * The meta object literal for the '<em><b>Attributes Decl</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL = eINSTANCE.getXMLAttributeDeclarationItem_AttributesDecl();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionElementImpl <em>XML Value Function Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionElementImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionElement()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_ELEMENT = eINSTANCE.getXMLValueFunctionElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Element Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_ELEMENT__ELEMENT_NAME = eINSTANCE.getXMLValueFunctionElement_ElementName();
+
+		/**
+		 * The meta object literal for the '<em><b>Returning Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_ELEMENT__RETURNING_OPTION = eINSTANCE.getXMLValueFunctionElement_ReturningOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Namespaces Decl</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_ELEMENT__NAMESPACES_DECL = eINSTANCE.getXMLValueFunctionElement_NamespacesDecl();
+
+		/**
+		 * The meta object literal for the '<em><b>Attributes Decl</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_ELEMENT__ATTRIBUTES_DECL = eINSTANCE.getXMLValueFunctionElement_AttributesDecl();
+
+		/**
+		 * The meta object literal for the '<em><b>Element Content List</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_ELEMENT__ELEMENT_CONTENT_LIST = eINSTANCE.getXMLValueFunctionElement_ElementContentList();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLNamespaceDeclarationItemImpl <em>XML Namespace Declaration Item</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLNamespaceDeclarationItemImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLNamespaceDeclarationItem()
+		 * @generated
+		 */
+		EClass XML_NAMESPACE_DECLARATION_ITEM = eINSTANCE.getXMLNamespaceDeclarationItem();
+
+		/**
+		 * The meta object literal for the '<em><b>Uri</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_NAMESPACE_DECLARATION_ITEM__URI = eINSTANCE.getXMLNamespaceDeclarationItem_Uri();
+
+		/**
+		 * The meta object literal for the '<em><b>Namespaces Decl</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL = eINSTANCE.getXMLNamespaceDeclarationItem_NamespacesDecl();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionElementContentItemImpl <em>XML Value Function Element Content Item</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionElementContentItemImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionElementContentItem()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_ELEMENT_CONTENT_ITEM = eINSTANCE.getXMLValueFunctionElementContentItem();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_ELEMENT_CONTENT_ITEM__VALUE_EXPR = eINSTANCE.getXMLValueFunctionElementContentItem_ValueExpr();
+
+		/**
+		 * The meta object literal for the '<em><b>Element Content List</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_ELEMENT_CONTENT_ITEM__ELEMENT_CONTENT_LIST = eINSTANCE.getXMLValueFunctionElementContentItem_ElementContentList();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionForestImpl <em>XML Value Function Forest</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionForestImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionForest()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_FOREST = eINSTANCE.getXMLValueFunctionForest();
+
+		/**
+		 * The meta object literal for the '<em><b>Null Handling Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_FOREST__NULL_HANDLING_OPTION = eINSTANCE.getXMLValueFunctionForest_NullHandlingOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Returning Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_FOREST__RETURNING_OPTION = eINSTANCE.getXMLValueFunctionForest_ReturningOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Forest Content List</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_FOREST__FOREST_CONTENT_LIST = eINSTANCE.getXMLValueFunctionForest_ForestContentList();
+
+		/**
+		 * The meta object literal for the '<em><b>Namespaces Decl</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_FOREST__NAMESPACES_DECL = eINSTANCE.getXMLValueFunctionForest_NamespacesDecl();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionCommentImpl <em>XML Value Function Comment</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionCommentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionComment()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_COMMENT = eINSTANCE.getXMLValueFunctionComment();
+
+		/**
+		 * The meta object literal for the '<em><b>Returning Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_COMMENT__RETURNING_OPTION = eINSTANCE.getXMLValueFunctionComment_ReturningOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Comment Content</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_COMMENT__COMMENT_CONTENT = eINSTANCE.getXMLValueFunctionComment_CommentContent();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionDocumentImpl <em>XML Value Function Document</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionDocumentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionDocument()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_DOCUMENT = eINSTANCE.getXMLValueFunctionDocument();
+
+		/**
+		 * The meta object literal for the '<em><b>Returning Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_DOCUMENT__RETURNING_OPTION = eINSTANCE.getXMLValueFunctionDocument_ReturningOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Document Content</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_DOCUMENT__DOCUMENT_CONTENT = eINSTANCE.getXMLValueFunctionDocument_DocumentContent();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionParseImpl <em>XML Value Function Parse</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionParseImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionParse()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_PARSE = eINSTANCE.getXMLValueFunctionParse();
+
+		/**
+		 * The meta object literal for the '<em><b>Content Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_PARSE__CONTENT_OPTION = eINSTANCE.getXMLValueFunctionParse_ContentOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Whitespace Handling Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_PARSE__WHITESPACE_HANDLING_OPTION = eINSTANCE.getXMLValueFunctionParse_WhitespaceHandlingOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Parse Content</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_PARSE__PARSE_CONTENT = eINSTANCE.getXMLValueFunctionParse_ParseContent();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionPIImpl <em>XML Value Function PI</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionPIImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionPI()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_PI = eINSTANCE.getXMLValueFunctionPI();
+
+		/**
+		 * The meta object literal for the '<em><b>Target Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_PI__TARGET_NAME = eINSTANCE.getXMLValueFunctionPI_TargetName();
+
+		/**
+		 * The meta object literal for the '<em><b>Returning Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_PI__RETURNING_OPTION = eINSTANCE.getXMLValueFunctionPI_ReturningOption();
+
+		/**
+		 * The meta object literal for the '<em><b>PI Content</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_PI__PI_CONTENT = eINSTANCE.getXMLValueFunctionPI_PIContent();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionQueryImpl <em>XML Value Function Query</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionQueryImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionQuery()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_QUERY = eINSTANCE.getXMLValueFunctionQuery();
+
+		/**
+		 * The meta object literal for the '<em><b>Empty Handling Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_QUERY__EMPTY_HANDLING_OPTION = eINSTANCE.getXMLValueFunctionQuery_EmptyHandlingOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Xquery Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_QUERY__XQUERY_EXPR = eINSTANCE.getXMLValueFunctionQuery_XqueryExpr();
+
+		/**
+		 * The meta object literal for the '<em><b>Xquery Arg List</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_QUERY__XQUERY_ARG_LIST = eINSTANCE.getXMLValueFunctionQuery_XqueryArgList();
+
+		/**
+		 * The meta object literal for the '<em><b>Query Returning</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_QUERY__QUERY_RETURNING = eINSTANCE.getXMLValueFunctionQuery_QueryReturning();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionTextImpl <em>XML Value Function Text</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionTextImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionText()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_TEXT = eINSTANCE.getXMLValueFunctionText();
+
+		/**
+		 * The meta object literal for the '<em><b>Returning Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_TEXT__RETURNING_OPTION = eINSTANCE.getXMLValueFunctionText_ReturningOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Text Content</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_TEXT__TEXT_CONTENT = eINSTANCE.getXMLValueFunctionText_TextContent();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateImpl <em>XML Value Function Validate</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionValidate()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_VALIDATE = eINSTANCE.getXMLValueFunctionValidate();
+
+		/**
+		 * The meta object literal for the '<em><b>Content Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_VALIDATE__CONTENT_OPTION = eINSTANCE.getXMLValueFunctionValidate_ContentOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Validate Content</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE__VALIDATE_CONTENT = eINSTANCE.getXMLValueFunctionValidate_ValidateContent();
+
+		/**
+		 * The meta object literal for the '<em><b>Validate According To</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE__VALIDATE_ACCORDING_TO = eINSTANCE.getXMLValueFunctionValidate_ValidateAccordingTo();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueExpressionCastImpl <em>XML Value Expression Cast</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueExpressionCastImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueExpressionCast()
+		 * @generated
+		 */
+		EClass XML_VALUE_EXPRESSION_CAST = eINSTANCE.getXMLValueExpressionCast();
+
+		/**
+		 * The meta object literal for the '<em><b>Passing Mechanism</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_EXPRESSION_CAST__PASSING_MECHANISM = eINSTANCE.getXMLValueExpressionCast_PassingMechanism();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateImpl <em>XML Predicate</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLPredicate()
+		 * @generated
+		 */
+		EClass XML_PREDICATE = eINSTANCE.getXMLPredicate();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateContentImpl <em>XML Predicate Content</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateContentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLPredicateContent()
+		 * @generated
+		 */
+		EClass XML_PREDICATE_CONTENT = eINSTANCE.getXMLPredicateContent();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateDocumentImpl <em>XML Predicate Document</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateDocumentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLPredicateDocument()
+		 * @generated
+		 */
+		EClass XML_PREDICATE_DOCUMENT = eINSTANCE.getXMLPredicateDocument();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateExistsImpl <em>XML Predicate Exists</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateExistsImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLPredicateExists()
+		 * @generated
+		 */
+		EClass XML_PREDICATE_EXISTS = eINSTANCE.getXMLPredicateExists();
+
+		/**
+		 * The meta object literal for the '<em><b>Xquery Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_PREDICATE_EXISTS__XQUERY_EXPR = eINSTANCE.getXMLPredicateExists_XqueryExpr();
+
+		/**
+		 * The meta object literal for the '<em><b>Xquery Arg List</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_PREDICATE_EXISTS__XQUERY_ARG_LIST = eINSTANCE.getXMLPredicateExists_XqueryArgList();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateValidImpl <em>XML Predicate Valid</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLPredicateValidImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLPredicateValid()
+		 * @generated
+		 */
+		EClass XML_PREDICATE_VALID = eINSTANCE.getXMLPredicateValid();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLQueryExpressionImpl <em>XML Query Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLQueryExpressionImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLQueryExpression()
+		 * @generated
+		 */
+		EClass XML_QUERY_EXPRESSION = eINSTANCE.getXMLQueryExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Xquery Expr Content</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_QUERY_EXPRESSION__XQUERY_EXPR_CONTENT = eINSTANCE.getXMLQueryExpression_XqueryExprContent();
+
+		/**
+		 * The meta object literal for the '<em><b>Predicate Exists</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_QUERY_EXPRESSION__PREDICATE_EXISTS = eINSTANCE.getXMLQueryExpression_PredicateExists();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Query</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY = eINSTANCE.getXMLQueryExpression_ValueFunctionQuery();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLQueryArgumentListImpl <em>XML Query Argument List</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLQueryArgumentListImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLQueryArgumentList()
+		 * @generated
+		 */
+		EClass XML_QUERY_ARGUMENT_LIST = eINSTANCE.getXMLQueryArgumentList();
+
+		/**
+		 * The meta object literal for the '<em><b>Passing Mechanism</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_QUERY_ARGUMENT_LIST__PASSING_MECHANISM = eINSTANCE.getXMLQueryArgumentList_PassingMechanism();
+
+		/**
+		 * The meta object literal for the '<em><b>Predicate Exists</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS = eINSTANCE.getXMLQueryArgumentList_PredicateExists();
+
+		/**
+		 * The meta object literal for the '<em><b>Xquery Arg List Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_QUERY_ARGUMENT_LIST__XQUERY_ARG_LIST_CHILDREN = eINSTANCE.getXMLQueryArgumentList_XqueryArgListChildren();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Query</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY = eINSTANCE.getXMLQueryArgumentList_ValueFunctionQuery();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Function</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION = eINSTANCE.getXMLQueryArgumentList_TableFunction();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLQueryArgumentItemImpl <em>XML Query Argument Item</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLQueryArgumentItemImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLQueryArgumentItem()
+		 * @generated
+		 */
+		EClass XML_QUERY_ARGUMENT_ITEM = eINSTANCE.getXMLQueryArgumentItem();
+
+		/**
+		 * The meta object literal for the '<em><b>Passing Mechanism</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_QUERY_ARGUMENT_ITEM__PASSING_MECHANISM = eINSTANCE.getXMLQueryArgumentItem_PassingMechanism();
+
+		/**
+		 * The meta object literal for the '<em><b>Xquery Arg List</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST = eINSTANCE.getXMLQueryArgumentItem_XqueryArgList();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR = eINSTANCE.getXMLQueryArgumentItem_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLSerializeFunctionImpl <em>XML Serialize Function</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLSerializeFunctionImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLSerializeFunction()
+		 * @generated
+		 */
+		EClass XML_SERIALIZE_FUNCTION = eINSTANCE.getXMLSerializeFunction();
+
+		/**
+		 * The meta object literal for the '<em><b>Content Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_SERIALIZE_FUNCTION__CONTENT_OPTION = eINSTANCE.getXMLSerializeFunction_ContentOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Serialize Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_SERIALIZE_FUNCTION__SERIALIZE_VERSION = eINSTANCE.getXMLSerializeFunction_SerializeVersion();
+
+		/**
+		 * The meta object literal for the '<em><b>Declaration Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_SERIALIZE_FUNCTION__DECLARATION_OPTION = eINSTANCE.getXMLSerializeFunction_DeclarationOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Serialize Target</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_SERIALIZE_FUNCTION__SERIALIZE_TARGET = eINSTANCE.getXMLSerializeFunction_SerializeTarget();
+
+		/**
+		 * The meta object literal for the '<em><b>Serialize Encoding</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_SERIALIZE_FUNCTION__SERIALIZE_ENCODING = eINSTANCE.getXMLSerializeFunction_SerializeEncoding();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLSerializeFunctionTargetImpl <em>XML Serialize Function Target</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLSerializeFunctionTargetImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLSerializeFunctionTarget()
+		 * @generated
+		 */
+		EClass XML_SERIALIZE_FUNCTION_TARGET = eINSTANCE.getXMLSerializeFunctionTarget();
+
+		/**
+		 * The meta object literal for the '<em><b>Serialize Function</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_SERIALIZE_FUNCTION_TARGET__SERIALIZE_FUNCTION = eINSTANCE.getXMLSerializeFunctionTarget_SerializeFunction();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR = eINSTANCE.getXMLSerializeFunctionTarget_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLAggregateFunctionImpl <em>XML Aggregate Function</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLAggregateFunctionImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLAggregateFunction()
+		 * @generated
+		 */
+		EClass XML_AGGREGATE_FUNCTION = eINSTANCE.getXMLAggregateFunction();
+
+		/**
+		 * The meta object literal for the '<em><b>Returning Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_AGGREGATE_FUNCTION__RETURNING_OPTION = eINSTANCE.getXMLAggregateFunction_ReturningOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Sort Spec List</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST = eINSTANCE.getXMLAggregateFunction_SortSpecList();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionConcatContentItemImpl <em>XML Value Function Concat Content Item</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionConcatContentItemImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionConcatContentItem()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_CONCAT_CONTENT_ITEM = eINSTANCE.getXMLValueFunctionConcatContentItem();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Concat</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_CONCAT_CONTENT_ITEM__VALUE_FUNCTION_CONCAT = eINSTANCE.getXMLValueFunctionConcatContentItem_ValueFunctionConcat();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_CONCAT_CONTENT_ITEM__VALUE_EXPR = eINSTANCE.getXMLValueFunctionConcatContentItem_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionCommentContentImpl <em>XML Value Function Comment Content</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionCommentContentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionCommentContent()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_COMMENT_CONTENT = eINSTANCE.getXMLValueFunctionCommentContent();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Comment</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_COMMENT_CONTENT__VALUE_FUNCTION_COMMENT = eINSTANCE.getXMLValueFunctionCommentContent_ValueFunctionComment();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_COMMENT_CONTENT__VALUE_EXPR = eINSTANCE.getXMLValueFunctionCommentContent_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionDocumentContentImpl <em>XML Value Function Document Content</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionDocumentContentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionDocumentContent()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_DOCUMENT_CONTENT = eINSTANCE.getXMLValueFunctionDocumentContent();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Document</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_DOCUMENT_CONTENT__VALUE_FUNCTION_DOCUMENT = eINSTANCE.getXMLValueFunctionDocumentContent_ValueFunctionDocument();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_DOCUMENT_CONTENT__VALUE_EXPR = eINSTANCE.getXMLValueFunctionDocumentContent_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLAggregateSortSpecificationImpl <em>XML Aggregate Sort Specification</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLAggregateSortSpecificationImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLAggregateSortSpecification()
+		 * @generated
+		 */
+		EClass XML_AGGREGATE_SORT_SPECIFICATION = eINSTANCE.getXMLAggregateSortSpecification();
+
+		/**
+		 * The meta object literal for the '<em><b>Aggregate Function</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION = eINSTANCE.getXMLAggregateSortSpecification_AggregateFunction();
+
+		/**
+		 * The meta object literal for the '<em><b>Order By Spec</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_AGGREGATE_SORT_SPECIFICATION__ORDER_BY_SPEC = eINSTANCE.getXMLAggregateSortSpecification_OrderBySpec();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionForestContentItemImpl <em>XML Value Function Forest Content Item</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionForestContentItemImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionForestContentItem()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_FOREST_CONTENT_ITEM = eINSTANCE.getXMLValueFunctionForestContentItem();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Forest</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_FOREST_CONTENT_ITEM__VALUE_FUNCTION_FOREST = eINSTANCE.getXMLValueFunctionForestContentItem_ValueFunctionForest();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_FOREST_CONTENT_ITEM__VALUE_EXPR = eINSTANCE.getXMLValueFunctionForestContentItem_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionParseContentImpl <em>XML Value Function Parse Content</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionParseContentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionParseContent()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_PARSE_CONTENT = eINSTANCE.getXMLValueFunctionParseContent();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Parse</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_PARSE_CONTENT__VALUE_FUNCTION_PARSE = eINSTANCE.getXMLValueFunctionParseContent_ValueFunctionParse();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_PARSE_CONTENT__VALUE_EXPR = eINSTANCE.getXMLValueFunctionParseContent_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionPIContentImpl <em>XML Value Function PI Content</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionPIContentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionPIContent()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_PI_CONTENT = eINSTANCE.getXMLValueFunctionPIContent();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function PI</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_PI_CONTENT__VALUE_FUNCTION_PI = eINSTANCE.getXMLValueFunctionPIContent_ValueFunctionPI();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_PI_CONTENT__VALUE_EXPR = eINSTANCE.getXMLValueFunctionPIContent_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableFunctionImpl <em>XML Table Function</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableFunctionImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLTableFunction()
+		 * @generated
+		 */
+		EClass XML_TABLE_FUNCTION = eINSTANCE.getXMLTableFunction();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Row Pattern</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_TABLE_FUNCTION__TABLE_ROW_PATTERN = eINSTANCE.getXMLTableFunction_TableRowPattern();
+
+		/**
+		 * The meta object literal for the '<em><b>Xquery Arg List</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_TABLE_FUNCTION__XQUERY_ARG_LIST = eINSTANCE.getXMLTableFunction_XqueryArgList();
+
+		/**
+		 * The meta object literal for the '<em><b>Column Def List</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_TABLE_FUNCTION__COLUMN_DEF_LIST = eINSTANCE.getXMLTableFunction_ColumnDefList();
+
+		/**
+		 * The meta object literal for the '<em><b>Namespaces Decl</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_TABLE_FUNCTION__NAMESPACES_DECL = eINSTANCE.getXMLTableFunction_NamespacesDecl();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionTextContentImpl <em>XML Value Function Text Content</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionTextContentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionTextContent()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_TEXT_CONTENT = eINSTANCE.getXMLValueFunctionTextContent();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Text</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_TEXT_CONTENT__VALUE_FUNCTION_TEXT = eINSTANCE.getXMLValueFunctionTextContent_ValueFunctionText();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_TEXT_CONTENT__VALUE_EXPR = eINSTANCE.getXMLValueFunctionTextContent_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateContentImpl <em>XML Value Function Validate Content</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateContentImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionValidateContent()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_VALIDATE_CONTENT = eINSTANCE.getXMLValueFunctionValidateContent();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Validate</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE_CONTENT__VALUE_FUNCTION_VALIDATE = eINSTANCE.getXMLValueFunctionValidateContent_ValueFunctionValidate();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE_CONTENT__VALUE_EXPR = eINSTANCE.getXMLValueFunctionValidateContent_ValueExpr();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableColumnDefinitionItemImpl <em>XML Table Column Definition Item</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableColumnDefinitionItemImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLTableColumnDefinitionItem()
+		 * @generated
+		 */
+		EClass XML_TABLE_COLUMN_DEFINITION_ITEM = eINSTANCE.getXMLTableColumnDefinitionItem();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Function</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_TABLE_COLUMN_DEFINITION_ITEM__TABLE_FUNCTION = eINSTANCE.getXMLTableColumnDefinitionItem_TableFunction();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableColumnDefinitionRegularImpl <em>XML Table Column Definition Regular</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableColumnDefinitionRegularImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLTableColumnDefinitionRegular()
+		 * @generated
+		 */
+		EClass XML_TABLE_COLUMN_DEFINITION_REGULAR = eINSTANCE.getXMLTableColumnDefinitionRegular();
+
+		/**
+		 * The meta object literal for the '<em><b>Data Type</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_TABLE_COLUMN_DEFINITION_REGULAR__DATA_TYPE = eINSTANCE.getXMLTableColumnDefinitionRegular_DataType();
+
+		/**
+		 * The meta object literal for the '<em><b>Passing Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_TABLE_COLUMN_DEFINITION_REGULAR__PASSING_OPTION = eINSTANCE.getXMLTableColumnDefinitionRegular_PassingOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Column Pattern</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_TABLE_COLUMN_DEFINITION_REGULAR__TABLE_COLUMN_PATTERN = eINSTANCE.getXMLTableColumnDefinitionRegular_TableColumnPattern();
+
+		/**
+		 * The meta object literal for the '<em><b>Column Definition Default</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_TABLE_COLUMN_DEFINITION_REGULAR__COLUMN_DEFINITION_DEFAULT = eINSTANCE.getXMLTableColumnDefinitionRegular_ColumnDefinitionDefault();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableColumnDefinitionOrdinalityImpl <em>XML Table Column Definition Ordinality</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableColumnDefinitionOrdinalityImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLTableColumnDefinitionOrdinality()
+		 * @generated
+		 */
+		EClass XML_TABLE_COLUMN_DEFINITION_ORDINALITY = eINSTANCE.getXMLTableColumnDefinitionOrdinality();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateAccordingToImpl <em>XML Value Function Validate According To</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateAccordingToImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionValidateAccordingTo()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO = eINSTANCE.getXMLValueFunctionValidateAccordingTo();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Validate</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO__VALUE_FUNCTION_VALIDATE = eINSTANCE.getXMLValueFunctionValidateAccordingTo_ValueFunctionValidate();
+
+		/**
+		 * The meta object literal for the '<em><b>Validate Element</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO__VALIDATE_ELEMENT = eINSTANCE.getXMLValueFunctionValidateAccordingTo_ValidateElement();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateAccordingToURIImpl <em>XML Value Function Validate According To URI</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateAccordingToURIImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionValidateAccordingToURI()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_URI = eINSTANCE.getXMLValueFunctionValidateAccordingToURI();
+
+		/**
+		 * The meta object literal for the '<em><b>No Namespace</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_URI__NO_NAMESPACE = eINSTANCE.getXMLValueFunctionValidateAccordingToURI_NoNamespace();
+
+		/**
+		 * The meta object literal for the '<em><b>Target Namespace URI</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_URI__TARGET_NAMESPACE_URI = eINSTANCE.getXMLValueFunctionValidateAccordingToURI_TargetNamespaceURI();
+
+		/**
+		 * The meta object literal for the '<em><b>Schema Location URI</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_URI__SCHEMA_LOCATION_URI = eINSTANCE.getXMLValueFunctionValidateAccordingToURI_SchemaLocationURI();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateAccordingToIdentifierImpl <em>XML Value Function Validate According To Identifier</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateAccordingToIdentifierImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionValidateAccordingToIdentifier()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_IDENTIFIER = eINSTANCE.getXMLValueFunctionValidateAccordingToIdentifier();
+
+		/**
+		 * The meta object literal for the '<em><b>Schema Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_IDENTIFIER__SCHEMA_NAME = eINSTANCE.getXMLValueFunctionValidateAccordingToIdentifier_SchemaName();
+
+		/**
+		 * The meta object literal for the '<em><b>Registered XML Schema Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_VALIDATE_ACCORDING_TO_IDENTIFIER__REGISTERED_XML_SCHEMA_NAME = eINSTANCE.getXMLValueFunctionValidateAccordingToIdentifier_RegisteredXMLSchemaName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateElementNameImpl <em>XML Value Function Validate Element Name</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateElementNameImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionValidateElementName()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAME = eINSTANCE.getXMLValueFunctionValidateElementName();
+
+		/**
+		 * The meta object literal for the '<em><b>Validate Element</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAME__VALIDATE_ELEMENT = eINSTANCE.getXMLValueFunctionValidateElementName_ValidateElement();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateElementNamespaceImpl <em>XML Value Function Validate Element Namespace</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateElementNamespaceImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionValidateElementNamespace()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAMESPACE = eINSTANCE.getXMLValueFunctionValidateElementNamespace();
+
+		/**
+		 * The meta object literal for the '<em><b>No Namespace</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAMESPACE__NO_NAMESPACE = eINSTANCE.getXMLValueFunctionValidateElementNamespace_NoNamespace();
+
+		/**
+		 * The meta object literal for the '<em><b>Namespace URI</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAMESPACE__NAMESPACE_URI = eINSTANCE.getXMLValueFunctionValidateElementNamespace_NamespaceURI();
+
+		/**
+		 * The meta object literal for the '<em><b>Validate Element</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE_ELEMENT_NAMESPACE__VALIDATE_ELEMENT = eINSTANCE.getXMLValueFunctionValidateElementNamespace_ValidateElement();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLNamespacesDeclarationImpl <em>XML Namespaces Declaration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLNamespacesDeclarationImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLNamespacesDeclaration()
+		 * @generated
+		 */
+		EClass XML_NAMESPACES_DECLARATION = eINSTANCE.getXMLNamespacesDeclaration();
+
+		/**
+		 * The meta object literal for the '<em><b>Namespace Decltem List</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST = eINSTANCE.getXMLNamespacesDeclaration_NamespaceDecltemList();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Element</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT = eINSTANCE.getXMLNamespacesDeclaration_ValueFunctionElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Forest</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST = eINSTANCE.getXMLNamespacesDeclaration_ValueFunctionForest();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Function</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_NAMESPACES_DECLARATION__TABLE_FUNCTION = eINSTANCE.getXMLNamespacesDeclaration_TableFunction();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLAttributesDeclarationImpl <em>XML Attributes Declaration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLAttributesDeclarationImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLAttributesDeclaration()
+		 * @generated
+		 */
+		EClass XML_ATTRIBUTES_DECLARATION = eINSTANCE.getXMLAttributesDeclaration();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Element</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT = eINSTANCE.getXMLAttributesDeclaration_ValueFunctionElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Attribute Decl Item</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM = eINSTANCE.getXMLAttributesDeclaration_AttributeDeclItem();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionElementContentListImpl <em>XML Value Function Element Content List</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionElementContentListImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionElementContentList()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_ELEMENT_CONTENT_LIST = eINSTANCE.getXMLValueFunctionElementContentList();
+
+		/**
+		 * The meta object literal for the '<em><b>Null Handling Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_ELEMENT_CONTENT_LIST__NULL_HANDLING_OPTION = eINSTANCE.getXMLValueFunctionElementContentList_NullHandlingOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Element</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_ELEMENT_CONTENT_LIST__VALUE_FUNCTION_ELEMENT = eINSTANCE.getXMLValueFunctionElementContentList_ValueFunctionElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Element Content List Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_ELEMENT_CONTENT_LIST__ELEMENT_CONTENT_LIST_CHILDREN = eINSTANCE.getXMLValueFunctionElementContentList_ElementContentListChildren();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionQueryReturningImpl <em>XML Value Function Query Returning</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionQueryReturningImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionQueryReturning()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_QUERY_RETURNING = eINSTANCE.getXMLValueFunctionQueryReturning();
+
+		/**
+		 * The meta object literal for the '<em><b>Returning Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_QUERY_RETURNING__RETURNING_OPTION = eINSTANCE.getXMLValueFunctionQueryReturning_ReturningOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Passing Option</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_VALUE_FUNCTION_QUERY_RETURNING__PASSING_OPTION = eINSTANCE.getXMLValueFunctionQueryReturning_PassingOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Function Query</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_QUERY_RETURNING__VALUE_FUNCTION_QUERY = eINSTANCE.getXMLValueFunctionQueryReturning_ValueFunctionQuery();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateElementImpl <em>XML Value Function Validate Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLValueFunctionValidateElementImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLValueFunctionValidateElement()
+		 * @generated
+		 */
+		EClass XML_VALUE_FUNCTION_VALIDATE_ELEMENT = eINSTANCE.getXMLValueFunctionValidateElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Validate Element Namespace</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE_ELEMENT__VALIDATE_ELEMENT_NAMESPACE = eINSTANCE.getXMLValueFunctionValidateElement_ValidateElementNamespace();
+
+		/**
+		 * The meta object literal for the '<em><b>Validate Element Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE_ELEMENT__VALIDATE_ELEMENT_NAME = eINSTANCE.getXMLValueFunctionValidateElement_ValidateElementName();
+
+		/**
+		 * The meta object literal for the '<em><b>Validate According To</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_VALUE_FUNCTION_VALIDATE_ELEMENT__VALIDATE_ACCORDING_TO = eINSTANCE.getXMLValueFunctionValidateElement_ValidateAccordingTo();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableColumnDefinitionDefaultImpl <em>XML Table Column Definition Default</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLTableColumnDefinitionDefaultImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLTableColumnDefinitionDefault()
+		 * @generated
+		 */
+		EClass XML_TABLE_COLUMN_DEFINITION_DEFAULT = eINSTANCE.getXMLTableColumnDefinitionDefault();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_TABLE_COLUMN_DEFINITION_DEFAULT__VALUE_EXPR = eINSTANCE.getXMLTableColumnDefinitionDefault_ValueExpr();
+
+		/**
+		 * The meta object literal for the '<em><b>Column Definition Regular</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XML_TABLE_COLUMN_DEFINITION_DEFAULT__COLUMN_DEFINITION_REGULAR = eINSTANCE.getXMLTableColumnDefinitionDefault_ColumnDefinitionRegular();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLSerializeFunctionEncodingImpl <em>XML Serialize Function Encoding</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.XMLSerializeFunctionEncodingImpl
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLSerializeFunctionEncoding()
+		 * @generated
+		 */
+		EClass XML_SERIALIZE_FUNCTION_ENCODING = eINSTANCE.getXMLSerializeFunctionEncoding();
+
+		/**
+		 * The meta object literal for the '<em><b>Encoding Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XML_SERIALIZE_FUNCTION_ENCODING__ENCODING_NAME = eINSTANCE.getXMLSerializeFunctionEncoding_EncodingName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.XMLPassingType <em>XML Passing Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.XMLPassingType
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLPassingType()
+		 * @generated
+		 */
+		EEnum XML_PASSING_TYPE = eINSTANCE.getXMLPassingType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.XMLContentType <em>XML Content Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.XMLContentType
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLContentType()
+		 * @generated
+		 */
+		EEnum XML_CONTENT_TYPE = eINSTANCE.getXMLContentType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.XMLDeclarationType <em>XML Declaration Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.XMLDeclarationType
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLDeclarationType()
+		 * @generated
+		 */
+		EEnum XML_DECLARATION_TYPE = eINSTANCE.getXMLDeclarationType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.XMLReturningType <em>XML Returning Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.XMLReturningType
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLReturningType()
+		 * @generated
+		 */
+		EEnum XML_RETURNING_TYPE = eINSTANCE.getXMLReturningType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.XMLNullHandlingType <em>XML Null Handling Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.XMLNullHandlingType
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLNullHandlingType()
+		 * @generated
+		 */
+		EEnum XML_NULL_HANDLING_TYPE = eINSTANCE.getXMLNullHandlingType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.XMLWhitespaceHandlingType <em>XML Whitespace Handling Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.XMLWhitespaceHandlingType
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLWhitespaceHandlingType()
+		 * @generated
+		 */
+		EEnum XML_WHITESPACE_HANDLING_TYPE = eINSTANCE.getXMLWhitespaceHandlingType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.XMLEmptyHandlingType <em>XML Empty Handling Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.XMLEmptyHandlingType
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLEmptyHandlingType()
+		 * @generated
+		 */
+		EEnum XML_EMPTY_HANDLING_TYPE = eINSTANCE.getXMLEmptyHandlingType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.sql.xml.query.XMLContentType2 <em>XML Content Type2</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.XMLContentType2
+		 * @see org.eclipse.datatools.modelbase.sql.xml.query.impl.SQLXMLQueryModelPackageImpl#getXMLContentType2()
+		 * @generated
+		 */
+		EEnum XML_CONTENT_TYPE2 = eINSTANCE.getXMLContentType2();
+
+	}
+
 } //SQLXMLQueryPackage
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLContentType.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLContentType.java
index 9856eeb..c965c74 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLContentType.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLContentType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLContentType.java,v 1.2 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLContentType.java,v 1.3 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -67,7 +67,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLContentType CONTENT_LITERAL = new XMLContentType(CONTENT, "CONTENT");
+    public static final XMLContentType CONTENT_LITERAL = new XMLContentType(CONTENT, "CONTENT", "CONTENT");
 
 	/**
 	 * The '<em><b>DOCUMENT</b></em>' literal object.
@@ -81,7 +81,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLContentType DOCUMENT_LITERAL = new XMLContentType(DOCUMENT, "DOCUMENT");
+    public static final XMLContentType DOCUMENT_LITERAL = new XMLContentType(DOCUMENT, "DOCUMENT", "DOCUMENT");
 
 	/**
 	 * The '<em><b>NONE</b></em>' literal object.
@@ -95,7 +95,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLContentType NONE_LITERAL = new XMLContentType(NONE, "NONE");
+    public static final XMLContentType NONE_LITERAL = new XMLContentType(NONE, "NONE", "NONE");
 
 	/**
 	 * An array of all the '<em><b>XML Content Type</b></em>' enumerators.
@@ -119,15 +119,15 @@
     public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>XML Content Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>XML Content Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public static XMLContentType get(String name) {
+    public static XMLContentType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			XMLContentType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -135,7 +135,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>XML Content Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>XML Content Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static XMLContentType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			XMLContentType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>XML Content Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -155,8 +171,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private XMLContentType(int value, String name) {
-		super(value, name);
+	private XMLContentType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //XMLContentType
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLContentType2.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLContentType2.java
index f116865..ca56063 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLContentType2.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLContentType2.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLContentType2.java,v 1.2 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLContentType2.java,v 1.3 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -78,7 +78,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLContentType2 CONTENT_LITERAL = new XMLContentType2(CONTENT, "CONTENT");
+    public static final XMLContentType2 CONTENT_LITERAL = new XMLContentType2(CONTENT, "CONTENT", "CONTENT");
 
 	/**
 	 * The '<em><b>DOCUMENT</b></em>' literal object.
@@ -92,7 +92,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLContentType2 DOCUMENT_LITERAL = new XMLContentType2(DOCUMENT, "DOCUMENT");
+    public static final XMLContentType2 DOCUMENT_LITERAL = new XMLContentType2(DOCUMENT, "DOCUMENT", "DOCUMENT");
 
 	/**
 	 * The '<em><b>SEQUENCE</b></em>' literal object.
@@ -106,7 +106,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLContentType2 SEQUENCE_LITERAL = new XMLContentType2(SEQUENCE, "SEQUENCE");
+    public static final XMLContentType2 SEQUENCE_LITERAL = new XMLContentType2(SEQUENCE, "SEQUENCE", "SEQUENCE");
 
 	/**
 	 * The '<em><b>NONE</b></em>' literal object.
@@ -120,7 +120,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLContentType2 NONE_LITERAL = new XMLContentType2(NONE, "NONE");
+    public static final XMLContentType2 NONE_LITERAL = new XMLContentType2(NONE, "NONE", "NONE");
 
 	/**
 	 * An array of all the '<em><b>XML Content Type2</b></em>' enumerators.
@@ -145,15 +145,15 @@
     public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>XML Content Type2</b></em>' literal with the specified name.
+	 * Returns the '<em><b>XML Content Type2</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public static XMLContentType2 get(String name) {
+    public static XMLContentType2 get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			XMLContentType2 result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -161,7 +161,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>XML Content Type2</b></em>' literal with the specified value.
+	 * Returns the '<em><b>XML Content Type2</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static XMLContentType2 getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			XMLContentType2 result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>XML Content Type2</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -182,8 +198,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private XMLContentType2(int value, String name) {
-		super(value, name);
+	private XMLContentType2(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //XMLContentType2
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLDeclarationType.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLDeclarationType.java
index ea6398a..faa190d 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLDeclarationType.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLDeclarationType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLDeclarationType.java,v 1.2 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLDeclarationType.java,v 1.3 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -67,7 +67,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLDeclarationType EXCLUDING_XMLDECLARATION_LITERAL = new XMLDeclarationType(EXCLUDING_XMLDECLARATION, "EXCLUDING_XMLDECLARATION");
+    public static final XMLDeclarationType EXCLUDING_XMLDECLARATION_LITERAL = new XMLDeclarationType(EXCLUDING_XMLDECLARATION, "EXCLUDING_XMLDECLARATION", "EXCLUDING_XMLDECLARATION");
 
 	/**
 	 * The '<em><b>INCLUDING XMLDECLARATION</b></em>' literal object.
@@ -81,7 +81,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLDeclarationType INCLUDING_XMLDECLARATION_LITERAL = new XMLDeclarationType(INCLUDING_XMLDECLARATION, "INCLUDING_XMLDECLARATION");
+    public static final XMLDeclarationType INCLUDING_XMLDECLARATION_LITERAL = new XMLDeclarationType(INCLUDING_XMLDECLARATION, "INCLUDING_XMLDECLARATION", "INCLUDING_XMLDECLARATION");
 
 	/**
 	 * The '<em><b>NONE</b></em>' literal object.
@@ -95,7 +95,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLDeclarationType NONE_LITERAL = new XMLDeclarationType(NONE, "NONE");
+    public static final XMLDeclarationType NONE_LITERAL = new XMLDeclarationType(NONE, "NONE", "NONE");
 
 	/**
 	 * An array of all the '<em><b>XML Declaration Type</b></em>' enumerators.
@@ -119,15 +119,15 @@
     public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>XML Declaration Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>XML Declaration Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public static XMLDeclarationType get(String name) {
+    public static XMLDeclarationType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			XMLDeclarationType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -135,7 +135,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>XML Declaration Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>XML Declaration Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static XMLDeclarationType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			XMLDeclarationType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>XML Declaration Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -155,8 +171,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private XMLDeclarationType(int value, String name) {
-		super(value, name);
+	private XMLDeclarationType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //XMLDeclarationType
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLEmptyHandlingType.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLEmptyHandlingType.java
index e6b4072..474b8c9 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLEmptyHandlingType.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLEmptyHandlingType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLEmptyHandlingType.java,v 1.2 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLEmptyHandlingType.java,v 1.3 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -67,7 +67,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLEmptyHandlingType EMPTY_ON_EMPTY_LITERAL = new XMLEmptyHandlingType(EMPTY_ON_EMPTY, "EMPTY_ON_EMPTY");
+    public static final XMLEmptyHandlingType EMPTY_ON_EMPTY_LITERAL = new XMLEmptyHandlingType(EMPTY_ON_EMPTY, "EMPTY_ON_EMPTY", "EMPTY_ON_EMPTY");
 
 	/**
 	 * The '<em><b>NULL ON EMPTY</b></em>' literal object.
@@ -81,7 +81,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLEmptyHandlingType NULL_ON_EMPTY_LITERAL = new XMLEmptyHandlingType(NULL_ON_EMPTY, "NULL_ON_EMPTY");
+    public static final XMLEmptyHandlingType NULL_ON_EMPTY_LITERAL = new XMLEmptyHandlingType(NULL_ON_EMPTY, "NULL_ON_EMPTY", "NULL_ON_EMPTY");
 
 	/**
 	 * The '<em><b>NONE</b></em>' literal object.
@@ -95,7 +95,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLEmptyHandlingType NONE_LITERAL = new XMLEmptyHandlingType(NONE, "NONE");
+    public static final XMLEmptyHandlingType NONE_LITERAL = new XMLEmptyHandlingType(NONE, "NONE", "NONE");
 
 	/**
 	 * An array of all the '<em><b>XML Empty Handling Type</b></em>' enumerators.
@@ -119,15 +119,15 @@
     public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>XML Empty Handling Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>XML Empty Handling Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public static XMLEmptyHandlingType get(String name) {
+    public static XMLEmptyHandlingType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			XMLEmptyHandlingType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -135,7 +135,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>XML Empty Handling Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>XML Empty Handling Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static XMLEmptyHandlingType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			XMLEmptyHandlingType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>XML Empty Handling Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -155,8 +171,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private XMLEmptyHandlingType(int value, String name) {
-		super(value, name);
+	private XMLEmptyHandlingType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //XMLEmptyHandlingType
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLNullHandlingType.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLNullHandlingType.java
index 22ef404..40a56ac 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLNullHandlingType.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLNullHandlingType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLNullHandlingType.java,v 1.2 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLNullHandlingType.java,v 1.3 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -100,7 +100,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLNullHandlingType ABSENT_ON_NULL_LITERAL = new XMLNullHandlingType(ABSENT_ON_NULL, "ABSENT_ON_NULL");
+    public static final XMLNullHandlingType ABSENT_ON_NULL_LITERAL = new XMLNullHandlingType(ABSENT_ON_NULL, "ABSENT_ON_NULL", "ABSENT_ON_NULL");
 
 	/**
 	 * The '<em><b>EMPTY ON NULL</b></em>' literal object.
@@ -114,7 +114,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLNullHandlingType EMPTY_ON_NULL_LITERAL = new XMLNullHandlingType(EMPTY_ON_NULL, "EMPTY_ON_NULL");
+    public static final XMLNullHandlingType EMPTY_ON_NULL_LITERAL = new XMLNullHandlingType(EMPTY_ON_NULL, "EMPTY_ON_NULL", "EMPTY_ON_NULL");
 
 	/**
 	 * The '<em><b>NIL ON NO CONTENT</b></em>' literal object.
@@ -128,7 +128,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLNullHandlingType NIL_ON_NO_CONTENT_LITERAL = new XMLNullHandlingType(NIL_ON_NO_CONTENT, "NIL_ON_NO_CONTENT");
+    public static final XMLNullHandlingType NIL_ON_NO_CONTENT_LITERAL = new XMLNullHandlingType(NIL_ON_NO_CONTENT, "NIL_ON_NO_CONTENT", "NIL_ON_NO_CONTENT");
 
 	/**
 	 * The '<em><b>NIL ON NULL</b></em>' literal object.
@@ -142,7 +142,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLNullHandlingType NIL_ON_NULL_LITERAL = new XMLNullHandlingType(NIL_ON_NULL, "NIL_ON_NULL");
+    public static final XMLNullHandlingType NIL_ON_NULL_LITERAL = new XMLNullHandlingType(NIL_ON_NULL, "NIL_ON_NULL", "NIL_ON_NULL");
 
 	/**
 	 * The '<em><b>NULL ON NULL</b></em>' literal object.
@@ -156,7 +156,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLNullHandlingType NULL_ON_NULL_LITERAL = new XMLNullHandlingType(NULL_ON_NULL, "NULL_ON_NULL");
+    public static final XMLNullHandlingType NULL_ON_NULL_LITERAL = new XMLNullHandlingType(NULL_ON_NULL, "NULL_ON_NULL", "NULL_ON_NULL");
 
 	/**
 	 * The '<em><b>NONE</b></em>' literal object.
@@ -170,7 +170,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLNullHandlingType NONE_LITERAL = new XMLNullHandlingType(NONE, "NONE");
+    public static final XMLNullHandlingType NONE_LITERAL = new XMLNullHandlingType(NONE, "NONE", "NONE");
 
 	/**
 	 * An array of all the '<em><b>XML Null Handling Type</b></em>' enumerators.
@@ -197,15 +197,15 @@
     public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>XML Null Handling Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>XML Null Handling Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public static XMLNullHandlingType get(String name) {
+    public static XMLNullHandlingType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			XMLNullHandlingType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -213,7 +213,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>XML Null Handling Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>XML Null Handling Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static XMLNullHandlingType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			XMLNullHandlingType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>XML Null Handling Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -236,8 +252,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private XMLNullHandlingType(int value, String name) {
-		super(value, name);
+	private XMLNullHandlingType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //XMLNullHandlingType
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLPassingType.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLPassingType.java
index 4edb0b9..3cac5f3 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLPassingType.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLPassingType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLPassingType.java,v 1.2 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLPassingType.java,v 1.3 2005/12/22 22:21:19 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -74,7 +74,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLPassingType BY_REF_LITERAL = new XMLPassingType(BY_REF, "BY_REF");
+    public static final XMLPassingType BY_REF_LITERAL = new XMLPassingType(BY_REF, "BY_REF", "BY_REF");
 
 	/**
 	 * The '<em><b>BY VALUE</b></em>' literal object.
@@ -84,7 +84,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLPassingType BY_VALUE_LITERAL = new XMLPassingType(BY_VALUE, "BY_VALUE");
+    public static final XMLPassingType BY_VALUE_LITERAL = new XMLPassingType(BY_VALUE, "BY_VALUE", "BY_VALUE");
 
 	/**
 	 * The '<em><b>NONE</b></em>' literal object.
@@ -98,7 +98,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLPassingType NONE_LITERAL = new XMLPassingType(NONE, "NONE");
+    public static final XMLPassingType NONE_LITERAL = new XMLPassingType(NONE, "NONE", "NONE");
 
 	/**
 	 * An array of all the '<em><b>XML Passing Type</b></em>' enumerators.
@@ -122,15 +122,15 @@
     public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>XML Passing Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>XML Passing Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public static XMLPassingType get(String name) {
+    public static XMLPassingType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			XMLPassingType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -138,7 +138,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>XML Passing Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>XML Passing Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static XMLPassingType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			XMLPassingType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>XML Passing Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -158,8 +174,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private XMLPassingType(int value, String name) {
-		super(value, name);
+	private XMLPassingType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //XMLPassingType
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLReturningType.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLReturningType.java
index 639d691..7482a18 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLReturningType.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLReturningType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLReturningType.java,v 1.2 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLReturningType.java,v 1.3 2005/12/22 22:21:19 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -67,7 +67,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLReturningType RETURNING_CONTENT_LITERAL = new XMLReturningType(RETURNING_CONTENT, "RETURNING_CONTENT");
+    public static final XMLReturningType RETURNING_CONTENT_LITERAL = new XMLReturningType(RETURNING_CONTENT, "RETURNING_CONTENT", "RETURNING_CONTENT");
 
 	/**
 	 * The '<em><b>RETURNING SEQUENCE</b></em>' literal object.
@@ -81,7 +81,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLReturningType RETURNING_SEQUENCE_LITERAL = new XMLReturningType(RETURNING_SEQUENCE, "RETURNING_SEQUENCE");
+    public static final XMLReturningType RETURNING_SEQUENCE_LITERAL = new XMLReturningType(RETURNING_SEQUENCE, "RETURNING_SEQUENCE", "RETURNING_SEQUENCE");
 
 	/**
 	 * The '<em><b>NONE</b></em>' literal object.
@@ -95,7 +95,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLReturningType NONE_LITERAL = new XMLReturningType(NONE, "NONE");
+    public static final XMLReturningType NONE_LITERAL = new XMLReturningType(NONE, "NONE", "NONE");
 
 	/**
 	 * An array of all the '<em><b>XML Returning Type</b></em>' enumerators.
@@ -119,15 +119,15 @@
     public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>XML Returning Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>XML Returning Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public static XMLReturningType get(String name) {
+    public static XMLReturningType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			XMLReturningType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -135,7 +135,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>XML Returning Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>XML Returning Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static XMLReturningType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			XMLReturningType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>XML Returning Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -155,8 +171,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private XMLReturningType(int value, String name) {
-		super(value, name);
+	private XMLReturningType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //XMLReturningType
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLWhitespaceHandlingType.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLWhitespaceHandlingType.java
index 2a96964..aa5d6d6 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLWhitespaceHandlingType.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/XMLWhitespaceHandlingType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLWhitespaceHandlingType.java,v 1.2 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLWhitespaceHandlingType.java,v 1.3 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query;
 
@@ -67,7 +67,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLWhitespaceHandlingType PRESERE_WHITESPACE_LITERAL = new XMLWhitespaceHandlingType(PRESERE_WHITESPACE, "PRESERE_WHITESPACE");
+    public static final XMLWhitespaceHandlingType PRESERE_WHITESPACE_LITERAL = new XMLWhitespaceHandlingType(PRESERE_WHITESPACE, "PRESERE_WHITESPACE", "PRESERE_WHITESPACE");
 
 	/**
 	 * The '<em><b>STRIP WHITESPACE</b></em>' literal object.
@@ -81,7 +81,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLWhitespaceHandlingType STRIP_WHITESPACE_LITERAL = new XMLWhitespaceHandlingType(STRIP_WHITESPACE, "STRIP_WHITESPACE");
+    public static final XMLWhitespaceHandlingType STRIP_WHITESPACE_LITERAL = new XMLWhitespaceHandlingType(STRIP_WHITESPACE, "STRIP_WHITESPACE", "STRIP_WHITESPACE");
 
 	/**
 	 * The '<em><b>NONE</b></em>' literal object.
@@ -95,7 +95,7 @@
 	 * @generated
 	 * @ordered
 	 */
-    public static final XMLWhitespaceHandlingType NONE_LITERAL = new XMLWhitespaceHandlingType(NONE, "NONE");
+    public static final XMLWhitespaceHandlingType NONE_LITERAL = new XMLWhitespaceHandlingType(NONE, "NONE", "NONE");
 
 	/**
 	 * An array of all the '<em><b>XML Whitespace Handling Type</b></em>' enumerators.
@@ -119,15 +119,15 @@
     public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>XML Whitespace Handling Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>XML Whitespace Handling Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public static XMLWhitespaceHandlingType get(String name) {
+    public static XMLWhitespaceHandlingType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			XMLWhitespaceHandlingType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -135,7 +135,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>XML Whitespace Handling Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>XML Whitespace Handling Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static XMLWhitespaceHandlingType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			XMLWhitespaceHandlingType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>XML Whitespace Handling Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
 	 * @generated
@@ -155,8 +171,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private XMLWhitespaceHandlingType(int value, String name) {
-		super(value, name);
+	private XMLWhitespaceHandlingType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //XMLWhitespaceHandlingType
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/SQLXMLQueryModelFactoryImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/SQLXMLQueryModelFactoryImpl.java
index c579734..1d8af2a 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/SQLXMLQueryModelFactoryImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/SQLXMLQueryModelFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SQLXMLQueryFactoryImpl.java,v 1.2 2005/12/19 20:57:49 bpayton Exp $
+ * $Id: SQLXMLQueryModelFactoryImpl.java,v 1.1 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -12,8 +12,12 @@
 import org.eclipse.emf.ecore.EDataType;
 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 -->
  * An implementation of the model <b>Factory</b>.
@@ -22,6 +26,25 @@
  */
 public class SQLXMLQueryModelFactoryImpl extends EFactoryImpl implements SQLXMLQueryModelFactory {
 	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static SQLXMLQueryModelFactory init() {
+		try {
+			SQLXMLQueryModelFactory theSQLXMLQueryModelFactory = (SQLXMLQueryModelFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/datatools/modelbase/sql/xml/query/SQLXMLQueryModel.ecore"); 
+			if (theSQLXMLQueryModelFactory != null) {
+				return theSQLXMLQueryModelFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new SQLXMLQueryModelFactoryImpl();
+	}
+
+	/**
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -101,46 +124,22 @@
 	 */
     public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case SQLXMLQueryModelPackage.XML_PASSING_TYPE: {
-				XMLPassingType result = XMLPassingType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case SQLXMLQueryModelPackage.XML_CONTENT_TYPE: {
-				XMLContentType result = XMLContentType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case SQLXMLQueryModelPackage.XML_DECLARATION_TYPE: {
-				XMLDeclarationType result = XMLDeclarationType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case SQLXMLQueryModelPackage.XML_RETURNING_TYPE: {
-				XMLReturningType result = XMLReturningType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case SQLXMLQueryModelPackage.XML_NULL_HANDLING_TYPE: {
-				XMLNullHandlingType result = XMLNullHandlingType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case SQLXMLQueryModelPackage.XML_WHITESPACE_HANDLING_TYPE: {
-				XMLWhitespaceHandlingType result = XMLWhitespaceHandlingType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case SQLXMLQueryModelPackage.XML_EMPTY_HANDLING_TYPE: {
-				XMLEmptyHandlingType result = XMLEmptyHandlingType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case SQLXMLQueryModelPackage.XML_CONTENT_TYPE2: {
-				XMLContentType2 result = XMLContentType2.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
+			case SQLXMLQueryModelPackage.XML_PASSING_TYPE:
+				return createXMLPassingTypeFromString(eDataType, initialValue);
+			case SQLXMLQueryModelPackage.XML_CONTENT_TYPE:
+				return createXMLContentTypeFromString(eDataType, initialValue);
+			case SQLXMLQueryModelPackage.XML_DECLARATION_TYPE:
+				return createXMLDeclarationTypeFromString(eDataType, initialValue);
+			case SQLXMLQueryModelPackage.XML_RETURNING_TYPE:
+				return createXMLReturningTypeFromString(eDataType, initialValue);
+			case SQLXMLQueryModelPackage.XML_NULL_HANDLING_TYPE:
+				return createXMLNullHandlingTypeFromString(eDataType, initialValue);
+			case SQLXMLQueryModelPackage.XML_WHITESPACE_HANDLING_TYPE:
+				return createXMLWhitespaceHandlingTypeFromString(eDataType, initialValue);
+			case SQLXMLQueryModelPackage.XML_EMPTY_HANDLING_TYPE:
+				return createXMLEmptyHandlingTypeFromString(eDataType, initialValue);
+			case SQLXMLQueryModelPackage.XML_CONTENT_TYPE2:
+				return createXMLContentType2FromString(eDataType, initialValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
@@ -154,21 +153,21 @@
     public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
 			case SQLXMLQueryModelPackage.XML_PASSING_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertXMLPassingTypeToString(eDataType, instanceValue);
 			case SQLXMLQueryModelPackage.XML_CONTENT_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertXMLContentTypeToString(eDataType, instanceValue);
 			case SQLXMLQueryModelPackage.XML_DECLARATION_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertXMLDeclarationTypeToString(eDataType, instanceValue);
 			case SQLXMLQueryModelPackage.XML_RETURNING_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertXMLReturningTypeToString(eDataType, instanceValue);
 			case SQLXMLQueryModelPackage.XML_NULL_HANDLING_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertXMLNullHandlingTypeToString(eDataType, instanceValue);
 			case SQLXMLQueryModelPackage.XML_WHITESPACE_HANDLING_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertXMLWhitespaceHandlingTypeToString(eDataType, instanceValue);
 			case SQLXMLQueryModelPackage.XML_EMPTY_HANDLING_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertXMLEmptyHandlingTypeToString(eDataType, instanceValue);
 			case SQLXMLQueryModelPackage.XML_CONTENT_TYPE2:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertXMLContentType2ToString(eDataType, instanceValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
@@ -689,6 +688,166 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public XMLPassingType createXMLPassingTypeFromString(EDataType eDataType, String initialValue) {
+		XMLPassingType result = XMLPassingType.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 convertXMLPassingTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XMLContentType createXMLContentTypeFromString(EDataType eDataType, String initialValue) {
+		XMLContentType result = XMLContentType.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 convertXMLContentTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XMLDeclarationType createXMLDeclarationTypeFromString(EDataType eDataType, String initialValue) {
+		XMLDeclarationType result = XMLDeclarationType.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 convertXMLDeclarationTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XMLReturningType createXMLReturningTypeFromString(EDataType eDataType, String initialValue) {
+		XMLReturningType result = XMLReturningType.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 convertXMLReturningTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XMLNullHandlingType createXMLNullHandlingTypeFromString(EDataType eDataType, String initialValue) {
+		XMLNullHandlingType result = XMLNullHandlingType.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 convertXMLNullHandlingTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XMLWhitespaceHandlingType createXMLWhitespaceHandlingTypeFromString(EDataType eDataType, String initialValue) {
+		XMLWhitespaceHandlingType result = XMLWhitespaceHandlingType.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 convertXMLWhitespaceHandlingTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XMLEmptyHandlingType createXMLEmptyHandlingTypeFromString(EDataType eDataType, String initialValue) {
+		XMLEmptyHandlingType result = XMLEmptyHandlingType.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 convertXMLEmptyHandlingTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XMLContentType2 createXMLContentType2FromString(EDataType eDataType, String initialValue) {
+		XMLContentType2 result = XMLContentType2.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 convertXMLContentType2ToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public SQLXMLQueryModelPackage getSQLXMLQueryModelPackage() {
 		return (SQLXMLQueryModelPackage)getEPackage();
 	}
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/SQLXMLQueryModelPackageImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/SQLXMLQueryModelPackageImpl.java
index 7611adf..efe5c66 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/SQLXMLQueryModelPackageImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/SQLXMLQueryModelPackageImpl.java
@@ -2,16 +2,30 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SQLXMLQueryPackageImpl.java,v 1.2 2005/12/17 01:52:31 bpayton Exp $
+ * $Id: SQLXMLQueryModelPackageImpl.java,v 1.1 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
+import org.eclipse.datatools.modelbase.sql.accesscontrol.SQLAccessControlPackage;
+
+import org.eclipse.datatools.modelbase.sql.constraints.SQLConstraintsPackage;
+
 import org.eclipse.datatools.modelbase.sql.accesscontrol.impl.SQLAccessControlPackageImpl;
 import org.eclipse.datatools.modelbase.sql.constraints.impl.SQLConstraintsPackageImpl;
 import org.eclipse.datatools.modelbase.sql.datatypes.SQLDataTypesPackage;
+import org.eclipse.datatools.modelbase.sql.expressions.SQLExpressionsPackage;
+
 import org.eclipse.datatools.modelbase.sql.datatypes.impl.SQLDataTypesPackageImpl;
 import org.eclipse.datatools.modelbase.sql.expressions.impl.SQLExpressionsPackageImpl;
 import org.eclipse.datatools.modelbase.sql.query.SQLQueryModelPackage;
+import org.eclipse.datatools.modelbase.sql.routines.SQLRoutinesPackage;
+
+import org.eclipse.datatools.modelbase.sql.schema.SQLSchemaPackage;
+
+import org.eclipse.datatools.modelbase.sql.statements.SQLStatementsPackage;
+
+import org.eclipse.datatools.modelbase.sql.tables.SQLTablesPackage;
+
 import org.eclipse.datatools.modelbase.sql.query.impl.SQLQueryModelPackageImpl;
 import org.eclipse.datatools.modelbase.sql.routines.impl.SQLRoutinesPackageImpl;
 import org.eclipse.datatools.modelbase.sql.schema.impl.SQLSchemaPackageImpl;
@@ -85,6 +99,8 @@
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.impl.EcorePackageImpl;
 
@@ -579,16 +595,16 @@
 		isInited = true;
 
 		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		SQLQueryModelPackageImpl.init();
-		SQLSchemaPackageImpl.init();
-		SQLConstraintsPackageImpl.init();
-		SQLDataTypesPackageImpl.init();
-		SQLExpressionsPackageImpl.init();
-		SQLRoutinesPackageImpl.init();
-		SQLStatementsPackageImpl.init();
-		SQLTablesPackageImpl.init();
-		SQLAccessControlPackageImpl.init();
+		EcorePackage.eINSTANCE.eClass();
+		SQLQueryModelPackage.eINSTANCE.eClass();
+		SQLSchemaPackage.eINSTANCE.eClass();
+		SQLConstraintsPackage.eINSTANCE.eClass();
+		SQLDataTypesPackage.eINSTANCE.eClass();
+		SQLExpressionsPackage.eINSTANCE.eClass();
+		SQLRoutinesPackage.eINSTANCE.eClass();
+		SQLStatementsPackage.eINSTANCE.eClass();
+		SQLTablesPackage.eINSTANCE.eClass();
+		SQLAccessControlPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theSQLXMLQueryModelPackage.createPackageContents();
@@ -2490,8 +2506,8 @@
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		SQLQueryModelPackageImpl theSQLQueryModelPackage = (SQLQueryModelPackageImpl)EPackage.Registry.INSTANCE.getEPackage(SQLQueryModelPackage.eNS_URI);
-		SQLDataTypesPackageImpl theSQLDataTypesPackage = (SQLDataTypesPackageImpl)EPackage.Registry.INSTANCE.getEPackage(SQLDataTypesPackage.eNS_URI);
+		SQLQueryModelPackage theSQLQueryModelPackage = (SQLQueryModelPackage)EPackage.Registry.INSTANCE.getEPackage(SQLQueryModelPackage.eNS_URI);
+		SQLDataTypesPackage theSQLDataTypesPackage = (SQLDataTypesPackage)EPackage.Registry.INSTANCE.getEPackage(SQLDataTypesPackage.eNS_URI);
 
 		// Add supertypes to classes
 		xmlValueFunctionConcatEClass.getESuperTypes().add(this.getXMLValueFunction());
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAggregateFunctionImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAggregateFunctionImpl.java
index 642ba51..03acd1e 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAggregateFunctionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAggregateFunctionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLAggregateFunctionImpl.java,v 1.3 2005/12/19 20:57:49 bpayton Exp $
+ * $Id: XMLAggregateFunctionImpl.java,v 1.4 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -110,7 +110,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLAggregateFunction();
+		return SQLXMLQueryModelPackage.Literals.XML_AGGREGATE_FUNCTION;
 	}
 
 	/**
@@ -148,236 +148,15 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUES_ROW:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__ORDER_BY_VALUE_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__ORDER_BY_VALUE_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RESULT_COLUMN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RESULT_COLUMN, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_PATTERN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_PATTERN, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_MATCHING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_MATCHING, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PREDICATE_NULL:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PREDICATE_NULL, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT1:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT1, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT2:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT2, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CAST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CAST, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_FUNCTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__GROUPING_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__GROUPING_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_ELSE, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_ESCAPE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_ESCAPE, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_LABELED_DURATION, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UPDATE_SOURCE_EXPR_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PARAMETER_LIST:
-					return ((InternalEList)getParameterList()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST:
-					return ((InternalEList)getSortSpecList()).basicAdd(otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST:
+				return ((InternalEList)getSortSpecList()).basicAdd(otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- 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 SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DATA_TYPE:
-					return basicSetDataType(null, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUES_ROW:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__ORDER_BY_VALUE_EXPR:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__ORDER_BY_VALUE_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RESULT_COLUMN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RESULT_COLUMN, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_PATTERN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_PATTERN, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_MATCHING:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_MATCHING, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PREDICATE_NULL:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PREDICATE_NULL, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT1:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT1, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT2:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT2, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CAST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CAST, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_FUNCTION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__GROUPING_EXPR:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__GROUPING_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_ELSE, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_ESCAPE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_ESCAPE, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_LABELED_DURATION, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NEST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UPDATE_SOURCE_EXPR_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PARAMETER_LIST:
-					return ((InternalEList)getParameterList()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST:
-					return ((InternalEList)getSortSpecList()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -385,319 +164,36 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUES_ROW:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUES_ROW__EXPR_LIST, ValuesRow.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__ORDER_BY_VALUE_EXPR:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.ORDER_BY_VALUE_EXPRESSION__VALUE_EXPR, OrderByValueExpression.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RESULT_COLUMN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.RESULT_COLUMN__VALUE_EXPR, ResultColumn.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BASIC__RIGHT_VALUE_EXPR, PredicateBasic.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BASIC__LEFT_VALUE_EXPR, PredicateBasic.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_PATTERN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__PATTERN_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_MATCHING:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__MATCHING_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PREDICATE_NULL:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IS_NULL__VALUE_EXPR, PredicateIsNull.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_LIST__VALUE_EXPR_LIST, PredicateInValueList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_LIST__VALUE_EXPR, PredicateInValueList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_ROW_SELECT__VALUE_EXPR_LIST, PredicateInValueRowSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_SELECT__VALUE_EXPR, PredicateInValueSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_QUANTIFIED_ROW_SELECT__VALUE_EXPR_LIST, PredicateQuantifiedRowSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_QUANTIFIED_VALUE_SELECT__VALUE_EXPR, PredicateQuantifiedValueSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__LEFT_VALUE_EXPR, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT1:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__RIGHT_VALUE_EXPR1, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT2:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__RIGHT_VALUE_EXPR2, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CAST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CAST__VALUE_EXPR, ValueExpressionCast.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_FUNCTION:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__PARAMETER_LIST, ValueExpressionFunction.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_COMBINED__LEFT_VALUE_EXPR, ValueExpressionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_COMBINED__RIGHT_VALUE_EXPR, ValueExpressionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__GROUPING_EXPR:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.GROUPING_EXPRESSION__VALUE_EXPR, GroupingExpression.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_ELSE__VALUE_EXPR, ValueExpressionCaseElse.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE__VALUE_EXPR, ValueExpressionCaseSimple.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE_CONTENT__WHEN_VALUE_EXPR, ValueExpressionCaseSimpleContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE_CONTENT__RESULT_VALUE_EXPR, ValueExpressionCaseSimpleContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SEARCH_CONTENT__VALUE_EXPR, ValueExpressionCaseSearchContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_ESCAPE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__ESCAPE_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_LABELED_DURATION__VALUE_EXPR, ValueExpressionLabeledDuration.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NEST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_NESTED__NESTED_VALUE_EXPR, ValueExpressionNested.class, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.UPDATE_SOURCE_EXPR_LIST__VALUE_EXPR_LIST, UpdateSourceExprList.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST:
+				return ((InternalEList)getSortSpecList()).basicRemove(otherEnd, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UNARY_OPERATOR:
-				return getUnaryOperator();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DATA_TYPE:
-				return getDataType();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUES_ROW:
-				return getValuesRow();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__ORDER_BY_VALUE_EXPR:
-				return getOrderByValueExpr();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RESULT_COLUMN:
-				return getResultColumn();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_RIGHT:
-				return getBasicRight();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_LEFT:
-				return getBasicLeft();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_PATTERN:
-				return getLikePattern();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_MATCHING:
-				return getLikeMatching();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PREDICATE_NULL:
-				return getPredicateNull();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_RIGHT:
-				return getInValueListRight();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_LEFT:
-				return getInValueListLeft();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-				return getInValueRowSelectLeft();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_SELECT_LEFT:
-				return getInValueSelectLeft();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-				return getQuantifiedRowSelectLeft();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-				return getQuantifiedValueSelectLeft();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_LEFT:
-				return getBetweenLeft();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT1:
-				return getBetweenRight1();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT2:
-				return getBetweenRight2();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CAST:
-				return getValueExprCast();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_FUNCTION:
-				return getValueExprFunction();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-				return getValueExprCombinedLeft();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-				return getValueExprCombinedRight();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__GROUPING_EXPR:
-				return getGroupingExpr();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-				return getValueExprCaseElse();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-				return getValueExprCaseSimple();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				return getValueExprCaseSimpleContentWhen();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				return getValueExprCaseSimpleContentResult();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_ESCAPE:
-				return getLikeEscape();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-				return getValueExprLabeledDuration();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NEST:
-				return getNest();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-				return getUpdateSourceExprList();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SPECIAL_REGISTER:
-				return isSpecialRegister() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DISTINCT:
-				return isDistinct() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__COLUMN_FUNCTION:
-				return isColumnFunction() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PARAMETER_LIST:
-				return getParameterList();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__FUNCTION:
-				if (resolve) return getFunction();
-				return basicGetFunction();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RETURNING_OPTION:
 				return getReturningOption();
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST:
 				return getSortSpecList();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UNARY_OPERATOR:
-				setUnaryOperator((ValueExpressionUnaryOperator)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DATA_TYPE:
-				setDataType((DataType)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUES_ROW:
-				setValuesRow((ValuesRow)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__ORDER_BY_VALUE_EXPR:
-				setOrderByValueExpr((OrderByValueExpression)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RESULT_COLUMN:
-				setResultColumn((ResultColumn)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_RIGHT:
-				setBasicRight((PredicateBasic)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_LEFT:
-				setBasicLeft((PredicateBasic)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_PATTERN:
-				setLikePattern((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_MATCHING:
-				setLikeMatching((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PREDICATE_NULL:
-				setPredicateNull((PredicateIsNull)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_RIGHT:
-				setInValueListRight((PredicateInValueList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_LEFT:
-				setInValueListLeft((PredicateInValueList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-				setInValueRowSelectLeft((PredicateInValueRowSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_SELECT_LEFT:
-				setInValueSelectLeft((PredicateInValueSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-				setQuantifiedRowSelectLeft((PredicateQuantifiedRowSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-				setQuantifiedValueSelectLeft((PredicateQuantifiedValueSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_LEFT:
-				setBetweenLeft((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT1:
-				setBetweenRight1((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT2:
-				setBetweenRight2((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CAST:
-				setValueExprCast((ValueExpressionCast)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_FUNCTION:
-				setValueExprFunction((ValueExpressionFunction)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-				setValueExprCombinedLeft((ValueExpressionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-				setValueExprCombinedRight((ValueExpressionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__GROUPING_EXPR:
-				setGroupingExpr((GroupingExpression)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-				setValueExprCaseElse((ValueExpressionCaseElse)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-				setValueExprCaseSimple((ValueExpressionCaseSimple)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				setValueExprCaseSimpleContentWhen((ValueExpressionCaseSimpleContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				setValueExprCaseSimpleContentResult((ValueExpressionCaseSimpleContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_ESCAPE:
-				setLikeEscape((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-				setValueExprLabeledDuration((ValueExpressionLabeledDuration)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NEST:
-				setNest((ValueExpressionNested)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-				setUpdateSourceExprList((UpdateSourceExprList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SPECIAL_REGISTER:
-				setSpecialRegister(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DISTINCT:
-				setDistinct(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__COLUMN_FUNCTION:
-				setColumnFunction(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PARAMETER_LIST:
-				getParameterList().clear();
-				getParameterList().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__FUNCTION:
-				setFunction((Function)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RETURNING_OPTION:
 				setReturningOption((XMLReturningType)newValue);
 				return;
@@ -706,145 +202,16 @@
 				getSortSpecList().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UNARY_OPERATOR:
-				setUnaryOperator(UNARY_OPERATOR_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DATA_TYPE:
-				setDataType((DataType)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUES_ROW:
-				setValuesRow((ValuesRow)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__ORDER_BY_VALUE_EXPR:
-				setOrderByValueExpr((OrderByValueExpression)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RESULT_COLUMN:
-				setResultColumn((ResultColumn)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_RIGHT:
-				setBasicRight((PredicateBasic)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_LEFT:
-				setBasicLeft((PredicateBasic)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_PATTERN:
-				setLikePattern((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_MATCHING:
-				setLikeMatching((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PREDICATE_NULL:
-				setPredicateNull((PredicateIsNull)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_RIGHT:
-				setInValueListRight((PredicateInValueList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_LEFT:
-				setInValueListLeft((PredicateInValueList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-				setInValueRowSelectLeft((PredicateInValueRowSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_SELECT_LEFT:
-				setInValueSelectLeft((PredicateInValueSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-				setQuantifiedRowSelectLeft((PredicateQuantifiedRowSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-				setQuantifiedValueSelectLeft((PredicateQuantifiedValueSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_LEFT:
-				setBetweenLeft((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT1:
-				setBetweenRight1((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT2:
-				setBetweenRight2((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CAST:
-				setValueExprCast((ValueExpressionCast)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_FUNCTION:
-				setValueExprFunction((ValueExpressionFunction)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-				setValueExprCombinedLeft((ValueExpressionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-				setValueExprCombinedRight((ValueExpressionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__GROUPING_EXPR:
-				setGroupingExpr((GroupingExpression)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-				setValueExprCaseElse((ValueExpressionCaseElse)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-				setValueExprCaseSimple((ValueExpressionCaseSimple)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				setValueExprCaseSimpleContentWhen((ValueExpressionCaseSimpleContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				setValueExprCaseSimpleContentResult((ValueExpressionCaseSimpleContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_ESCAPE:
-				setLikeEscape((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-				setValueExprLabeledDuration((ValueExpressionLabeledDuration)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NEST:
-				setNest((ValueExpressionNested)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-				setUpdateSourceExprList((UpdateSourceExprList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SPECIAL_REGISTER:
-				setSpecialRegister(SPECIAL_REGISTER_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DISTINCT:
-				setDistinct(DISTINCT_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__COLUMN_FUNCTION:
-				setColumnFunction(COLUMN_FUNCTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PARAMETER_LIST:
-				getParameterList().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__FUNCTION:
-				setFunction((Function)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RETURNING_OPTION:
 				setReturningOption(RETURNING_OPTION_EDEFAULT);
 				return;
@@ -852,108 +219,22 @@
 				getSortSpecList().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UNARY_OPERATOR:
-				return unaryOperator != UNARY_OPERATOR_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DATA_TYPE:
-				return dataType != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUES_ROW:
-				return getValuesRow() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__ORDER_BY_VALUE_EXPR:
-				return getOrderByValueExpr() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RESULT_COLUMN:
-				return getResultColumn() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_RIGHT:
-				return getBasicRight() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BASIC_LEFT:
-				return getBasicLeft() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_PATTERN:
-				return getLikePattern() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_MATCHING:
-				return getLikeMatching() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PREDICATE_NULL:
-				return getPredicateNull() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_RIGHT:
-				return getInValueListRight() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_LIST_LEFT:
-				return getInValueListLeft() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-				return getInValueRowSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__IN_VALUE_SELECT_LEFT:
-				return getInValueSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-				return getQuantifiedRowSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-				return getQuantifiedValueSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_LEFT:
-				return getBetweenLeft() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT1:
-				return getBetweenRight1() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__BETWEEN_RIGHT2:
-				return getBetweenRight2() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CAST:
-				return getValueExprCast() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_FUNCTION:
-				return getValueExprFunction() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-				return getValueExprCombinedLeft() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-				return getValueExprCombinedRight() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__GROUPING_EXPR:
-				return getGroupingExpr() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-				return getValueExprCaseElse() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-				return getValueExprCaseSimple() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				return getValueExprCaseSimpleContentWhen() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				return getValueExprCaseSimpleContentResult() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__LIKE_ESCAPE:
-				return getLikeEscape() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-				return getValueExprLabeledDuration() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__NEST:
-				return getNest() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-				return getUpdateSourceExprList() != null;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SPECIAL_REGISTER:
-				return specialRegister != SPECIAL_REGISTER_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__DISTINCT:
-				return distinct != DISTINCT_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__COLUMN_FUNCTION:
-				return columnFunction != COLUMN_FUNCTION_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__PARAMETER_LIST:
-				return parameterList != null && !parameterList.isEmpty();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__FUNCTION:
-				return function != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__RETURNING_OPTION:
 				return returningOption != RETURNING_OPTION_EDEFAULT;
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST:
 				return sortSpecList != null && !sortSpecList.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAggregateSortSpecificationImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAggregateSortSpecificationImpl.java
index 4d72503..a9b1d83 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAggregateSortSpecificationImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAggregateSortSpecificationImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLAggregateSortSpecificationImpl.java,v 1.1 2005/12/16 13:16:51 bpayton Exp $
+ * $Id: XMLAggregateSortSpecificationImpl.java,v 1.2 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLAggregateSortSpecification();
+		return SQLXMLQueryModelPackage.Literals.XML_AGGREGATE_SORT_SPECIFICATION;
 	}
 
 	/**
@@ -78,7 +78,17 @@
 	 */
     public XMLAggregateFunction getAggregateFunction() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION) return null;
-		return (XMLAggregateFunction)eContainer;
+		return (XMLAggregateFunction)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetAggregateFunction(XMLAggregateFunction newAggregateFunction, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newAggregateFunction, SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION, msgs);
+		return msgs;
 	}
 
 	/**
@@ -87,15 +97,15 @@
 	 * @generated
 	 */
     public void setAggregateFunction(XMLAggregateFunction newAggregateFunction) {
-		if (newAggregateFunction != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION && newAggregateFunction != null)) {
+		if (newAggregateFunction != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION && newAggregateFunction != null)) {
 			if (EcoreUtil.isAncestor(this, newAggregateFunction))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newAggregateFunction != null)
 				msgs = ((InternalEObject)newAggregateFunction).eInverseAdd(this, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST, XMLAggregateFunction.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newAggregateFunction, SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION, msgs);
+			msgs = basicSetAggregateFunction(newAggregateFunction, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -147,116 +157,69 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetAggregateFunction((XMLAggregateFunction)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-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 SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__ORDER_BY_SPEC:
-					return basicSetOrderBySpec(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
+				return basicSetAggregateFunction(null, msgs);
+			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__ORDER_BY_SPEC:
+				return basicSetOrderBySpec(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST, XMLAggregateFunction.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID) {
+			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_AGGREGATE_FUNCTION__SORT_SPEC_LIST, XMLAggregateFunction.class, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__LABEL:
-				return getLabel();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
 				return getAggregateFunction();
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__ORDER_BY_SPEC:
 				return getOrderBySpec();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__LABEL:
-				setLabel((String)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
 				setAggregateFunction((XMLAggregateFunction)newValue);
 				return;
@@ -264,31 +227,16 @@
 				setOrderBySpec((OrderBySpecification)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
 				setAggregateFunction((XMLAggregateFunction)null);
 				return;
@@ -296,32 +244,22 @@
 				setOrderBySpec((OrderBySpecification)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__AGGREGATE_FUNCTION:
 				return getAggregateFunction() != null;
 			case SQLXMLQueryModelPackage.XML_AGGREGATE_SORT_SPECIFICATION__ORDER_BY_SPEC:
 				return orderBySpec != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //XMLAggregateSortSpecificationImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAttributeDeclarationItemImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAttributeDeclarationItemImpl.java
index 9b3bb94..f109787 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAttributeDeclarationItemImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAttributeDeclarationItemImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLAttributeDeclarationItemImpl.java,v 1.1 2005/12/16 13:16:51 bpayton Exp $
+ * $Id: XMLAttributeDeclarationItemImpl.java,v 1.2 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -95,7 +95,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLAttributeDeclarationItem();
+		return SQLXMLQueryModelPackage.Literals.XML_ATTRIBUTE_DECLARATION_ITEM;
 	}
 
 	/**
@@ -148,7 +148,17 @@
 	 */
     public XMLAttributesDeclaration getAttributesDecl() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL) return null;
-		return (XMLAttributesDeclaration)eContainer;
+		return (XMLAttributesDeclaration)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetAttributesDecl(XMLAttributesDeclaration newAttributesDecl, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newAttributesDecl, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL, msgs);
+		return msgs;
 	}
 
 	/**
@@ -157,15 +167,15 @@
 	 * @generated
 	 */
     public void setAttributesDecl(XMLAttributesDeclaration newAttributesDecl) {
-		if (newAttributesDecl != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL && newAttributesDecl != null)) {
+		if (newAttributesDecl != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL && newAttributesDecl != null)) {
 			if (EcoreUtil.isAncestor(this, newAttributesDecl))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newAttributesDecl != null)
 				msgs = ((InternalEObject)newAttributesDecl).eInverseAdd(this, SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM, XMLAttributesDeclaration.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newAttributesDecl, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL, msgs);
+			msgs = basicSetAttributesDecl(newAttributesDecl, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -174,531 +184,69 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUES_ROW:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ORDER_BY_VALUE_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ORDER_BY_VALUE_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__RESULT_COLUMN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__RESULT_COLUMN, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_PATTERN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_PATTERN, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_MATCHING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_MATCHING, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__PREDICATE_NULL:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__PREDICATE_NULL, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT1:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT1, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT2:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT2, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CAST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CAST, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_FUNCTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__GROUPING_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__GROUPING_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_ELSE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_ELSE, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_ESCAPE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_ESCAPE, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_LABELED_DURATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_LABELED_DURATION, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UPDATE_SOURCE_EXPR_LIST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UPDATE_SOURCE_EXPR_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetAttributesDecl((XMLAttributesDeclaration)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-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 SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DATA_TYPE:
-					return basicSetDataType(null, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUES_ROW:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ORDER_BY_VALUE_EXPR:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ORDER_BY_VALUE_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__RESULT_COLUMN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__RESULT_COLUMN, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_PATTERN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_PATTERN, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_MATCHING:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_MATCHING, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__PREDICATE_NULL:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__PREDICATE_NULL, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT1:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT1, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT2:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT2, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CAST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CAST, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_FUNCTION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__GROUPING_EXPR:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__GROUPING_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_ELSE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_ELSE, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_ESCAPE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_ESCAPE, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_LABELED_DURATION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_LABELED_DURATION, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NEST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UPDATE_SOURCE_EXPR_LIST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UPDATE_SOURCE_EXPR_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR:
-					return basicSetValueExpr(null, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR:
+				return basicSetValueExpr(null, msgs);
+			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL:
+				return basicSetAttributesDecl(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUES_ROW:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUES_ROW__EXPR_LIST, ValuesRow.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ORDER_BY_VALUE_EXPR:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.ORDER_BY_VALUE_EXPRESSION__VALUE_EXPR, OrderByValueExpression.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__RESULT_COLUMN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.RESULT_COLUMN__VALUE_EXPR, ResultColumn.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BASIC__RIGHT_VALUE_EXPR, PredicateBasic.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BASIC__LEFT_VALUE_EXPR, PredicateBasic.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_PATTERN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__PATTERN_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_MATCHING:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__MATCHING_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__PREDICATE_NULL:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IS_NULL__VALUE_EXPR, PredicateIsNull.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_LIST__VALUE_EXPR_LIST, PredicateInValueList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_LIST__VALUE_EXPR, PredicateInValueList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_ROW_SELECT__VALUE_EXPR_LIST, PredicateInValueRowSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_SELECT__VALUE_EXPR, PredicateInValueSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_QUANTIFIED_ROW_SELECT__VALUE_EXPR_LIST, PredicateQuantifiedRowSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_QUANTIFIED_VALUE_SELECT__VALUE_EXPR, PredicateQuantifiedValueSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__LEFT_VALUE_EXPR, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT1:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__RIGHT_VALUE_EXPR1, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT2:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__RIGHT_VALUE_EXPR2, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CAST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CAST__VALUE_EXPR, ValueExpressionCast.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_FUNCTION:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__PARAMETER_LIST, ValueExpressionFunction.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_COMBINED__LEFT_VALUE_EXPR, ValueExpressionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_COMBINED__RIGHT_VALUE_EXPR, ValueExpressionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__GROUPING_EXPR:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.GROUPING_EXPRESSION__VALUE_EXPR, GroupingExpression.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_ELSE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_ELSE__VALUE_EXPR, ValueExpressionCaseElse.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE__VALUE_EXPR, ValueExpressionCaseSimple.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE_CONTENT__WHEN_VALUE_EXPR, ValueExpressionCaseSimpleContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE_CONTENT__RESULT_VALUE_EXPR, ValueExpressionCaseSimpleContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SEARCH_CONTENT__VALUE_EXPR, ValueExpressionCaseSearchContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_ESCAPE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__ESCAPE_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_LABELED_DURATION:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_LABELED_DURATION__VALUE_EXPR, ValueExpressionLabeledDuration.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NEST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_NESTED__NESTED_VALUE_EXPR, ValueExpressionNested.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UPDATE_SOURCE_EXPR_LIST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.UPDATE_SOURCE_EXPR_LIST__VALUE_EXPR_LIST, UpdateSourceExprList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM, XMLAttributesDeclaration.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID) {
+			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM, XMLAttributesDeclaration.class, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UNARY_OPERATOR:
-				return getUnaryOperator();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DATA_TYPE:
-				return getDataType();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUES_ROW:
-				return getValuesRow();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ORDER_BY_VALUE_EXPR:
-				return getOrderByValueExpr();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__RESULT_COLUMN:
-				return getResultColumn();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_RIGHT:
-				return getBasicRight();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_LEFT:
-				return getBasicLeft();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_PATTERN:
-				return getLikePattern();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_MATCHING:
-				return getLikeMatching();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__PREDICATE_NULL:
-				return getPredicateNull();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_RIGHT:
-				return getInValueListRight();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_LEFT:
-				return getInValueListLeft();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-				return getInValueRowSelectLeft();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_SELECT_LEFT:
-				return getInValueSelectLeft();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-				return getQuantifiedRowSelectLeft();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-				return getQuantifiedValueSelectLeft();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_LEFT:
-				return getBetweenLeft();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT1:
-				return getBetweenRight1();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT2:
-				return getBetweenRight2();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CAST:
-				return getValueExprCast();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_FUNCTION:
-				return getValueExprFunction();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_LEFT:
-				return getValueExprCombinedLeft();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-				return getValueExprCombinedRight();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__GROUPING_EXPR:
-				return getGroupingExpr();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_ELSE:
-				return getValueExprCaseElse();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE:
-				return getValueExprCaseSimple();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				return getValueExprCaseSimpleContentWhen();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				return getValueExprCaseSimpleContentResult();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_ESCAPE:
-				return getLikeEscape();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_LABELED_DURATION:
-				return getValueExprLabeledDuration();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NEST:
-				return getNest();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UPDATE_SOURCE_EXPR_LIST:
-				return getUpdateSourceExprList();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR:
 				return getValueExpr();
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL:
 				return getAttributesDecl();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UNARY_OPERATOR:
-				setUnaryOperator((ValueExpressionUnaryOperator)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DATA_TYPE:
-				setDataType((DataType)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUES_ROW:
-				setValuesRow((ValuesRow)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ORDER_BY_VALUE_EXPR:
-				setOrderByValueExpr((OrderByValueExpression)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__RESULT_COLUMN:
-				setResultColumn((ResultColumn)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_RIGHT:
-				setBasicRight((PredicateBasic)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_LEFT:
-				setBasicLeft((PredicateBasic)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_PATTERN:
-				setLikePattern((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_MATCHING:
-				setLikeMatching((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__PREDICATE_NULL:
-				setPredicateNull((PredicateIsNull)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_RIGHT:
-				setInValueListRight((PredicateInValueList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_LEFT:
-				setInValueListLeft((PredicateInValueList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-				setInValueRowSelectLeft((PredicateInValueRowSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_SELECT_LEFT:
-				setInValueSelectLeft((PredicateInValueSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-				setQuantifiedRowSelectLeft((PredicateQuantifiedRowSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-				setQuantifiedValueSelectLeft((PredicateQuantifiedValueSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_LEFT:
-				setBetweenLeft((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT1:
-				setBetweenRight1((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT2:
-				setBetweenRight2((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CAST:
-				setValueExprCast((ValueExpressionCast)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_FUNCTION:
-				setValueExprFunction((ValueExpressionFunction)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_LEFT:
-				setValueExprCombinedLeft((ValueExpressionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-				setValueExprCombinedRight((ValueExpressionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__GROUPING_EXPR:
-				setGroupingExpr((GroupingExpression)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_ELSE:
-				setValueExprCaseElse((ValueExpressionCaseElse)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE:
-				setValueExprCaseSimple((ValueExpressionCaseSimple)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				setValueExprCaseSimpleContentWhen((ValueExpressionCaseSimpleContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				setValueExprCaseSimpleContentResult((ValueExpressionCaseSimpleContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_ESCAPE:
-				setLikeEscape((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_LABELED_DURATION:
-				setValueExprLabeledDuration((ValueExpressionLabeledDuration)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NEST:
-				setNest((ValueExpressionNested)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UPDATE_SOURCE_EXPR_LIST:
-				setUpdateSourceExprList((UpdateSourceExprList)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR:
 				setValueExpr((QueryValueExpression)newValue);
 				return;
@@ -706,130 +254,16 @@
 				setAttributesDecl((XMLAttributesDeclaration)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UNARY_OPERATOR:
-				setUnaryOperator(UNARY_OPERATOR_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DATA_TYPE:
-				setDataType((DataType)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUES_ROW:
-				setValuesRow((ValuesRow)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ORDER_BY_VALUE_EXPR:
-				setOrderByValueExpr((OrderByValueExpression)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__RESULT_COLUMN:
-				setResultColumn((ResultColumn)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_RIGHT:
-				setBasicRight((PredicateBasic)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_LEFT:
-				setBasicLeft((PredicateBasic)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_PATTERN:
-				setLikePattern((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_MATCHING:
-				setLikeMatching((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__PREDICATE_NULL:
-				setPredicateNull((PredicateIsNull)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_RIGHT:
-				setInValueListRight((PredicateInValueList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_LEFT:
-				setInValueListLeft((PredicateInValueList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-				setInValueRowSelectLeft((PredicateInValueRowSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_SELECT_LEFT:
-				setInValueSelectLeft((PredicateInValueSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-				setQuantifiedRowSelectLeft((PredicateQuantifiedRowSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-				setQuantifiedValueSelectLeft((PredicateQuantifiedValueSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_LEFT:
-				setBetweenLeft((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT1:
-				setBetweenRight1((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT2:
-				setBetweenRight2((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CAST:
-				setValueExprCast((ValueExpressionCast)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_FUNCTION:
-				setValueExprFunction((ValueExpressionFunction)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_LEFT:
-				setValueExprCombinedLeft((ValueExpressionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-				setValueExprCombinedRight((ValueExpressionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__GROUPING_EXPR:
-				setGroupingExpr((GroupingExpression)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_ELSE:
-				setValueExprCaseElse((ValueExpressionCaseElse)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE:
-				setValueExprCaseSimple((ValueExpressionCaseSimple)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				setValueExprCaseSimpleContentWhen((ValueExpressionCaseSimpleContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				setValueExprCaseSimpleContentResult((ValueExpressionCaseSimpleContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_ESCAPE:
-				setLikeEscape((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_LABELED_DURATION:
-				setValueExprLabeledDuration((ValueExpressionLabeledDuration)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NEST:
-				setNest((ValueExpressionNested)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UPDATE_SOURCE_EXPR_LIST:
-				setUpdateSourceExprList((UpdateSourceExprList)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR:
 				setValueExpr((QueryValueExpression)null);
 				return;
@@ -837,98 +271,22 @@
 				setAttributesDecl((XMLAttributesDeclaration)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UNARY_OPERATOR:
-				return unaryOperator != UNARY_OPERATOR_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__DATA_TYPE:
-				return dataType != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUES_ROW:
-				return getValuesRow() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ORDER_BY_VALUE_EXPR:
-				return getOrderByValueExpr() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__RESULT_COLUMN:
-				return getResultColumn() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_RIGHT:
-				return getBasicRight() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BASIC_LEFT:
-				return getBasicLeft() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_PATTERN:
-				return getLikePattern() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_MATCHING:
-				return getLikeMatching() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__PREDICATE_NULL:
-				return getPredicateNull() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_RIGHT:
-				return getInValueListRight() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_LIST_LEFT:
-				return getInValueListLeft() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-				return getInValueRowSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__IN_VALUE_SELECT_LEFT:
-				return getInValueSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-				return getQuantifiedRowSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-				return getQuantifiedValueSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_LEFT:
-				return getBetweenLeft() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT1:
-				return getBetweenRight1() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__BETWEEN_RIGHT2:
-				return getBetweenRight2() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CAST:
-				return getValueExprCast() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_FUNCTION:
-				return getValueExprFunction() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_LEFT:
-				return getValueExprCombinedLeft() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-				return getValueExprCombinedRight() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__GROUPING_EXPR:
-				return getGroupingExpr() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_ELSE:
-				return getValueExprCaseElse() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE:
-				return getValueExprCaseSimple() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				return getValueExprCaseSimpleContentWhen() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				return getValueExprCaseSimpleContentResult() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__LIKE_ESCAPE:
-				return getLikeEscape() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR_LABELED_DURATION:
-				return getValueExprLabeledDuration() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__NEST:
-				return getNest() != null;
-			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__UPDATE_SOURCE_EXPR_LIST:
-				return getUpdateSourceExprList() != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__VALUE_EXPR:
 				return valueExpr != null;
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTE_DECLARATION_ITEM__ATTRIBUTES_DECL:
 				return getAttributesDecl() != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //XMLAttributeDeclarationItemImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAttributesDeclarationImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAttributesDeclarationImpl.java
index 7947f56..c185415 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAttributesDeclarationImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLAttributesDeclarationImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLAttributesDeclarationImpl.java,v 1.1 2005/12/16 13:16:51 bpayton Exp $
+ * $Id: XMLAttributesDeclarationImpl.java,v 1.2 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -69,7 +69,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLAttributesDeclaration();
+		return SQLXMLQueryModelPackage.Literals.XML_ATTRIBUTES_DECLARATION;
 	}
 
 	/**
@@ -79,7 +79,17 @@
 	 */
     public XMLValueFunctionElement getValueFunctionElement() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT) return null;
-		return (XMLValueFunctionElement)eContainer;
+		return (XMLValueFunctionElement)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetValueFunctionElement(XMLValueFunctionElement newValueFunctionElement, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newValueFunctionElement, SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT, msgs);
+		return msgs;
 	}
 
 	/**
@@ -88,15 +98,15 @@
 	 * @generated
 	 */
     public void setValueFunctionElement(XMLValueFunctionElement newValueFunctionElement) {
-		if (newValueFunctionElement != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT && newValueFunctionElement != null)) {
+		if (newValueFunctionElement != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT && newValueFunctionElement != null)) {
 			if (EcoreUtil.isAncestor(this, newValueFunctionElement))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newValueFunctionElement != null)
 				msgs = ((InternalEObject)newValueFunctionElement).eInverseAdd(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_ELEMENT__ATTRIBUTES_DECL, XMLValueFunctionElement.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newValueFunctionElement, SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT, msgs);
+			msgs = basicSetValueFunctionElement(newValueFunctionElement, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -117,85 +127,71 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM:
-					return ((InternalEList)getAttributeDeclItem()).basicAdd(otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetValueFunctionElement((XMLValueFunctionElement)otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM:
+				return ((InternalEList)getAttributeDeclItem()).basicAdd(otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-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 SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM:
-					return ((InternalEList)getAttributeDeclItem()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
+				return basicSetValueFunctionElement(null, msgs);
+			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM:
+				return ((InternalEList)getAttributeDeclItem()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_ELEMENT__ATTRIBUTES_DECL, XMLValueFunctionElement.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID) {
+			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_ELEMENT__ATTRIBUTES_DECL, XMLValueFunctionElement.class, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- 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 SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
 				return getValueFunctionElement();
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM:
 				return getAttributeDeclItem();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
 				setValueFunctionElement((XMLValueFunctionElement)newValue);
 				return;
@@ -204,16 +200,16 @@
 				getAttributeDeclItem().addAll((Collection)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
 				setValueFunctionElement((XMLValueFunctionElement)null);
 				return;
@@ -221,22 +217,22 @@
 				getAttributeDeclItem().clear();
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__VALUE_FUNCTION_ELEMENT:
 				return getValueFunctionElement() != null;
 			case SQLXMLQueryModelPackage.XML_ATTRIBUTES_DECLARATION__ATTRIBUTE_DECL_ITEM:
 				return attributeDeclItem != null && !attributeDeclItem.isEmpty();
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //XMLAttributesDeclarationImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationDefaultImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationDefaultImpl.java
index 45ff392..6d7be9b 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationDefaultImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationDefaultImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLNamespaceDeclarationDefaultImpl.java,v 1.3 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLNamespaceDeclarationDefaultImpl.java,v 1.4 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -71,7 +71,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLNamespaceDeclarationDefault();
+		return SQLXMLQueryModelPackage.Literals.XML_NAMESPACE_DECLARATION_DEFAULT;
 	}
 
 	/**
@@ -100,186 +100,53 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAMESPACES_DECL:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAMESPACES_DECL, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- 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 SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAMESPACES_DECL:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAMESPACES_DECL, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAMESPACES_DECL:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST, XMLNamespacesDeclaration.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__URI:
-				return getUri();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAMESPACES_DECL:
-				return getNamespacesDecl();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NO_DEFAULT:
 				return isNoDefault() ? Boolean.TRUE : Boolean.FALSE;
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__URI:
-				setUri((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAMESPACES_DECL:
-				setNamespacesDecl((XMLNamespacesDeclaration)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NO_DEFAULT:
 				setNoDefault(((Boolean)newValue).booleanValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAMESPACES_DECL:
-				setNamespacesDecl((XMLNamespacesDeclaration)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NO_DEFAULT:
 				setNoDefault(NO_DEFAULT_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NAMESPACES_DECL:
-				return getNamespacesDecl() != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_DEFAULT__NO_DEFAULT:
 				return noDefault != NO_DEFAULT_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationItemImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationItemImpl.java
index bf74423..06caf63 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationItemImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationItemImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLNamespaceDeclarationItemImpl.java,v 1.1 2005/12/16 13:16:51 bpayton Exp $
+ * $Id: XMLNamespaceDeclarationItemImpl.java,v 1.2 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -76,7 +76,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLNamespaceDeclarationItem();
+		return SQLXMLQueryModelPackage.Literals.XML_NAMESPACE_DECLARATION_ITEM;
 	}
 
 	/**
@@ -107,7 +107,17 @@
 	 */
     public XMLNamespacesDeclaration getNamespacesDecl() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL) return null;
-		return (XMLNamespacesDeclaration)eContainer;
+		return (XMLNamespacesDeclaration)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetNamespacesDecl(XMLNamespacesDeclaration newNamespacesDecl, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newNamespacesDecl, SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL, msgs);
+		return msgs;
 	}
 
 	/**
@@ -116,15 +126,15 @@
 	 * @generated
 	 */
     public void setNamespacesDecl(XMLNamespacesDeclaration newNamespacesDecl) {
-		if (newNamespacesDecl != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL && newNamespacesDecl != null)) {
+		if (newNamespacesDecl != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL && newNamespacesDecl != null)) {
 			if (EcoreUtil.isAncestor(this, newNamespacesDecl))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newNamespacesDecl != null)
 				msgs = ((InternalEObject)newNamespacesDecl).eInverseAdd(this, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST, XMLNamespacesDeclaration.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newNamespacesDecl, SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL, msgs);
+			msgs = basicSetNamespacesDecl(newNamespacesDecl, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -133,114 +143,67 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetNamespacesDecl((XMLNamespacesDeclaration)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-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 SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL:
+				return basicSetNamespacesDecl(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST, XMLNamespacesDeclaration.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID) {
+			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST, XMLNamespacesDeclaration.class, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__LABEL:
-				return getLabel();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__URI:
 				return getUri();
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL:
 				return getNamespacesDecl();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__LABEL:
-				setLabel((String)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__URI:
 				setUri((String)newValue);
 				return;
@@ -248,31 +211,16 @@
 				setNamespacesDecl((XMLNamespacesDeclaration)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__URI:
 				setUri(URI_EDEFAULT);
 				return;
@@ -280,32 +228,22 @@
 				setNamespacesDecl((XMLNamespacesDeclaration)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__URI:
 				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_ITEM__NAMESPACES_DECL:
 				return getNamespacesDecl() != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationPrefixImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationPrefixImpl.java
index 91b1a1b..b5027e2 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationPrefixImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespaceDeclarationPrefixImpl.java
@@ -1,7 +1,7 @@
 /**
  * </copyright>
  *
- * $Id: XMLNamespaceDeclarationPrefixImpl.java,v 1.3 2005/12/19 20:57:49 bpayton Exp $
+ * $Id: XMLNamespaceDeclarationPrefixImpl.java,v 1.4 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -71,7 +71,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLNamespaceDeclarationPrefix();
+		return SQLXMLQueryModelPackage.Literals.XML_NAMESPACE_DECLARATION_PREFIX;
 	}
 
 	/**
@@ -100,186 +100,53 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAMESPACES_DECL:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAMESPACES_DECL, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- 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 SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAMESPACES_DECL:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAMESPACES_DECL, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAMESPACES_DECL:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST, XMLNamespacesDeclaration.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__URI:
-				return getUri();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAMESPACES_DECL:
-				return getNamespacesDecl();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__PREFIX:
 				return getPrefix();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__URI:
-				setUri((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAMESPACES_DECL:
-				setNamespacesDecl((XMLNamespacesDeclaration)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__PREFIX:
 				setPrefix((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAMESPACES_DECL:
-				setNamespacesDecl((XMLNamespacesDeclaration)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__PREFIX:
 				setPrefix(PREFIX_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__NAMESPACES_DECL:
-				return getNamespacesDecl() != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACE_DECLARATION_PREFIX__PREFIX:
 				return PREFIX_EDEFAULT == null ? prefix != null : !PREFIX_EDEFAULT.equals(prefix);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespacesDeclarationImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespacesDeclarationImpl.java
index 2138bcb..c9fff0b 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespacesDeclarationImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLNamespacesDeclarationImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLNamespacesDeclarationImpl.java,v 1.1 2005/12/16 13:16:51 bpayton Exp $
+ * $Id: XMLNamespacesDeclarationImpl.java,v 1.2 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -74,7 +74,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLNamespacesDeclaration();
+		return SQLXMLQueryModelPackage.Literals.XML_NAMESPACES_DECLARATION;
 	}
 
 	/**
@@ -96,7 +96,17 @@
 	 */
     public XMLValueFunctionElement getValueFunctionElement() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT) return null;
-		return (XMLValueFunctionElement)eContainer;
+		return (XMLValueFunctionElement)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetValueFunctionElement(XMLValueFunctionElement newValueFunctionElement, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newValueFunctionElement, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT, msgs);
+		return msgs;
 	}
 
 	/**
@@ -105,15 +115,15 @@
 	 * @generated
 	 */
     public void setValueFunctionElement(XMLValueFunctionElement newValueFunctionElement) {
-		if (newValueFunctionElement != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT && newValueFunctionElement != null)) {
+		if (newValueFunctionElement != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT && newValueFunctionElement != null)) {
 			if (EcoreUtil.isAncestor(this, newValueFunctionElement))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newValueFunctionElement != null)
 				msgs = ((InternalEObject)newValueFunctionElement).eInverseAdd(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_ELEMENT__NAMESPACES_DECL, XMLValueFunctionElement.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newValueFunctionElement, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT, msgs);
+			msgs = basicSetValueFunctionElement(newValueFunctionElement, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -127,7 +137,17 @@
 	 */
     public XMLValueFunctionForest getValueFunctionForest() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST) return null;
-		return (XMLValueFunctionForest)eContainer;
+		return (XMLValueFunctionForest)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetValueFunctionForest(XMLValueFunctionForest newValueFunctionForest, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newValueFunctionForest, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST, msgs);
+		return msgs;
 	}
 
 	/**
@@ -136,15 +156,15 @@
 	 * @generated
 	 */
     public void setValueFunctionForest(XMLValueFunctionForest newValueFunctionForest) {
-		if (newValueFunctionForest != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST && newValueFunctionForest != null)) {
+		if (newValueFunctionForest != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST && newValueFunctionForest != null)) {
 			if (EcoreUtil.isAncestor(this, newValueFunctionForest))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newValueFunctionForest != null)
 				msgs = ((InternalEObject)newValueFunctionForest).eInverseAdd(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_FOREST__NAMESPACES_DECL, XMLValueFunctionForest.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newValueFunctionForest, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST, msgs);
+			msgs = basicSetValueFunctionForest(newValueFunctionForest, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -158,7 +178,17 @@
 	 */
     public XMLTableFunction getTableFunction() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION) return null;
-		return (XMLTableFunction)eContainer;
+		return (XMLTableFunction)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTableFunction(XMLTableFunction newTableFunction, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newTableFunction, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION, msgs);
+		return msgs;
 	}
 
 	/**
@@ -167,15 +197,15 @@
 	 * @generated
 	 */
     public void setTableFunction(XMLTableFunction newTableFunction) {
-		if (newTableFunction != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION && newTableFunction != null)) {
+		if (newTableFunction != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION && newTableFunction != null)) {
 			if (EcoreUtil.isAncestor(this, newTableFunction))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newTableFunction != null)
 				msgs = ((InternalEObject)newTableFunction).eInverseAdd(this, SQLXMLQueryModelPackage.XML_TABLE_FUNCTION__NAMESPACES_DECL, XMLTableFunction.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newTableFunction, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION, msgs);
+			msgs = basicSetTableFunction(newTableFunction, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -184,102 +214,72 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST:
-					return ((InternalEList)getNamespaceDecltemList()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST:
+				return ((InternalEList)getNamespaceDecltemList()).basicAdd(otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetValueFunctionElement((XMLValueFunctionElement)otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetValueFunctionForest((XMLValueFunctionForest)otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetTableFunction((XMLTableFunction)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-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 SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST:
-					return ((InternalEList)getNamespaceDecltemList()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST:
+				return ((InternalEList)getNamespaceDecltemList()).basicRemove(otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT:
+				return basicSetValueFunctionElement(null, msgs);
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST:
+				return basicSetValueFunctionForest(null, msgs);
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION:
+				return basicSetTableFunction(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_ELEMENT__NAMESPACES_DECL, XMLValueFunctionElement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_FOREST__NAMESPACES_DECL, XMLValueFunctionForest.class, msgs);
-				case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_TABLE_FUNCTION__NAMESPACES_DECL, XMLTableFunction.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID) {
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_ELEMENT__NAMESPACES_DECL, XMLValueFunctionElement.class, msgs);
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_FOREST:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_FOREST__NAMESPACES_DECL, XMLValueFunctionForest.class, msgs);
+			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_TABLE_FUNCTION__NAMESPACES_DECL, XMLTableFunction.class, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__LABEL:
-				return getLabel();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST:
 				return getNamespaceDecltemList();
 			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT:
@@ -289,33 +289,16 @@
 			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION:
 				return getTableFunction();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__LABEL:
-				setLabel((String)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST:
 				getNamespaceDecltemList().clear();
 				getNamespaceDecltemList().addAll((Collection)newValue);
@@ -330,31 +313,16 @@
 				setTableFunction((XMLTableFunction)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST:
 				getNamespaceDecltemList().clear();
 				return;
@@ -368,26 +336,16 @@
 				setTableFunction((XMLTableFunction)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__NAMESPACE_DECLTEM_LIST:
 				return namespaceDecltemList != null && !namespaceDecltemList.isEmpty();
 			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__VALUE_FUNCTION_ELEMENT:
@@ -397,7 +355,7 @@
 			case SQLXMLQueryModelPackage.XML_NAMESPACES_DECLARATION__TABLE_FUNCTION:
 				return getTableFunction() != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //XMLNamespacesDeclarationImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateContentImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateContentImpl.java
index 1a3c64d..409369a 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateContentImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateContentImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLPredicateContentImpl.java,v 1.3 2005/12/19 20:57:49 bpayton Exp $
+ * $Id: XMLPredicateContentImpl.java,v 1.4 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -55,358 +55,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLPredicateContent();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__UPDATE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DELETE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__TABLE_JOINED:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_HAVING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_WHERE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEST, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- 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 SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__UPDATE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DELETE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__TABLE_JOINED:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_HAVING:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_WHERE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEST, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__UPDATE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_UPDATE_STATEMENT__WHERE_CLAUSE, QueryUpdateStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DELETE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_DELETE_STATEMENT__WHERE_CLAUSE, QueryDeleteStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__TABLE_JOINED:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.TABLE_JOINED__JOIN_CONDITION, TableJoined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__LEFT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__RIGHT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_HAVING:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__HAVING_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_WHERE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__WHERE_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SEARCH_CONTENT__SEARCH_CONDITION, ValueExpressionCaseSearchContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_NESTED__NESTED_CONDITION, SearchConditionNested.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEGATED_CONDITION:
-				return isNegatedCondition() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__UPDATE_STATEMENT:
-				return getUpdateStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DELETE_STATEMENT:
-				return getDeleteStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__TABLE_JOINED:
-				return getTableJoined();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_LEFT:
-				return getCombinedLeft();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_RIGHT:
-				return getCombinedRight();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEST:
-				return getNest();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEGATED_PREDICATE:
-				return isNegatedPredicate() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__HAS_SELECTIVITY:
-				return isHasSelectivity() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__SELECTIVITY_VALUE:
-				return getSelectivityValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEGATED_CONDITION:
-				setNegatedCondition(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__TABLE_JOINED:
-				setTableJoined((TableJoined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEST:
-				setNest((SearchConditionNested)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEGATED_PREDICATE:
-				setNegatedPredicate(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__HAS_SELECTIVITY:
-				setHasSelectivity(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__SELECTIVITY_VALUE:
-				setSelectivityValue((Integer)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEGATED_CONDITION:
-				setNegatedCondition(NEGATED_CONDITION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__TABLE_JOINED:
-				setTableJoined((TableJoined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEST:
-				setNest((SearchConditionNested)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEGATED_PREDICATE:
-				setNegatedPredicate(NEGATED_PREDICATE_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__HAS_SELECTIVITY:
-				setHasSelectivity(HAS_SELECTIVITY_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__SELECTIVITY_VALUE:
-				setSelectivityValue(SELECTIVITY_VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEGATED_CONDITION:
-				return negatedCondition != NEGATED_CONDITION_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__UPDATE_STATEMENT:
-				return getUpdateStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__DELETE_STATEMENT:
-				return getDeleteStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__TABLE_JOINED:
-				return getTableJoined() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_LEFT:
-				return getCombinedLeft() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__COMBINED_RIGHT:
-				return getCombinedRight() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEST:
-				return getNest() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__NEGATED_PREDICATE:
-				return negatedPredicate != NEGATED_PREDICATE_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__HAS_SELECTIVITY:
-				return hasSelectivity != HAS_SELECTIVITY_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_CONTENT__SELECTIVITY_VALUE:
-				return SELECTIVITY_VALUE_EDEFAULT == null ? selectivityValue != null : !SELECTIVITY_VALUE_EDEFAULT.equals(selectivityValue);
-		}
-		return eDynamicIsSet(eFeature);
+		return SQLXMLQueryModelPackage.Literals.XML_PREDICATE_CONTENT;
 	}
 
 } //XMLPredicateContentImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateDocumentImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateDocumentImpl.java
index 8a970e3..401fb14 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateDocumentImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateDocumentImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLPredicateDocumentImpl.java,v 1.3 2005/12/19 20:57:49 bpayton Exp $
+ * $Id: XMLPredicateDocumentImpl.java,v 1.4 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -55,358 +55,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLPredicateDocument();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__UPDATE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DELETE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__TABLE_JOINED:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_HAVING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_WHERE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEST, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- 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 SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__UPDATE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DELETE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__TABLE_JOINED:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_HAVING:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_WHERE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEST, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__UPDATE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_UPDATE_STATEMENT__WHERE_CLAUSE, QueryUpdateStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DELETE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_DELETE_STATEMENT__WHERE_CLAUSE, QueryDeleteStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__TABLE_JOINED:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.TABLE_JOINED__JOIN_CONDITION, TableJoined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__LEFT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__RIGHT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_HAVING:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__HAVING_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_WHERE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__WHERE_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SEARCH_CONTENT__SEARCH_CONDITION, ValueExpressionCaseSearchContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_NESTED__NESTED_CONDITION, SearchConditionNested.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEGATED_CONDITION:
-				return isNegatedCondition() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__UPDATE_STATEMENT:
-				return getUpdateStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DELETE_STATEMENT:
-				return getDeleteStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__TABLE_JOINED:
-				return getTableJoined();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_LEFT:
-				return getCombinedLeft();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_RIGHT:
-				return getCombinedRight();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEST:
-				return getNest();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEGATED_PREDICATE:
-				return isNegatedPredicate() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__HAS_SELECTIVITY:
-				return isHasSelectivity() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__SELECTIVITY_VALUE:
-				return getSelectivityValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEGATED_CONDITION:
-				setNegatedCondition(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__TABLE_JOINED:
-				setTableJoined((TableJoined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEST:
-				setNest((SearchConditionNested)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEGATED_PREDICATE:
-				setNegatedPredicate(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__HAS_SELECTIVITY:
-				setHasSelectivity(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__SELECTIVITY_VALUE:
-				setSelectivityValue((Integer)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEGATED_CONDITION:
-				setNegatedCondition(NEGATED_CONDITION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__TABLE_JOINED:
-				setTableJoined((TableJoined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEST:
-				setNest((SearchConditionNested)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEGATED_PREDICATE:
-				setNegatedPredicate(NEGATED_PREDICATE_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__HAS_SELECTIVITY:
-				setHasSelectivity(HAS_SELECTIVITY_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__SELECTIVITY_VALUE:
-				setSelectivityValue(SELECTIVITY_VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEGATED_CONDITION:
-				return negatedCondition != NEGATED_CONDITION_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__UPDATE_STATEMENT:
-				return getUpdateStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__DELETE_STATEMENT:
-				return getDeleteStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__TABLE_JOINED:
-				return getTableJoined() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_LEFT:
-				return getCombinedLeft() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__COMBINED_RIGHT:
-				return getCombinedRight() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEST:
-				return getNest() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__NEGATED_PREDICATE:
-				return negatedPredicate != NEGATED_PREDICATE_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__HAS_SELECTIVITY:
-				return hasSelectivity != HAS_SELECTIVITY_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_DOCUMENT__SELECTIVITY_VALUE:
-				return SELECTIVITY_VALUE_EDEFAULT == null ? selectivityValue != null : !SELECTIVITY_VALUE_EDEFAULT.equals(selectivityValue);
-		}
-		return eDynamicIsSet(eFeature);
+		return SQLXMLQueryModelPackage.Literals.XML_PREDICATE_DOCUMENT;
 	}
 
 } //XMLPredicateDocumentImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateExistsImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateExistsImpl.java
index 20ba79a..ceeb1fb 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateExistsImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateExistsImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLPredicateExistsImpl.java,v 1.3 2005/12/19 20:57:50 bpayton Exp $
+ * $Id: XMLPredicateExistsImpl.java,v 1.4 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -80,7 +80,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLPredicateExists();
+		return SQLXMLQueryModelPackage.Literals.XML_PREDICATE_EXISTS;
 	}
 
 	/**
@@ -171,106 +171,21 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__UPDATE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DELETE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__TABLE_JOINED:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_HAVING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_WHERE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR:
-					if (xqueryExpr != null)
-						msgs = ((InternalEObject)xqueryExpr).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR, null, msgs);
-					return basicSetXqueryExpr((XMLQueryExpression)otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST:
-					if (xqueryArgList != null)
-						msgs = ((InternalEObject)xqueryArgList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST, null, msgs);
-					return basicSetXqueryArgList((XMLQueryArgumentList)otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR:
+				if (xqueryExpr != null)
+					msgs = ((InternalEObject)xqueryExpr).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR, null, msgs);
+				return basicSetXqueryExpr((XMLQueryExpression)otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST:
+				if (xqueryArgList != null)
+					msgs = ((InternalEObject)xqueryArgList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST, null, msgs);
+				return basicSetXqueryArgList((XMLQueryArgumentList)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- 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 SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__UPDATE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DELETE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__TABLE_JOINED:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_HAVING:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_WHERE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR:
-					return basicSetXqueryExpr(null, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST:
-					return basicSetXqueryArgList(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -278,148 +193,38 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__UPDATE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_UPDATE_STATEMENT__WHERE_CLAUSE, QueryUpdateStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DELETE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_DELETE_STATEMENT__WHERE_CLAUSE, QueryDeleteStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__TABLE_JOINED:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.TABLE_JOINED__JOIN_CONDITION, TableJoined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__LEFT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__RIGHT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_HAVING:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__HAVING_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_WHERE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__WHERE_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SEARCH_CONTENT__SEARCH_CONDITION, ValueExpressionCaseSearchContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_NESTED__NESTED_CONDITION, SearchConditionNested.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR:
+				return basicSetXqueryExpr(null, msgs);
+			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST:
+				return basicSetXqueryArgList(null, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEGATED_CONDITION:
-				return isNegatedCondition() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__UPDATE_STATEMENT:
-				return getUpdateStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DELETE_STATEMENT:
-				return getDeleteStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__TABLE_JOINED:
-				return getTableJoined();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_LEFT:
-				return getCombinedLeft();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_RIGHT:
-				return getCombinedRight();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEST:
-				return getNest();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEGATED_PREDICATE:
-				return isNegatedPredicate() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__HAS_SELECTIVITY:
-				return isHasSelectivity() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__SELECTIVITY_VALUE:
-				return getSelectivityValue();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR:
 				return getXqueryExpr();
 			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST:
 				return getXqueryArgList();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEGATED_CONDITION:
-				setNegatedCondition(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__TABLE_JOINED:
-				setTableJoined((TableJoined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEST:
-				setNest((SearchConditionNested)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEGATED_PREDICATE:
-				setNegatedPredicate(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__HAS_SELECTIVITY:
-				setHasSelectivity(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__SELECTIVITY_VALUE:
-				setSelectivityValue((Integer)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR:
 				setXqueryExpr((XMLQueryExpression)newValue);
 				return;
@@ -427,70 +232,16 @@
 				setXqueryArgList((XMLQueryArgumentList)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEGATED_CONDITION:
-				setNegatedCondition(NEGATED_CONDITION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__TABLE_JOINED:
-				setTableJoined((TableJoined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEST:
-				setNest((SearchConditionNested)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEGATED_PREDICATE:
-				setNegatedPredicate(NEGATED_PREDICATE_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__HAS_SELECTIVITY:
-				setHasSelectivity(HAS_SELECTIVITY_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__SELECTIVITY_VALUE:
-				setSelectivityValue(SELECTIVITY_VALUE_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR:
 				setXqueryExpr((XMLQueryExpression)null);
 				return;
@@ -498,58 +249,22 @@
 				setXqueryArgList((XMLQueryArgumentList)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEGATED_CONDITION:
-				return negatedCondition != NEGATED_CONDITION_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__UPDATE_STATEMENT:
-				return getUpdateStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__DELETE_STATEMENT:
-				return getDeleteStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__TABLE_JOINED:
-				return getTableJoined() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_LEFT:
-				return getCombinedLeft() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__COMBINED_RIGHT:
-				return getCombinedRight() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEST:
-				return getNest() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__NEGATED_PREDICATE:
-				return negatedPredicate != NEGATED_PREDICATE_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__HAS_SELECTIVITY:
-				return hasSelectivity != HAS_SELECTIVITY_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__SELECTIVITY_VALUE:
-				return SELECTIVITY_VALUE_EDEFAULT == null ? selectivityValue != null : !SELECTIVITY_VALUE_EDEFAULT.equals(selectivityValue);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR:
 				return xqueryExpr != null;
 			case SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST:
 				return xqueryArgList != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 } //XMLPredicateExistsImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateImpl.java
index 7e203e3..83a1229 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLPredicateImpl.java,v 1.3 2005/12/19 20:57:49 bpayton Exp $
+ * $Id: XMLPredicateImpl.java,v 1.4 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -54,358 +54,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLPredicate();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__UPDATE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__DELETE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__TABLE_JOINED:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_HAVING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_WHERE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE__NEST, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- 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 SQLXMLQueryModelPackage.XML_PREDICATE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__UPDATE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__DELETE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__TABLE_JOINED:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_HAVING:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_WHERE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__NEST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE__NEST, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE__UPDATE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_UPDATE_STATEMENT__WHERE_CLAUSE, QueryUpdateStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__DELETE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_DELETE_STATEMENT__WHERE_CLAUSE, QueryDeleteStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__TABLE_JOINED:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.TABLE_JOINED__JOIN_CONDITION, TableJoined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__LEFT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__RIGHT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_HAVING:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__HAVING_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_WHERE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__WHERE_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SEARCH_CONTENT__SEARCH_CONDITION, ValueExpressionCaseSearchContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE__NEST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_NESTED__NESTED_CONDITION, SearchConditionNested.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEGATED_CONDITION:
-				return isNegatedCondition() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__UPDATE_STATEMENT:
-				return getUpdateStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DELETE_STATEMENT:
-				return getDeleteStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__TABLE_JOINED:
-				return getTableJoined();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_LEFT:
-				return getCombinedLeft();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_RIGHT:
-				return getCombinedRight();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEST:
-				return getNest();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEGATED_PREDICATE:
-				return isNegatedPredicate() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__HAS_SELECTIVITY:
-				return isHasSelectivity() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__SELECTIVITY_VALUE:
-				return getSelectivityValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEGATED_CONDITION:
-				setNegatedCondition(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__TABLE_JOINED:
-				setTableJoined((TableJoined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEST:
-				setNest((SearchConditionNested)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEGATED_PREDICATE:
-				setNegatedPredicate(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__HAS_SELECTIVITY:
-				setHasSelectivity(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__SELECTIVITY_VALUE:
-				setSelectivityValue((Integer)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEGATED_CONDITION:
-				setNegatedCondition(NEGATED_CONDITION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__TABLE_JOINED:
-				setTableJoined((TableJoined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEST:
-				setNest((SearchConditionNested)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEGATED_PREDICATE:
-				setNegatedPredicate(NEGATED_PREDICATE_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__HAS_SELECTIVITY:
-				setHasSelectivity(HAS_SELECTIVITY_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__SELECTIVITY_VALUE:
-				setSelectivityValue(SELECTIVITY_VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_PREDICATE__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEGATED_CONDITION:
-				return negatedCondition != NEGATED_CONDITION_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__UPDATE_STATEMENT:
-				return getUpdateStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__DELETE_STATEMENT:
-				return getDeleteStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__TABLE_JOINED:
-				return getTableJoined() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_LEFT:
-				return getCombinedLeft() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__COMBINED_RIGHT:
-				return getCombinedRight() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEST:
-				return getNest() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__NEGATED_PREDICATE:
-				return negatedPredicate != NEGATED_PREDICATE_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__HAS_SELECTIVITY:
-				return hasSelectivity != HAS_SELECTIVITY_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE__SELECTIVITY_VALUE:
-				return SELECTIVITY_VALUE_EDEFAULT == null ? selectivityValue != null : !SELECTIVITY_VALUE_EDEFAULT.equals(selectivityValue);
-		}
-		return eDynamicIsSet(eFeature);
+		return SQLXMLQueryModelPackage.Literals.XML_PREDICATE;
 	}
 
 } //XMLPredicateImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateValidImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateValidImpl.java
index 1714abb..6aa3b1b 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateValidImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLPredicateValidImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLPredicateValidImpl.java,v 1.3 2005/12/19 20:57:49 bpayton Exp $
+ * $Id: XMLPredicateValidImpl.java,v 1.4 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -53,358 +53,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLPredicateValid();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__UPDATE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DELETE_STATEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__TABLE_JOINED:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_HAVING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_WHERE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEST, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- 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 SQLXMLQueryModelPackage.XML_PREDICATE_VALID__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__UPDATE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__UPDATE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DELETE_STATEMENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DELETE_STATEMENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__TABLE_JOINED:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__TABLE_JOINED, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_HAVING:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_HAVING, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_WHERE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_WHERE, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEST, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__UPDATE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_UPDATE_STATEMENT__WHERE_CLAUSE, QueryUpdateStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DELETE_STATEMENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_DELETE_STATEMENT__WHERE_CLAUSE, QueryDeleteStatement.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__TABLE_JOINED:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.TABLE_JOINED__JOIN_CONDITION, TableJoined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__LEFT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_COMBINED__RIGHT_CONDITION, SearchConditionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_HAVING:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__HAVING_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_WHERE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.QUERY_SELECT__WHERE_CLAUSE, QuerySelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SEARCH_CONTENT__SEARCH_CONDITION, ValueExpressionCaseSearchContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.SEARCH_CONDITION_NESTED__NESTED_CONDITION, SearchConditionNested.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEGATED_CONDITION:
-				return isNegatedCondition() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__UPDATE_STATEMENT:
-				return getUpdateStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DELETE_STATEMENT:
-				return getDeleteStatement();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__TABLE_JOINED:
-				return getTableJoined();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_LEFT:
-				return getCombinedLeft();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_RIGHT:
-				return getCombinedRight();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEST:
-				return getNest();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEGATED_PREDICATE:
-				return isNegatedPredicate() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__HAS_SELECTIVITY:
-				return isHasSelectivity() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__SELECTIVITY_VALUE:
-				return getSelectivityValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEGATED_CONDITION:
-				setNegatedCondition(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__TABLE_JOINED:
-				setTableJoined((TableJoined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEST:
-				setNest((SearchConditionNested)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEGATED_PREDICATE:
-				setNegatedPredicate(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__HAS_SELECTIVITY:
-				setHasSelectivity(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__SELECTIVITY_VALUE:
-				setSelectivityValue((Integer)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEGATED_CONDITION:
-				setNegatedCondition(NEGATED_CONDITION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__UPDATE_STATEMENT:
-				setUpdateStatement((QueryUpdateStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DELETE_STATEMENT:
-				setDeleteStatement((QueryDeleteStatement)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__TABLE_JOINED:
-				setTableJoined((TableJoined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_LEFT:
-				setCombinedLeft((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_RIGHT:
-				setCombinedRight((SearchConditionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_HAVING:
-				setQuerySelectHaving((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_WHERE:
-				setQuerySelectWhere((QuerySelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEST:
-				setNest((SearchConditionNested)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEGATED_PREDICATE:
-				setNegatedPredicate(NEGATED_PREDICATE_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__HAS_SELECTIVITY:
-				setHasSelectivity(HAS_SELECTIVITY_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__SELECTIVITY_VALUE:
-				setSelectivityValue(SELECTIVITY_VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEGATED_CONDITION:
-				return negatedCondition != NEGATED_CONDITION_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__UPDATE_STATEMENT:
-				return getUpdateStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__DELETE_STATEMENT:
-				return getDeleteStatement() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__TABLE_JOINED:
-				return getTableJoined() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_LEFT:
-				return getCombinedLeft() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__COMBINED_RIGHT:
-				return getCombinedRight() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_HAVING:
-				return getQuerySelectHaving() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__QUERY_SELECT_WHERE:
-				return getQuerySelectWhere() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEST:
-				return getNest() != null;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__NEGATED_PREDICATE:
-				return negatedPredicate != NEGATED_PREDICATE_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__HAS_SELECTIVITY:
-				return hasSelectivity != HAS_SELECTIVITY_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_PREDICATE_VALID__SELECTIVITY_VALUE:
-				return SELECTIVITY_VALUE_EDEFAULT == null ? selectivityValue != null : !SELECTIVITY_VALUE_EDEFAULT.equals(selectivityValue);
-		}
-		return eDynamicIsSet(eFeature);
+		return SQLXMLQueryModelPackage.Literals.XML_PREDICATE_VALID;
 	}
 
 } //XMLPredicateValidImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryArgumentItemImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryArgumentItemImpl.java
index 10e712e..7d4563f 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryArgumentItemImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryArgumentItemImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLQueryArgumentItemImpl.java,v 1.1 2005/12/16 13:16:51 bpayton Exp $
+ * $Id: XMLQueryArgumentItemImpl.java,v 1.2 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -117,7 +117,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLQueryArgumentItem();
+		return SQLXMLQueryModelPackage.Literals.XML_QUERY_ARGUMENT_ITEM;
 	}
 
 	/**
@@ -148,7 +148,17 @@
 	 */
     public XMLQueryArgumentList getXqueryArgList() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST) return null;
-		return (XMLQueryArgumentList)eContainer;
+		return (XMLQueryArgumentList)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetXqueryArgList(XMLQueryArgumentList newXqueryArgList, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newXqueryArgList, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST, msgs);
+		return msgs;
 	}
 
 	/**
@@ -157,15 +167,15 @@
 	 * @generated
 	 */
     public void setXqueryArgList(XMLQueryArgumentList newXqueryArgList) {
-		if (newXqueryArgList != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST && newXqueryArgList != null)) {
+		if (newXqueryArgList != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST && newXqueryArgList != null)) {
 			if (EcoreUtil.isAncestor(this, newXqueryArgList))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newXqueryArgList != null)
 				msgs = ((InternalEObject)newXqueryArgList).eInverseAdd(this, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__XQUERY_ARG_LIST_CHILDREN, XMLQueryArgumentList.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newXqueryArgList, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST, msgs);
+			msgs = basicSetXqueryArgList(newXqueryArgList, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -217,400 +227,54 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUES_ROW:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__ORDER_BY_VALUE_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__ORDER_BY_VALUE_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__RESULT_COLUMN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__RESULT_COLUMN, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_PATTERN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_PATTERN, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_MATCHING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_MATCHING, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PREDICATE_NULL:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PREDICATE_NULL, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT1:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT1, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT2:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT2, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CAST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CAST, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_FUNCTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__GROUPING_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__GROUPING_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_ELSE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_ELSE, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_ESCAPE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_ESCAPE, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_LABELED_DURATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_LABELED_DURATION, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UPDATE_SOURCE_EXPR_LIST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UPDATE_SOURCE_EXPR_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetXqueryArgList((XMLQueryArgumentList)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-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 SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DATA_TYPE:
-					return basicSetDataType(null, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUES_ROW:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__ORDER_BY_VALUE_EXPR:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__ORDER_BY_VALUE_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__RESULT_COLUMN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__RESULT_COLUMN, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_PATTERN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_PATTERN, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_MATCHING:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_MATCHING, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PREDICATE_NULL:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PREDICATE_NULL, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT1:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT1, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT2:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT2, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CAST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CAST, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_FUNCTION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__GROUPING_EXPR:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__GROUPING_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_ELSE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_ELSE, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_ESCAPE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_ESCAPE, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_LABELED_DURATION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_LABELED_DURATION, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NEST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UPDATE_SOURCE_EXPR_LIST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UPDATE_SOURCE_EXPR_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR:
-					return basicSetValueExpr(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST:
+				return basicSetXqueryArgList(null, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR:
+				return basicSetValueExpr(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUES_ROW:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUES_ROW__EXPR_LIST, ValuesRow.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__ORDER_BY_VALUE_EXPR:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.ORDER_BY_VALUE_EXPRESSION__VALUE_EXPR, OrderByValueExpression.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__RESULT_COLUMN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.RESULT_COLUMN__VALUE_EXPR, ResultColumn.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BASIC__RIGHT_VALUE_EXPR, PredicateBasic.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BASIC__LEFT_VALUE_EXPR, PredicateBasic.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_PATTERN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__PATTERN_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_MATCHING:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__MATCHING_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PREDICATE_NULL:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IS_NULL__VALUE_EXPR, PredicateIsNull.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_LIST__VALUE_EXPR_LIST, PredicateInValueList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_LIST__VALUE_EXPR, PredicateInValueList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_ROW_SELECT__VALUE_EXPR_LIST, PredicateInValueRowSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_SELECT__VALUE_EXPR, PredicateInValueSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_QUANTIFIED_ROW_SELECT__VALUE_EXPR_LIST, PredicateQuantifiedRowSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_QUANTIFIED_VALUE_SELECT__VALUE_EXPR, PredicateQuantifiedValueSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__LEFT_VALUE_EXPR, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT1:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__RIGHT_VALUE_EXPR1, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT2:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__RIGHT_VALUE_EXPR2, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CAST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CAST__VALUE_EXPR, ValueExpressionCast.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_FUNCTION:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__PARAMETER_LIST, ValueExpressionFunction.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_COMBINED__LEFT_VALUE_EXPR, ValueExpressionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_COMBINED__RIGHT_VALUE_EXPR, ValueExpressionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__GROUPING_EXPR:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.GROUPING_EXPRESSION__VALUE_EXPR, GroupingExpression.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_ELSE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_ELSE__VALUE_EXPR, ValueExpressionCaseElse.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE__VALUE_EXPR, ValueExpressionCaseSimple.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE_CONTENT__WHEN_VALUE_EXPR, ValueExpressionCaseSimpleContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE_CONTENT__RESULT_VALUE_EXPR, ValueExpressionCaseSimpleContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SEARCH_CONTENT__VALUE_EXPR, ValueExpressionCaseSearchContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_ESCAPE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__ESCAPE_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_LABELED_DURATION:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_LABELED_DURATION__VALUE_EXPR, ValueExpressionLabeledDuration.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NEST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_NESTED__NESTED_VALUE_EXPR, ValueExpressionNested.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UPDATE_SOURCE_EXPR_LIST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.UPDATE_SOURCE_EXPR_LIST__VALUE_EXPR_LIST, UpdateSourceExprList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__XQUERY_ARG_LIST_CHILDREN, XMLQueryArgumentList.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID) {
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__XQUERY_ARG_LIST_CHILDREN, XMLQueryArgumentList.class, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UNARY_OPERATOR:
-				return getUnaryOperator();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DATA_TYPE:
-				return getDataType();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUES_ROW:
-				return getValuesRow();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__ORDER_BY_VALUE_EXPR:
-				return getOrderByValueExpr();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__RESULT_COLUMN:
-				return getResultColumn();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_RIGHT:
-				return getBasicRight();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_LEFT:
-				return getBasicLeft();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_PATTERN:
-				return getLikePattern();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_MATCHING:
-				return getLikeMatching();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PREDICATE_NULL:
-				return getPredicateNull();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_RIGHT:
-				return getInValueListRight();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_LEFT:
-				return getInValueListLeft();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-				return getInValueRowSelectLeft();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_SELECT_LEFT:
-				return getInValueSelectLeft();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-				return getQuantifiedRowSelectLeft();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-				return getQuantifiedValueSelectLeft();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_LEFT:
-				return getBetweenLeft();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT1:
-				return getBetweenRight1();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT2:
-				return getBetweenRight2();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CAST:
-				return getValueExprCast();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_FUNCTION:
-				return getValueExprFunction();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_LEFT:
-				return getValueExprCombinedLeft();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-				return getValueExprCombinedRight();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__GROUPING_EXPR:
-				return getGroupingExpr();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_ELSE:
-				return getValueExprCaseElse();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE:
-				return getValueExprCaseSimple();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				return getValueExprCaseSimpleContentWhen();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				return getValueExprCaseSimpleContentResult();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_ESCAPE:
-				return getLikeEscape();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_LABELED_DURATION:
-				return getValueExprLabeledDuration();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NEST:
-				return getNest();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UPDATE_SOURCE_EXPR_LIST:
-				return getUpdateSourceExprList();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PASSING_MECHANISM:
 				return getPassingMechanism();
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST:
@@ -618,132 +282,16 @@
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR:
 				return getValueExpr();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UNARY_OPERATOR:
-				setUnaryOperator((ValueExpressionUnaryOperator)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DATA_TYPE:
-				setDataType((DataType)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUES_ROW:
-				setValuesRow((ValuesRow)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__ORDER_BY_VALUE_EXPR:
-				setOrderByValueExpr((OrderByValueExpression)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__RESULT_COLUMN:
-				setResultColumn((ResultColumn)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_RIGHT:
-				setBasicRight((PredicateBasic)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_LEFT:
-				setBasicLeft((PredicateBasic)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_PATTERN:
-				setLikePattern((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_MATCHING:
-				setLikeMatching((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PREDICATE_NULL:
-				setPredicateNull((PredicateIsNull)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_RIGHT:
-				setInValueListRight((PredicateInValueList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_LEFT:
-				setInValueListLeft((PredicateInValueList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-				setInValueRowSelectLeft((PredicateInValueRowSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_SELECT_LEFT:
-				setInValueSelectLeft((PredicateInValueSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-				setQuantifiedRowSelectLeft((PredicateQuantifiedRowSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-				setQuantifiedValueSelectLeft((PredicateQuantifiedValueSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_LEFT:
-				setBetweenLeft((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT1:
-				setBetweenRight1((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT2:
-				setBetweenRight2((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CAST:
-				setValueExprCast((ValueExpressionCast)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_FUNCTION:
-				setValueExprFunction((ValueExpressionFunction)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_LEFT:
-				setValueExprCombinedLeft((ValueExpressionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-				setValueExprCombinedRight((ValueExpressionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__GROUPING_EXPR:
-				setGroupingExpr((GroupingExpression)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_ELSE:
-				setValueExprCaseElse((ValueExpressionCaseElse)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE:
-				setValueExprCaseSimple((ValueExpressionCaseSimple)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				setValueExprCaseSimpleContentWhen((ValueExpressionCaseSimpleContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				setValueExprCaseSimpleContentResult((ValueExpressionCaseSimpleContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_ESCAPE:
-				setLikeEscape((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_LABELED_DURATION:
-				setValueExprLabeledDuration((ValueExpressionLabeledDuration)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NEST:
-				setNest((ValueExpressionNested)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UPDATE_SOURCE_EXPR_LIST:
-				setUpdateSourceExprList((UpdateSourceExprList)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PASSING_MECHANISM:
 				setPassingMechanism((XMLPassingType)newValue);
 				return;
@@ -754,130 +302,16 @@
 				setValueExpr((QueryValueExpression)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UNARY_OPERATOR:
-				setUnaryOperator(UNARY_OPERATOR_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DATA_TYPE:
-				setDataType((DataType)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUES_ROW:
-				setValuesRow((ValuesRow)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__ORDER_BY_VALUE_EXPR:
-				setOrderByValueExpr((OrderByValueExpression)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__RESULT_COLUMN:
-				setResultColumn((ResultColumn)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_RIGHT:
-				setBasicRight((PredicateBasic)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_LEFT:
-				setBasicLeft((PredicateBasic)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_PATTERN:
-				setLikePattern((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_MATCHING:
-				setLikeMatching((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PREDICATE_NULL:
-				setPredicateNull((PredicateIsNull)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_RIGHT:
-				setInValueListRight((PredicateInValueList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_LEFT:
-				setInValueListLeft((PredicateInValueList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-				setInValueRowSelectLeft((PredicateInValueRowSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_SELECT_LEFT:
-				setInValueSelectLeft((PredicateInValueSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-				setQuantifiedRowSelectLeft((PredicateQuantifiedRowSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-				setQuantifiedValueSelectLeft((PredicateQuantifiedValueSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_LEFT:
-				setBetweenLeft((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT1:
-				setBetweenRight1((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT2:
-				setBetweenRight2((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CAST:
-				setValueExprCast((ValueExpressionCast)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_FUNCTION:
-				setValueExprFunction((ValueExpressionFunction)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_LEFT:
-				setValueExprCombinedLeft((ValueExpressionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-				setValueExprCombinedRight((ValueExpressionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__GROUPING_EXPR:
-				setGroupingExpr((GroupingExpression)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_ELSE:
-				setValueExprCaseElse((ValueExpressionCaseElse)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE:
-				setValueExprCaseSimple((ValueExpressionCaseSimple)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				setValueExprCaseSimpleContentWhen((ValueExpressionCaseSimpleContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				setValueExprCaseSimpleContentResult((ValueExpressionCaseSimpleContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_ESCAPE:
-				setLikeEscape((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_LABELED_DURATION:
-				setValueExprLabeledDuration((ValueExpressionLabeledDuration)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NEST:
-				setNest((ValueExpressionNested)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UPDATE_SOURCE_EXPR_LIST:
-				setUpdateSourceExprList((UpdateSourceExprList)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PASSING_MECHANISM:
 				setPassingMechanism(PASSING_MECHANISM_EDEFAULT);
 				return;
@@ -888,92 +322,16 @@
 				setValueExpr((QueryValueExpression)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UNARY_OPERATOR:
-				return unaryOperator != UNARY_OPERATOR_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__DATA_TYPE:
-				return dataType != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUES_ROW:
-				return getValuesRow() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__ORDER_BY_VALUE_EXPR:
-				return getOrderByValueExpr() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__RESULT_COLUMN:
-				return getResultColumn() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_RIGHT:
-				return getBasicRight() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BASIC_LEFT:
-				return getBasicLeft() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_PATTERN:
-				return getLikePattern() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_MATCHING:
-				return getLikeMatching() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PREDICATE_NULL:
-				return getPredicateNull() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_RIGHT:
-				return getInValueListRight() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_LIST_LEFT:
-				return getInValueListLeft() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_ROW_SELECT_LEFT:
-				return getInValueRowSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__IN_VALUE_SELECT_LEFT:
-				return getInValueSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_ROW_SELECT_LEFT:
-				return getQuantifiedRowSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__QUANTIFIED_VALUE_SELECT_LEFT:
-				return getQuantifiedValueSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_LEFT:
-				return getBetweenLeft() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT1:
-				return getBetweenRight1() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__BETWEEN_RIGHT2:
-				return getBetweenRight2() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CAST:
-				return getValueExprCast() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_FUNCTION:
-				return getValueExprFunction() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_LEFT:
-				return getValueExprCombinedLeft() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_COMBINED_RIGHT:
-				return getValueExprCombinedRight() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__GROUPING_EXPR:
-				return getGroupingExpr() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_ELSE:
-				return getValueExprCaseElse() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE:
-				return getValueExprCaseSimple() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				return getValueExprCaseSimpleContentWhen() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				return getValueExprCaseSimpleContentResult() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__LIKE_ESCAPE:
-				return getLikeEscape() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR_LABELED_DURATION:
-				return getValueExprLabeledDuration() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__NEST:
-				return getNest() != null;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__UPDATE_SOURCE_EXPR_LIST:
-				return getUpdateSourceExprList() != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__PASSING_MECHANISM:
 				return passingMechanism != PASSING_MECHANISM_EDEFAULT;
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__XQUERY_ARG_LIST:
@@ -981,7 +339,7 @@
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_ITEM__VALUE_EXPR:
 				return valueExpr != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryArgumentListImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryArgumentListImpl.java
index 773fa89..540532b 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryArgumentListImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryArgumentListImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLQueryArgumentListImpl.java,v 1.1 2005/12/16 13:16:52 bpayton Exp $
+ * $Id: XMLQueryArgumentListImpl.java,v 1.2 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -96,7 +96,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLQueryArgumentList();
+		return SQLXMLQueryModelPackage.Literals.XML_QUERY_ARGUMENT_LIST;
 	}
 
 	/**
@@ -127,7 +127,17 @@
 	 */
     public XMLPredicateExists getPredicateExists() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS) return null;
-		return (XMLPredicateExists)eContainer;
+		return (XMLPredicateExists)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetPredicateExists(XMLPredicateExists newPredicateExists, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newPredicateExists, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS, msgs);
+		return msgs;
 	}
 
 	/**
@@ -136,15 +146,15 @@
 	 * @generated
 	 */
     public void setPredicateExists(XMLPredicateExists newPredicateExists) {
-		if (newPredicateExists != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS && newPredicateExists != null)) {
+		if (newPredicateExists != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS && newPredicateExists != null)) {
 			if (EcoreUtil.isAncestor(this, newPredicateExists))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newPredicateExists != null)
 				msgs = ((InternalEObject)newPredicateExists).eInverseAdd(this, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST, XMLPredicateExists.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newPredicateExists, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS, msgs);
+			msgs = basicSetPredicateExists(newPredicateExists, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -170,7 +180,17 @@
 	 */
     public XMLValueFunctionQuery getValueFunctionQuery() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY) return null;
-		return (XMLValueFunctionQuery)eContainer;
+		return (XMLValueFunctionQuery)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetValueFunctionQuery(XMLValueFunctionQuery newValueFunctionQuery, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newValueFunctionQuery, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY, msgs);
+		return msgs;
 	}
 
 	/**
@@ -179,15 +199,15 @@
 	 * @generated
 	 */
     public void setValueFunctionQuery(XMLValueFunctionQuery newValueFunctionQuery) {
-		if (newValueFunctionQuery != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY && newValueFunctionQuery != null)) {
+		if (newValueFunctionQuery != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY && newValueFunctionQuery != null)) {
 			if (EcoreUtil.isAncestor(this, newValueFunctionQuery))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newValueFunctionQuery != null)
 				msgs = ((InternalEObject)newValueFunctionQuery).eInverseAdd(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_QUERY__XQUERY_ARG_LIST, XMLValueFunctionQuery.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newValueFunctionQuery, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY, msgs);
+			msgs = basicSetValueFunctionQuery(newValueFunctionQuery, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -201,7 +221,17 @@
 	 */
     public XMLTableFunction getTableFunction() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION) return null;
-		return (XMLTableFunction)eContainer;
+		return (XMLTableFunction)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTableFunction(XMLTableFunction newTableFunction, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newTableFunction, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION, msgs);
+		return msgs;
 	}
 
 	/**
@@ -210,15 +240,15 @@
 	 * @generated
 	 */
     public void setTableFunction(XMLTableFunction newTableFunction) {
-		if (newTableFunction != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION && newTableFunction != null)) {
+		if (newTableFunction != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION && newTableFunction != null)) {
 			if (EcoreUtil.isAncestor(this, newTableFunction))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newTableFunction != null)
 				msgs = ((InternalEObject)newTableFunction).eInverseAdd(this, SQLXMLQueryModelPackage.XML_TABLE_FUNCTION__XQUERY_ARG_LIST, XMLTableFunction.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newTableFunction, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION, msgs);
+			msgs = basicSetTableFunction(newTableFunction, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -227,102 +257,72 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__XQUERY_ARG_LIST_CHILDREN:
-					return ((InternalEList)getXqueryArgListChildren()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetPredicateExists((XMLPredicateExists)otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__XQUERY_ARG_LIST_CHILDREN:
+				return ((InternalEList)getXqueryArgListChildren()).basicAdd(otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetValueFunctionQuery((XMLValueFunctionQuery)otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetTableFunction((XMLTableFunction)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-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 SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__XQUERY_ARG_LIST_CHILDREN:
-					return ((InternalEList)getXqueryArgListChildren()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS:
+				return basicSetPredicateExists(null, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__XQUERY_ARG_LIST_CHILDREN:
+				return ((InternalEList)getXqueryArgListChildren()).basicRemove(otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY:
+				return basicSetValueFunctionQuery(null, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION:
+				return basicSetTableFunction(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST, XMLPredicateExists.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_QUERY__XQUERY_ARG_LIST, XMLValueFunctionQuery.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_TABLE_FUNCTION__XQUERY_ARG_LIST, XMLTableFunction.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID) {
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_ARG_LIST, XMLPredicateExists.class, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__VALUE_FUNCTION_QUERY:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_QUERY__XQUERY_ARG_LIST, XMLValueFunctionQuery.class, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_TABLE_FUNCTION__XQUERY_ARG_LIST, XMLTableFunction.class, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__LABEL:
-				return getLabel();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PASSING_MECHANISM:
 				return getPassingMechanism();
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS:
@@ -334,33 +334,16 @@
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION:
 				return getTableFunction();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__LABEL:
-				setLabel((String)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PASSING_MECHANISM:
 				setPassingMechanism((XMLPassingType)newValue);
 				return;
@@ -378,31 +361,16 @@
 				setTableFunction((XMLTableFunction)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PASSING_MECHANISM:
 				setPassingMechanism(PASSING_MECHANISM_EDEFAULT);
 				return;
@@ -419,26 +387,16 @@
 				setTableFunction((XMLTableFunction)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PASSING_MECHANISM:
 				return passingMechanism != PASSING_MECHANISM_EDEFAULT;
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__PREDICATE_EXISTS:
@@ -450,7 +408,7 @@
 			case SQLXMLQueryModelPackage.XML_QUERY_ARGUMENT_LIST__TABLE_FUNCTION:
 				return getTableFunction() != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryExpressionImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryExpressionImpl.java
index ac923f1..ecfa99a 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryExpressionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLQueryExpressionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLQueryExpressionImpl.java,v 1.1 2005/12/16 13:16:51 bpayton Exp $
+ * $Id: XMLQueryExpressionImpl.java,v 1.2 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -78,7 +78,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLQueryExpression();
+		return SQLXMLQueryModelPackage.Literals.XML_QUERY_EXPRESSION;
 	}
 
 	/**
@@ -109,7 +109,17 @@
 	 */
     public XMLPredicateExists getPredicateExists() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS) return null;
-		return (XMLPredicateExists)eContainer;
+		return (XMLPredicateExists)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetPredicateExists(XMLPredicateExists newPredicateExists, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newPredicateExists, SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS, msgs);
+		return msgs;
 	}
 
 	/**
@@ -118,15 +128,15 @@
 	 * @generated
 	 */
     public void setPredicateExists(XMLPredicateExists newPredicateExists) {
-		if (newPredicateExists != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS && newPredicateExists != null)) {
+		if (newPredicateExists != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS && newPredicateExists != null)) {
 			if (EcoreUtil.isAncestor(this, newPredicateExists))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newPredicateExists != null)
 				msgs = ((InternalEObject)newPredicateExists).eInverseAdd(this, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR, XMLPredicateExists.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newPredicateExists, SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS, msgs);
+			msgs = basicSetPredicateExists(newPredicateExists, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -140,7 +150,17 @@
 	 */
     public XMLValueFunctionQuery getValueFunctionQuery() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY) return null;
-		return (XMLValueFunctionQuery)eContainer;
+		return (XMLValueFunctionQuery)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetValueFunctionQuery(XMLValueFunctionQuery newValueFunctionQuery, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newValueFunctionQuery, SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY, msgs);
+		return msgs;
 	}
 
 	/**
@@ -149,15 +169,15 @@
 	 * @generated
 	 */
     public void setValueFunctionQuery(XMLValueFunctionQuery newValueFunctionQuery) {
-		if (newValueFunctionQuery != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY && newValueFunctionQuery != null)) {
+		if (newValueFunctionQuery != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY && newValueFunctionQuery != null)) {
 			if (EcoreUtil.isAncestor(this, newValueFunctionQuery))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newValueFunctionQuery != null)
 				msgs = ((InternalEObject)newValueFunctionQuery).eInverseAdd(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_QUERY__XQUERY_EXPR, XMLValueFunctionQuery.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newValueFunctionQuery, SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY, msgs);
+			msgs = basicSetValueFunctionQuery(newValueFunctionQuery, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -166,90 +186,60 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetPredicateExists((XMLPredicateExists)otherEnd, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetValueFunctionQuery((XMLValueFunctionQuery)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-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 SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS:
+				return basicSetPredicateExists(null, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY:
+				return basicSetValueFunctionQuery(null, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR, XMLPredicateExists.class, msgs);
-				case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY:
-					return eContainer.eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_QUERY__XQUERY_EXPR, XMLValueFunctionQuery.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID) {
+			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_PREDICATE_EXISTS__XQUERY_EXPR, XMLPredicateExists.class, msgs);
+			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY:
+				return eInternalContainer().eInverseRemove(this, SQLXMLQueryModelPackage.XML_VALUE_FUNCTION_QUERY__XQUERY_EXPR, XMLValueFunctionQuery.class, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__LABEL:
-				return getLabel();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__XQUERY_EXPR_CONTENT:
 				return getXqueryExprContent();
 			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS:
@@ -257,33 +247,16 @@
 			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY:
 				return getValueFunctionQuery();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__LABEL:
-				setLabel((String)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__XQUERY_EXPR_CONTENT:
 				setXqueryExprContent((String)newValue);
 				return;
@@ -294,31 +267,16 @@
 				setValueFunctionQuery((XMLValueFunctionQuery)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__XQUERY_EXPR_CONTENT:
 				setXqueryExprContent(XQUERY_EXPR_CONTENT_EDEFAULT);
 				return;
@@ -329,26 +287,16 @@
 				setValueFunctionQuery((XMLValueFunctionQuery)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__XQUERY_EXPR_CONTENT:
 				return XQUERY_EXPR_CONTENT_EDEFAULT == null ? xqueryExprContent != null : !XQUERY_EXPR_CONTENT_EDEFAULT.equals(xqueryExprContent);
 			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__PREDICATE_EXISTS:
@@ -356,7 +304,7 @@
 			case SQLXMLQueryModelPackage.XML_QUERY_EXPRESSION__VALUE_FUNCTION_QUERY:
 				return getValueFunctionQuery() != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionEncodingImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionEncodingImpl.java
index 9078969..064831d 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionEncodingImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionEncodingImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLSerializeFunctionEncodingImpl.java,v 1.3 2005/12/19 20:57:49 bpayton Exp $
+ * $Id: XMLSerializeFunctionEncodingImpl.java,v 1.4 2005/12/22 22:21:17 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -71,7 +71,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLSerializeFunctionEncoding();
+		return SQLXMLQueryModelPackage.Literals.XML_SERIALIZE_FUNCTION_ENCODING;
 	}
 
 	/**
@@ -100,18 +100,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__ENCODING_NAME:
+				return getEncodingName();
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -119,124 +113,40 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).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 SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__ENCODING_NAME:
-				return getEncodingName();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__LABEL:
-				setLabel((String)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__ENCODING_NAME:
 				setEncodingName((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__ENCODING_NAME:
 				setEncodingName(ENCODING_NAME_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_ENCODING__ENCODING_NAME:
 				return ENCODING_NAME_EDEFAULT == null ? encodingName != null : !ENCODING_NAME_EDEFAULT.equals(encodingName);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionImpl.java
index f668cd9..f12223d 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLSerializeFunctionImpl.java,v 1.3 2005/12/19 20:57:49 bpayton Exp $
+ * $Id: XMLSerializeFunctionImpl.java,v 1.4 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -163,7 +163,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLSerializeFunction();
+		return SQLXMLQueryModelPackage.Literals.XML_SERIALIZE_FUNCTION;
 	}
 
 	/**
@@ -317,240 +317,17 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUES_ROW:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__ORDER_BY_VALUE_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__ORDER_BY_VALUE_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__RESULT_COLUMN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__RESULT_COLUMN, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_PATTERN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_PATTERN, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_MATCHING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_MATCHING, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PREDICATE_NULL:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PREDICATE_NULL, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT1:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT1, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT2:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT2, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CAST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CAST, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_FUNCTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__GROUPING_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__GROUPING_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_ELSE, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_ESCAPE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_ESCAPE, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_LABELED_DURATION, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UPDATE_SOURCE_EXPR_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PARAMETER_LIST:
-					return ((InternalEList)getParameterList()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_TARGET:
-					if (serializeTarget != null)
-						msgs = ((InternalEObject)serializeTarget).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_TARGET, null, msgs);
-					return basicSetSerializeTarget((XMLSerializeFunctionTarget)otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_TARGET:
+				if (serializeTarget != null)
+					msgs = ((InternalEObject)serializeTarget).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_TARGET, null, msgs);
+				return basicSetSerializeTarget((XMLSerializeFunctionTarget)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- 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 SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DATA_TYPE:
-					return basicSetDataType(null, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUES_ROW:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__ORDER_BY_VALUE_EXPR:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__ORDER_BY_VALUE_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__RESULT_COLUMN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__RESULT_COLUMN, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_PATTERN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_PATTERN, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_MATCHING:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_MATCHING, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PREDICATE_NULL:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PREDICATE_NULL, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT1:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT1, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT2:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT2, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CAST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CAST, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_FUNCTION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__GROUPING_EXPR:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__GROUPING_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_ELSE, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_ESCAPE:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_ESCAPE, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_LABELED_DURATION, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NEST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UPDATE_SOURCE_EXPR_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PARAMETER_LIST:
-					return ((InternalEList)getParameterList()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_TARGET:
-					return basicSetSerializeTarget(null, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_ENCODING:
-					return basicSetSerializeEncoding(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -558,172 +335,23 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUES_ROW:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUES_ROW__EXPR_LIST, ValuesRow.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__ORDER_BY_VALUE_EXPR:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.ORDER_BY_VALUE_EXPRESSION__VALUE_EXPR, OrderByValueExpression.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__RESULT_COLUMN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.RESULT_COLUMN__VALUE_EXPR, ResultColumn.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BASIC__RIGHT_VALUE_EXPR, PredicateBasic.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BASIC__LEFT_VALUE_EXPR, PredicateBasic.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_PATTERN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__PATTERN_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_MATCHING:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__MATCHING_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PREDICATE_NULL:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IS_NULL__VALUE_EXPR, PredicateIsNull.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_LIST__VALUE_EXPR_LIST, PredicateInValueList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_LIST__VALUE_EXPR, PredicateInValueList.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_ROW_SELECT__VALUE_EXPR_LIST, PredicateInValueRowSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_IN_VALUE_SELECT__VALUE_EXPR, PredicateInValueSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_QUANTIFIED_ROW_SELECT__VALUE_EXPR_LIST, PredicateQuantifiedRowSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_QUANTIFIED_VALUE_SELECT__VALUE_EXPR, PredicateQuantifiedValueSelect.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__LEFT_VALUE_EXPR, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT1:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__RIGHT_VALUE_EXPR1, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT2:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_BETWEEN__RIGHT_VALUE_EXPR2, PredicateBetween.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CAST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CAST__VALUE_EXPR, ValueExpressionCast.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_FUNCTION:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_FUNCTION__PARAMETER_LIST, ValueExpressionFunction.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_COMBINED__LEFT_VALUE_EXPR, ValueExpressionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_COMBINED__RIGHT_VALUE_EXPR, ValueExpressionCombined.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__GROUPING_EXPR:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.GROUPING_EXPRESSION__VALUE_EXPR, GroupingExpression.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_ELSE__VALUE_EXPR, ValueExpressionCaseElse.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE__VALUE_EXPR, ValueExpressionCaseSimple.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE_CONTENT__WHEN_VALUE_EXPR, ValueExpressionCaseSimpleContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SIMPLE_CONTENT__RESULT_VALUE_EXPR, ValueExpressionCaseSimpleContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_CASE_SEARCH_CONTENT__VALUE_EXPR, ValueExpressionCaseSearchContent.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_ESCAPE:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.PREDICATE_LIKE__ESCAPE_VALUE_EXPR, PredicateLike.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_LABELED_DURATION__VALUE_EXPR, ValueExpressionLabeledDuration.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NEST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.VALUE_EXPRESSION_NESTED__NESTED_VALUE_EXPR, ValueExpressionNested.class, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-					return eContainer.eInverseRemove(this, SQLQueryModelPackage.UPDATE_SOURCE_EXPR_LIST__VALUE_EXPR_LIST, UpdateSourceExprList.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_TARGET:
+				return basicSetSerializeTarget(null, msgs);
+			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_ENCODING:
+				return basicSetSerializeEncoding(null, msgs);
 		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__EANNOTATIONS:
-				return getEAnnotations();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NAME:
-				return getName();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DEPENDENCIES:
-				return getDependencies();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DESCRIPTION:
-				return getDescription();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LABEL:
-				return getLabel();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UNARY_OPERATOR:
-				return getUnaryOperator();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DATA_TYPE:
-				return getDataType();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUES_ROW:
-				return getValuesRow();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__ORDER_BY_VALUE_EXPR:
-				return getOrderByValueExpr();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__RESULT_COLUMN:
-				return getResultColumn();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_RIGHT:
-				return getBasicRight();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_LEFT:
-				return getBasicLeft();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_PATTERN:
-				return getLikePattern();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_MATCHING:
-				return getLikeMatching();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PREDICATE_NULL:
-				return getPredicateNull();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_RIGHT:
-				return getInValueListRight();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_LEFT:
-				return getInValueListLeft();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-				return getInValueRowSelectLeft();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_SELECT_LEFT:
-				return getInValueSelectLeft();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-				return getQuantifiedRowSelectLeft();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-				return getQuantifiedValueSelectLeft();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_LEFT:
-				return getBetweenLeft();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT1:
-				return getBetweenRight1();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT2:
-				return getBetweenRight2();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CAST:
-				return getValueExprCast();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_FUNCTION:
-				return getValueExprFunction();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-				return getValueExprCombinedLeft();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-				return getValueExprCombinedRight();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__GROUPING_EXPR:
-				return getGroupingExpr();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-				return getValueExprCaseElse();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-				return getValueExprCaseSimple();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				return getValueExprCaseSimpleContentWhen();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				return getValueExprCaseSimpleContentResult();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_ESCAPE:
-				return getLikeEscape();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-				return getValueExprLabeledDuration();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NEST:
-				return getNest();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-				return getUpdateSourceExprList();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SPECIAL_REGISTER:
-				return isSpecialRegister() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DISTINCT:
-				return isDistinct() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__COLUMN_FUNCTION:
-				return isColumnFunction() ? Boolean.TRUE : Boolean.FALSE;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PARAMETER_LIST:
-				return getParameterList();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__FUNCTION:
-				if (resolve) return getFunction();
-				return basicGetFunction();
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__CONTENT_OPTION:
 				return getContentOption();
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_VERSION:
@@ -735,148 +363,16 @@
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_ENCODING:
 				return getSerializeEncoding();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NAME:
-				setName((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DEPENDENCIES:
-				getDependencies().clear();
-				getDependencies().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LABEL:
-				setLabel((String)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UNARY_OPERATOR:
-				setUnaryOperator((ValueExpressionUnaryOperator)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DATA_TYPE:
-				setDataType((DataType)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUES_ROW:
-				setValuesRow((ValuesRow)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__ORDER_BY_VALUE_EXPR:
-				setOrderByValueExpr((OrderByValueExpression)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__RESULT_COLUMN:
-				setResultColumn((ResultColumn)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_RIGHT:
-				setBasicRight((PredicateBasic)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_LEFT:
-				setBasicLeft((PredicateBasic)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_PATTERN:
-				setLikePattern((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_MATCHING:
-				setLikeMatching((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PREDICATE_NULL:
-				setPredicateNull((PredicateIsNull)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_RIGHT:
-				setInValueListRight((PredicateInValueList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_LEFT:
-				setInValueListLeft((PredicateInValueList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-				setInValueRowSelectLeft((PredicateInValueRowSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_SELECT_LEFT:
-				setInValueSelectLeft((PredicateInValueSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-				setQuantifiedRowSelectLeft((PredicateQuantifiedRowSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-				setQuantifiedValueSelectLeft((PredicateQuantifiedValueSelect)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_LEFT:
-				setBetweenLeft((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT1:
-				setBetweenRight1((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT2:
-				setBetweenRight2((PredicateBetween)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CAST:
-				setValueExprCast((ValueExpressionCast)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_FUNCTION:
-				setValueExprFunction((ValueExpressionFunction)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-				setValueExprCombinedLeft((ValueExpressionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-				setValueExprCombinedRight((ValueExpressionCombined)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__GROUPING_EXPR:
-				setGroupingExpr((GroupingExpression)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-				setValueExprCaseElse((ValueExpressionCaseElse)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-				setValueExprCaseSimple((ValueExpressionCaseSimple)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				setValueExprCaseSimpleContentWhen((ValueExpressionCaseSimpleContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				setValueExprCaseSimpleContentResult((ValueExpressionCaseSimpleContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_ESCAPE:
-				setLikeEscape((PredicateLike)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-				setValueExprLabeledDuration((ValueExpressionLabeledDuration)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NEST:
-				setNest((ValueExpressionNested)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-				setUpdateSourceExprList((UpdateSourceExprList)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SPECIAL_REGISTER:
-				setSpecialRegister(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DISTINCT:
-				setDistinct(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__COLUMN_FUNCTION:
-				setColumnFunction(((Boolean)newValue).booleanValue());
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PARAMETER_LIST:
-				getParameterList().clear();
-				getParameterList().addAll((Collection)newValue);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__FUNCTION:
-				setFunction((Function)newValue);
-				return;
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__CONTENT_OPTION:
 				setContentOption((XMLContentType)newValue);
 				return;
@@ -893,145 +389,16 @@
 				setSerializeEncoding((XMLSerializeFunctionEncoding)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DEPENDENCIES:
-				getDependencies().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UNARY_OPERATOR:
-				setUnaryOperator(UNARY_OPERATOR_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DATA_TYPE:
-				setDataType((DataType)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUES_ROW:
-				setValuesRow((ValuesRow)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__ORDER_BY_VALUE_EXPR:
-				setOrderByValueExpr((OrderByValueExpression)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__RESULT_COLUMN:
-				setResultColumn((ResultColumn)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_RIGHT:
-				setBasicRight((PredicateBasic)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_LEFT:
-				setBasicLeft((PredicateBasic)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_PATTERN:
-				setLikePattern((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_MATCHING:
-				setLikeMatching((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PREDICATE_NULL:
-				setPredicateNull((PredicateIsNull)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_RIGHT:
-				setInValueListRight((PredicateInValueList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_LEFT:
-				setInValueListLeft((PredicateInValueList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-				setInValueRowSelectLeft((PredicateInValueRowSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_SELECT_LEFT:
-				setInValueSelectLeft((PredicateInValueSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-				setQuantifiedRowSelectLeft((PredicateQuantifiedRowSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-				setQuantifiedValueSelectLeft((PredicateQuantifiedValueSelect)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_LEFT:
-				setBetweenLeft((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT1:
-				setBetweenRight1((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT2:
-				setBetweenRight2((PredicateBetween)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CAST:
-				setValueExprCast((ValueExpressionCast)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_FUNCTION:
-				setValueExprFunction((ValueExpressionFunction)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-				setValueExprCombinedLeft((ValueExpressionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-				setValueExprCombinedRight((ValueExpressionCombined)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__GROUPING_EXPR:
-				setGroupingExpr((GroupingExpression)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-				setValueExprCaseElse((ValueExpressionCaseElse)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-				setValueExprCaseSimple((ValueExpressionCaseSimple)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				setValueExprCaseSimpleContentWhen((ValueExpressionCaseSimpleContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				setValueExprCaseSimpleContentResult((ValueExpressionCaseSimpleContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				setValueExprCaseSearchContent((ValueExpressionCaseSearchContent)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_ESCAPE:
-				setLikeEscape((PredicateLike)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-				setValueExprLabeledDuration((ValueExpressionLabeledDuration)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NEST:
-				setNest((ValueExpressionNested)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-				setUpdateSourceExprList((UpdateSourceExprList)null);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SPECIAL_REGISTER:
-				setSpecialRegister(SPECIAL_REGISTER_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DISTINCT:
-				setDistinct(DISTINCT_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__COLUMN_FUNCTION:
-				setColumnFunction(COLUMN_FUNCTION_EDEFAULT);
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PARAMETER_LIST:
-				getParameterList().clear();
-				return;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__FUNCTION:
-				setFunction((Function)null);
-				return;
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__CONTENT_OPTION:
 				setContentOption(CONTENT_OPTION_EDEFAULT);
 				return;
@@ -1048,102 +415,16 @@
 				setSerializeEncoding((XMLSerializeFunctionEncoding)null);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DEPENDENCIES:
-				return dependencies != null && !dependencies.isEmpty();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UNARY_OPERATOR:
-				return unaryOperator != UNARY_OPERATOR_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DATA_TYPE:
-				return dataType != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUES_ROW:
-				return getValuesRow() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__ORDER_BY_VALUE_EXPR:
-				return getOrderByValueExpr() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__RESULT_COLUMN:
-				return getResultColumn() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_RIGHT:
-				return getBasicRight() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BASIC_LEFT:
-				return getBasicLeft() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_PATTERN:
-				return getLikePattern() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_MATCHING:
-				return getLikeMatching() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PREDICATE_NULL:
-				return getPredicateNull() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_RIGHT:
-				return getInValueListRight() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_LIST_LEFT:
-				return getInValueListLeft() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_ROW_SELECT_LEFT:
-				return getInValueRowSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__IN_VALUE_SELECT_LEFT:
-				return getInValueSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_ROW_SELECT_LEFT:
-				return getQuantifiedRowSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__QUANTIFIED_VALUE_SELECT_LEFT:
-				return getQuantifiedValueSelectLeft() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_LEFT:
-				return getBetweenLeft() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT1:
-				return getBetweenRight1() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__BETWEEN_RIGHT2:
-				return getBetweenRight2() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CAST:
-				return getValueExprCast() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_FUNCTION:
-				return getValueExprFunction() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_LEFT:
-				return getValueExprCombinedLeft() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_COMBINED_RIGHT:
-				return getValueExprCombinedRight() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__GROUPING_EXPR:
-				return getGroupingExpr() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_ELSE:
-				return getValueExprCaseElse() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE:
-				return getValueExprCaseSimple() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-				return getValueExprCaseSimpleContentWhen() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-				return getValueExprCaseSimpleContentResult() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_CASE_SEARCH_CONTENT:
-				return getValueExprCaseSearchContent() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__LIKE_ESCAPE:
-				return getLikeEscape() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__VALUE_EXPR_LABELED_DURATION:
-				return getValueExprLabeledDuration() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__NEST:
-				return getNest() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__UPDATE_SOURCE_EXPR_LIST:
-				return getUpdateSourceExprList() != null;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SPECIAL_REGISTER:
-				return specialRegister != SPECIAL_REGISTER_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__DISTINCT:
-				return distinct != DISTINCT_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__COLUMN_FUNCTION:
-				return columnFunction != COLUMN_FUNCTION_EDEFAULT;
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__PARAMETER_LIST:
-				return parameterList != null && !parameterList.isEmpty();
-			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__FUNCTION:
-				return function != null;
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__CONTENT_OPTION:
 				return contentOption != CONTENT_OPTION_EDEFAULT;
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_VERSION:
@@ -1155,7 +436,7 @@
 			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_ENCODING:
 				return serializeEncoding != null;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionTargetImpl.java b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionTargetImpl.java
index 4cf2a3a..1ca91b8 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionTargetImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/src/org/eclipse/datatools/modelbase/sql/xml/query/impl/XMLSerializeFunctionTargetImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: XMLSerializeFunctionTargetImpl.java,v 1.2 2005/12/17 01:52:31 bpayton Exp $
+ * $Id: XMLSerializeFunctionTargetImpl.java,v 1.3 2005/12/22 22:21:18 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.sql.xml.query.impl;
 
@@ -88,7 +88,7 @@
 	 * @generated
 	 */
     protected EClass eStaticClass() {
-		return SQLXMLQueryModelPackage.eINSTANCE.getXMLSerializeFunctionTarget();
+		return SQLXMLQueryModelPackage.Literals.XML_SERIALIZE_FUNCTION_TARGET;
 	}
 
 	/**
@@ -98,7 +98,17 @@
 	 */
     public XMLSerializeFunction getSerializeFunction() {
 		if (eContainerFeatureID != SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__SERIALIZE_FUNCTION) return null;
-		return (XMLSerializeFunction)eContainer;
+		return (XMLSerializeFunction)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetSerializeFunction(XMLSerializeFunction newSerializeFunction, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newSerializeFunction, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__SERIALIZE_FUNCTION, msgs);
+		return msgs;
 	}
 
 	/**
@@ -107,15 +117,15 @@
 	 * @generated
 	 */
     public void setSerializeFunction(XMLSerializeFunction newSerializeFunction) {
-		if (newSerializeFunction != eContainer || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__SERIALIZE_FUNCTION && newSerializeFunction != null)) {
+		if (newSerializeFunction != eInternalContainer() || (eContainerFeatureID != SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__SERIALIZE_FUNCTION && newSerializeFunction != null)) {
 			if (EcoreUtil.isAncestor(this, newSerializeFunction))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eContainer != null)
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newSerializeFunction != null)
 				msgs = ((InternalEObject)newSerializeFunction).eInverseAdd(this, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION__SERIALIZE_TARGET, XMLSerializeFunction.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newSerializeFunction, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__SERIALIZE_FUNCTION, msgs);
+			msgs = basicSetSerializeFunction(newSerializeFunction, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
@@ -167,531 +177,69 @@
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUES_ROW:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__ORDER_BY_VALUE_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__ORDER_BY_VALUE_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__RESULT_COLUMN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__RESULT_COLUMN, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BASIC_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BASIC_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BASIC_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BASIC_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__LIKE_PATTERN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__LIKE_PATTERN, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__LIKE_MATCHING:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__LIKE_MATCHING, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__PREDICATE_NULL:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__PREDICATE_NULL, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__IN_VALUE_LIST_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__IN_VALUE_LIST_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__IN_VALUE_LIST_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__IN_VALUE_LIST_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__IN_VALUE_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__IN_VALUE_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__IN_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__IN_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__QUANTIFIED_ROW_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__QUANTIFIED_ROW_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__QUANTIFIED_VALUE_SELECT_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__QUANTIFIED_VALUE_SELECT_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BETWEEN_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BETWEEN_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BETWEEN_RIGHT1:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BETWEEN_RIGHT1, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BETWEEN_RIGHT2:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__BETWEEN_RIGHT2, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CAST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CAST, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_FUNCTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_FUNCTION, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_COMBINED_LEFT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_COMBINED_LEFT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_COMBINED_RIGHT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_COMBINED_RIGHT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__GROUPING_EXPR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__GROUPING_EXPR, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_ELSE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_ELSE, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_SIMPLE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_SIMPLE, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_SIMPLE_CONTENT_WHEN, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_SIMPLE_CONTENT_RESULT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_SEARCH_CONTENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_CASE_SEARCH_CONTENT, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__LIKE_ESCAPE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__LIKE_ESCAPE, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_LABELED_DURATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUE_EXPR_LABELED_DURATION, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__NEST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__NEST, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__UPDATE_SOURCE_EXPR_LIST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__UPDATE_SOURCE_EXPR_LIST, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__SERIALIZE_FUNCTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__SERIALIZE_FUNCTION, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__SERIALIZE_FUNCTION:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetSerializeFunction((XMLSerializeFunction)otherEnd, msgs);
 		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-     * <!-- end-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 SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__DEPENDENCIES:
-					return ((InternalEList)getDependencies()).basicRemove(otherEnd, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__DATA_TYPE:
-					return basicSetDataType(null, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUES_ROW:
-					return eBasicSetContainer(null, SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGET__VALUES_ROW, msgs);
-				case SQLXMLQueryModelPackage.XML_SERIALIZE_FUNCTION_TARGE