[339432] fix validation of virtual overrides

1 files changed, 10 insertions, 9 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeOverrideContainer.java
index d4d1369e42..e3a51dad74 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeOverrideContainer.java
@@ -27,6 +27,15 @@ import java.util.ListIterator;
 public interface AttributeOverrideContainer
 	extends OverrideContainer
 {
+	/**
+	 * Return the column of the mapping or attribute override for the specified
+	 * attribute. Return <code>null</code> if it does not exist. This
+	 * column mapping/attribute override will be found in the mapped superclass
+	 * (or embeddable), not in the owning entity.
+	 */
+	ReadOnlyColumn resolveOverriddenColumn(String attributeName);
+
+	// covariant overrides
 	ListIterator<? extends ReadOnlyAttributeOverride> overrides();
 	ReadOnlyAttributeOverride getOverrideNamed(String name);
 	ListIterator<? extends AttributeOverride> specifiedOverrides();
@@ -36,14 +45,6 @@ public interface AttributeOverrideContainer
 	VirtualAttributeOverride convertOverrideToVirtual(Override_ specifiedOverride);
 	AttributeOverride convertOverrideToSpecified(VirtualOverride virtualOverride);
 
-	/**
-	 * Return the column of the mapping or attribute override with the specified
-	 * attribute name. Return <code>null</code> if it does not exist. This
-	 * column mapping/attribute override will be found in the mapped superclass
-	 * (or embeddable), not in the owning entity.
-	 */
-	Column resolveOverriddenColumn(String attributeName);
-
 
 	// ********** owner **********
 
@@ -53,6 +54,6 @@ public interface AttributeOverrideContainer
 		/**
 		 * @see AttributeOverrideContainer#resolveOverriddenColumn(String)
 		 */
-		Column resolveOverriddenColumn(String attributeName);
+		ReadOnlyColumn resolveOverriddenColumn(String attributeName);
 	}
 }