columnResults -> columns

6 files changed, 43 insertions, 44 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
index 9ed1e0b1bd..eb41052bb0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
@@ -472,8 +472,7 @@
       </genClasses>

       <genClasses image="false" ecoreClass="orm.ecore#//v2_1/ConstructorResult_2_1">

         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/ConstructorResult_2_1/targetClass"/>

-        <genFeatures notify="false" createChild="false" propertySortChoices="true"

-            ecoreFeature="ecore:EReference orm.ecore#//v2_1/ConstructorResult_2_1/columnResults"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/ConstructorResult_2_1/columns"/>

       </genClasses>

       <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlAssociationOverride_2_1">

         <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlAssociationOverride_2_1/foreignKey"/>

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
index d1f21b0561..4c56c1fff9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
@@ -606,7 +606,7 @@
         interface="true">

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetClass" lowerBound="1"

           eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="columnResults" upperBound="-1"

+      <eStructuralFeatures xsi:type="ecore:EReference" name="columns" upperBound="-1"

           eType="#//ColumnResult" containment="true"/>

     </eClassifiers>

     <eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride_2_1" abstract="true"

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java
index 8d348765e7..f0380607b0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java
@@ -72,14 +72,14 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
 	protected String targetClass = TARGET_CLASS_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getColumnResults() <em>Column Results</em>}' containment reference list.
+	 * The cached value of the '{@link #getColumns() <em>Columns</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getColumnResults()
+	 * @see #getColumns()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<ColumnResult> columnResults;
+	protected EList<ColumnResult> columns;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -138,26 +138,26 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
 	}
 
 	/**
-	 * Returns the value of the '<em><b>Column Results</b></em>' containment reference list.
+	 * Returns the value of the '<em><b>Columns</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.ColumnResult}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Column Results</em>' reference list isn't clear,
+	 * If the meaning of the '<em>Columns</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Results</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getConstructorResult_2_1_ColumnResults()
+	 * @return the value of the '<em>Columns</em>' containment reference list.
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getConstructorResult_2_1_Columns()
 	 * @model containment="true"
 	 * @generated
 	 */
-	public EList<ColumnResult> getColumnResults()
+	public EList<ColumnResult> getColumns()
 	{
-		if (columnResults == null)
+		if (columns == null)
 		{
-			columnResults = new EObjectContainmentEList<ColumnResult>(ColumnResult.class, this, OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS);
+			columns = new EObjectContainmentEList<ColumnResult>(ColumnResult.class, this, OrmPackage.CONSTRUCTOR_RESULT__COLUMNS);
 		}
-		return columnResults;
+		return columns;
 	}
 
 	/**
@@ -170,8 +170,8 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
 	{
 		switch (featureID)
 		{
-			case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
-				return ((InternalEList<?>)getColumnResults()).basicRemove(otherEnd, msgs);
+			case OrmPackage.CONSTRUCTOR_RESULT__COLUMNS:
+				return ((InternalEList<?>)getColumns()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -188,8 +188,8 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
 		{
 			case OrmPackage.CONSTRUCTOR_RESULT__TARGET_CLASS:
 				return getTargetClass();
-			case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
-				return getColumnResults();
+			case OrmPackage.CONSTRUCTOR_RESULT__COLUMNS:
+				return getColumns();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -208,9 +208,9 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
 			case OrmPackage.CONSTRUCTOR_RESULT__TARGET_CLASS:
 				setTargetClass((String)newValue);
 				return;
-			case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
-				getColumnResults().clear();
-				getColumnResults().addAll((Collection<? extends ColumnResult>)newValue);
+			case OrmPackage.CONSTRUCTOR_RESULT__COLUMNS:
+				getColumns().clear();
+				getColumns().addAll((Collection<? extends ColumnResult>)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -229,8 +229,8 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
 			case OrmPackage.CONSTRUCTOR_RESULT__TARGET_CLASS:
 				setTargetClass(TARGET_CLASS_EDEFAULT);
 				return;
-			case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
-				getColumnResults().clear();
+			case OrmPackage.CONSTRUCTOR_RESULT__COLUMNS:
+				getColumns().clear();
 				return;
 		}
 		super.eUnset(featureID);
@@ -248,8 +248,8 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
 		{
 			case OrmPackage.CONSTRUCTOR_RESULT__TARGET_CLASS:
 				return TARGET_CLASS_EDEFAULT == null ? targetClass != null : !TARGET_CLASS_EDEFAULT.equals(targetClass);
-			case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
-				return columnResults != null && !columnResults.isEmpty();
+			case OrmPackage.CONSTRUCTOR_RESULT__COLUMNS:
+				return columns != null && !columns.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -290,7 +290,7 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
 	}
 
 	protected static Translator buildColumnTranslator() {
-		return ColumnResult.buildTranslator(JPA2_1.COLUMN, OrmV2_1Package.eINSTANCE.getConstructorResult_2_1_ColumnResults());
+		return ColumnResult.buildTranslator(JPA2_1.COLUMN, OrmV2_1Package.eINSTANCE.getConstructorResult_2_1_Columns());
 	}
 
 	protected static Translator buildTargetClassTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
index 7e56dfe0e1..c5dfec1199 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
@@ -2015,13 +2015,13 @@ public class OrmPackage extends EPackageImpl
 	public static final int CONSTRUCTOR_RESULT__TARGET_CLASS = OrmV2_1Package.CONSTRUCTOR_RESULT_21__TARGET_CLASS;
 
 	/**
-	 * The feature id for the '<em><b>Column Results</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Columns</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int CONSTRUCTOR_RESULT__COLUMN_RESULTS = OrmV2_1Package.CONSTRUCTOR_RESULT_21__COLUMN_RESULTS;
+	public static final int CONSTRUCTOR_RESULT__COLUMNS = OrmV2_1Package.CONSTRUCTOR_RESULT_21__COLUMNS;
 
 	/**
 	 * The number of structural features of the '<em>Constructor Result</em>' class.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java
index 0b0e92c351..03aed66b1e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.ColumnResult;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getTargetClass <em>Target Class</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getColumnResults <em>Column Results</em>}</li>
+ *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getColumns <em>Columns</em>}</li>
  * </ul>
  * </p>
  *
@@ -67,19 +67,19 @@ public interface ConstructorResult_2_1 extends EBaseObject
 	void setTargetClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Column Results</b></em>' containment reference list.
+	 * Returns the value of the '<em><b>Columns</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.ColumnResult}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Column Results</em>' reference list isn't clear,
+	 * If the meaning of the '<em>Columns</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Results</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getConstructorResult_2_1_ColumnResults()
+	 * @return the value of the '<em>Columns</em>' containment reference list.
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getConstructorResult_2_1_Columns()
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<ColumnResult> getColumnResults();
+	EList<ColumnResult> getColumns();
 
 } // ConstructorResult_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java
index eb4665538c..b8a71230db 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java
@@ -133,13 +133,13 @@ public class OrmV2_1Package extends EPackageImpl
 	public static final int CONSTRUCTOR_RESULT_21__TARGET_CLASS = 0;
 
 	/**
-	 * The feature id for the '<em><b>Column Results</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Columns</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int CONSTRUCTOR_RESULT_21__COLUMN_RESULTS = 1;
+	public static final int CONSTRUCTOR_RESULT_21__COLUMNS = 1;
 
 	/**
 	 * The number of structural features of the '<em>Constructor Result 21</em>' class.
@@ -1627,15 +1627,15 @@ public class OrmV2_1Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getColumnResults <em>Column Results</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getColumns <em>Columns</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Column Results</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getColumnResults()
+	 * @return the meta object for the containment reference list '<em>Columns</em>'.
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getColumns()
 	 * @see #getConstructorResult_2_1()
 	 * @generated
 	 */
