diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java')
| -rw-r--r-- | jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java index ddfa8a782e..23b3ada09b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java @@ -31,8 +31,6 @@ public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<Pri protected String specifiedReferencedColumnName; protected String defaultReferencedColumnName; - - protected PrimaryKeyJoinColumnAnnotation resourcePrimaryKeyJoinColumn; public GenericJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, JavaBaseJoinColumn.Owner owner) { super(parent, owner); @@ -40,24 +38,25 @@ public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<Pri @Override public void initialize(PrimaryKeyJoinColumnAnnotation column) { - this.resourcePrimaryKeyJoinColumn = column; super.initialize(column); - this.specifiedReferencedColumnName = this.getResourceReferencedColumnName(column); + this.specifiedReferencedColumnName = this.getResourceReferencedColumnName(); this.defaultReferencedColumnName = this.buildDefaultReferencedColumnName(); } + @Override + public void update(PrimaryKeyJoinColumnAnnotation resourceColumn) { + super.update(resourceColumn); + this.setSpecifiedReferencedColumnName_(this.getResourceReferencedColumnName()); + this.setDefaultReferencedColumnName(this.buildDefaultReferencedColumnName()); + } + //************** JavaNamedColumn implementation *************** @Override public JavaBaseJoinColumn.Owner getOwner() { return (JavaBaseJoinColumn.Owner) super.getOwner(); } - @Override - protected PrimaryKeyJoinColumnAnnotation getResourceColumn() { - return this.resourcePrimaryKeyJoinColumn; - } - - //************** IAbstractJoinColumn implementation *************** + //************** BaseJoinColumn implementation *************** public String getReferencedColumnName() { return (this.specifiedReferencedColumnName == null) ? this.defaultReferencedColumnName : this.specifiedReferencedColumnName; @@ -149,17 +148,9 @@ public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<Pri TextRange textRange = getResourceColumn().getTextRange(astRoot); return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot); } - - @Override - public void update(PrimaryKeyJoinColumnAnnotation resourceColumn) { - this.resourcePrimaryKeyJoinColumn = resourceColumn; - super.update(resourceColumn); - this.setSpecifiedReferencedColumnName_(this.getResourceReferencedColumnName(resourceColumn)); - this.setDefaultReferencedColumnName(this.buildDefaultReferencedColumnName()); - } - protected String getResourceReferencedColumnName(PrimaryKeyJoinColumnAnnotation resourceColumn) { - return resourceColumn.getReferencedColumnName(); + protected String getResourceReferencedColumnName() { + return getResourceColumn().getReferencedColumnName(); } //TODO not correct when we start supporting primaryKeyJoinColumns in 1-1 mappings |