186030 - applied Paul's patch - uniqueConstraints columnNames do not work in xml
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/core.ecore b/jpa/plugins/org.eclipse.jpt.core/model/core.ecore
index 5187cee..eaf0f0e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/core.ecore
+++ b/jpa/plugins/org.eclipse.jpt.core/model/core.ecore
@@ -78,7 +78,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="IJpaRootContentNode" abstract="true"
       interface="true" eSuperTypes="#//IJpaContentNode">
     <eStructuralFeatures xsi:type="ecore:EReference" name="jpaFile" eType="#//IJpaFile"
-        changeable="false" defaultValueLiteral="" eOpposite="#//JpaFile/content"/>
+        changeable="false" eOpposite="#//JpaFile/content"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IPersistentType" abstract="true" interface="true"
       eSuperTypes="#//IJpaContentNode">
@@ -205,8 +205,8 @@
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="IUniqueConstraint" abstract="true"
         interface="true" eSuperTypes="#//IJpaSourceObject">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnNames" upperBound="-1"
-          eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnNames" unique="false"
+          upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="INamedColumn" abstract="true" interface="true"
         eSuperTypes="#//IJpaSourceObject">
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/java.ecore b/jpa/plugins/org.eclipse.jpt.core/model/java.ecore
index 7c3425f..ef96ec7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/java.ecore
+++ b/jpa/plugins/org.eclipse.jpt.core/model/java.ecore
@@ -13,11 +13,11 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="JavaPersistentType" eSuperTypes="#//JavaEObject core.ecore#//IPersistentType">
     <eStructuralFeatures xsi:type="ecore:EReference" name="mapping" lowerBound="1"
-        eType="#//IJavaTypeMapping" defaultValueLiteral="" containment="true"/>
+        eType="#//IJavaTypeMapping" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
         eType="#//JavaPersistentAttribute" containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="access" eType="ecore:EEnum core.ecore#//AccessType"
-        changeable="false" defaultValueLiteral=""/>
+        changeable="false"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="JavaPersistentAttribute" eSuperTypes="#//JavaEObject core.ecore#//IPersistentAttribute">
     <eStructuralFeatures xsi:type="ecore:EReference" name="defaultMapping" lowerBound="1"
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
index f6cafd0..670d9b2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
@@ -10,13 +10,12 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EntityMappingsInternal" eSuperTypes="core.ecore#//XmlEObject core.ecore#//IJpaContentNode #//EntityMappingsForXml #//EntityMappings">
     <eStructuralFeatures xsi:type="ecore:EReference" name="root" ordered="false" unique="false"
-        lowerBound="1" eType="#//XmlRootContentNode" defaultValueLiteral="" resolveProxies="false"
-        eOpposite="#//XmlRootContentNode/entityMappings"/>
+        lowerBound="1" eType="#//XmlRootContentNode" resolveProxies="false" eOpposite="#//XmlRootContentNode/entityMappings"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnitMetadataInternal"
         lowerBound="1" eType="#//PersistenceUnitMetadataInternal" changeable="false"
-        defaultValueLiteral="" containment="true"/>
+        containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageInternal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultSchema" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="specifiedSchema" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -31,7 +30,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="access" eType="ecore:EEnum core.ecore#//AccessType"
         changeable="false" volatile="true" transient="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="typeMappings" upperBound="-1"
-        eType="#//XmlTypeMapping" defaultValueLiteral="" containment="true" resolveProxies="false"/>
+        eType="#//XmlTypeMapping" containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="persistentTypes" upperBound="-1"
         eType="#//XmlPersistentType" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerators" upperBound="-1"
@@ -45,8 +44,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EntityMappings" abstract="true" interface="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnitMetadata"
-        eType="#//PersistenceUnitMetadata" changeable="false" volatile="true" defaultValueLiteral=""
-        resolveProxies="false"/>
+        eType="#//PersistenceUnitMetadata" changeable="false" volatile="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="package" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         volatile="true"/>
   </eClassifiers>
@@ -141,29 +139,26 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnitDefaultsInternal"
         lowerBound="1" eType="#//PersistenceUnitDefaultsInternal" changeable="false"
-        defaultValueLiteral="" containment="true"/>
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PersistenceUnitMetadata" abstract="true"
       interface="true" eSuperTypes="core.ecore#//IXmlEObject">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMappingMetadataComplete"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" volatile="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnitDefaults"
-        eType="#//PersistenceUnitDefaults" changeable="false" volatile="true" defaultValueLiteral=""
-        resolveProxies="false"/>
+        eType="#//PersistenceUnitDefaults" changeable="false" volatile="true" resolveProxies="false"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PersistenceUnitMetadataForXml" abstract="true"
       interface="true" eSuperTypes="core.ecore#//IXmlEObject">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMappingMetadataCompleteForXml"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" volatile="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnitDefaultsForXml"
-        eType="#//PersistenceUnitDefaultsForXml" volatile="true" defaultValueLiteral=""
-        resolveProxies="false"/>
+        eType="#//PersistenceUnitDefaultsForXml" volatile="true" resolveProxies="false"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PersistenceUnitDefaultsInternal" eSuperTypes="core.ecore#//XmlEObject #//PersistenceUnitDefaults #//PersistenceUnitDefaultsForXml">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="schemaInternal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalogInternal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessInternal" eType="ecore:EEnum core.ecore#//AccessType"
-        defaultValueLiteral=""/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessInternal" eType="ecore:EEnum core.ecore#//AccessType"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadePersistInternal"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
@@ -174,7 +169,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         volatile="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="access" eType="ecore:EEnum core.ecore#//AccessType"
-        volatile="true" defaultValueLiteral=""/>
+        volatile="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadePersist" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         volatile="true"/>
   </eClassifiers>
@@ -185,7 +180,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalogForXml" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         volatile="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessForXml" eType="ecore:EEnum core.ecore#//AccessType"
-        volatile="true" defaultValueLiteral=""/>
+        volatile="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadePersistForXml" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         volatile="true"/>
   </eClassifiers>
@@ -269,12 +264,10 @@
   <eClassifiers xsi:type="ecore:EClass" name="XmlUniqueConstraint" eSuperTypes="core.ecore#//XmlEObject core.ecore#//mappings/IUniqueConstraint"/>
   <eClassifiers xsi:type="ecore:EClass" name="XmlCascade" eSuperTypes="core.ecore#//XmlEObject core.ecore#//mappings/ICascade"/>
   <eClassifiers xsi:type="ecore:EClass" name="XmlIdClass" eSuperTypes="core.ecore#//XmlEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-        defaultValueLiteral=""/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="XmlInheritance" eSuperTypes="core.ecore#//XmlEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="ecore:EEnum core.ecore#//mappings/InheritanceType"
-        defaultValueLiteral=""/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="ecore:EEnum core.ecore#//mappings/InheritanceType"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="XmlMapKey" eSuperTypes="core.ecore#//XmlEObject">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AccessType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AccessType.java
index a21c66d..26706f2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AccessType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AccessType.java
@@ -10,9 +10,6 @@
  *******************************************************************************/
 package org.eclipse.jpt.core.internal;
 
-import static org.eclipse.jpt.core.internal.AccessType.DEFAULT_VALUE;
-import static org.eclipse.jpt.core.internal.AccessType.FIELD_VALUE;
-import static org.eclipse.jpt.core.internal.AccessType.PROPERTY_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaProject.java
index 6b9a224..ca0c6db 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaProject.java
@@ -91,7 +91,7 @@
 	 * @generated
 	 */
 	void setDiscoverAnnotatedClasses(boolean discoverAnnotatedClasses);
-	
+
 	/**
 	 * Return the root "deploy path" for this project.
 	 * 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaRootContentNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaRootContentNode.java
index 3666fd7..00db1db 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaRootContentNode.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaRootContentNode.java
@@ -30,7 +30,6 @@
 {
 	/**
 	 * Returns the value of the '<em><b>Jpa File</b></em>' container reference.
-	 * The default value is <code>""</code>.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.jpt.core.internal.JpaFile#getContent <em>Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -41,7 +40,7 @@
 	 * @return the value of the '<em>Jpa File</em>' container reference.
 	 * @see org.eclipse.jpt.core.internal.JpaCorePackage#getIJpaRootContentNode_JpaFile()
 	 * @see org.eclipse.jpt.core.internal.JpaFile#getContent
-	 * @model opposite="content" changeable="false"
+	 * @model opposite="content" transient="false" changeable="false"
 	 * @generated
 	 */
 	IJpaFile getJpaFile();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaCorePackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaCorePackage.java
