Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2012-04-10 09:21:38 -0400
committerkmoore2012-04-10 09:21:38 -0400
commita8195d55f03af975249fbb9fe5cc9c90a13fbb25 (patch)
treec64b73912649866482938ba0e431de5228570aeb
parent2920426bd51d61c33cde68d2943049c96675a6fc (diff)
downloadwebtools.dali-a8195d55f03af975249fbb9fe5cc9c90a13fbb25.tar.gz
webtools.dali-a8195d55f03af975249fbb9fe5cc9c90a13fbb25.tar.xz
webtools.dali-a8195d55f03af975249fbb9fe5cc9c90a13fbb25.zip
reordered setting of rootEntity, broke tests with my changes to build column names during construction
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java
index a556674c0a..d5e99192ab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java
@@ -170,6 +170,8 @@ public abstract class AbstractJavaEntity
this.specifiedName = this.mappingAnnotation.getName();
this.idClassReference = this.buildIdClassReference();
this.table = this.buildTable();
+ // start with the entity as the root - it will be recalculated in update()
+ this.rootEntity = this;
this.specifiedSecondaryTableOwner = this.buildSpecifiedSecondaryTableOwner();
this.specifiedSecondaryTableContainer = this.buildSpecifiedSecondaryTableContainer();
this.primaryKeyJoinColumnOwner = this.buildPrimaryKeyJoinColumnOwner();
@@ -177,8 +179,6 @@ public abstract class AbstractJavaEntity
this.specifiedInheritanceStrategy = this.buildSpecifiedInheritanceStrategy();
this.specifiedDiscriminatorValue = this.getDiscriminatorValueAnnotation().getValue();
this.discriminatorColumn = this.buildDiscriminatorColumn();
- // start with the entity as the root - it will be recalculated in update()
- this.rootEntity = this;
this.attributeOverrideContainer = this.buildAttributeOverrideContainer();
this.associationOverrideContainer = this.buildAssociationOverrideContainer();
this.generatorContainer = this.buildGeneratorContainer();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java
index 78ae7e70c7..fc0e6767ba 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java
@@ -195,6 +195,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity>
this.specifiedName = xmlEntity.getName();
this.idClassReference = this.buildIdClassReference();
this.table = this.buildTable();
+ // start with the entity as the root - it will be recalculated in update()
+ this.rootEntity = this;
this.secondaryTableOwner = this.buildSecondaryTableOwner();
this.specifiedSecondaryTableContainer = this.buildSpecifiedSecondaryTableContainer();
this.virtualSecondaryTableContainer = this.buildVirtualSecondaryTableContainer();
@@ -203,8 +205,6 @@ public abstract class AbstractOrmEntity<X extends XmlEntity>
this.specifiedInheritanceStrategy = this.buildSpecifiedInheritanceStrategy();
this.specifiedDiscriminatorValue = xmlEntity.getDiscriminatorValue();
this.discriminatorColumn = this.buildDiscriminatorColumn();
- // start with the entity as the root - it will be recalculated in update()
- this.rootEntity = this;
this.attributeOverrideContainer = this.buildAttributeOverrideContainer();
this.associationOverrideContainer = this.buildAssociationOverrideContainer();
this.generatorContainer = this.buildGeneratorContainer();

Back to the top