diff options
author | Karen Butzke | 2012-10-04 16:42:51 +0000 |
---|---|---|
committer | Karen Butzke | 2012-10-04 16:42:51 +0000 |
commit | 520b200b106daae50dfeff1de8f9ecbdf234adea (patch) | |
tree | 8009690713b15741ce3cc97725f57cd6cc3cf764 | |
parent | fcb01261e33cdbe16b16179b18d138233e614ff1 (diff) | |
download | webtools.dali-520b200b106daae50dfeff1de8f9ecbdf234adea.tar.gz webtools.dali-520b200b106daae50dfeff1de8f9ecbdf234adea.tar.xz webtools.dali-520b200b106daae50dfeff1de8f9ecbdf234adea.zip |
moved getValidationTextRange() to the abstract class since it was the same implementation in the subclasses
9 files changed, 20 insertions, 31 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java index 9513928c4d..fdc8506ac2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java @@ -42,6 +42,10 @@ public abstract class AbstractAccessor return this.getParent(); } + public TextRange getValidationTextRange() { + return this.getResourceAttribute().getNameTextRange(); + } + // ********** unannotated Java resource member ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java index b9497dcead..f8bbed8619 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java @@ -10,6 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; + +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -320,4 +322,11 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy joinColumn.validate(messages, reporter); } } + + // ********** validation ********** + + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java index a99c56b954..9140486f2b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java @@ -10,6 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; + +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationshipStrategy; @@ -192,4 +194,9 @@ public abstract class AbstractJavaJoinTableRelationshipStrategy this.joinTable.validate(messages, reporter); } } + + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java index 6be313be48..37af16b57d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java @@ -15,7 +15,6 @@ import org.eclipse.jdt.core.dom.FieldDeclaration; import org.eclipse.jdt.core.dom.VariableDeclarationFragment; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; @@ -64,10 +63,6 @@ public class FieldAccessor return new PersistentFieldValidator(persistentAttribute, this); } - public TextRange getValidationTextRange() { - return this.getResourceAttribute().getNameTextRange(); - } - public JavaPersistentAttribute buildUnannotatedJavaAttribute(PersistentType type) { return this.buildJavaAttribute(type, this.buildUnannotatedJavaResourceField()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java index c62fea2393..7ef971575c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java @@ -139,10 +139,6 @@ public class GenericJavaMappingJoinColumnRelationshipStrategy return JpaValidationDescriptionMessages.NOT_VALID_FOR_THIS_ENTITY; } - public TextRange getValidationTextRange() { - return this.getRelationship().getValidationTextRange(); - } - // ********** join column owner ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java index 8dfc6f76ee..a17fac160b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java @@ -152,13 +152,6 @@ public class GenericJavaOverrideJoinColumnRelationshipStrategy } - // ********** validation ********** - - public TextRange getValidationTextRange() { - return this.getRelationship().getValidationTextRange(); - } - - // ********** join column owner adapter ********** protected class JoinColumnOwner diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java index 2e4558b31f..bafc168000 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java @@ -14,7 +14,6 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.MethodSignature; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -95,10 +94,6 @@ public class PropertyAccessor return new PersistentPropertyValidator(persistentAttribute, this); } - public TextRange getValidationTextRange() { - return this.getResourceAttribute().getNameTextRange(); - } - public IJavaElement getJavaElement() { PersistentType persistentType = this.getAttribute().getOwningPersistentType(); if (persistentType instanceof JavaElementReference) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java index dc6fe34195..11c2fe8604 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JoinTable; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; @@ -84,10 +83,6 @@ public class GenericJavaMappingJoinTableRelationshipStrategy return this.getRelationshipMapping().validatesAgainstDatabase(); } - public TextRange getValidationTextRange() { - return this.getRelationship().getValidationTextRange(); - } - protected PersistentAttribute getPersistentAttribute() { return this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableRelationshipStrategy2_0.java index d20a993672..b808abff8a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableRelationshipStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableRelationshipStrategy2_0.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; @@ -72,10 +71,6 @@ public class GenericJavaOverrideJoinTableRelationshipStrategy2_0 return this.getRelationship().getTypeMapping().validatesAgainstDatabase(); } - public TextRange getValidationTextRange() { - return this.getRelationship().getValidationTextRange(); - } - public JptValidator buildTableValidator(ReadOnlyTable table) { return this.getRelationship().buildJoinTableValidator((ReadOnlyJoinTable) table); } |