refactored column validation

1 files changed, 9 insertions, 7 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java
index cca8d0cb49..74ff5696dd 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java
@@ -13,6 +13,8 @@ import java.util.List;
 import org.eclipse.jpt.core.context.NamedColumn;
 import org.eclipse.jpt.core.context.XmlContextNode;
 import org.eclipse.jpt.core.context.orm.OrmNamedColumn;
+import org.eclipse.jpt.core.internal.context.JptValidator;
+import org.eclipse.jpt.core.internal.context.NamedColumnTextRangeResolver;
 import org.eclipse.jpt.core.resource.orm.AbstractXmlNamedColumn;
 import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.db.Column;
@@ -206,14 +208,14 @@ public abstract class AbstractOrmNamedColumn<T extends AbstractXmlNamedColumn> e
 	@Override
 	public void validate(List<IMessage> messages, IReporter reporter) {
 		super.validate(messages, reporter);
-		this.validateName(messages);
+		this.buildColumnValidator().validate(messages, reporter);
 	}
-	
-	protected void validateName(List<IMessage> messages) {
-		Table dbTable = this.getDbTable();
-		if (dbTable != null && ! this.isResolved()) {
-			messages.add(this.getOwner().buildUnresolvedNameMessage(this, this.getNameTextRange()));
-		}
+
+	protected JptValidator buildColumnValidator() {
+		return this.getOwner().buildColumnValidator(this, buildTextRangeResolver());
 	}
 
+	protected NamedColumnTextRangeResolver buildTextRangeResolver() {
+		return new OrmNamedColumnTextRangeResolver(this);
+	}
 }
\ No newline at end of file