From fb2b0808b94e85bebf70df2f8e1e497aceb63000 Mon Sep 17 00:00:00 2001 From: kmoore Date: Thu, 2 Sep 2010 17:07:58 +0000 Subject: fixed validation when table is defined in java single-table inheritance hierarchy, entity overriden in orm.xml --- .../jpt/core/internal/context/orm/AbstractOrmEntity.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java index 3b1d822901..45e77c61da 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java @@ -1048,7 +1048,11 @@ public abstract class AbstractOrmEntity protected boolean isAbstractTablePerClass() { return isAbstract() && isTablePerClass(); } - + + protected boolean isResourceTableSpecified() { + return this.table.isResourceSpecified() || (getJavaEntity() != null && getJavaEntity().getTable().isResourceSpecified()); + } + /** * Return whether the entity is a part of a "table per class" * inheritance hierarchy. @@ -1662,7 +1666,7 @@ public abstract class AbstractOrmEntity protected void validateTable(List messages, IReporter reporter) { if (isAbstractTablePerClass()) { - if (this.table.isResourceSpecified()) { + if (this.isResourceTableSpecified()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -1676,7 +1680,7 @@ public abstract class AbstractOrmEntity return; } if (isSingleTableDescendant()) { - if (this.table.isResourceSpecified()) { + if (this.isResourceTableSpecified()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, -- cgit v1.2.3