-	public EReference getConstructorResult_2_1_ColumnResults()
+	public EReference getConstructorResult_2_1_Columns()
 	{
 		return (EReference)constructorResult_2_1EClass.getEStructuralFeatures().get(1);
 	}
@@ -3012,7 +3012,7 @@ public class OrmV2_1Package extends EPackageImpl
 
 		constructorResult_2_1EClass = createEClass(CONSTRUCTOR_RESULT_21);
 		createEAttribute(constructorResult_2_1EClass, CONSTRUCTOR_RESULT_21__TARGET_CLASS);
-		createEReference(constructorResult_2_1EClass, CONSTRUCTOR_RESULT_21__COLUMN_RESULTS);
+		createEReference(constructorResult_2_1EClass, CONSTRUCTOR_RESULT_21__COLUMNS);
 
 		xmlAssociationOverride_2_1EClass = createEClass(XML_ASSOCIATION_OVERRIDE_21);
 		createEReference(xmlAssociationOverride_2_1EClass, XML_ASSOCIATION_OVERRIDE_21__FOREIGN_KEY);
@@ -3178,7 +3178,7 @@ public class OrmV2_1Package extends EPackageImpl
 
 		initEClass(constructorResult_2_1EClass, ConstructorResult_2_1.class, "ConstructorResult_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getConstructorResult_2_1_TargetClass(), theXMLTypePackage.getString(), "targetClass", null, 1, 1, ConstructorResult_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConstructorResult_2_1_ColumnResults(), theOrmPackage.getColumnResult(), null, "columnResults", null, 0, -1, ConstructorResult_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getConstructorResult_2_1_Columns(), theOrmPackage.getColumnResult(), null, "columns", null, 0, -1, ConstructorResult_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(xmlAssociationOverride_2_1EClass, XmlAssociationOverride_2_1.class, "XmlAssociationOverride_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getXmlAssociationOverride_2_1_ForeignKey(), theOrmPackage.getXmlForeignKey(), null, "foreignKey", null, 0, 1, XmlAssociationOverride_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3360,12 +3360,12 @@ public class OrmV2_1Package extends EPackageImpl
 		public static final EAttribute CONSTRUCTOR_RESULT_21__TARGET_CLASS = eINSTANCE.getConstructorResult_2_1_TargetClass();
 
 		/**
-		 * The meta object literal for the '<em><b>Column Results</b></em>' containment reference list feature.
+		 * The meta object literal for the '<em><b>Columns</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		public static final EReference CONSTRUCTOR_RESULT_21__COLUMN_RESULTS = eINSTANCE.getConstructorResult_2_1_ColumnResults();
+		public static final EReference CONSTRUCTOR_RESULT_21__COLUMNS = eINSTANCE.getConstructorResult_2_1_Columns();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlAssociationOverride_2_1 <em>Xml Association Override 21</em>}' class.