index 0ff0f2c..b081913 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaCorePackage.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaCorePackage.java
@@ -1413,19 +1413,19 @@
 		initEClass(jpaModelEClass, JpaModel.class, "JpaModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getJpaModel_Projects(), this.getIJpaProject(), null, "projects", null, 0, -1, JpaModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(iJpaEObjectEClass, IJpaEObject.class, "IJpaEObject", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iJpaEObjectEClass, this.getIJpaProject(), "getJpaProject", 0, 1);
+		addEOperation(iJpaEObjectEClass, this.getIJpaProject(), "getJpaProject", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(jpaEObjectEClass, JpaEObject.class, "JpaEObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(iJpaProjectEClass, IJpaProject.class, "IJpaProject", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iJpaProjectEClass, this.getIJpaModel(), "getModel", 1, 1);
-		addEOperation(iJpaProjectEClass, this.getIJpaPlatform(), "getPlatform", 1, 1);
-		EOperation op = addEOperation(iJpaProjectEClass, null, "setPlatform");
-		addEParameter(op, theEcorePackage.getEString(), "platformId", 1, 1);
-		addEOperation(iJpaProjectEClass, this.getIJpaDataSource(), "getDataSource", 1, 1);
-		op = addEOperation(iJpaProjectEClass, null, "setDataSource");
-		addEParameter(op, theEcorePackage.getEString(), "connectionProfileName", 1, 1);
-		addEOperation(iJpaProjectEClass, theEcorePackage.getEBoolean(), "isDiscoverAnnotatedClasses", 1, 1);
-		op = addEOperation(iJpaProjectEClass, null, "setDiscoverAnnotatedClasses");
-		addEParameter(op, theEcorePackage.getEBoolean(), "discoverAnnotatedClasses", 1, 1);
+		addEOperation(iJpaProjectEClass, this.getIJpaModel(), "getModel", 1, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iJpaProjectEClass, this.getIJpaPlatform(), "getPlatform", 1, 1, !IS_UNIQUE, !IS_ORDERED);
+		EOperation op = addEOperation(iJpaProjectEClass, null, "setPlatform", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "platformId", 1, 1, IS_UNIQUE, !IS_ORDERED);
+		addEOperation(iJpaProjectEClass, this.getIJpaDataSource(), "getDataSource", 1, 1, IS_UNIQUE, IS_ORDERED);
+		op = addEOperation(iJpaProjectEClass, null, "setDataSource", 1, 1, !IS_UNIQUE, !IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "connectionProfileName", 1, 1, !IS_UNIQUE, !IS_ORDERED);
+		addEOperation(iJpaProjectEClass, theEcorePackage.getEBoolean(), "isDiscoverAnnotatedClasses", 1, 1, IS_UNIQUE, IS_ORDERED);
+		op = addEOperation(iJpaProjectEClass, null, "setDiscoverAnnotatedClasses", 1, 1, !IS_UNIQUE, !IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEBoolean(), "discoverAnnotatedClasses", 1, 1, !IS_UNIQUE, !IS_ORDERED);
 		initEClass(jpaProjectEClass, JpaProject.class, "JpaProject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getJpaProject_Platform(), this.getIJpaPlatform(), null, "platform", null, 1, 1, JpaProject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getJpaProject_DataSource(), this.getIJpaDataSource(), null, "dataSource", null, 0, 1, JpaProject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -1433,41 +1433,41 @@
 		initEReference(getJpaProject_Files(), this.getIJpaFile(), null, "files", null, 0, -1, JpaProject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(iJpaPlatformEClass, IJpaPlatform.class, "IJpaPlatform", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(iJpaDataSourceEClass, IJpaDataSource.class, "IJpaDataSource", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iJpaDataSourceEClass, theEcorePackage.getEString(), "getConnectionProfileName", 1, 1);
+		addEOperation(iJpaDataSourceEClass, theEcorePackage.getEString(), "getConnectionProfileName", 1, 1, !IS_UNIQUE, !IS_ORDERED);
 		initEClass(jpaDataSourceEClass, JpaDataSource.class, "JpaDataSource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getJpaDataSource_ConnectionProfileName(), ecorePackage.getEString(), "connectionProfileName", null, 1, 1, JpaDataSource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(iJpaFileEClass, IJpaFile.class, "IJpaFile", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iJpaFileEClass, ecorePackage.getEString(), "getContentId", 1, 1);
-		addEOperation(iJpaFileEClass, this.getIJpaRootContentNode(), "getContent", 0, 1);
+		addEOperation(iJpaFileEClass, ecorePackage.getEString(), "getContentId", 1, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iJpaFileEClass, this.getIJpaRootContentNode(), "getContent", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(jpaFileEClass, JpaFile.class, "JpaFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getJpaFile_ContentId(), ecorePackage.getEString(), "contentId", null, 1, 1, JpaFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getJpaFile_Content(), this.getIJpaRootContentNode(), this.getIJpaRootContentNode_JpaFile(), "content", null, 0, 1, JpaFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(iJpaSourceObjectEClass, IJpaSourceObject.class, "IJpaSourceObject", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iJpaSourceObjectEClass, this.getIJpaFile(), "getJpaFile", 0, 1);
+		addEOperation(iJpaSourceObjectEClass, this.getIJpaFile(), "getJpaFile", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(iXmlEObjectEClass, IXmlEObject.class, "IXmlEObject", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(xmlEObjectEClass, XmlEObject.class, "XmlEObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(iJpaContentNodeEClass, IJpaContentNode.class, "IJpaContentNode", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iJpaContentNodeEClass, this.getIJpaFile(), "getJpaFile", 1, 1);
+		addEOperation(iJpaContentNodeEClass, this.getIJpaFile(), "getJpaFile", 1, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(iJpaRootContentNodeEClass, IJpaRootContentNode.class, "IJpaRootContentNode", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getIJpaRootContentNode_JpaFile(), this.getIJpaFile(), this.getJpaFile_Content(), "jpaFile", "", 0, 1, IJpaRootContentNode.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIJpaRootContentNode_JpaFile(), this.getIJpaFile(), this.getJpaFile_Content(), "jpaFile", null, 0, 1, IJpaRootContentNode.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(iPersistentTypeEClass, IPersistentType.class, "IPersistentType", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getIPersistentType_MappingKey(), ecorePackage.getEString(), "mappingKey", null, 1, 1, IPersistentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		addEOperation(iPersistentTypeEClass, this.getITypeMapping(), "getMapping", 1, 1);
-		addEOperation(iPersistentTypeEClass, this.getIPersistentType(), "parentPersistentType", 0, 1);
+		addEOperation(iPersistentTypeEClass, this.getITypeMapping(), "getMapping", 1, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iPersistentTypeEClass, this.getIPersistentType(), "parentPersistentType", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(iTypeMappingEClass, ITypeMapping.class, "ITypeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getITypeMapping_Name(), ecorePackage.getEString(), "name", null, 0, 1, ITypeMapping.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEAttribute(getITypeMapping_TableName(), ecorePackage.getEString(), "tableName", null, 0, 1, ITypeMapping.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		addEOperation(iTypeMappingEClass, this.getIPersistentType(), "getPersistentType", 1, 1);
+		addEOperation(iTypeMappingEClass, this.getIPersistentType(), "getPersistentType", 1, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(nullTypeMappingEClass, NullTypeMapping.class, "NullTypeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(iPersistentAttributeEClass, IPersistentAttribute.class, "IPersistentAttribute", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getIPersistentAttribute_Mapping(), this.getIAttributeMapping(), null, "mapping", null, 1, 1, IPersistentAttribute.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		addEOperation(iPersistentAttributeEClass, this.getITypeMapping(), "typeMapping", 1, 1);
-		addEOperation(iPersistentAttributeEClass, theEcorePackage.getEString(), "getName", 1, 1);
-		addEOperation(iPersistentAttributeEClass, ecorePackage.getEString(), "mappingKey", 1, 1);
-		addEOperation(iPersistentAttributeEClass, ecorePackage.getEString(), "defaultMappingKey", 1, 1);
+		addEOperation(iPersistentAttributeEClass, this.getITypeMapping(), "typeMapping", 1, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iPersistentAttributeEClass, theEcorePackage.getEString(), "getName", 1, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iPersistentAttributeEClass, ecorePackage.getEString(), "mappingKey", 1, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iPersistentAttributeEClass, ecorePackage.getEString(), "defaultMappingKey", 1, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(iAttributeMappingEClass, IAttributeMapping.class, "IAttributeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iAttributeMappingEClass, this.getIPersistentAttribute(), "getPersistentAttribute", 1, 1);
-		addEOperation(iAttributeMappingEClass, theEcorePackage.getEBoolean(), "isDefault", 0, 1);
+		addEOperation(iAttributeMappingEClass, this.getIPersistentAttribute(), "getPersistentAttribute", 1, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iAttributeMappingEClass, theEcorePackage.getEBoolean(), "isDefault", 0, 1, IS_UNIQUE, IS_ORDERED);
 		// Initialize enums and add enum literals
 		initEEnum(accessTypeEEnum, AccessType.class, "AccessType");
 		addEEnumLiteral(accessTypeEEnum, AccessType.DEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModel.java
index f99442f..5245e26 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModel.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModel.java
@@ -90,7 +90,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Projects</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.JpaCorePackage#getJpaModel_Projects()
-	 * @model type="org.eclipse.jpt.core.internal.IJpaProject" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJpaProject> getProjects() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProject.java
index f160b04..5eadeb8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProject.java
@@ -47,7 +47,6 @@
 import org.eclipse.jpt.db.internal.ConnectionProfile;
 import org.eclipse.jpt.db.internal.JptDbPlugin;
 import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyIterator;
 import org.eclipse.jst.j2ee.internal.J2EEConstants;
 import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
 import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
@@ -436,7 +435,7 @@
 	public boolean isSetDiscoverAnnotatedClasses() {
 		return discoverAnnotatedClassesESet;
 	}
-	
+
 	public String rootDeployLocation() {
 		String metaInfLocation = "";
 		try {
@@ -467,7 +466,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Files</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.JpaCorePackage#getJpaProject_Files()
-	 * @model type="org.eclipse.jpt.core.internal.IJpaFile" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJpaFile> getFiles() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JavaPersistentAttribute.java
index 4a50f4b..073e2d8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JavaPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JavaPersistentAttribute.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.core.internal.content.java;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JavaPersistentType.java
index 50b81df..7d8620d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JavaPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JavaPersistentType.java
@@ -299,7 +299,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Mapping</b></em>' containment reference.
-	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Mapping</em>' containment reference isn't clear,
@@ -393,7 +392,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Attributes</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.JpaJavaPackage#getJavaPersistentType_Attributes()
-	 * @model type="org.eclipse.jpt.core.internal.content.java.JavaPersistentAttribute" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<JavaPersistentAttribute> getAttributes() {
@@ -405,7 +404,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>""</code>.
 	 * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.AccessType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -416,7 +414,7 @@
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.internal.AccessType
 	 * @see org.eclipse.jpt.core.internal.content.java.JpaJavaPackage#getJavaPersistentType_Access()
-	 * @model default="" changeable="false"
+	 * @model changeable="false"
 	 * @generated
 	 */
 	public AccessType getAccess() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JpaCompilationUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JpaCompilationUnit.java
index e42ed42..1d8bdbc 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JpaCompilationUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JpaCompilationUnit.java
@@ -89,7 +89,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Jpa File</b></em>' container reference.
-	 * The default value is <code>""</code>.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.jpt.core.internal.JpaFile#getContent <em>Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -100,7 +99,7 @@
 	 * @return the value of the '<em>Jpa File</em>' container reference.
 	 * @see org.eclipse.jpt.core.internal.content.java.JpaJavaPackage#getIJpaRootContentNode_JpaFile()
 	 * @see org.eclipse.jpt.core.internal.JpaFile#getContent
-	 * @model opposite="content" changeable="false"
+	 * @model opposite="content" transient="false" changeable="false"
 	 * @generated
 	 */
 	@Override
@@ -121,7 +120,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Types</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.JpaJavaPackage#getJpaCompilationUnit_Types()
-	 * @model type="org.eclipse.jpt.core.internal.content.java.JavaPersistentType" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<JavaPersistentType> getTypes() {
@@ -368,13 +367,13 @@
 				this.synchCompilationUnitWithJavaDelta(delta);
 				break;
 			default :
-				break;  // the event is somehow lower than a compilation unit
+				break; // the event is somehow lower than a compilation unit
 		}
 	}
 
 	private void synchChildrenWithJavaDelta(IJavaElementDelta delta) {
 		for (IJavaElementDelta child : delta.getAffectedChildren()) {
-			this.synchWithJavaDelta(child);  // recurse
+			this.synchWithJavaDelta(child); // recurse
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JpaJavaPackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JpaJavaPackage.java
index 120ef85..d624b57 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JpaJavaPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/JpaJavaPackage.java
@@ -642,21 +642,21 @@
 		iJavaAttributeMappingEClass.getESuperTypes().add(theJpaCorePackage.getIAttributeMapping());
 		// Initialize classes and features; add operations and parameters
 		initEClass(javaEObjectEClass, JavaEObject.class, "JavaEObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(javaEObjectEClass, theJpaCorePackage.getIJpaFile(), "getJpaFile", 0, 1);
-		addEOperation(javaEObjectEClass, theJpaCorePackage.getIJpaRootContentNode(), "getRoot", 0, 1);
+		addEOperation(javaEObjectEClass, theJpaCorePackage.getIJpaFile(), "getJpaFile", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(javaEObjectEClass, theJpaCorePackage.getIJpaRootContentNode(), "getRoot", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(jpaCompilationUnitEClass, JpaCompilationUnit.class, "JpaCompilationUnit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getJpaCompilationUnit_Types(), this.getJavaPersistentType(), null, "types", null, 0, -1, JpaCompilationUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(javaPersistentTypeEClass, JavaPersistentType.class, "JavaPersistentType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getJavaPersistentType_Mapping(), this.getIJavaTypeMapping(), null, "mapping", "", 1, 1, JavaPersistentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getJavaPersistentType_Mapping(), this.getIJavaTypeMapping(), null, "mapping", null, 1, 1, JavaPersistentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getJavaPersistentType_Attributes(), this.getJavaPersistentAttribute(), null, "attributes", null, 0, -1, JavaPersistentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaPersistentType_Access(), theJpaCorePackage.getAccessType(), "access", "", 0, 1, JavaPersistentType.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getJavaPersistentType_Access(), theJpaCorePackage.getAccessType(), "access", null, 0, 1, JavaPersistentType.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(javaPersistentAttributeEClass, JavaPersistentAttribute.class, "JavaPersistentAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getJavaPersistentAttribute_DefaultMapping(), this.getIJavaAttributeMapping(), null, "defaultMapping", null, 1, 1, JavaPersistentAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getJavaPersistentAttribute_SpecifiedMapping(), this.getIJavaAttributeMapping(), null, "specifiedMapping", null, 1, 1, JavaPersistentAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(iJavaTypeMappingEClass, IJavaTypeMapping.class, "IJavaTypeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iJavaTypeMappingEClass, null, "initialize");
+		addEOperation(iJavaTypeMappingEClass, null, "initialize", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(iJavaAttributeMappingEClass, IJavaAttributeMapping.class, "IJavaAttributeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iJavaAttributeMappingEClass, null, "initialize");
+		addEOperation(iJavaAttributeMappingEClass, null, "initialize", 0, 1, IS_UNIQUE, IS_ORDERED);
 		// Create resource
 		createResource(eNS_URI);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/AbstractJavaTable.java
index 6bf5e1b..8dbe8e6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/AbstractJavaTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/AbstractJavaTable.java
@@ -547,7 +547,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Unique Constraints</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getITable_UniqueConstraints()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IUniqueConstraint" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IUniqueConstraint> getUniqueConstraints() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAbstractQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAbstractQuery.java
index bc6aba4..76230a7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAbstractQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAbstractQuery.java
@@ -289,7 +289,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Hints</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIQuery_Hints()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IQueryHint" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IQueryHint> getHints() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAssociationOverride.java
index 1966b57..cfd89de 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAssociationOverride.java
@@ -162,7 +162,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIAssociationOverride_SpecifiedJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getSpecifiedJoinColumns() {
@@ -183,7 +183,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIAssociationOverride_DefaultJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getDefaultJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEmbedded.java
index b92f7a8..b69f111 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEmbedded.java
@@ -248,7 +248,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEmbedded_SpecifiedAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAttributeOverride> getSpecifiedAttributeOverrides() {
@@ -269,7 +269,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEmbedded_DefaultAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAttributeOverride> getDefaultAttributeOverrides() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEntity.java
index ac15135..a648186 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEntity.java
@@ -1291,7 +1291,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Secondary Tables</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEntity_SpecifiedSecondaryTables()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.ISecondaryTable" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<ISecondaryTable> getSpecifiedSecondaryTables() {
@@ -1610,7 +1610,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEntity_SpecifiedPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IPrimaryKeyJoinColumn> getSpecifiedPrimaryKeyJoinColumns() {
@@ -1631,7 +1631,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEntity_DefaultPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IPrimaryKeyJoinColumn> getDefaultPrimaryKeyJoinColumns() {
@@ -1651,7 +1651,7 @@
 	public IAttributeOverride attributeOverrideNamed(String name) {
 		return (IAttributeOverride) overrideNamed(name, getAttributeOverrides());
 	}
-	
+
 	public boolean containsAttributeOverride(String name) {
 		return containsOverride(name, getAttributeOverrides());
 	}
@@ -1671,12 +1671,11 @@
 	public boolean containsSpecifiedAssociationOverride(String name) {
 		return containsOverride(name, getSpecifiedAssociationOverrides());
 	}
-	
+
 	public boolean containsDefaultAssociationOverride(String name) {
 		return containsOverride(name, getDefaultAssociationOverrides());
 	}
 
-
 	private IOverride overrideNamed(String name, List<? extends IOverride> overrides) {
 		for (IOverride override : overrides) {
 			String overrideName = override.getName();
@@ -1705,7 +1704,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEntity_SpecifiedAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAttributeOverride> getSpecifiedAttributeOverrides() {
@@ -1726,7 +1725,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEntity_DefaultAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAttributeOverride> getDefaultAttributeOverrides() {
@@ -1754,7 +1753,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Association Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEntity_SpecifiedAssociationOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAssociationOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAssociationOverride> getSpecifiedAssociationOverrides() {
@@ -1775,7 +1774,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Association Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEntity_DefaultAssociationOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAssociationOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAssociationOverride> getDefaultAssociationOverrides() {
@@ -1796,7 +1795,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Named Queries</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEntity_NamedQueries()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.INamedQuery" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<INamedQuery> getNamedQueries() {
@@ -1817,7 +1816,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Named Native Queries</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIEntity_NamedNativeQueries()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.INamedNativeQuery" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<INamedNativeQuery> getNamedNativeQueries() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaJoinTable.java
index 60bbfdd..06bb606 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaJoinTable.java
@@ -248,7 +248,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIJoinTable_SpecifiedJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getSpecifiedJoinColumns() {
@@ -269,7 +269,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIJoinTable_DefaultJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getDefaultJoinColumns() {
@@ -294,7 +294,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Inverse Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIJoinTable_SpecifiedInverseJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getSpecifiedInverseJoinColumns() {
@@ -315,7 +315,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Inverse Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIJoinTable_DefaultInverseJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getDefaultInverseJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaMultiRelationshipMapping.java
index c843c47..51e93a8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaMultiRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaMultiRelationshipMapping.java
@@ -372,7 +372,7 @@
 	 * @generated NOT
 	 */
 	public boolean isCustomOrdering() {
-		return ! StringTools.stringIsEmpty(getOrderBy());
+		return !StringTools.stringIsEmpty(getOrderBy());
 	}
 
 	public ITextRange mappedByTextRange() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSecondaryTable.java
index ecad438..5b52f1b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSecondaryTable.java
@@ -163,7 +163,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getISecondaryTable_SpecifiedPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IPrimaryKeyJoinColumn> getSpecifiedPrimaryKeyJoinColumns() {
@@ -184,7 +184,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getISecondaryTable_DefaultPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IPrimaryKeyJoinColumn> getDefaultPrimaryKeyJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSingleRelationshipMapping.java
index e6c7239..73dd74f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSingleRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSingleRelationshipMapping.java
@@ -337,7 +337,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getISingleRelationshipMapping_SpecifiedJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getSpecifiedJoinColumns() {
@@ -358,7 +358,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getISingleRelationshipMapping_DefaultJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getDefaultJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaTableGenerator.java
index d6377e8..a18eeea 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaTableGenerator.java
@@ -842,7 +842,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Unique Constraints</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getITableGenerator_UniqueConstraints()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IUniqueConstraint" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IUniqueConstraint> getUniqueConstraints() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaUniqueConstraint.java
index a3cd6e9..2e8165f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaUniqueConstraint.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaUniqueConstraint.java
@@ -14,7 +14,7 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
 import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.ArrayInitializer;
 import org.eclipse.jdt.core.dom.CompilationUnit;
@@ -137,12 +137,12 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Column Names</em>' attribute list.
 	 * @see org.eclipse.jpt.core.internal.content.java.mappings.JpaJavaMappingsPackage#getIUniqueConstraint_ColumnNames()
-	 * @model type="java.lang.String"
+	 * @model unique="false"
 	 * @generated
 	 */
 	public EList<String> getColumnNames() {
 		if (columnNames == null) {
-			columnNames = new EDataTypeUniqueEList<String>(String.class, this, JpaJavaMappingsPackage.JAVA_UNIQUE_CONSTRAINT__COLUMN_NAMES);
+			columnNames = new EDataTypeEList<String>(String.class, this, JpaJavaMappingsPackage.JAVA_UNIQUE_CONSTRAINT__COLUMN_NAMES);
 		}
 		return columnNames;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/util/JpaJavaMappingsSwitch.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/util/JpaJavaMappingsSwitch.java
index 887ae78..d6052b4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/util/JpaJavaMappingsSwitch.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/util/JpaJavaMappingsSwitch.java
@@ -1145,13 +1145,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Entity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Entity</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Entity</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Entity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1160,13 +1160,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Mapped Superclass</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Mapped Superclass</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Mapped Superclass</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Mapped Superclass</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1175,13 +1175,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Embeddable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Embeddable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Embeddable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Embeddable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1190,13 +1190,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Null Type Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Null Type Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Null Type Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Null Type Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1205,13 +1205,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Null Attribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Null Attribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Null Attribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Null Attribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1220,13 +1220,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Basic</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Basic</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Basic</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Basic</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1235,13 +1235,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Id</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Id</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Id</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1250,13 +1250,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Transient</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Transient</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Transient</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Transient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1265,13 +1265,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Version</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Version</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Version</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Version</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1280,13 +1280,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Embedded Id</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Embedded Id</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Embedded Id</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Embedded Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1295,13 +1295,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Embedded</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Embedded</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Embedded</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Embedded</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1310,13 +1310,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Attribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Attribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Attribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Attribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1325,13 +1325,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Type Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Type Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Type Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Type Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1340,13 +1340,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Abstract Java Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Java Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Abstract Java Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Java Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1355,13 +1355,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1370,13 +1370,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1385,13 +1385,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1400,13 +1400,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Single Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Single Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Single Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Single Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1415,13 +1415,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java One To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java One To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java One To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java One To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1430,13 +1430,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Many To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Many To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Many To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Many To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1445,13 +1445,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Join Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Join Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Join Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Join Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1460,13 +1460,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Named Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Named Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Named Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Named Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1475,13 +1475,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Abstract Java Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Java Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Abstract Java Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Java Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1490,13 +1490,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1505,13 +1505,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1520,13 +1520,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Attribute Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Attribute Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Attribute Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Attribute Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1535,13 +1535,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Association Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Association Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Association Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Association Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1550,13 +1550,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Discriminator Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Discriminator Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Discriminator Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Discriminator Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1565,13 +1565,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Primary Key Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Primary Key Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Primary Key Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Primary Key Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1580,13 +1580,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Generated Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Generated Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Generated Value</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Generated Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1595,13 +1595,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1610,13 +1610,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Table Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Table Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Table Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Table Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1625,13 +1625,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Sequence Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Sequence Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Sequence Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Sequence Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1640,13 +1640,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Abstract Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Abstract Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Abstract Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Abstract Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1655,13 +1655,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Named Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Named Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Named Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Named Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1670,13 +1670,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Named Native Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Named Native Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Named Native Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Named Native Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1685,13 +1685,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Query Hint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Query Hint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Query Hint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Query Hint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1700,13 +1700,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Unique Constraint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Unique Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Unique Constraint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Unique Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1715,13 +1715,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Cascade</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Cascade</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Cascade</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Cascade</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1730,13 +1730,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Secondary Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Secondary Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Secondary Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Secondary Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1745,13 +1745,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1760,13 +1760,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1775,13 +1775,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1790,13 +1790,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1805,13 +1805,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Many To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Many To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Many To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Many To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1820,13 +1820,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java One To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java One To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java One To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java One To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1835,13 +1835,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Multi Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Multi Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Multi Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Multi Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1850,13 +1850,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1865,13 +1865,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJava Type Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJava Type Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJava Type Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJava Type Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1880,13 +1880,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEntity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEntity</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEntity</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEntity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1895,13 +1895,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMapped Superclass</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMapped Superclass</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMapped Superclass</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMapped Superclass</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1910,13 +1910,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEmbeddable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEmbeddable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEmbeddable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEmbeddable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1925,13 +1925,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1940,13 +1940,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJava Attribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJava Attribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJava Attribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJava Attribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1955,13 +1955,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IColumn Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IColumn Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IColumn Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IColumn Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1970,13 +1970,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IBasic</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IBasic</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IBasic</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IBasic</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1985,13 +1985,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IId</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IId</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IId</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IId</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2000,13 +2000,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ITransient</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ITransient</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ITransient</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ITransient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2015,13 +2015,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IVersion</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IVersion</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IVersion</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IVersion</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2030,13 +2030,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEmbedded Id</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEmbedded Id</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEmbedded Id</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEmbedded Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2045,13 +2045,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEmbedded</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEmbedded</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEmbedded</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEmbedded</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2060,13 +2060,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ITable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ITable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ITable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ITable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2075,13 +2075,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IColumn</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IColumn</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IColumn</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IColumn</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2090,13 +2090,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAbstract Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAbstract Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAbstract Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAbstract Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2105,13 +2105,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IRelationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IRelationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IRelationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IRelationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2120,13 +2120,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2135,13 +2135,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IOne To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IOne To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IOne To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IOne To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2150,13 +2150,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMany To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMany To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMany To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMany To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2165,13 +2165,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJoin Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJoin Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJoin Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJoin Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2180,13 +2180,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INamed Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INamed Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INamed Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INamed Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2195,13 +2195,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAbstract Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAbstract Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAbstract Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAbstract Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2210,13 +2210,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJoin Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJoin Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJoin Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJoin Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2225,13 +2225,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IOverride</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IOverride</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IOverride</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IOverride</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2240,13 +2240,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAttribute Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAttribute Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAttribute Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAttribute Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2255,13 +2255,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAssociation Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAssociation Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAssociation Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAssociation Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2270,13 +2270,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IDiscriminator Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IDiscriminator Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IDiscriminator Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IDiscriminator Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2285,13 +2285,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IPrimary Key Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IPrimary Key Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IPrimary Key Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IPrimary Key Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2300,13 +2300,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IGenerated Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IGenerated Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IGenerated Value</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IGenerated Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2315,13 +2315,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IGenerator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IGenerator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IGenerator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IGenerator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2330,13 +2330,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ITable Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ITable Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ITable Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ITable Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2345,13 +2345,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ISequence Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ISequence Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ISequence Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ISequence Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2360,13 +2360,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IQuery</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IQuery</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IQuery</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IQuery</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2375,13 +2375,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INamed Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INamed Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INamed Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INamed Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2390,13 +2390,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INamed Native Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INamed Native Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INamed Native Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INamed Native Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2405,13 +2405,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IQuery Hint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IQuery Hint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IQuery Hint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IQuery Hint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2420,13 +2420,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IUnique Constraint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IUnique Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IUnique Constraint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IUnique Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2435,13 +2435,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ICascade</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ICascade</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ICascade</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ICascade</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2450,13 +2450,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ISecondary Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ISecondary Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ISecondary Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ISecondary Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2465,13 +2465,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2480,13 +2480,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMany To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMany To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMany To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMany To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2495,13 +2495,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IOne To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IOne To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IOne To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IOne To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2510,13 +2510,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INon Owning Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INon Owning Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INon Owning Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INon Owning Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2525,13 +2525,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/util/JpaJavaSwitch.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/util/JpaJavaSwitch.java
index 15d6525..a59d2f8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/util/JpaJavaSwitch.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/util/JpaJavaSwitch.java
@@ -203,13 +203,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJava Attribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJava Attribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJava Attribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJava Attribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -218,13 +218,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJava Type Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJava Type Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJava Type Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJava Type Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -233,13 +233,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -248,13 +248,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa Compilation Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa Compilation Unit</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa Compilation Unit</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa Compilation Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -263,13 +263,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Persistent Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Persistent Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Persistent Type</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Persistent Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -278,13 +278,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Persistent Attribute</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Persistent Attribute</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Persistent Attribute</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Persistent Attribute</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -293,13 +293,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -308,13 +308,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -323,13 +323,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -338,13 +338,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Root Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Root Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Root Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Root Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -353,13 +353,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IPersistent Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IPersistent Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IPersistent Type</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IPersistent Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -368,13 +368,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IPersistent Attribute</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IPersistent Attribute</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IPersistent Attribute</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IPersistent Attribute</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -383,13 +383,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -398,13 +398,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -413,13 +413,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -428,13 +428,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/AbstractXmlQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/AbstractXmlQuery.java
index 3a9952e..7b7e7b6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/AbstractXmlQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/AbstractXmlQuery.java
@@ -181,7 +181,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Hints</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIQuery_Hints()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IQueryHint" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IQueryHint> getHints() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/AbstractXmlTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/AbstractXmlTable.java
index 0d0d91d..bae5c6d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/AbstractXmlTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/AbstractXmlTable.java
@@ -528,7 +528,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Unique Constraints</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getITable_UniqueConstraints()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IUniqueConstraint" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IUniqueConstraint> getUniqueConstraints() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/EntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/EntityMappings.java
index f9445ba..4bd4d6d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/EntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/EntityMappings.java
@@ -32,7 +32,6 @@
 {
 	/**
 	 * Returns the value of the '<em><b>Persistence Unit Metadata</b></em>' reference.
-	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Persistence Unit Metadata</em>' reference isn't clear,
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/EntityMappingsInternal.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/EntityMappingsInternal.java
index ae69349..7d9d517 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/EntityMappingsInternal.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/EntityMappingsInternal.java
@@ -993,7 +993,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type Mappings</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getEntityMappingsInternal_TypeMappings()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlTypeMapping" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<XmlTypeMapping> getTypeMappingsGen() {
@@ -1021,7 +1021,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Persistent Types</em>' reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getEntityMappingsInternal_PersistentTypes()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlPersistentType" resolveProxies="false"
+	 * @model resolveProxies="false"
 	 * @generated
 	 */
 	public EList<XmlPersistentType> getPersistentTypes() {
@@ -1054,7 +1054,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Table Generators</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getEntityMappingsInternal_TableGenerators()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlTableGenerator" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<XmlTableGenerator> getTableGenerators() {
@@ -1075,7 +1075,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Named Queries</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getEntityMappingsInternal_NamedQueries()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlNamedQuery" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<XmlNamedQuery> getNamedQueries() {
@@ -1096,7 +1096,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Named Native Queries</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getEntityMappingsInternal_NamedNativeQueries()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlNamedNativeQuery" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<XmlNamedNativeQuery> getNamedNativeQueries() {
@@ -1117,7 +1117,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence Generators</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getEntityMappingsInternal_SequenceGenerators()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlSequenceGenerator" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<XmlSequenceGenerator> getSequenceGenerators() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/OrmPackage.java
index 5dd4524..6494a6e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/OrmPackage.java
@@ -8531,10 +8531,10 @@
 		initEClass(xmlRootContentNodeEClass, XmlRootContentNode.class, "XmlRootContentNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getXmlRootContentNode_EntityMappings(), this.getEntityMappingsInternal(), this.getEntityMappingsInternal_Root(), "entityMappings", null, 1, 1, XmlRootContentNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(entityMappingsInternalEClass, EntityMappingsInternal.class, "EntityMappingsInternal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEntityMappingsInternal_Root(), this.getXmlRootContentNode(), this.getXmlRootContentNode_EntityMappings(), "root", "", 1, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getEntityMappingsInternal_Root(), this.getXmlRootContentNode(), this.getXmlRootContentNode_EntityMappings(), "root", null, 1, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getEntityMappingsInternal_Version(), ecorePackage.getEString(), "version", null, 0, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEntityMappingsInternal_Description(), ecorePackage.getEString(), "description", null, 0, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityMappingsInternal_PersistenceUnitMetadataInternal(), this.getPersistenceUnitMetadataInternal(), null, "persistenceUnitMetadataInternal", "", 1, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getEntityMappingsInternal_PersistenceUnitMetadataInternal(), this.getPersistenceUnitMetadataInternal(), null, "persistenceUnitMetadataInternal", null, 1, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEntityMappingsInternal_PackageInternal(), ecorePackage.getEString(), "packageInternal", null, 0, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEntityMappingsInternal_DefaultSchema(), ecorePackage.getEString(), "defaultSchema", null, 0, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEntityMappingsInternal_SpecifiedSchema(), ecorePackage.getEString(), "specifiedSchema", null, 0, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -8545,14 +8545,14 @@
 		initEAttribute(getEntityMappingsInternal_DefaultAccess(), theJpaCorePackage.getAccessType(), "defaultAccess", null, 0, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEntityMappingsInternal_SpecifiedAccess(), theJpaCorePackage.getAccessType(), "specifiedAccess", null, 0, 1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEntityMappingsInternal_Access(), theJpaCorePackage.getAccessType(), "access", null, 0, 1, EntityMappingsInternal.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityMappingsInternal_TypeMappings(), this.getXmlTypeMapping(), null, "typeMappings", "", 0, -1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getEntityMappingsInternal_TypeMappings(), this.getXmlTypeMapping(), null, "typeMappings", null, 0, -1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getEntityMappingsInternal_PersistentTypes(), this.getXmlPersistentType(), null, "persistentTypes", null, 0, -1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getEntityMappingsInternal_SequenceGenerators(), this.getXmlSequenceGenerator(), null, "sequenceGenerators", null, 0, -1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getEntityMappingsInternal_TableGenerators(), this.getXmlTableGenerator(), null, "tableGenerators", null, 0, -1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getEntityMappingsInternal_NamedQueries(), this.getXmlNamedQuery(), null, "namedQueries", null, 0, -1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getEntityMappingsInternal_NamedNativeQueries(), this.getXmlNamedNativeQuery(), null, "namedNativeQueries", null, 0, -1, EntityMappingsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(entityMappingsEClass, EntityMappings.class, "EntityMappings", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEntityMappings_PersistenceUnitMetadata(), this.getPersistenceUnitMetadata(), null, "persistenceUnitMetadata", "", 0, 1, EntityMappings.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getEntityMappings_PersistenceUnitMetadata(), this.getPersistenceUnitMetadata(), null, "persistenceUnitMetadata", null, 0, 1, EntityMappings.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEntityMappings_Package(), ecorePackage.getEString(), "package", null, 0, 1, EntityMappings.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(entityMappingsForXmlEClass, EntityMappingsForXml.class, "EntityMappingsForXml", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getEntityMappingsForXml_PersistenceUnitMetadataForXml(), this.getPersistenceUnitMetadataForXml(), null, "persistenceUnitMetadataForXml", null, 0, 1, EntityMappingsForXml.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -8603,27 +8603,27 @@
 		initEAttribute(getXmlPersistentAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlPersistentAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(persistenceUnitMetadataInternalEClass, PersistenceUnitMetadataInternal.class, "PersistenceUnitMetadataInternal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPersistenceUnitMetadataInternal_XmlMappingMetadataCompleteInternal(), ecorePackage.getEBoolean(), "xmlMappingMetadataCompleteInternal", null, 0, 1, PersistenceUnitMetadataInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPersistenceUnitMetadataInternal_PersistenceUnitDefaultsInternal(), this.getPersistenceUnitDefaultsInternal(), null, "persistenceUnitDefaultsInternal", "", 1, 1, PersistenceUnitMetadataInternal.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPersistenceUnitMetadataInternal_PersistenceUnitDefaultsInternal(), this.getPersistenceUnitDefaultsInternal(), null, "persistenceUnitDefaultsInternal", null, 1, 1, PersistenceUnitMetadataInternal.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(persistenceUnitMetadataEClass, PersistenceUnitMetadata.class, "PersistenceUnitMetadata", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPersistenceUnitMetadata_XmlMappingMetadataComplete(), ecorePackage.getEBoolean(), "xmlMappingMetadataComplete", null, 0, 1, PersistenceUnitMetadata.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPersistenceUnitMetadata_PersistenceUnitDefaults(), this.getPersistenceUnitDefaults(), null, "persistenceUnitDefaults", "", 0, 1, PersistenceUnitMetadata.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPersistenceUnitMetadata_PersistenceUnitDefaults(), this.getPersistenceUnitDefaults(), null, "persistenceUnitDefaults", null, 0, 1, PersistenceUnitMetadata.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(persistenceUnitMetadataForXmlEClass, PersistenceUnitMetadataForXml.class, "PersistenceUnitMetadataForXml", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPersistenceUnitMetadataForXml_XmlMappingMetadataCompleteForXml(), ecorePackage.getEBoolean(), "xmlMappingMetadataCompleteForXml", null, 0, 1, PersistenceUnitMetadataForXml.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPersistenceUnitMetadataForXml_PersistenceUnitDefaultsForXml(), this.getPersistenceUnitDefaultsForXml(), null, "persistenceUnitDefaultsForXml", "", 0, 1, PersistenceUnitMetadataForXml.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPersistenceUnitMetadataForXml_PersistenceUnitDefaultsForXml(), this.getPersistenceUnitDefaultsForXml(), null, "persistenceUnitDefaultsForXml", null, 0, 1, PersistenceUnitMetadataForXml.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(persistenceUnitDefaultsInternalEClass, PersistenceUnitDefaultsInternal.class, "PersistenceUnitDefaultsInternal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPersistenceUnitDefaultsInternal_SchemaInternal(), ecorePackage.getEString(), "schemaInternal", null, 0, 1, PersistenceUnitDefaultsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getPersistenceUnitDefaultsInternal_CatalogInternal(), ecorePackage.getEString(), "catalogInternal", null, 0, 1, PersistenceUnitDefaultsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPersistenceUnitDefaultsInternal_AccessInternal(), theJpaCorePackage.getAccessType(), "accessInternal", "", 0, 1, PersistenceUnitDefaultsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPersistenceUnitDefaultsInternal_AccessInternal(), theJpaCorePackage.getAccessType(), "accessInternal", null, 0, 1, PersistenceUnitDefaultsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getPersistenceUnitDefaultsInternal_CascadePersistInternal(), ecorePackage.getEBoolean(), "cascadePersistInternal", null, 0, 1, PersistenceUnitDefaultsInternal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(persistenceUnitDefaultsEClass, PersistenceUnitDefaults.class, "PersistenceUnitDefaults", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPersistenceUnitDefaults_Schema(), ecorePackage.getEString(), "schema", null, 0, 1, PersistenceUnitDefaults.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getPersistenceUnitDefaults_Catalog(), ecorePackage.getEString(), "catalog", null, 0, 1, PersistenceUnitDefaults.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPersistenceUnitDefaults_Access(), theJpaCorePackage.getAccessType(), "access", "", 0, 1, PersistenceUnitDefaults.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPersistenceUnitDefaults_Access(), theJpaCorePackage.getAccessType(), "access", null, 0, 1, PersistenceUnitDefaults.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getPersistenceUnitDefaults_CascadePersist(), ecorePackage.getEBoolean(), "cascadePersist", null, 0, 1, PersistenceUnitDefaults.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(persistenceUnitDefaultsForXmlEClass, PersistenceUnitDefaultsForXml.class, "PersistenceUnitDefaultsForXml", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPersistenceUnitDefaultsForXml_SchemaForXml(), ecorePackage.getEString(), "schemaForXml", null, 0, 1, PersistenceUnitDefaultsForXml.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getPersistenceUnitDefaultsForXml_CatalogForXml(), ecorePackage.getEString(), "catalogForXml", null, 0, 1, PersistenceUnitDefaultsForXml.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPersistenceUnitDefaultsForXml_AccessForXml(), theJpaCorePackage.getAccessType(), "accessForXml", "", 0, 1, PersistenceUnitDefaultsForXml.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPersistenceUnitDefaultsForXml_AccessForXml(), theJpaCorePackage.getAccessType(), "accessForXml", null, 0, 1, PersistenceUnitDefaultsForXml.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getPersistenceUnitDefaultsForXml_CascadePersistForXml(), ecorePackage.getEBoolean(), "cascadePersistForXml", null, 0, 1, PersistenceUnitDefaultsForXml.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(xmlTableEClass, XmlTable.class, "XmlTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(abstractXmlNamedColumnEClass, AbstractXmlNamedColumn.class, "AbstractXmlNamedColumn", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -8643,8 +8643,8 @@
 		initEAttribute(getXmlJoinColumn_SpecifiedReferencedColumnNameForXml(), ecorePackage.getEString(), "specifiedReferencedColumnNameForXml", null, 0, 1, XmlJoinColumn.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(iXmlColumnMappingEClass, IXmlColumnMapping.class, "IXmlColumnMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getIXmlColumnMapping_ColumnForXml(), this.getXmlColumn(), null, "columnForXml", null, 0, 1, IXmlColumnMapping.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		addEOperation(iXmlColumnMappingEClass, null, "makeColumnForXmlNonNull");
-		addEOperation(iXmlColumnMappingEClass, null, "makeColumnForXmlNull");
+		addEOperation(iXmlColumnMappingEClass, null, "makeColumnForXmlNonNull", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iXmlColumnMappingEClass, null, "makeColumnForXmlNull", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(xmlManyToOneEClass, XmlManyToOne.class, "XmlManyToOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(xmlOneToOneEClass, XmlOneToOne.class, "XmlOneToOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(xmlSingleRelationshipMappingEClass, XmlSingleRelationshipMapping.class, "XmlSingleRelationshipMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -8674,9 +8674,9 @@
 		initEClass(xmlUniqueConstraintEClass, XmlUniqueConstraint.class, "XmlUniqueConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(xmlCascadeEClass, XmlCascade.class, "XmlCascade", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(xmlIdClassEClass, XmlIdClass.class, "XmlIdClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlIdClass_Value(), theEcorePackage.getEString(), "value", "", 0, 1, XmlIdClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getXmlIdClass_Value(), theEcorePackage.getEString(), "value", null, 0, 1, XmlIdClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(xmlInheritanceEClass, XmlInheritance.class, "XmlInheritance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlInheritance_Strategy(), theJpaCoreMappingsPackage.getInheritanceType(), "strategy", "", 0, 1, XmlInheritance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getXmlInheritance_Strategy(), theJpaCoreMappingsPackage.getInheritanceType(), "strategy", null, 0, 1, XmlInheritance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(xmlMapKeyEClass, XmlMapKey.class, "XmlMapKey", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlMapKey_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlMapKey.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		// Create resource
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaults.java
index 1966dd4..f1b6c44 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaults.java
@@ -87,7 +87,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>""</code>.
 	 * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.AccessType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -99,7 +98,7 @@
 	 * @see org.eclipse.jpt.core.internal.AccessType
 	 * @see #setAccess(AccessType)
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getPersistenceUnitDefaults_Access()
-	 * @model default="" volatile="true"
+	 * @model volatile="true"
 	 * @generated
 	 */
 	AccessType getAccess();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaultsForXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaultsForXml.java
index 4748075..81da952 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaultsForXml.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaultsForXml.java
@@ -87,7 +87,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Access For Xml</b></em>' attribute.
-	 * The default value is <code>""</code>.
 	 * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.AccessType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -99,7 +98,7 @@
 	 * @see org.eclipse.jpt.core.internal.AccessType
 	 * @see #setAccessForXml(AccessType)
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getPersistenceUnitDefaultsForXml_AccessForXml()
-	 * @model default="" volatile="true"
+	 * @model volatile="true"
 	 * @generated
 	 */
 	AccessType getAccessForXml();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaultsInternal.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaultsInternal.java
index 7b51533..8941898 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaultsInternal.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitDefaultsInternal.java
@@ -596,7 +596,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Access Internal</b></em>' attribute.
-	 * The default value is <code>""</code>.
 	 * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.AccessType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -608,7 +607,7 @@
 	 * @see org.eclipse.jpt.core.internal.AccessType
 	 * @see #setAccessInternal(AccessType)
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getPersistenceUnitDefaultsInternal_AccessInternal()
-	 * @model default=""
+	 * @model
 	 * @generated
 	 */
 	public AccessType getAccessInternal() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadata.java
index 9696fed..ef8b57d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadata.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadata.java
@@ -58,7 +58,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Persistence Unit Defaults</b></em>' reference.
-	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Persistence Unit Defaults</em>' reference isn't clear,
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadataForXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadataForXml.java
index 848acae..2d98702 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadataForXml.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadataForXml.java
@@ -58,7 +58,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Persistence Unit Defaults For Xml</b></em>' reference.
-	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Persistence Unit Defaults For Xml</em>' reference isn't clear,
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadataInternal.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadataInternal.java
index 07f07ff..b88ecac 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadataInternal.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/PersistenceUnitMetadataInternal.java
@@ -302,7 +302,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Persistence Unit Defaults Internal</b></em>' containment reference.
-	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Persistence Unit Defaults Internal</em>' containment reference isn't clear,
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlAssociationOverride.java
index e890df0..8035356 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlAssociationOverride.java
@@ -93,7 +93,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIAssociationOverride_SpecifiedJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getSpecifiedJoinColumns() {
@@ -114,7 +114,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIAssociationOverride_DefaultJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getDefaultJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlAttributeMapping.java
index 6e663af..f548a58 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlAttributeMapping.java
@@ -81,7 +81,7 @@
 	protected INamedColumn.Owner buildOwner() {
 		return new ColumnOwner();
 	}
-	
+
 	@Override
 	protected void addInsignificantFeatureIdsTo(Set<Integer> insignificantFeatureIds) {
 		super.addInsignificantFeatureIdsTo(insignificantFeatureIds);
@@ -244,8 +244,7 @@
 	 */
 	protected abstract void initializeOn(XmlAttributeMapping newMapping);
 
-	public void initializeFromXmlAttributeMapping(XmlAttributeMapping oldMapping) {
-	}
+	public void initializeFromXmlAttributeMapping(XmlAttributeMapping oldMapping) {}
 
 	public void initializeFromXmlBasicMapping(XmlBasic oldMapping) {
 		initializeFromXmlAttributeMapping(oldMapping);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEmbedded.java
index 1e0d2f6..844d79e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEmbedded.java
@@ -116,7 +116,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEmbedded_SpecifiedAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAttributeOverride> getSpecifiedAttributeOverrides() {
@@ -137,7 +137,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEmbedded_DefaultAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAttributeOverride> getDefaultAttributeOverrides() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEntity.java
index 7f88ec7..ff4274b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEntity.java
@@ -42,7 +42,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Secondary Tables</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getXmlEntity_SecondaryTables()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.ISecondaryTable" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<ISecondaryTable> getSecondaryTables();
@@ -58,7 +58,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Virtual Secondary Tables</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getXmlEntity_VirtualSecondaryTables()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.ISecondaryTable" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<ISecondaryTable> getVirtualSecondaryTables();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEntityInternal.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEntityInternal.java
index 6563159..735531c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEntityInternal.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlEntityInternal.java
@@ -568,7 +568,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Virtual Secondary Tables</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getXmlEntity_VirtualSecondaryTables()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.ISecondaryTable" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<ISecondaryTable> getVirtualSecondaryTables() {
@@ -613,7 +613,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Secondary Tables</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEntity_SpecifiedSecondaryTables()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.ISecondaryTable" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<ISecondaryTable> getSpecifiedSecondaryTables() {
@@ -920,7 +920,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEntity_SpecifiedPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IPrimaryKeyJoinColumn> getSpecifiedPrimaryKeyJoinColumns() {
@@ -941,7 +941,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEntity_DefaultPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IPrimaryKeyJoinColumn> getDefaultPrimaryKeyJoinColumns() {
@@ -969,7 +969,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEntity_SpecifiedAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAttributeOverride> getSpecifiedAttributeOverrides() {
@@ -990,7 +990,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEntity_DefaultAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAttributeOverride> getDefaultAttributeOverrides() {
@@ -1018,7 +1018,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Association Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEntity_SpecifiedAssociationOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAssociationOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAssociationOverride> getSpecifiedAssociationOverrides() {
@@ -1039,7 +1039,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Association Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEntity_DefaultAssociationOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAssociationOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IAssociationOverride> getDefaultAssociationOverrides() {
@@ -1060,7 +1060,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Named Queries</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEntity_NamedQueries()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.INamedQuery" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<INamedQuery> getNamedQueries() {
@@ -1081,7 +1081,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Named Native Queries</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIEntity_NamedNativeQueries()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.INamedNativeQuery" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<INamedNativeQuery> getNamedNativeQueries() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlIdClass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlIdClass.java
index 84025b6..4bb0a55 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlIdClass.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlIdClass.java
@@ -44,7 +44,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String VALUE_EDEFAULT = "";
+	protected static final String VALUE_EDEFAULT = null;
 
 	/**
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
@@ -100,7 +100,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
@@ -110,7 +109,7 @@
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getXmlIdClass_Value()
-	 * @model default=""
+	 * @model
 	 * @generated
 	 */
 	public String getValue() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlInheritance.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlInheritance.java
index 6e06610..0635c7a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlInheritance.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlInheritance.java
@@ -103,7 +103,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Strategy</b></em>' attribute.
-	 * The default value is <code>""</code>.
 	 * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.mappings.InheritanceType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -115,7 +114,7 @@
 	 * @see org.eclipse.jpt.core.internal.mappings.InheritanceType
 	 * @see #setStrategy(InheritanceType)
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getXmlInheritance_Strategy()
-	 * @model default=""
+	 * @model
 	 * @generated
 	 */
 	public InheritanceType getStrategy() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlJoinTable.java
index bc63a52..0470ad1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlJoinTable.java
@@ -182,7 +182,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIJoinTable_SpecifiedJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getSpecifiedJoinColumns() {
@@ -203,7 +203,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIJoinTable_DefaultJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getDefaultJoinColumns() {
@@ -242,7 +242,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Inverse Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIJoinTable_SpecifiedInverseJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getSpecifiedInverseJoinColumns() {
@@ -263,7 +263,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Inverse Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIJoinTable_DefaultInverseJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getDefaultInverseJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlMultiRelationshipMappingInternal.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlMultiRelationshipMappingInternal.java
index a93d5d6..91bba67 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlMultiRelationshipMappingInternal.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlMultiRelationshipMappingInternal.java
@@ -334,7 +334,7 @@
 	 * @generated NOT
 	 */
 	public boolean isCustomOrdering() {
-		return ! StringTools.stringIsEmpty(getOrderBy());
+		return !StringTools.stringIsEmpty(getOrderBy());
 	}
 
 	public ITextRange mappedByTextRange() {
@@ -816,7 +816,7 @@
 			setOrderBy(targetEntity.primaryKeyAttributeName() + " ASC");
 		}
 	}
-	
+
 	//TODO copied from JavaMultiRelationshipMapping
 	/**
 	 * extract the element type from the specified container signature and
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlPersistentType.java
index aa14ad2..7358f22 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlPersistentType.java
@@ -313,7 +313,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Attribute Mappings</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getXmlPersistentType_SpecifiedAttributeMappings()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlAttributeMapping" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<XmlAttributeMapping> getSpecifiedAttributeMappingsGen() {
@@ -341,7 +341,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Virtual Attribute Mappings</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getXmlPersistentType_VirtualAttributeMappings()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlAttributeMapping" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<XmlAttributeMapping> getVirtualAttributeMappingsGen() {
@@ -390,7 +390,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Persistent Attributes</em>' reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getXmlPersistentType_SpecifiedPersistentAttributes()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlPersistentAttribute" resolveProxies="false"
+	 * @model resolveProxies="false"
 	 * @generated
 	 */
 	public EList<XmlPersistentAttribute> getSpecifiedPersistentAttributes() {
@@ -411,7 +411,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Virtual Persistent Attributes</em>' reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getXmlPersistentType_VirtualPersistentAttributes()
-	 * @model type="org.eclipse.jpt.core.internal.content.orm.XmlPersistentAttribute" resolveProxies="false"
+	 * @model resolveProxies="false"
 	 * @generated
 	 */
 	public EList<XmlPersistentAttribute> getVirtualPersistentAttributes() {
@@ -429,7 +429,6 @@
 		XmlPersistentAttribute nullAttribute = OrmFactory.eINSTANCE.createXmlPersistentAttribute();
 		XmlPersistentAttribute attribute = oldMapping.getPersistentAttribute();
 		oldMapping.setPersistentAttribute(nullAttribute);
-		
 		if (virtual) {
 			getVirtualPersistentAttributes().remove(attribute);
 			getVirtualAttributeMappings().remove(oldMapping);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlPrimaryKeyJoinColumn.java
index bbb7425..73ce0d5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlPrimaryKeyJoinColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlPrimaryKeyJoinColumn.java
@@ -197,7 +197,7 @@
 	public String getDefaultReferencedColumnName() {
 		return defaultReferencedColumnName;
 	}
-	
+
 	protected void setDefaultReferencedColumnName(String newDefaultReferencedColumnName) {
 		String oldDefaultReferencedColumnName = this.defaultReferencedColumnName;
 		this.defaultReferencedColumnName = newDefaultReferencedColumnName;
@@ -422,10 +422,9 @@
 		IDOMNode referencedColumnNameNode = (IDOMNode) DOMUtilities.getChildAttributeNode(node, OrmXmlMapper.REFERENCED_COLUMN_NAME);
 		return (referencedColumnNameNode == null) ? validationTextRange() : buildTextRange(referencedColumnNameNode);
 	}
-	
+
 	public void refreshDefaults(DefaultsContext defaultsContext) {
 		setDefaultReferencedColumnName((String) defaultsContext.getDefault(BaseJpaPlatform.DEFAULT_JOIN_COLUMN_REFERENCED_COLUMN_NAME_KEY));
 		setDefaultName((String) defaultsContext.getDefault(BaseJpaPlatform.DEFAULT_JOIN_COLUMN_NAME_KEY));
 	}
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRelationshipMapping.java
index de47356..2f52b03 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRelationshipMapping.java
@@ -554,7 +554,7 @@
 		}
 		setResolvedTargetEntity(null);
 	}
-	
+
 	/**
 	 * the default 'targetEntity' is calculated from the attribute type;
 	 * return null if the attribute type cannot possibly be an entity
@@ -578,5 +578,4 @@
 		}
 		return JDTTools.resolve(Signature.toString(signature), jdtType);
 	}
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRootContentNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRootContentNode.java
index f75b4fc..dc02b8e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRootContentNode.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRootContentNode.java
@@ -77,7 +77,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Jpa File</b></em>' container reference.
-	 * The default value is <code>""</code>.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.jpt.core.internal.JpaFile#getContent <em>Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -88,7 +87,7 @@
 	 * @return the value of the '<em>Jpa File</em>' container reference.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIJpaRootContentNode_JpaFile()
 	 * @see org.eclipse.jpt.core.internal.JpaFile#getContent
-	 * @model opposite="content" changeable="false"
+	 * @model opposite="content" transient="false" changeable="false"
 	 * @generated
 	 */
 	public IJpaFile getJpaFile() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlSecondaryTable.java
index 8295c68..cdde614 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlSecondaryTable.java
@@ -88,7 +88,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getISecondaryTable_SpecifiedPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IPrimaryKeyJoinColumn> getSpecifiedPrimaryKeyJoinColumns() {
@@ -109,7 +109,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getISecondaryTable_DefaultPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IPrimaryKeyJoinColumn> getDefaultPrimaryKeyJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlSingleRelationshipMapping.java
index f392d9f..64d1733 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlSingleRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlSingleRelationshipMapping.java
@@ -217,7 +217,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getISingleRelationshipMapping_SpecifiedJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getSpecifiedJoinColumns() {
@@ -238,7 +238,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getISingleRelationshipMapping_DefaultJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IJoinColumn> getDefaultJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlTableGenerator.java
index cf10c77..9dddb25 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlTableGenerator.java
@@ -709,7 +709,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Unique Constraints</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getITableGenerator_UniqueConstraints()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IUniqueConstraint" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<IUniqueConstraint> getUniqueConstraints() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlTypeMapping.java
index 51a6f2c..35a78f1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlTypeMapping.java
@@ -169,7 +169,7 @@
 	protected XmlPersistentType createXmlPersistentType() {
 		return OrmFactory.eINSTANCE.createXmlPersistentType(getKey());
 	}
-	
+
 	@Override
 	protected void addInsignificantFeatureIdsTo(Set<Integer> insignificantFeatureIds) {
 		super.addInsignificantFeatureIdsTo(insignificantFeatureIds);
@@ -603,8 +603,7 @@
 	 * fromthe old ITypeMapping (oldMapping)
 	 * @param oldMapping
 	 */
-	public void initializeFrom(XmlTypeMapping oldMapping) {
-	}
+	public void initializeFrom(XmlTypeMapping oldMapping) {}
 
 	public IJpaContentNode getContentNode(int offset) {
 		return getPersistentType().getContentNode(offset);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlUniqueConstraint.java
index e590a8a..7d45ae1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlUniqueConstraint.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlUniqueConstraint.java
@@ -11,7 +11,7 @@
 import java.util.Collection;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
 import org.eclipse.jpt.core.internal.XmlEObject;
 import org.eclipse.jpt.core.internal.mappings.IUniqueConstraint;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
@@ -69,12 +69,12 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Column Names</em>' attribute list.
 	 * @see org.eclipse.jpt.core.internal.content.orm.OrmPackage#getIUniqueConstraint_ColumnNames()
-	 * @model type="java.lang.String"
+	 * @model unique="false"
 	 * @generated
 	 */
 	public EList<String> getColumnNames() {
 		if (columnNames == null) {
-			columnNames = new EDataTypeUniqueEList<String>(String.class, this, OrmPackage.XML_UNIQUE_CONSTRAINT__COLUMN_NAMES);
+			columnNames = new EDataTypeEList<String>(String.class, this, OrmPackage.XML_UNIQUE_CONSTRAINT__COLUMN_NAMES);
 		}
 		return columnNames;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/AbstractTableTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/AbstractTableTranslator.java
index fb809d2..8ce5668 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/AbstractTableTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/AbstractTableTranslator.java
@@ -53,7 +53,6 @@
 	}
 	
 	protected Translator createUniqueConstraintTranslator() {
-		return new Translator(UNIQUE_CONSTRAINT, (EStructuralFeature) null);
-		//TODO return new UniqueConstraintTranslator(UNIQUE_CONSTRAINT, MAPPINGS_PKG.getITable_UniqueConstraints());
+		return new UniqueConstraintTranslator();
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/IdTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/IdTranslator.java
index efa31b1..93ec76c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/IdTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/IdTranslator.java
@@ -9,7 +9,6 @@
 package org.eclipse.jpt.core.internal.content.orm.resource;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jpt.core.internal.mappings.IBasic;
 import org.eclipse.jpt.core.internal.mappings.IId;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/JoinTableTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/JoinTableTranslator.java
index a84833a..162d23d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/JoinTableTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/JoinTableTranslator.java
@@ -50,7 +50,7 @@
 			createSchemaTranslator(),
 			createJoinColumnsTranslator(),
 			createInverseJoinColumnsTranslator(),
-			createUniqueConstraintTranslator(),
+			createUniqueConstraintTranslator()
 		};
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/SecondaryTableTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/SecondaryTableTranslator.java
index 85a4fd8..fe07d1a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/SecondaryTableTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/SecondaryTableTranslator.java
@@ -52,7 +52,7 @@
 			createCatalogTranslator(),
 			createSchemaTranslator(),
 			createPrimaryKeyJoinColumnsTranslator(),
-			createUniqueConstraintTranslator(),
+			createUniqueConstraintTranslator()
 		};
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/TableTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/TableTranslator.java
index f27f9fd..6cc6c21 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/TableTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/TableTranslator.java
@@ -43,7 +43,7 @@
 			createNameTranslator(),
 			createCatalogTranslator(),
 			createSchemaTranslator(),
-			createUniqueConstraintTranslator(),
+			createUniqueConstraintTranslator()
 		};
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/UniqueConstraintTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/UniqueConstraintTranslator.java
index 258a273..c450b19 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/UniqueConstraintTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/UniqueConstraintTranslator.java
@@ -9,9 +9,7 @@
 package org.eclipse.jpt.core.internal.content.orm.resource;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.jpt.core.internal.content.orm.OrmFactory;
-import org.eclipse.jpt.core.internal.content.orm.OrmPackage;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -20,16 +18,16 @@
 {
 	protected static final JpaCoreMappingsPackage MAPPINGS_PKG = 
 		JpaCoreMappingsPackage.eINSTANCE;
-	protected static final OrmPackage JPA_CORE_XML_PKG = 
-		OrmPackage.eINSTANCE;
 	
 	
 	private Translator[] children;	
 	
-	public UniqueConstraintTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
+	
+	public UniqueConstraintTranslator() {
+		super(UNIQUE_CONSTRAINT, MAPPINGS_PKG.getITable_UniqueConstraints());
 	}
 	
+	
 	public Translator[] getChildren(Object target, int versionID) {
 		if (children == null) {
 			children = createChildren();
@@ -45,7 +43,7 @@
 	}
 	
 	protected Translator creatColumnNamesTranslator() {
-		return new Translator(UNIQUE_CONSTRAINT__COLUMN_NAME, MAPPINGS_PKG.getITable_UniqueConstraints());
+		return new Translator(UNIQUE_CONSTRAINT__COLUMN_NAME, MAPPINGS_PKG.getIUniqueConstraint_ColumnNames());
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/VersionTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/VersionTranslator.java
index fcf1eb8..fd9619f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/VersionTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/resource/VersionTranslator.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.core.internal.content.orm.resource;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jpt.core.internal.mappings.IBasic;
 import org.eclipse.jpt.core.internal.mappings.IVersion;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/util/OrmSwitch.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/util/OrmSwitch.java
index 54e5ce9..1a24e6d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/util/OrmSwitch.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/util/OrmSwitch.java
@@ -1518,13 +1518,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1533,13 +1533,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Root Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Root Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Root Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Root Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1548,13 +1548,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Entity Mappings Internal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Entity Mappings Internal</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Entity Mappings Internal</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Entity Mappings Internal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1563,13 +1563,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Entity Mappings</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Entity Mappings</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Entity Mappings</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Entity Mappings</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1578,13 +1578,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Entity Mappings For Xml</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Entity Mappings For Xml</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Entity Mappings For Xml</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Entity Mappings For Xml</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1593,13 +1593,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Type Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Type Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Type Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Type Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1608,13 +1608,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Persistent Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Persistent Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Persistent Type</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Persistent Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1623,13 +1623,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Embeddable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Embeddable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Embeddable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Embeddable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1638,13 +1638,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Attribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Attribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Attribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Attribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1653,13 +1653,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Null Attribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Null Attribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Null Attribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Null Attribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1668,13 +1668,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Persistent Attribute</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Persistent Attribute</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Persistent Attribute</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Persistent Attribute</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1683,13 +1683,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Basic</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Basic</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Basic</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1698,13 +1698,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Id</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Id</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Id</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1713,13 +1713,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Transient</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Transient</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Transient</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Transient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1728,13 +1728,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Embedded</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Embedded</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1743,13 +1743,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Embedded Id</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Id</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Embedded Id</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1758,13 +1758,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Version</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Version</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Version</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Version</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1773,13 +1773,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Multi Relationship Mapping Internal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Multi Relationship Mapping Internal</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Multi Relationship Mapping Internal</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Multi Relationship Mapping Internal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1788,13 +1788,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Multi Relationship Mapping For Xml</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Multi Relationship Mapping For Xml</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Multi Relationship Mapping For Xml</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Multi Relationship Mapping For Xml</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1803,13 +1803,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Multi Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Multi Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Multi Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Multi Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1818,13 +1818,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml One To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml One To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml One To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml One To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1833,13 +1833,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Many To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Many To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Many To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1848,13 +1848,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Persistence Unit Metadata Internal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Persistence Unit Metadata Internal</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Persistence Unit Metadata Internal</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Persistence Unit Metadata Internal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1863,13 +1863,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Persistence Unit Metadata</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Persistence Unit Metadata</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Persistence Unit Metadata</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Persistence Unit Metadata</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1878,13 +1878,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Persistence Unit Metadata For Xml</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Persistence Unit Metadata For Xml</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Persistence Unit Metadata For Xml</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Persistence Unit Metadata For Xml</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1893,13 +1893,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Persistence Unit Defaults Internal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Persistence Unit Defaults Internal</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Persistence Unit Defaults Internal</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Persistence Unit Defaults Internal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1908,13 +1908,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Persistence Unit Defaults</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Persistence Unit Defaults</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Persistence Unit Defaults</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Persistence Unit Defaults</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1923,13 +1923,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Persistence Unit Defaults For Xml</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Persistence Unit Defaults For Xml</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Persistence Unit Defaults For Xml</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Persistence Unit Defaults For Xml</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1938,13 +1938,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1953,13 +1953,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Abstract Xml Named Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Xml Named Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Abstract Xml Named Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Xml Named Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1968,13 +1968,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Abstract Xml Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Xml Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Abstract Xml Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Xml Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1983,13 +1983,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1998,13 +1998,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2013,13 +2013,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IXml Column Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IXml Column Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IXml Column Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IXml Column Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2028,13 +2028,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Many To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Many To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Many To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2043,13 +2043,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml One To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml One To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml One To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml One To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2058,13 +2058,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Single Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Single Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Single Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Single Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2073,13 +2073,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2088,13 +2088,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Join Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Join Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Join Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Join Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2103,13 +2103,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Abstract Xml Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Xml Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Abstract Xml Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Xml Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2118,13 +2118,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2133,13 +2133,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Attribute Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Attribute Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Attribute Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Attribute Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2148,13 +2148,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Association Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Association Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Association Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Association Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2163,13 +2163,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Discriminator Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Discriminator Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Discriminator Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Discriminator Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2178,13 +2178,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Secondary Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Secondary Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Secondary Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Secondary Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2193,13 +2193,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Primary Key Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Primary Key Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Primary Key Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Primary Key Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2208,13 +2208,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Generated Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Generated Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Generated Value</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Generated Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2223,13 +2223,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2238,13 +2238,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Sequence Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Sequence Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Sequence Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Sequence Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2253,13 +2253,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Table Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Table Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Table Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Table Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2268,13 +2268,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Abstract Xml Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Xml Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Abstract Xml Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Xml Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2283,13 +2283,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Named Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Named Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Named Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Named Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2298,13 +2298,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Named Native Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Named Native Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Named Native Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Named Native Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2313,13 +2313,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Query Hint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Query Hint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Query Hint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Query Hint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2328,13 +2328,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Unique Constraint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Unique Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Unique Constraint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Unique Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2343,13 +2343,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Cascade</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Cascade</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Cascade</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Cascade</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2358,13 +2358,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Id Class</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Id Class</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Id Class</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Id Class</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2373,13 +2373,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Inheritance</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Inheritance</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Inheritance</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Inheritance</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2388,13 +2388,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Map Key</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Map Key</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Map Key</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Map Key</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2403,13 +2403,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2418,13 +2418,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2433,13 +2433,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2448,13 +2448,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IXml EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IXml EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IXml EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IXml EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2463,13 +2463,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2478,13 +2478,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Root Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Root Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Root Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Root Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2493,13 +2493,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Mapped Superclass</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Mapped Superclass</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Mapped Superclass</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Mapped Superclass</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2508,13 +2508,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Entity Internal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Entity Internal</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Entity Internal</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Entity Internal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2523,13 +2523,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Entity For Xml</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Entity For Xml</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Entity For Xml</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Entity For Xml</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2538,13 +2538,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Entity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Entity</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Entity</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Entity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2553,13 +2553,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2568,13 +2568,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IColumn Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IColumn Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IColumn Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IColumn Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2583,13 +2583,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IPersistent Attribute</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IPersistent Attribute</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IPersistent Attribute</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IPersistent Attribute</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2598,13 +2598,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ITable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ITable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ITable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ITable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2613,13 +2613,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INamed Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INamed Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INamed Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INamed Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2628,13 +2628,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAbstract Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAbstract Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAbstract Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAbstract Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2643,13 +2643,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IColumn</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IColumn</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IColumn</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IColumn</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2658,13 +2658,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAbstract Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAbstract Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAbstract Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAbstract Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2673,13 +2673,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJoin Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJoin Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJoin Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJoin Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2688,13 +2688,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2703,13 +2703,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMany To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMany To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMany To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMany To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2718,13 +2718,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IOne To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IOne To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IOne To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IOne To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2733,13 +2733,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJoin Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJoin Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJoin Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJoin Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2748,13 +2748,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IOverride</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IOverride</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IOverride</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IOverride</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2763,13 +2763,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAttribute Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAttribute Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAttribute Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAttribute Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2778,13 +2778,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAssociation Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAssociation Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAssociation Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAssociation Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2793,13 +2793,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IDiscriminator Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IDiscriminator Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IDiscriminator Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IDiscriminator Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2808,13 +2808,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ISecondary Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ISecondary Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ISecondary Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ISecondary Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2823,13 +2823,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IPrimary Key Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IPrimary Key Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IPrimary Key Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IPrimary Key Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2838,13 +2838,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IGenerated Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IGenerated Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IGenerated Value</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IGenerated Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2853,13 +2853,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IGenerator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IGenerator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IGenerator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IGenerator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2868,13 +2868,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ISequence Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ISequence Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ISequence Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ISequence Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2883,13 +2883,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ITable Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ITable Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ITable Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ITable Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2898,13 +2898,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IQuery</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IQuery</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IQuery</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IQuery</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2913,13 +2913,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INamed Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INamed Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INamed Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INamed Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2928,13 +2928,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INamed Native Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INamed Native Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INamed Native Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INamed Native Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2943,13 +2943,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IQuery Hint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IQuery Hint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IQuery Hint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IQuery Hint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2958,13 +2958,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IUnique Constraint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IUnique Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IUnique Constraint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IUnique Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2973,13 +2973,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ICascade</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ICascade</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ICascade</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ICascade</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -2988,13 +2988,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IBasic</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IBasic</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IBasic</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IBasic</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3003,13 +3003,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IId</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IId</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IId</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IId</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3018,13 +3018,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ITransient</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ITransient</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ITransient</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ITransient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3033,13 +3033,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEmbedded</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEmbedded</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEmbedded</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEmbedded</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3048,13 +3048,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEmbedded Id</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEmbedded Id</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEmbedded Id</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEmbedded Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3063,13 +3063,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IVersion</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IVersion</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IVersion</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IVersion</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3078,13 +3078,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IRelationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IRelationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IRelationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IRelationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3093,13 +3093,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INon Owning Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INon Owning Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INon Owning Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INon Owning Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3108,13 +3108,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3123,13 +3123,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IOne To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IOne To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IOne To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IOne To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3138,13 +3138,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMany To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMany To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMany To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMany To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3153,13 +3153,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IPersistent Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IPersistent Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IPersistent Type</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IPersistent Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3168,13 +3168,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMapped Superclass</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMapped Superclass</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMapped Superclass</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMapped Superclass</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3183,13 +3183,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEntity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEntity</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEntity</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEntity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3198,13 +3198,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEmbeddable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEmbeddable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEmbeddable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEmbeddable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3213,13 +3213,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -3228,13 +3228,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/Persistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/Persistence.java
index 43fdf8a..da6e457 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/Persistence.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/Persistence.java
@@ -107,7 +107,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Persistence Units</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.persistence.PersistencePackage#getPersistence_PersistenceUnits()
-	 * @model type="org.eclipse.jpt.core.internal.content.persistence.PersistenceUnit" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<PersistenceUnit> getPersistenceUnits() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceUnit.java
index d9e5584..b0e2df6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceUnit.java
@@ -388,7 +388,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Mapping Files</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.persistence.PersistencePackage#getPersistenceUnit_MappingFiles()
-	 * @model type="org.eclipse.jpt.core.internal.content.persistence.MappingFileRef" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<MappingFileRef> getMappingFiles() {
@@ -405,7 +405,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Jar Files</em>' attribute list.
 	 * @see org.eclipse.jpt.core.internal.content.persistence.PersistencePackage#getPersistenceUnit_JarFiles()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
 	public EList<String> getJarFiles() {
@@ -422,7 +422,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Classes</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.persistence.PersistencePackage#getPersistenceUnit_Classes()
-	 * @model type="org.eclipse.jpt.core.internal.content.persistence.JavaClassRef" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<JavaClassRef> getClasses() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlRootContentNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlRootContentNode.java
index 6205c4f..77bd8ad 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlRootContentNode.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlRootContentNode.java
@@ -19,7 +19,6 @@
 import org.eclipse.jpt.core.internal.IJpaContentNode;
 import org.eclipse.jpt.core.internal.IJpaFile;
 import org.eclipse.jpt.core.internal.IJpaRootContentNode;
-import org.eclipse.jpt.core.internal.ITextRange;
 import org.eclipse.jpt.core.internal.JpaCorePackage;
 import org.eclipse.jpt.core.internal.JpaFile;
 import org.eclipse.jpt.core.internal.XmlEObject;
@@ -75,7 +74,6 @@
 
 	/**
 	 * Returns the value of the '<em><b>Jpa File</b></em>' container reference.
-	 * The default value is <code>""</code>.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.jpt.core.internal.JpaFile#getContent <em>Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -86,7 +84,7 @@
 	 * @return the value of the '<em>Jpa File</em>' container reference.
 	 * @see org.eclipse.jpt.core.internal.content.persistence.PersistencePackage#getIJpaRootContentNode_JpaFile()
 	 * @see org.eclipse.jpt.core.internal.JpaFile#getContent
-	 * @model opposite="content" changeable="false"
+	 * @model opposite="content" transient="false" changeable="false"
 	 * @generated
 	 */
 	public IJpaFile getJpaFile() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/Properties.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/Properties.java
index 707f9da..2ecd61f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/Properties.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/Properties.java
@@ -71,7 +71,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Properties</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.content.persistence.PersistencePackage#getProperties_Properties()
-	 * @model type="org.eclipse.jpt.core.internal.content.persistence.Property" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	public EList<Property> getProperties() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/util/PersistenceSwitch.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/util/PersistenceSwitch.java
index 3096f60..0d2cb56 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/util/PersistenceSwitch.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/util/PersistenceSwitch.java
@@ -229,13 +229,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Persistence</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Persistence</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Persistence</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Persistence</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -244,13 +244,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Unit</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Unit</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -259,13 +259,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Mapping File Ref</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Mapping File Ref</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Mapping File Ref</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Mapping File Ref</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -274,13 +274,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Class Ref</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Java Class Ref</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Class Ref</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Java Class Ref</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -289,13 +289,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Properties</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Properties</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -304,13 +304,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Property</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Property</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Property</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Property</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -319,13 +319,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -334,13 +334,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -349,13 +349,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -364,13 +364,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IXml EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IXml EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IXml EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IXml EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -379,13 +379,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml Root Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml Root Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml Root Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml Root Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -394,13 +394,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -409,13 +409,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -424,13 +424,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Root Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Root Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Root Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Root Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -439,13 +439,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/CascadeType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/CascadeType.java
index 5514bda..9d64e1c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/CascadeType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/CascadeType.java
@@ -6,11 +6,6 @@
  */
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.CascadeType.ALL_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.CascadeType.MERGE_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.CascadeType.PERSIST_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.CascadeType.REFRESH_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.CascadeType.REMOVE_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultEagerFetchType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultEagerFetchType.java
index f76d0d7..73c30ca 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultEagerFetchType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultEagerFetchType.java
@@ -9,9 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.DefaultEagerFetchType.DEFAULT_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DefaultEagerFetchType.EAGER_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DefaultEagerFetchType.LAZY_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultFalseBoolean.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultFalseBoolean.java
index 2bc9fcd..e2e379b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultFalseBoolean.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultFalseBoolean.java
@@ -9,9 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.DefaultFalseBoolean.DEFAULT_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DefaultFalseBoolean.FALSE_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DefaultFalseBoolean.TRUE_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultLazyFetchType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultLazyFetchType.java
index 63b44ea..3c6961d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultLazyFetchType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultLazyFetchType.java
@@ -9,9 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.DefaultLazyFetchType.DEFAULT_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DefaultLazyFetchType.EAGER_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DefaultLazyFetchType.LAZY_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultTrueBoolean.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultTrueBoolean.java
index ad70d8d..7bd74d1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultTrueBoolean.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DefaultTrueBoolean.java
@@ -9,9 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.DefaultTrueBoolean.DEFAULT_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DefaultTrueBoolean.FALSE_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DefaultTrueBoolean.TRUE_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -61,7 +58,7 @@
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @see #DEFAULT
-	 * @model name="Default" literal="Default (False)"
+	 * @model name="Default" literal="Default (True)"
 	 * @generated
 	 * @ordered
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DiscriminatorType.java
index ef1b542..77811e9 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DiscriminatorType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/DiscriminatorType.java
@@ -9,10 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.DiscriminatorType.CHAR_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DiscriminatorType.DEFAULT_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DiscriminatorType.INTEGER_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.DiscriminatorType.STRING_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/EnumType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/EnumType.java
index fd7b48c..c205679 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/EnumType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/EnumType.java
@@ -9,9 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.EnumType.DEFAULT_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.EnumType.ORDINAL_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.EnumType.STRING_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/GenerationType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/GenerationType.java
index d767fcc..9348b70 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/GenerationType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/GenerationType.java
@@ -9,11 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.GenerationType.AUTO_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.GenerationType.DEFAULT_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.GenerationType.IDENTITY_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.GenerationType.SEQUENCE_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.GenerationType.TABLE_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IAssociationOverride.java
index 03aebfe..494a0e3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IAssociationOverride.java
@@ -46,7 +46,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIAssociationOverride_JoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getJoinColumns();
@@ -62,7 +62,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIAssociationOverride_SpecifiedJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getSpecifiedJoinColumns();
@@ -78,7 +78,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIAssociationOverride_DefaultJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getDefaultJoinColumns();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IEmbedded.java
index 91f43f9..d639388 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IEmbedded.java
@@ -48,7 +48,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEmbedded_AttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<IAttributeOverride> getAttributeOverrides();
@@ -64,7 +64,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEmbedded_SpecifiedAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IAttributeOverride> getSpecifiedAttributeOverrides();
@@ -80,7 +80,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEmbedded_DefaultAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IAttributeOverride> getDefaultAttributeOverrides();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IEntity.java
index 40ebb4c..78b1453 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IEntity.java
@@ -125,7 +125,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Secondary Tables</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_SpecifiedSecondaryTables()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.ISecondaryTable" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<ISecondaryTable> getSpecifiedSecondaryTables();
@@ -137,7 +137,7 @@
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @model kind="operation" type="org.eclipse.jpt.core.internal.mappings.ISecondaryTable"
+	 * @model kind="operation"
 	 * @generated
 	 */
 	EList<ISecondaryTable> getSecondaryTables();
@@ -316,7 +316,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_PrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<IPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns();
@@ -332,7 +332,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_SpecifiedPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IPrimaryKeyJoinColumn> getSpecifiedPrimaryKeyJoinColumns();
@@ -348,7 +348,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_DefaultPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IPrimaryKeyJoinColumn> getDefaultPrimaryKeyJoinColumns();
@@ -364,7 +364,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_AttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<IAttributeOverride> getAttributeOverrides();
@@ -380,7 +380,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_SpecifiedAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IAttributeOverride> getSpecifiedAttributeOverrides();
@@ -396,7 +396,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Attribute Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_DefaultAttributeOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAttributeOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IAttributeOverride> getDefaultAttributeOverrides();
@@ -412,7 +412,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Association Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_AssociationOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAssociationOverride" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<IAssociationOverride> getAssociationOverrides();
@@ -428,7 +428,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Association Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_SpecifiedAssociationOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAssociationOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IAssociationOverride> getSpecifiedAssociationOverrides();
@@ -444,7 +444,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Association Overrides</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_DefaultAssociationOverrides()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IAssociationOverride" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IAssociationOverride> getDefaultAssociationOverrides();
@@ -460,7 +460,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Named Queries</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_NamedQueries()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.INamedQuery" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<INamedQuery> getNamedQueries();
@@ -476,7 +476,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Named Native Queries</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIEntity_NamedNativeQueries()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.INamedNativeQuery" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<INamedNativeQuery> getNamedNativeQueries();
@@ -559,7 +559,7 @@
 	IAssociationOverride createAssociationOverride(int index);
 
 	IAttributeOverride attributeOverrideNamed(String name);
-	
+
 	boolean containsAttributeOverride(String name);
 
 	boolean containsSpecifiedAttributeOverride(String name);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IJoinTable.java
index 52da107..98c56f0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IJoinTable.java
@@ -52,7 +52,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIJoinTable_JoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getJoinColumns();
@@ -68,7 +68,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIJoinTable_SpecifiedJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getSpecifiedJoinColumns();
@@ -84,7 +84,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIJoinTable_DefaultJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getDefaultJoinColumns();
@@ -100,7 +100,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Inverse Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIJoinTable_InverseJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getInverseJoinColumns();
@@ -116,7 +116,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Inverse Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIJoinTable_SpecifiedInverseJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getSpecifiedInverseJoinColumns();
@@ -132,7 +132,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Inverse Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIJoinTable_DefaultInverseJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getDefaultInverseJoinColumns();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IQuery.java
index de11b6f..2a02f11 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IQuery.java
@@ -95,7 +95,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Hints</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIQuery_Hints()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IQueryHint" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IQueryHint> getHints();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ISecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ISecondaryTable.java
index 9e64992..19758b2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ISecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ISecondaryTable.java
@@ -46,7 +46,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getISecondaryTable_PrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<IPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns();
@@ -62,7 +62,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getISecondaryTable_SpecifiedPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IPrimaryKeyJoinColumn> getSpecifiedPrimaryKeyJoinColumns();
@@ -78,7 +78,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Primary Key Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getISecondaryTable_DefaultPrimaryKeyJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IPrimaryKeyJoinColumn> getDefaultPrimaryKeyJoinColumns();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ISingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ISingleRelationshipMapping.java
index 16359ae..a49d0ac 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ISingleRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ISingleRelationshipMapping.java
@@ -77,7 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getISingleRelationshipMapping_JoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true" transient="true" changeable="false" volatile="true"
+	 * @model containment="true" transient="true" changeable="false" volatile="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getJoinColumns();
@@ -93,7 +93,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specified Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getISingleRelationshipMapping_SpecifiedJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getSpecifiedJoinColumns();
@@ -109,7 +109,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Default Join Columns</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getISingleRelationshipMapping_DefaultJoinColumns()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IJoinColumn" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IJoinColumn> getDefaultJoinColumns();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ITable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ITable.java
index 77763ff..adacc51 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ITable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ITable.java
@@ -198,7 +198,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Unique Constraints</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getITable_UniqueConstraints()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IUniqueConstraint" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IUniqueConstraint> getUniqueConstraints();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ITableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ITableGenerator.java
index 3b7aaf9..07783b4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ITableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/ITableGenerator.java
@@ -398,7 +398,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Unique Constraints</em>' containment reference list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getITableGenerator_UniqueConstraints()
-	 * @model type="org.eclipse.jpt.core.internal.mappings.IUniqueConstraint" containment="true"
+	 * @model containment="true"
 	 * @generated
 	 */
 	EList<IUniqueConstraint> getUniqueConstraints();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IUniqueConstraint.java
index ca1984e..b62390b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IUniqueConstraint.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/IUniqueConstraint.java
@@ -41,7 +41,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Column Names</em>' attribute list.
 	 * @see org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage#getIUniqueConstraint_ColumnNames()
-	 * @model type="java.lang.String"
+	 * @model unique="false"
 	 * @generated
 	 */
 	EList<String> getColumnNames();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/InheritanceType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/InheritanceType.java
index ccd4ef2..5f216d2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/InheritanceType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/InheritanceType.java
@@ -9,10 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.InheritanceType.DEFAULT_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.InheritanceType.JOINED_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.InheritanceType.SINGLE_TABLE_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.InheritanceType.TABLE_PER_CLASS_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/JpaCoreMappingsPackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/JpaCoreMappingsPackage.java
index b5399b7..35eb236 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/JpaCoreMappingsPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/JpaCoreMappingsPackage.java
@@ -6840,10 +6840,10 @@
 		initEReference(getIEntity_NamedQueries(), this.getINamedQuery(), null, "namedQueries", null, 0, -1, IEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getIEntity_NamedNativeQueries(), this.getINamedNativeQuery(), null, "namedNativeQueries", null, 0, -1, IEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getIEntity_IdClass(), theEcorePackage.getEString(), "idClass", null, 0, 1, IEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		addEOperation(iEntityEClass, ecorePackage.getEBoolean(), "discriminatorValueIsAllowed", 0, 1);
-		addEOperation(iEntityEClass, this.getISecondaryTable(), "getSecondaryTables", 0, -1);
-		addEOperation(iEntityEClass, this.getIEntity(), "parentEntity", 0, 1);
-		addEOperation(iEntityEClass, this.getIEntity(), "rootEntity", 0, 1);
+		addEOperation(iEntityEClass, ecorePackage.getEBoolean(), "discriminatorValueIsAllowed", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iEntityEClass, this.getISecondaryTable(), "getSecondaryTables", 0, -1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iEntityEClass, this.getIEntity(), "parentEntity", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(iEntityEClass, this.getIEntity(), "rootEntity", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(iEmbeddableEClass, IEmbeddable.class, "IEmbeddable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(iTableEClass, ITable.class, "ITable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getITable_Name(), ecorePackage.getEString(), "name", null, 0, 1, ITable.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
@@ -6857,7 +6857,7 @@
 		initEAttribute(getITable_DefaultSchema(), ecorePackage.getEString(), "defaultSchema", null, 0, 1, ITable.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getITable_UniqueConstraints(), this.getIUniqueConstraint(), null, "uniqueConstraints", null, 0, -1, ITable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(iUniqueConstraintEClass, IUniqueConstraint.class, "IUniqueConstraint", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getIUniqueConstraint_ColumnNames(), theEcorePackage.getEString(), "columnNames", null, 0, -1, IUniqueConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIUniqueConstraint_ColumnNames(), theEcorePackage.getEString(), "columnNames", null, 0, -1, IUniqueConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(iNamedColumnEClass, INamedColumn.class, "INamedColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getINamedColumn_Name(), ecorePackage.getEString(), "name", null, 0, 1, INamedColumn.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEAttribute(getINamedColumn_SpecifiedName(), ecorePackage.getEString(), "specifiedName", null, 0, 1, INamedColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -6876,7 +6876,7 @@
 		initEAttribute(getIColumn_Precision(), ecorePackage.getEInt(), "precision", null, 0, 1, IColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getIColumn_Scale(), ecorePackage.getEInt(), "scale", null, 0, 1, IColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(iColumnMappingEClass, IColumnMapping.class, "IColumnMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		addEOperation(iColumnMappingEClass, this.getIColumn(), "getColumn", 0, 1);
+		addEOperation(iColumnMappingEClass, this.getIColumn(), "getColumn", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(iBasicEClass, IBasic.class, "IBasic", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getIBasic_Fetch(), this.getDefaultEagerFetchType(), "fetch", null, 0, 1, IBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getIBasic_Optional(), this.getDefaultTrueBoolean(), "optional", null, 0, 1, IBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -6899,7 +6899,7 @@
 		initEReference(getIEmbedded_AttributeOverrides(), this.getIAttributeOverride(), null, "attributeOverrides", null, 0, -1, IEmbedded.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getIEmbedded_SpecifiedAttributeOverrides(), this.getIAttributeOverride(), null, "specifiedAttributeOverrides", null, 0, -1, IEmbedded.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getIEmbedded_DefaultAttributeOverrides(), this.getIAttributeOverride(), null, "defaultAttributeOverrides", null, 0, -1, IEmbedded.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		addEOperation(iEmbeddedEClass, this.getIEmbeddable(), "embeddable", 0, 1);
+		addEOperation(iEmbeddedEClass, this.getIEmbeddable(), "embeddable", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(iRelationshipMappingEClass, IRelationshipMapping.class, "IRelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getIRelationshipMapping_TargetEntity(), ecorePackage.getEString(), "targetEntity", null, 0, 1, IRelationshipMapping.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEAttribute(getIRelationshipMapping_SpecifiedTargetEntity(), ecorePackage.getEString(), "specifiedTargetEntity", null, 0, 1, IRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -6913,11 +6913,11 @@
 		initEAttribute(getIMultiRelationshipMapping_Fetch(), this.getDefaultLazyFetchType(), "fetch", null, 0, 1, IMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getIMultiRelationshipMapping_JoinTable(), this.getIJoinTable(), null, "joinTable", null, 1, 1, IMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getIMultiRelationshipMapping_MapKey(), theEcorePackage.getEString(), "mapKey", null, 0, 1, IMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		addEOperation(iMultiRelationshipMappingEClass, ecorePackage.getEBoolean(), "isNoOrdering", 1, 1);
-		addEOperation(iMultiRelationshipMappingEClass, null, "setNoOrdering");
-		addEOperation(iMultiRelationshipMappingEClass, theEcorePackage.getEBoolean(), "isOrderByPk", 1, 1);
-		addEOperation(iMultiRelationshipMappingEClass, null, "setOrderByPk");
-		addEOperation(iMultiRelationshipMappingEClass, theEcorePackage.getEBoolean(), "isCustomOrdering", 1, 1);
+		addEOperation(iMultiRelationshipMappingEClass, ecorePackage.getEBoolean(), "isNoOrdering", 1, 1, !IS_UNIQUE, !IS_ORDERED);
+		addEOperation(iMultiRelationshipMappingEClass, null, "setNoOrdering", 0, 1, !IS_UNIQUE, !IS_ORDERED);
+		addEOperation(iMultiRelationshipMappingEClass, theEcorePackage.getEBoolean(), "isOrderByPk", 1, 1, !IS_UNIQUE, !IS_ORDERED);
+		addEOperation(iMultiRelationshipMappingEClass, null, "setOrderByPk", 0, 1, !IS_UNIQUE, !IS_ORDERED);
+		addEOperation(iMultiRelationshipMappingEClass, theEcorePackage.getEBoolean(), "isCustomOrdering", 1, 1, !IS_UNIQUE, !IS_ORDERED);
 		initEClass(iOneToManyEClass, IOneToMany.class, "IOneToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(iManyToManyEClass, IManyToMany.class, "IManyToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(iSingleRelationshipMappingEClass, ISingleRelationshipMapping.class, "ISingleRelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -6957,7 +6957,7 @@
 		initEReference(getISecondaryTable_PrimaryKeyJoinColumns(), this.getIPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, ISecondaryTable.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getISecondaryTable_SpecifiedPrimaryKeyJoinColumns(), this.getIPrimaryKeyJoinColumn(), null, "specifiedPrimaryKeyJoinColumns", null, 0, -1, ISecondaryTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getISecondaryTable_DefaultPrimaryKeyJoinColumns(), this.getIPrimaryKeyJoinColumn(), null, "defaultPrimaryKeyJoinColumns", null, 0, -1, ISecondaryTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		addEOperation(iSecondaryTableEClass, theJpaCorePackage.getITypeMapping(), "typeMapping", 0, 1);
+		addEOperation(iSecondaryTableEClass, theJpaCorePackage.getITypeMapping(), "typeMapping", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(iPrimaryKeyJoinColumnEClass, IPrimaryKeyJoinColumn.class, "IPrimaryKeyJoinColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(iGeneratorEClass, IGenerator.class, "IGenerator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getIGenerator_Name(), ecorePackage.getEString(), "name", null, 0, 1, IGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/OrderingType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/OrderingType.java
index 1eb81e3..0eb6c45 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/OrderingType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/OrderingType.java
@@ -9,9 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.OrderingType.CUSTOM_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.OrderingType.NONE_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.OrderingType.PRIMARY_KEY_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/TemporalType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/TemporalType.java
index 2824053..2d7cd32 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/TemporalType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/TemporalType.java
@@ -9,10 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.mappings;
 
-import static org.eclipse.jpt.core.internal.mappings.TemporalType.DATE_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.TemporalType.NULL_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.TemporalType.TIMESTAMP_VALUE;
-import static org.eclipse.jpt.core.internal.mappings.TemporalType.TIME_VALUE;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/util/JpaCoreMappingsSwitch.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/util/JpaCoreMappingsSwitch.java
index db4c09b..9467464 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/util/JpaCoreMappingsSwitch.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/mappings/util/JpaCoreMappingsSwitch.java
@@ -692,13 +692,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMapped Superclass</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMapped Superclass</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMapped Superclass</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMapped Superclass</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -707,13 +707,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEntity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEntity</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEntity</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEntity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -722,13 +722,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ITable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ITable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ITable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ITable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -737,13 +737,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IUnique Constraint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IUnique Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IUnique Constraint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IUnique Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -752,13 +752,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INamed Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INamed Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INamed Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INamed Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -767,13 +767,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAbstract Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAbstract Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAbstract Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAbstract Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -782,13 +782,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IColumn</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IColumn</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IColumn</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IColumn</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -797,13 +797,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IColumn Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IColumn Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IColumn Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IColumn Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -812,13 +812,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEmbeddable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEmbeddable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEmbeddable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEmbeddable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -827,13 +827,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IBasic</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IBasic</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IBasic</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IBasic</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -842,13 +842,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IId</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IId</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IId</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IId</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -857,13 +857,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ITransient</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ITransient</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ITransient</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ITransient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -872,13 +872,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IVersion</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IVersion</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IVersion</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IVersion</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -887,13 +887,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEmbedded Id</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEmbedded Id</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEmbedded Id</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEmbedded Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -902,13 +902,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IEmbedded</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IEmbedded</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IEmbedded</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IEmbedded</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -917,13 +917,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IRelationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IRelationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IRelationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IRelationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -932,13 +932,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INon Owning Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INon Owning Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INon Owning Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INon Owning Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -947,13 +947,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMulti Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -962,13 +962,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IOne To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IOne To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IOne To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IOne To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -977,13 +977,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMany To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMany To Many</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMany To Many</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMany To Many</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -992,13 +992,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ISingle Relationship Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1007,13 +1007,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMany To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IMany To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMany To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IMany To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1022,13 +1022,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IOne To One</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IOne To One</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IOne To One</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IOne To One</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1037,13 +1037,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJoin Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJoin Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJoin Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJoin Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1052,13 +1052,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAbstract Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAbstract Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAbstract Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAbstract Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1067,13 +1067,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJoin Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJoin Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJoin Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJoin Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1082,13 +1082,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IOverride</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IOverride</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IOverride</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IOverride</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1097,13 +1097,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAttribute Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAttribute Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAttribute Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAttribute Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1112,13 +1112,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAssociation Override</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAssociation Override</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAssociation Override</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAssociation Override</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1127,13 +1127,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IDiscriminator Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IDiscriminator Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IDiscriminator Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IDiscriminator Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1142,13 +1142,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ISecondary Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ISecondary Table</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ISecondary Table</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ISecondary Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1157,13 +1157,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IPrimary Key Join Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IPrimary Key Join Column</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IPrimary Key Join Column</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IPrimary Key Join Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1172,13 +1172,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IGenerator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IGenerator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IGenerator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IGenerator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1187,13 +1187,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ITable Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ITable Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ITable Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ITable Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1202,13 +1202,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ISequence Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ISequence Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ISequence Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ISequence Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1217,13 +1217,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IGenerated Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IGenerated Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IGenerated Value</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IGenerated Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1232,13 +1232,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IQuery</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IQuery</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IQuery</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IQuery</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1247,13 +1247,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INamed Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INamed Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INamed Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INamed Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1262,13 +1262,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>INamed Native Query</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>INamed Native Query</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>INamed Native Query</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>INamed Native Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1277,13 +1277,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IQuery Hint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IQuery Hint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IQuery Hint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IQuery Hint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1292,13 +1292,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ICascade</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>ICascade</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ICascade</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>ICascade</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1307,13 +1307,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1322,13 +1322,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1337,13 +1337,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1352,13 +1352,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1367,13 +1367,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaMappedSuperclassContext.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaMappedSuperclassContext.java
index 5748b2b..3943b47 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaMappedSuperclassContext.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaMappedSuperclassContext.java
@@ -8,9 +8,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.core.internal.platform;
 
-import java.util.List;
 import org.eclipse.jpt.core.internal.content.java.mappings.JavaMappedSuperclass;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 
 public class JavaMappedSuperclassContext extends JavaTypeContext
 {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlRelationshipMappingContext.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlRelationshipMappingContext.java
index 8c4eea9..2336412 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlRelationshipMappingContext.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlRelationshipMappingContext.java
@@ -12,7 +12,6 @@
 import org.eclipse.jpt.core.internal.IAttributeMapping;
 import org.eclipse.jpt.core.internal.IPersistentType;
 import org.eclipse.jpt.core.internal.ITypeMapping;
-import org.eclipse.jpt.core.internal.content.java.mappings.JavaRelationshipMapping;
 import org.eclipse.jpt.core.internal.content.orm.XmlRelationshipMapping;
 import org.eclipse.jpt.core.internal.jdtutility.Attribute;
 import org.eclipse.jpt.core.internal.mappings.IEntity;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/util/JpaCoreSwitch.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/util/JpaCoreSwitch.java
index 184193e..02b0d9f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/util/JpaCoreSwitch.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/util/JpaCoreSwitch.java
@@ -344,13 +344,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Model</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Model</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -359,13 +359,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa Model</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa Model</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -374,13 +374,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -389,13 +389,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -404,13 +404,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Project</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Project</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Project</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Project</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -419,13 +419,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa Project</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa Project</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa Project</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa Project</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -434,13 +434,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa File</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa File</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa File</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa File</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -449,13 +449,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa File</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa File</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa File</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa File</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -464,13 +464,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Source Object</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Source Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -479,13 +479,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IXml EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IXml EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IXml EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IXml EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -494,13 +494,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -509,13 +509,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Root Content Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Root Content Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Root Content Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Root Content Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -524,13 +524,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IPersistent Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IPersistent Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IPersistent Type</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IPersistent Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -539,13 +539,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IType Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IType Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -554,13 +554,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Null Type Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Null Type Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Null Type Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Null Type Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -569,13 +569,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IPersistent Attribute</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IPersistent Attribute</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IPersistent Attribute</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IPersistent Attribute</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -584,13 +584,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IAttribute Mapping</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IAttribute Mapping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -599,13 +599,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Xml EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Xml EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Xml EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Xml EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -614,13 +614,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Data Source</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Data Source</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Data Source</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Data Source</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -629,13 +629,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Jpa Data Source</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Jpa Data Source</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Jpa Data Source</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Jpa Data Source</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -644,13 +644,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IJpa Platform</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>IJpa Platform</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IJpa Platform</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>IJpa Platform</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -659,13 +659,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */