diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core')
66 files changed, 292 insertions, 439 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverter.java index c10376fc63..2b299503f8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverter.java @@ -8,7 +8,8 @@ * Oracle - initial API and implementation ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.context; -
import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +
import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.jpa.core.context.JpaNamedContextNode; /** @@ -24,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.JpaNamedContextNode; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 3.3 * @since 2.1 */ public interface EclipseLinkConverter @@ -49,5 +50,8 @@ public interface EclipseLinkConverter * @see org.eclipse.jdt.core.IType#getFullyQualifiedName(char) */ char getEnclosingTypeSeparator(); + + TextRange getNameTextRange(); + } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaReadOnlyTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaReadOnlyTenantDiscriminatorColumn2_3.java index 0169a52e23..5da9b356b3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaReadOnlyTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaReadOnlyTenantDiscriminatorColumn2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -22,21 +22,11 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.ReadOnlyTenantDiscriminatorC * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 3.1 */ public interface JavaReadOnlyTenantDiscriminatorColumn2_3 extends JavaReadOnlyNamedDiscriminatorColumn, ReadOnlyTenantDiscriminatorColumn2_3, JavaReadOnlyTableColumn { - // ********** owner ********** - - /** - * interface allowing tenant discriminator columns to be used in multiple places - */ - interface Owner - extends ReadOnlyTenantDiscriminatorColumn2_3.Owner, JavaReadOnlyNamedDiscriminatorColumn.Owner - { - //combining interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmReadOnlyTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmReadOnlyTenantDiscriminatorColumn2_3.java index 8879430be2..c0ee83351a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmReadOnlyTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmReadOnlyTenantDiscriminatorColumn2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -22,21 +22,11 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.ReadOnlyTenantDiscriminatorC * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 3.1 */ public interface OrmReadOnlyTenantDiscriminatorColumn2_3 extends OrmReadOnlyNamedDiscriminatorColumn, ReadOnlyTenantDiscriminatorColumn2_3, OrmReadOnlyTableColumn { - // ********** owner ********** - - /** - * interface allowing discriminator columns to be used in multiple places - */ - interface Owner - extends ReadOnlyTenantDiscriminatorColumn2_3.Owner, OrmReadOnlyNamedDiscriminatorColumn.Owner - { - //combining interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java index 83698b02ee..ea438863a3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java @@ -24,7 +24,6 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.internal.utility.JDTTools; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.NonEmptyStringFilter; @@ -1015,7 +1014,7 @@ public class EclipseLinkPersistenceUnit EclipseLinkJpaValidationMessages.CONVERTER_DUPLICATE_NAME, parms, dup, - this.extractNameTextRange(dup) + dup.getNameTextRange() ) ); } @@ -1054,20 +1053,13 @@ public class EclipseLinkPersistenceUnit } // TODO bjv isn't it obvious? - protected TextRange extractNameTextRange(EclipseLinkConverter converter) { - return (converter instanceof OrmEclipseLinkConverter<?>) ? - ((OrmEclipseLinkConverter<?>) converter).getNameTextRange() : - ((JavaEclipseLinkConverter<?>) converter).getNameTextRange(null); - } - - // TODO bjv isn't it obvious? protected void validate(EclipseLinkConverter converter, List<IMessage> messages, IReporter reporter) { if (converter instanceof OrmEclipseLinkConverter<?>) { ((OrmEclipseLinkConverter<?>) converter).validate(messages, reporter); } else { JavaEclipseLinkConverter<?> javaConverter = (JavaEclipseLinkConverter<?>) converter; if (this.converterSupportsValidationMessages(javaConverter)) { - javaConverter.validate(messages, reporter, null); + javaConverter.validate(messages, reporter); } } } @@ -1088,7 +1080,7 @@ public class EclipseLinkPersistenceUnit EclipseLinkJpaValidationMessages.GENERATOR_EQUIVALENT, parms, dup, - this.extractNameTextRange(dup) + dup.getNameTextRange() ) ); } @@ -1113,7 +1105,7 @@ public class EclipseLinkPersistenceUnit EclipseLinkJpaValidationMessages.QUERY_EQUIVALENT, parms, dup, - this.extractNameTextRange(dup) + dup.getNameTextRange() ) ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/AbstractEclipseLinkTypeMappingValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/AbstractEclipseLinkTypeMappingValidator.java index 0ada0fb11b..3b339dd6b0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/AbstractEclipseLinkTypeMappingValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/AbstractEclipseLinkTypeMappingValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractTypeMappingValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages; @@ -22,8 +21,8 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage; public abstract class AbstractEclipseLinkTypeMappingValidator<T extends TypeMapping> extends AbstractTypeMappingValidator<T> { - protected AbstractEclipseLinkTypeMappingValidator(T typeMapping, JavaResourceType jrt, TypeMappingTextRangeResolver textRangeResolver) { - super(typeMapping, jrt, textRangeResolver); + protected AbstractEclipseLinkTypeMappingValidator(T typeMapping, JavaResourceType jrt) { + super(typeMapping, jrt); } @@ -43,7 +42,7 @@ public abstract class AbstractEclipseLinkTypeMappingValidator<T extends TypeMapp msgID, new String[] {this.typeMapping.getName()}, this.typeMapping, - this.textRangeResolver.getTypeMappingTextRange() + this.typeMapping.getValidationTextRange() ); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkConvertValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkConvertValidator.java index 8a9057b880..45a51c9632 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkConvertValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkConvertValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -14,7 +14,6 @@ import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages; @@ -27,13 +26,10 @@ public class EclipseLinkConvertValidator { protected final EclipseLinkConvert convert; - protected final ConverterTextRangeResolver textRangeResolver; - - public EclipseLinkConvertValidator(EclipseLinkConvert convert, ConverterTextRangeResolver textRangeResolver) { + public EclipseLinkConvertValidator(EclipseLinkConvert convert) { super(); this.convert = convert; - this.textRangeResolver = textRangeResolver; } protected AttributeMapping getAttributeMapping() { @@ -77,7 +73,7 @@ public class EclipseLinkConvertValidator this.getAttributeMapping().getName() }, this.getAttributeMapping(), - this.textRangeResolver.getConverterTextRange() + this.convert.getValidationTextRange() ) ); return false; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkDynamicTypeMappingValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkDynamicTypeMappingValidator.java index 947aecf2d9..db4da9a1b0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkDynamicTypeMappingValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkDynamicTypeMappingValidator.java @@ -18,7 +18,7 @@ public class EclipseLinkDynamicTypeMappingValidator extends AbstractEclipseLinkTypeMappingValidator<TypeMapping> { public EclipseLinkDynamicTypeMappingValidator(TypeMapping typeMapping) { - super(typeMapping, null, null); + super(typeMapping, null); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkEntityPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkEntityPrimaryKeyValidator.java index 29a3a3fce5..d56ca69bb8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkEntityPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkEntityPrimaryKeyValidator.java @@ -13,7 +13,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context; import java.util.List; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; -import org.eclipse.jpt.jpa.core.internal.context.PrimaryKeyTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractEntityPrimaryKeyValidator; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; @@ -26,9 +25,9 @@ public class EclipseLinkEntityPrimaryKeyValidator extends AbstractEntityPrimaryKeyValidator { public EclipseLinkEntityPrimaryKeyValidator( - EclipseLinkEntity entity, PrimaryKeyTextRangeResolver textRangeResolver) { + EclipseLinkEntity entity) { - super(entity, textRangeResolver); + super(entity); } @@ -49,7 +48,7 @@ public class EclipseLinkEntityPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_REDEFINED, new String[0], typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassPrimaryKeyValidator.java index b3b97d2791..52b50687ff 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassPrimaryKeyValidator.java @@ -13,7 +13,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context; import java.util.List; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; -import org.eclipse.jpt.jpa.core.internal.context.PrimaryKeyTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractMappedSuperclassPrimaryKeyValidator; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; @@ -26,9 +25,9 @@ public class EclipseLinkMappedSuperclassPrimaryKeyValidator extends AbstractMappedSuperclassPrimaryKeyValidator { public EclipseLinkMappedSuperclassPrimaryKeyValidator( - EclipseLinkMappedSuperclass mappedSuperclass, PrimaryKeyTextRangeResolver textRangeResolver) { + EclipseLinkMappedSuperclass mappedSuperclass) { - super(mappedSuperclass, textRangeResolver); + super(mappedSuperclass); } @@ -49,7 +48,7 @@ public class EclipseLinkMappedSuperclassPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_REDEFINED, new String[0], typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassValidator.java index aab2123010..fe4a0094f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. + * Copyright (c) 2010, 2012 Oracle. * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at @@ -13,15 +13,14 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.jpa.core.context.MappedSuperclass; -import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; public class EclipseLinkMappedSuperclassValidator extends AbstractEclipseLinkTypeMappingValidator<MappedSuperclass> { - public EclipseLinkMappedSuperclassValidator(MappedSuperclass mappedSuperclass, JavaResourceType jrt, TypeMappingTextRangeResolver textRangeResolver) { - super(mappedSuperclass, jrt, textRangeResolver); + public EclipseLinkMappedSuperclassValidator(MappedSuperclass mappedSuperclass, JavaResourceType jrt) { + super(mappedSuperclass, jrt); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkPersistentAttributeValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkPersistentAttributeValidator.java index 1a0f14d1b7..7e96c78b8c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkPersistentAttributeValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkPersistentAttributeValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context; import java.util.List; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.PersistentAttributeTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractPersistentAttributeValidator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -19,9 +18,9 @@ public class EclipseLinkPersistentAttributeValidator extends AbstractPersistentAttributeValidator { public EclipseLinkPersistentAttributeValidator( - ReadOnlyPersistentAttribute persistentAttribute, PersistentAttributeTextRangeResolver textRangeResolver) + ReadOnlyPersistentAttribute persistentAttribute) { - super(persistentAttribute, textRangeResolver); + super(persistentAttribute); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkTypeMappingValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkTypeMappingValidator.java index a2f720f05f..82704c5ea7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkTypeMappingValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkTypeMappingValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. + * Copyright (c) 2010, 2012 Oracle. * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at @@ -12,12 +12,11 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver; public class EclipseLinkTypeMappingValidator extends AbstractEclipseLinkTypeMappingValidator<TypeMapping> { - public EclipseLinkTypeMappingValidator(TypeMapping typeMapping, JavaResourceType jrt, TypeMappingTextRangeResolver textRangeResolver) { - super(typeMapping, jrt, textRangeResolver); + public EclipseLinkTypeMappingValidator(TypeMapping typeMapping, JavaResourceType jrt) { + super(typeMapping, jrt); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/TenantDiscriminatorColumnValidator2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/TenantDiscriminatorColumnValidator2_3.java index 0ca15e5edc..d2f4495968 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/TenantDiscriminatorColumnValidator2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/TenantDiscriminatorColumnValidator2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractNamedColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.eclipselink.core.context.ReadOnlyTenantDiscriminatorColumn2_3; @@ -19,12 +18,11 @@ import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMes import org.eclipse.wst.validation.internal.provisional.core.IMessage; public class TenantDiscriminatorColumnValidator2_3 - extends AbstractNamedColumnValidator<ReadOnlyTenantDiscriminatorColumn2_3, NamedColumnTextRangeResolver> + extends AbstractNamedColumnValidator<ReadOnlyTenantDiscriminatorColumn2_3> { public TenantDiscriminatorColumnValidator2_3( - ReadOnlyTenantDiscriminatorColumn2_3 namedColumn, - NamedColumnTextRangeResolver textRangeResolver) { - super(namedColumn, textRangeResolver, new EntityTableDescriptionProvider()); + ReadOnlyTenantDiscriminatorColumn2_3 namedColumn) { + super(namedColumn, new EntityTableDescriptionProvider()); } @Override @@ -42,7 +40,7 @@ public class TenantDiscriminatorColumnValidator2_3 this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -93,7 +91,7 @@ public class TenantDiscriminatorColumnValidator2_3 this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getTextRangeResolver().getTableTextRange() + this.getColumn().getTableTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java index 4d558ee500..6abdf9ce6f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java @@ -16,10 +16,9 @@ import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaNamedColumn; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaTableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.AbstractJavaNamedDiscriminatorColumn; +import org.eclipse.jpt.jpa.eclipselink.core.context.ReadOnlyTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaReadOnlyTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTenantDiscriminatorColumnAnnotation2_3; @@ -28,7 +27,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTenantDiscr * Java tenant discriminator column */ public class EclipseLinkJavaTenantDiscriminatorColumn2_3 - extends AbstractJavaNamedDiscriminatorColumn<EclipseLinkTenantDiscriminatorColumnAnnotation2_3, JavaReadOnlyTenantDiscriminatorColumn2_3.Owner> + extends AbstractJavaNamedDiscriminatorColumn<EclipseLinkTenantDiscriminatorColumnAnnotation2_3, ReadOnlyTenantDiscriminatorColumn2_3.Owner> implements JavaTenantDiscriminatorColumn2_3 { /** @see AbstractJavaNamedColumn#AbstractJavaNamedColumn(JavaJpaContextNode, org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn.Owner, org.eclipse.jpt.jpa.core.resource.java.NamedColumnAnnotation) */ @@ -43,7 +42,7 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3 protected Boolean specifiedPrimaryKey; protected boolean defaultPrimaryKey = DEFAULT_PRIMARY_KEY; - public EclipseLinkJavaTenantDiscriminatorColumn2_3(JavaEclipseLinkMultitenancyImpl2_3 parent, JavaReadOnlyTenantDiscriminatorColumn2_3.Owner owner, EclipseLinkTenantDiscriminatorColumnAnnotation2_3 columnAnnotation) { + public EclipseLinkJavaTenantDiscriminatorColumn2_3(JavaEclipseLinkMultitenancyImpl2_3 parent, ReadOnlyTenantDiscriminatorColumn2_3.Owner owner, EclipseLinkTenantDiscriminatorColumnAnnotation2_3 columnAnnotation) { super(parent, owner, columnAnnotation); this.specifiedTable = this.buildSpecifiedTable(); this.specifiedContextProperty = this.buildSpecifiedContextProperty(); @@ -130,8 +129,8 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3 return this.owner.getDefaultTableName(); } - public TextRange getTableTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getColumnAnnotation().getTableTextRange(), astRoot); + public TextRange getTableTextRange() { + return this.getValidationTextRange(this.getColumnAnnotation().getTableTextRange()); } @@ -177,8 +176,8 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3 return this.owner.getDefaultContextPropertyName(); } - public TextRange getContextPropertyTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getColumnAnnotation().getContextPropertyTextRange(), astRoot); + public TextRange getContextPropertyTextRange() { + return this.getValidationTextRange(this.getColumnAnnotation().getContextPropertyTextRange()); } @@ -273,9 +272,4 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3 public boolean tableNameIsInvalid() { return this.owner.tableNameIsInvalid(this.getTable()); } - - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaTableColumnTextRangeResolver(this, astRoot); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java index d04f0dc00b..b33766c951 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTimeOfDay; @@ -140,8 +139,8 @@ public class EclipseLinkJavaTimeOfDay // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.todAnnotation.getTextRange(astRoot); - return (textRange != null) ? textRange : this.getCaching().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.todAnnotation.getTextRange(); + return (textRange != null) ? textRange : this.getCaching().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java index cc66614cf4..a2e8a96516 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java @@ -9,21 +9,17 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVirtualNamedDiscriminatorColumn; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaTableColumnTextRangeResolver; import org.eclipse.jpt.jpa.eclipselink.core.context.ReadOnlyTenantDiscriminatorColumn2_3; -import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaReadOnlyTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaVirtualTenantDiscriminatorColumn2_3; /** * Java virtual tenant discriminator column */ public class EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3 - extends AbstractJavaVirtualNamedDiscriminatorColumn<JavaReadOnlyTenantDiscriminatorColumn2_3.Owner, ReadOnlyTenantDiscriminatorColumn2_3> + extends AbstractJavaVirtualNamedDiscriminatorColumn<ReadOnlyTenantDiscriminatorColumn2_3.Owner, ReadOnlyTenantDiscriminatorColumn2_3> implements JavaVirtualTenantDiscriminatorColumn2_3 { protected final ReadOnlyTenantDiscriminatorColumn2_3 overriddenColumn; @@ -38,7 +34,7 @@ public class EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3 protected boolean defaultPrimaryKey; - public EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3(JavaJpaContextNode parent, JavaReadOnlyTenantDiscriminatorColumn2_3.Owner owner, ReadOnlyTenantDiscriminatorColumn2_3 overriddenColumn) { + public EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3(JavaJpaContextNode parent, ReadOnlyTenantDiscriminatorColumn2_3.Owner owner, ReadOnlyTenantDiscriminatorColumn2_3 overriddenColumn) { super(parent, owner); this.overriddenColumn = overriddenColumn; } @@ -186,12 +182,7 @@ public class EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3 // ********** validation ********** - public TextRange getTableTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); - } - - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaTableColumnTextRangeResolver(this, astRoot); + public TextRange getTableTextRange() { + return this.getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java index 082ca1d8ac..814459c351 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java @@ -31,8 +31,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaLobConverter; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaTemporalConverter; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; @@ -297,8 +295,8 @@ public class JavaEclipseLinkArrayMapping2_3 return this.getTypeMapping().getAllAssociatedTableNames(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, (TableColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, new EntityTableDescriptionProvider()); } // ********** Java completion proposals ********** @@ -324,9 +322,9 @@ public class JavaEclipseLinkArrayMapping2_3 // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.column.validate(messages, reporter, astRoot); - this.converter.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.column.validate(messages, reporter); + this.converter.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java index 131a82acea..912f542844 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; @@ -105,8 +104,8 @@ public class JavaEclipseLinkBasicMapping // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.mutable.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.mutable.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java index ff5600b69c..68aac4c74b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -629,12 +628,12 @@ public class JavaEclipseLinkCachingImpl // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateExpiry(messages, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateExpiry(messages); } - protected void validateExpiry(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateExpiry(List<IMessage> messages) { if ((this.expiry != null) && (this.expiryTimeOfDay != null)) { messages.add( DefaultEclipseLinkJpaValidationMessages.buildMessage( @@ -642,14 +641,14 @@ public class JavaEclipseLinkCachingImpl EclipseLinkJpaValidationMessages.CACHE_EXPIRY_AND_EXPIRY_TIME_OF_DAY_BOTH_SPECIFIED, new String[] {this.getPersistentType().getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getCacheAnnotation().getTextRange(astRoot); - return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getCacheAnnotation().getTextRange(); + return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java index b391bc8ddf..6f0abb9a28 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; @@ -130,13 +129,13 @@ public class JavaEclipseLinkChangeTracking // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getAnnotationTextRange() { EclipseLinkChangeTrackingAnnotation annotation = this.getChangeTrackingAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java index 41c83ced16..efe66b8259 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; @@ -103,21 +102,21 @@ public class JavaEclipseLinkConversionValue // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); } - public TextRange getDataValueTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.conversionValueAnnotation.getDataValueTextRange(), astRoot); + public TextRange getDataValueTextRange() { + return this.getValidationTextRange(this.conversionValueAnnotation.getDataValueTextRange()); } - protected TextRange getObjectValueTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.conversionValueAnnotation.getObjectValueTextRange(), astRoot); + protected TextRange getObjectValueTextRange() { + return this.getValidationTextRange(this.conversionValueAnnotation.getObjectValueTextRange()); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.conversionValueAnnotation.getTextRange(astRoot); - return (textRange != null) ? textRange : this.getObjectTypeConverter().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.conversionValueAnnotation.getTextRange(); + return (textRange != null) ? textRange : this.getObjectTypeConverter().getValidationTextRange(); } public boolean isEquivalentTo(EclipseLinkConversionValue conversionValue) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java index 5704051483..5e4592ca56 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java @@ -21,7 +21,6 @@ import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.AbstractJavaConverter; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; @@ -190,8 +189,8 @@ public class JavaEclipseLinkConvert @Override protected Owner buildOwner() { return new Owner() { - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { - return new EclipseLinkConvertValidator((EclipseLinkConvert) converter, textRangeResolver); + public JptValidator buildValidator(Converter converter) { + return new EclipseLinkConvertValidator((EclipseLinkConvert) converter); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java index 0b15ca6dce..b2fb77cdb4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -116,12 +115,12 @@ public abstract class JavaEclipseLinkConverter<A extends EclipseLinkNamedConvert // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateName(messages, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateName(messages); } - protected void validateName(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateName(List<IMessage> messages) { if (StringTools.stringIsEmpty(this.name)) { messages.add( DefaultEclipseLinkJpaValidationMessages.buildMessage( @@ -129,7 +128,7 @@ public abstract class JavaEclipseLinkConverter<A extends EclipseLinkNamedConvert EclipseLinkJpaValidationMessages.CONVERTER_NAME_UNDEFINED, EMPTY_STRING_ARRAY, this, - this.getNameTextRange(astRoot) + this.getNameTextRange() ) ); return; @@ -142,19 +141,19 @@ public abstract class JavaEclipseLinkConverter<A extends EclipseLinkNamedConvert EclipseLinkJpaValidationMessages.RESERVED_CONVERTER_NAME, EMPTY_STRING_ARRAY, this, - this.getNameTextRange(astRoot) + this.getNameTextRange() ) ); } } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.converterAnnotation.getTextRange(astRoot); - return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.converterAnnotation.getTextRange(); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange(CompilationUnit astRoot){ - return this.getValidationTextRange(this.getConverterAnnotation().getNameTextRange(), astRoot); + public TextRange getNameTextRange(){ + return this.getValidationTextRange(this.getConverterAnnotation().getNameTextRange()); } public boolean isEquivalentTo(JpaNamedContextNode node) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterClassConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterClassConverter.java index 549acbf736..a2eafbf50e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterClassConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterClassConverter.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -98,12 +97,12 @@ public abstract class JavaEclipseLinkConverterClassConverter<A extends EclipseLi //************ validation *************** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateConverterClass(messages, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateConverterClass(messages); } - protected void validateConverterClass(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateConverterClass(List<IMessage> messages) { if (this.converterClass == null) { // the annotation will have a compile error if its converter class is missing return; @@ -115,14 +114,14 @@ public abstract class JavaEclipseLinkConverterClassConverter<A extends EclipseLi IMessage.HIGH_SEVERITY, EclipseLinkJpaValidationMessages.CONVERTER_CLASS_DEFINED, this, - this.getConverterClassTextRange(astRoot) + this.getConverterClassTextRange() ) ); return; } if ( ! this.converterClassExists()) { - this.addConverterClassDoesNotExistMessageTo(messages, astRoot); + this.addConverterClassDoesNotExistMessageTo(messages); return; } @@ -133,20 +132,20 @@ public abstract class JavaEclipseLinkConverterClassConverter<A extends EclipseLi this.getEclipseLinkConverterInterfaceErrorMessage(), new String[] {this.getFullyQualifiedConverterClass()}, this, - this.getConverterClassTextRange(astRoot) + this.getConverterClassTextRange() ) ); } } - protected void addConverterClassDoesNotExistMessageTo(List<IMessage> messages, CompilationUnit astRoot) { + protected void addConverterClassDoesNotExistMessageTo(List<IMessage> messages) { messages.add( DefaultEclipseLinkJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, EclipseLinkJpaValidationMessages.CONVERTER_CLASS_EXISTS, new String[] {this.getFullyQualifiedConverterClass()}, this, - this.getConverterClassTextRange(astRoot) + this.getConverterClassTextRange() ) ); } @@ -167,8 +166,8 @@ public abstract class JavaEclipseLinkConverterClassConverter<A extends EclipseLi return this.typeImplementsInterface(this.getFullyQualifiedConverterClass(), interfaceName); } - protected TextRange getConverterClassTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getAnnotationConverterClassTextRange(), astRoot); + protected TextRange getConverterClassTextRange() { + return this.getValidationTextRange(this.getAnnotationConverterClassTextRange()); } protected abstract TextRange getAnnotationConverterClassTextRange(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterContainerImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterContainerImpl.java index 48f7bce159..2d5fe9174c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterContainerImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterContainerImpl.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; @@ -462,13 +461,13 @@ public class JavaEclipseLinkConverterContainerImpl * @see org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit#validateConverters(List, IReporter) */ @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); // converters are validated in the persistence unit } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getJavaResourceAnnotatedElement().getTextRange(astRoot); - return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getJavaResourceAnnotatedElement().getTextRange(); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomConverter.java index 70b7d67957..e13d9e3cde 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomConverter.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomConverter; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer; @@ -94,7 +93,7 @@ public class JavaEclipseLinkCustomConverter } @Override - protected void addConverterClassDoesNotExistMessageTo(List<IMessage> messages, CompilationUnit astRoot) { + protected void addConverterClassDoesNotExistMessageTo(List<IMessage> messages) { // no need to add message since there will already be a compiler error } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java index 55c275757f..1bf623178e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; @@ -158,12 +157,12 @@ public class JavaEclipseLinkCustomizer // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateCustomizerClass(messages, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateCustomizerClass(messages); } - protected void validateCustomizerClass(List<IMessage> messages,CompilationUnit astRoot) { + protected void validateCustomizerClass(List<IMessage> messages) { if (this.getFullyQualifiedCustomizerClass() == null) { return; } @@ -180,30 +179,41 @@ public class JavaEclipseLinkCustomizer EclipseLinkJpaValidationMessages.DESCRIPTOR_CUSTOMIZER_CLASS_NOT_VALID, new String[] {this.getFullyQualifiedCustomizerClass()}, this, - this.getCustomizerClassTextRange(astRoot) + this.getCustomizerClassTextRange() ) ); } - EclipseLinkCustomizerAnnotation annotation = this.getCustomizerAnnotation(); - if (!annotation.customizerClassImplementsInterface(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME, astRoot)) { + if (!customizerClassImplementsInterface(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME)) { messages.add( DefaultEclipseLinkJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, EclipseLinkJpaValidationMessages.DESCRIPTOR_CUSTOMIZER_CLASS_IMPLEMENTS_DESCRIPTOR_CUSTOMIZER, new String[] {this.getFullyQualifiedCustomizerClass()}, this, - this.getCustomizerClassTextRange(astRoot) + this.getCustomizerClassTextRange() ) ); } } - protected TextRange getCustomizerClassTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getCustomizerAnnotation().getValueTextRange(), astRoot); + protected boolean customizerClassImplementsInterface(String interfaceName) { + return this.typeImplementsInterface(this.getFullyQualifiedCustomizerClass(), interfaceName); + } + + /** + * Add <code>null</code> check. + */ + protected boolean typeImplementsInterface(String typeName, String interfaceName) { + return (typeName != null) && + JDTTools.typeIsSubType(this.getJavaProject(), typeName, interfaceName); + } + + protected TextRange getCustomizerClassTextRange() { + return this.getValidationTextRange(this.getCustomizerAnnotation().getValueTextRange()); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getCustomizerAnnotation().getTextRange(astRoot); - return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getCustomizerAnnotation().getTextRange(); + return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkElementCollectionMapping2_0.java index f2ba879a37..74945d2c3e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkElementCollectionMapping2_0.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; @@ -104,8 +103,8 @@ public class JavaEclipseLinkElementCollectionMapping2_0 // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.joinFetch.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.joinFetch.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddableImpl.java index aa64876362..87a5002b02 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddableImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddableImpl.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; @@ -156,15 +155,15 @@ public class JavaEclipseLinkEmbeddableImpl // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.converterContainer.validate(messages, reporter, astRoot); - this.changeTracking.validate(messages, reporter, astRoot); - this.customizer.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.converterContainer.validate(messages, reporter); + this.changeTracking.validate(messages, reporter); + this.customizer.validate(messages, reporter); } @Override - protected JptValidator buildTypeMappingValidator(CompilationUnit astRoot) { - return new EclipseLinkTypeMappingValidator(this, this.getJavaResourceType(), this.buildTextRangeResolver(astRoot)); + protected JptValidator buildTypeMappingValidator() { + return new EclipseLinkTypeMappingValidator(this, this.getJavaResourceType()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java index 324e1e264b..d9e9956fc0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java @@ -17,7 +17,6 @@ import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; -import org.eclipse.jpt.jpa.core.JpaPlatform.Version; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.InheritanceType; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; @@ -39,7 +38,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLink2_3JpaPlatformFa import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFactory.EclipseLinkJpaPlatformVersion; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkEntityPrimaryKeyValidator; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkTypeMappingValidator; -import org.eclipse.jpt.jpa.eclipselink.core.internal.plugin.JptJpaEclipseLinkCorePlugin; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkClassExtractorAnnotation2_1; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -276,23 +274,23 @@ public class JavaEclipseLinkEntityImpl // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.caching.validate(messages, reporter, astRoot); - this.readOnly.validate(messages, reporter, astRoot); - this.converterContainer.validate(messages, reporter, astRoot); - this.changeTracking.validate(messages, reporter, astRoot); - this.customizer.validate(messages, reporter, astRoot); - this.multitenancy.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.caching.validate(messages, reporter); + this.readOnly.validate(messages, reporter); + this.converterContainer.validate(messages, reporter); + this.changeTracking.validate(messages, reporter); + this.customizer.validate(messages, reporter); + this.multitenancy.validate(messages, reporter); } @Override - protected JptValidator buildPrimaryKeyValidator(CompilationUnit astRoot) { - return new EclipseLinkEntityPrimaryKeyValidator(this, this.buildTextRangeResolver(astRoot)); + protected JptValidator buildPrimaryKeyValidator() { + return new EclipseLinkEntityPrimaryKeyValidator(this); } @Override - protected JptValidator buildTypeMappingValidator(CompilationUnit astRoot) { - return new EclipseLinkTypeMappingValidator(this, this.getJavaResourceType(), buildTextRangeResolver(astRoot)); + protected JptValidator buildTypeMappingValidator() { + return new EclipseLinkTypeMappingValidator(this, this.getJavaResourceType()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java index 584749bc0d..7915869c6b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; @@ -102,8 +101,8 @@ public class JavaEclipseLinkIdMapping // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.mutable.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.mutable.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java index fcb9dd1148..21edcc429a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; @@ -124,13 +123,13 @@ public class JavaEclipseLinkJoinFetch // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getAnnotationTextRange() { EclipseLinkJoinFetchAnnotation annotation = this.getJoinFetchAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java index b169bd9e87..a20c7e1234 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; @@ -90,8 +89,8 @@ public class JavaEclipseLinkManyToManyMapping // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.joinFetch.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.joinFetch.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java index 2c1a52650a..84907a9b95 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; @@ -89,8 +88,8 @@ public class JavaEclipseLinkManyToOneMapping // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.joinFetch.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.joinFetch.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java index a7691ed13e..e18d42e84e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java @@ -38,7 +38,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLink2_3JpaPlatformFa import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFactory.EclipseLinkJpaPlatformVersion; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkMappedSuperclassPrimaryKeyValidator; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkMappedSuperclassValidator; -import org.eclipse.jpt.jpa.eclipselink.core.internal.plugin.JptJpaEclipseLinkCorePlugin; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -253,23 +252,23 @@ public class JavaEclipseLinkMappedSuperclassImpl // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.caching.validate(messages, reporter, astRoot); - this.readOnly.validate(messages, reporter, astRoot); - this.converterContainer.validate(messages, reporter, astRoot); - this.changeTracking.validate(messages, reporter, astRoot); - this.customizer.validate(messages, reporter, astRoot); - this.multitenancy.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.caching.validate(messages, reporter); + this.readOnly.validate(messages, reporter); + this.converterContainer.validate(messages, reporter); + this.changeTracking.validate(messages, reporter); + this.customizer.validate(messages, reporter); + this.multitenancy.validate(messages, reporter); } @Override - protected JptValidator buildPrimaryKeyValidator(CompilationUnit astRoot) { - return new EclipseLinkMappedSuperclassPrimaryKeyValidator(this, this.buildTextRangeResolver(astRoot)); + protected JptValidator buildPrimaryKeyValidator() { + return new EclipseLinkMappedSuperclassPrimaryKeyValidator(this); } @Override - protected JptValidator buildTypeMappingValidator(CompilationUnit astRoot) { - return new EclipseLinkMappedSuperclassValidator(this, this.getJavaResourceType(), this.buildTextRangeResolver(astRoot)); + protected JptValidator buildTypeMappingValidator() { + return new EclipseLinkMappedSuperclassValidator(this, this.getJavaResourceType()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java index 821a4f6be5..5b8a6acd50 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java @@ -30,7 +30,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkEntity; @@ -70,7 +69,7 @@ public class JavaEclipseLinkMultitenancyImpl2_3 protected Boolean specifiedIncludeCriteria; protected boolean defaultIncludeCriteria = DEFAULT_INCLUDE_CRITERIA; - protected final JavaReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner; + protected final ReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner; protected final ContextListContainer<JavaTenantDiscriminatorColumn2_3, EclipseLinkTenantDiscriminatorColumnAnnotation2_3> specifiedTenantDiscriminatorColumnContainer; protected final ContextListContainer<JavaVirtualTenantDiscriminatorColumn2_3, ReadOnlyTenantDiscriminatorColumn2_3> defaultTenantDiscriminatorColumnContainer; @@ -327,7 +326,7 @@ public class JavaEclipseLinkMultitenancyImpl2_3 return container; } - protected JavaReadOnlyTenantDiscriminatorColumn2_3.Owner buildTenantDiscriminatorColumnOwner() { + protected ReadOnlyTenantDiscriminatorColumn2_3.Owner buildTenantDiscriminatorColumnOwner() { return new TenantDiscriminatorColumnOwner(); } @@ -463,7 +462,7 @@ public class JavaEclipseLinkMultitenancyImpl2_3 // ********** JavaReadOnlyTenantDiscriminatorColumn.Owner implementation ********** protected class TenantDiscriminatorColumnOwner - implements JavaReadOnlyTenantDiscriminatorColumn2_3.Owner + implements ReadOnlyTenantDiscriminatorColumn2_3.Owner { public String getDefaultContextPropertyName() { @@ -502,12 +501,12 @@ public class JavaEclipseLinkMultitenancyImpl2_3 return getTypeMapping().tableNameIsInvalid(tableName); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new TenantDiscriminatorColumnValidator2_3((ReadOnlyTenantDiscriminatorColumn2_3) column, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new TenantDiscriminatorColumnValidator2_3((ReadOnlyTenantDiscriminatorColumn2_3) column); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return JavaEclipseLinkMultitenancyImpl2_3.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return JavaEclipseLinkMultitenancyImpl2_3.this.getValidationTextRange(); } } @@ -526,8 +525,8 @@ public class JavaEclipseLinkMultitenancyImpl2_3 return (EclipseLinkMultitenantAnnotation2_3) this.getJavaResourceType().getNonNullAnnotation(this.getMultitenantAnnotationName()); } - protected TextRange getMultitenantAnnotationTextRange(CompilationUnit astRoot) { - return this.getMultitenantAnnotation().getTextRange(astRoot); + protected TextRange getMultitenantAnnotationTextRange() { + return this.getMultitenantAnnotation().getTextRange(); } public boolean isMultitenantAnnotationSpecified() { @@ -673,8 +672,8 @@ public class JavaEclipseLinkMultitenancyImpl2_3 // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); if (getSpecifiedType() == EclipseLinkMultitenantType2_3.TABLE_PER_TENANT && ! this.getJpaPlatformVersion().isCompatibleWithEclipseLinkVersion(EclipseLink2_4JpaPlatformFactory.VERSION)) { messages.add( DefaultEclipseLinkJpaValidationMessages.buildMessage( @@ -682,7 +681,7 @@ public class JavaEclipseLinkMultitenancyImpl2_3 EclipseLinkJpaValidationMessages.MULTITENANT_TABLE_PER_TENANT_NOT_SUPPORTED, EMPTY_STRING_ARRAY, this, - this.getMultitenantAnnotationTextRange(astRoot) + this.getMultitenantAnnotationTextRange() ) ); } @@ -695,7 +694,7 @@ public class JavaEclipseLinkMultitenancyImpl2_3 EclipseLinkJpaValidationMessages.MULTITENANT_VPD_MIGHT_NOT_BE_NOT_SUPPORTED, EMPTY_STRING_ARRAY, this, - this.getMultitenantAnnotationTextRange(astRoot) + this.getMultitenantAnnotationTextRange() ) ); } @@ -706,7 +705,7 @@ public class JavaEclipseLinkMultitenancyImpl2_3 EclipseLinkJpaValidationMessages.MULTITENANT_VPD_NOT_SUPPORTED_ON_NON_ORACLE_DATABASE_PLATFORM, new String[] {targetDatabase}, this, - this.getMultitenantAnnotationTextRange(astRoot) + this.getMultitenantAnnotationTextRange() ) ); } @@ -719,13 +718,13 @@ public class JavaEclipseLinkMultitenancyImpl2_3 EclipseLinkJpaValidationMessages.MULTITENANT_METADATA_CANNOT_BE_SPECIFIED_ON_NON_ROOT_ENTITY, EMPTY_STRING_ARRAY, this, - this.getJavaResourceType().getTextRange(EclipseLinkTenantDiscriminatorColumnAnnotation2_3.ANNOTATION_NAME, astRoot) + this.getJavaResourceType().getTextRange(EclipseLinkTenantDiscriminatorColumnAnnotation2_3.ANNOTATION_NAME) ) ); } else if (this.isMultitenantAnnotationSpecified()) { for (JavaTenantDiscriminatorColumn2_3 column : this.getSpecifiedTenantDiscriminatorColumns()) { - column.validate(messages, reporter, astRoot); + column.validate(messages, reporter); } } else { @@ -735,7 +734,7 @@ public class JavaEclipseLinkMultitenancyImpl2_3 EclipseLinkJpaValidationMessages.MULTITENANT_NOT_SPECIFIED_WITH_TENANT_DISCRIMINATOR_COLUMNS, EMPTY_STRING_ARRAY, this, - this.getJavaResourceType().getTextRange(EclipseLinkTenantDiscriminatorColumnAnnotation2_3.ANNOTATION_NAME, astRoot) + this.getJavaResourceType().getTextRange(EclipseLinkTenantDiscriminatorColumnAnnotation2_3.ANNOTATION_NAME) ) ); } @@ -743,7 +742,7 @@ public class JavaEclipseLinkMultitenancyImpl2_3 if (this.specifiedTenantDiscriminatorColumnsAllowed()) { //bug 360731 no need to validate, they will be validated where they are specified for (JavaVirtualTenantDiscriminatorColumn2_3 column : this.getDefaultTenantDiscriminatorColumns()) { - column.validate(messages, reporter, astRoot); + column.validate(messages, reporter); } } if (this.getSpecifiedIncludeCriteria() == Boolean.TRUE && getType() == EclipseLinkMultitenantType2_3.VPD) { @@ -764,8 +763,8 @@ public class JavaEclipseLinkMultitenancyImpl2_3 return (EclipseLinkJpaPlatformVersion) super.getJpaPlatformVersion(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getMultitenantAnnotation().getTextRange(astRoot); - return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getMultitenantAnnotation().getTextRange(); + return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java index 69bc1deada..790c1f4650 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; @@ -165,13 +164,13 @@ public class JavaEclipseLinkMutable // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getAnnotationTextRange() { EclipseLinkMutableAnnotation annotation = this.getMutableAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkObjectTypeConverter.java index 8be199c18e..2d791f2301 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkObjectTypeConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkObjectTypeConverter.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -265,15 +264,15 @@ public class JavaEclipseLinkObjectTypeConverter // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.checkForDuplicateDataValues(messages, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.checkForDuplicateDataValues(messages); for (JavaEclipseLinkConversionValue conversionValue : this.getConversionValues()) { - conversionValue.validate(messages, reporter, astRoot); + conversionValue.validate(messages, reporter); } } - protected void checkForDuplicateDataValues(List<IMessage> messages, CompilationUnit astRoot) { + protected void checkForDuplicateDataValues(List<IMessage> messages) { for (ArrayList<JavaEclipseLinkConversionValue> dups : this.mapConversionValuesByDataValue().values()) { if (dups.size() > 1) { for (JavaEclipseLinkConversionValue dup : dups) { @@ -283,7 +282,7 @@ public class JavaEclipseLinkObjectTypeConverter EclipseLinkJpaValidationMessages.MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE, new String[] {dup.getDataValue()}, this, - dup.getDataValueTextRange(astRoot) + dup.getDataValueTextRange() ) ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java index 8dfc2c5ea7..7d7e2dde00 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaMappingRelationship; @@ -117,9 +116,9 @@ public class JavaEclipseLinkOneToManyMapping // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.joinFetch.validate(messages, reporter, astRoot); - this.privateOwned.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.joinFetch.validate(messages, reporter); + this.privateOwned.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java index ae6866d9d2..459e49ebc7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; @@ -101,9 +100,9 @@ public class JavaEclipseLinkOneToOneMapping // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.joinFetch.validate(messages, reporter, astRoot); - this.privateOwned.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.joinFetch.validate(messages, reporter); + this.privateOwned.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java index 01b6e9238b..d4794f006a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; @@ -110,13 +109,13 @@ public class JavaEclipseLinkPrivateOwned // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getAnnotationTextRange() { EclipseLinkPrivateOwnedAnnotation annotation = this.getPrivateOwnedAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java index 0cc0da0052..c3f3c79c43 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; @@ -124,13 +123,13 @@ public class JavaEclipseLinkReadOnly // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getAnnotationTextRange() { EclipseLinkReadOnlyAnnotation annotation = this.getReadOnlyAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java index 92b1f9bfcf..584b11d7b1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; @@ -105,13 +104,13 @@ public class JavaEclipseLinkVersionMapping // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.mutable.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.mutable.validate(messages, reporter); } @Override - protected void validateAttributeType(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateAttributeType(List<IMessage> messages) { if (!ArrayTools.contains(SUPPORTED_TYPE_NAMES, this.getPersistentAttribute().getTypeName())) { messages.add( DefaultEclipseLinkJpaValidationMessages.buildMessage( @@ -119,7 +118,7 @@ public class JavaEclipseLinkVersionMapping EclipseLinkJpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_VERSION_MAPPING_TYPE, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/NullJavaEclipseLinkMultitenancy2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/NullJavaEclipseLinkMultitenancy2_3.java index 47b1b00a4a..1307e56733 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/NullJavaEclipseLinkMultitenancy2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/NullJavaEclipseLinkMultitenancy2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -132,7 +131,7 @@ public class NullJavaEclipseLinkMultitenancy2_3 return 0; } - public TextRange getValidationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange() { throw new UnsupportedOperationException("Multitenancy is only supported in EclipseLink version 2.3 and higher"); //$NON-NLS-1$ } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/SpecifiedJavaEclipseLinkPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/SpecifiedJavaEclipseLinkPersistentAttribute.java index 7e9c72ffcd..45a24cf949 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/SpecifiedJavaEclipseLinkPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/SpecifiedJavaEclipseLinkPersistentAttribute.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; @@ -102,7 +101,7 @@ public class SpecifiedJavaEclipseLinkPersistentAttribute // ********** validation ********** @Override - protected JptValidator buildAttributeValidator(CompilationUnit astRoot) { - return new EclipseLinkPersistentAttributeValidator(this, buildTextRangeResolver(astRoot)); + protected JptValidator buildAttributeValidator() { + return new EclipseLinkPersistentAttributeValidator(this); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java index fb7ae7852e..bf59eb4a4b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java @@ -28,7 +28,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXml; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractEntityMappings; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter; @@ -61,7 +60,7 @@ public class EclipseLinkEntityMappingsImpl protected final OrmEclipseLinkConverterContainer converterContainer; protected final ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3> specifiedTenantDiscriminatorColumnContainer; - protected final OrmReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner; + protected final ReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner; protected final ContextListContainer<OrmVirtualTenantDiscriminatorColumn2_3, ReadOnlyTenantDiscriminatorColumn2_3> defaultTenantDiscriminatorColumnContainer; @@ -270,7 +269,7 @@ public class EclipseLinkEntityMappingsImpl } } - protected OrmReadOnlyTenantDiscriminatorColumn2_3.Owner buildTenantDiscriminatorColumnOwner() { + protected ReadOnlyTenantDiscriminatorColumn2_3.Owner buildTenantDiscriminatorColumnOwner() { return new TenantDiscriminatorColumnOwner(); } @@ -372,7 +371,7 @@ public class EclipseLinkEntityMappingsImpl // ********** OrmReadOnlyTenantDiscriminatorColumn.Owner implementation ********** protected class TenantDiscriminatorColumnOwner - implements OrmReadOnlyTenantDiscriminatorColumn2_3.Owner + implements ReadOnlyTenantDiscriminatorColumn2_3.Owner { public String getDefaultContextPropertyName() { @@ -420,7 +419,7 @@ public class EclipseLinkEntityMappingsImpl /** * no column validation can be done in the context of the persistence unit defaults */ - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { return JptValidator.Null.instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java index 463756227a..bfd7021447 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.XmlContextNode; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmTableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.AbstractOrmNamedDiscriminatorColumn; -import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmReadOnlyTenantDiscriminatorColumn2_3; +import org.eclipse.jpt.jpa.eclipselink.core.context.ReadOnlyTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3; @@ -23,7 +21,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscrimin * <code>orm.xml</code> tenant discriminator column */ public class EclipseLinkOrmTenantDiscriminatorColumn2_3 - extends AbstractOrmNamedDiscriminatorColumn<XmlTenantDiscriminatorColumn_2_3, OrmReadOnlyTenantDiscriminatorColumn2_3.Owner> + extends AbstractOrmNamedDiscriminatorColumn<XmlTenantDiscriminatorColumn_2_3, ReadOnlyTenantDiscriminatorColumn2_3.Owner> implements OrmTenantDiscriminatorColumn2_3 { protected XmlTenantDiscriminatorColumn_2_3 xmlTenantDiscriminatorColumn; @@ -37,7 +35,7 @@ public class EclipseLinkOrmTenantDiscriminatorColumn2_3 protected Boolean specifiedPrimaryKey; protected boolean defaultPrimaryKey = DEFAULT_PRIMARY_KEY; - public EclipseLinkOrmTenantDiscriminatorColumn2_3(XmlContextNode parent, OrmReadOnlyTenantDiscriminatorColumn2_3.Owner owner, XmlTenantDiscriminatorColumn_2_3 column) { + public EclipseLinkOrmTenantDiscriminatorColumn2_3(XmlContextNode parent, ReadOnlyTenantDiscriminatorColumn2_3.Owner owner, XmlTenantDiscriminatorColumn_2_3 column) { super(parent, owner, column); this.specifiedTable = this.buildSpecifiedTable(); this.specifiedContextProperty = this.buildSpecifiedContextProperty(); @@ -245,11 +243,6 @@ public class EclipseLinkOrmTenantDiscriminatorColumn2_3 return (xmlColumn == null) ? null : xmlColumn.getTableTextRange(); } - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmTableColumnTextRangeResolver(this); - } - // ********** completion proposals ********** @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/GenericOrmVirtualTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/GenericOrmVirtualTenantDiscriminatorColumn2_3.java index aceef294b9..0602fe2e87 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/GenericOrmVirtualTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/GenericOrmVirtualTenantDiscriminatorColumn2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,18 +11,15 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.XmlContextNode; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmVirtualNamedDiscriminatorColumn; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmTableColumnTextRangeResolver; import org.eclipse.jpt.jpa.eclipselink.core.context.ReadOnlyTenantDiscriminatorColumn2_3; -import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmReadOnlyTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmVirtualTenantDiscriminatorColumn2_3; /** * <code>orm.xml</code> virtual tenant discriminator column */ public class GenericOrmVirtualTenantDiscriminatorColumn2_3 - extends AbstractOrmVirtualNamedDiscriminatorColumn<OrmReadOnlyTenantDiscriminatorColumn2_3.Owner, ReadOnlyTenantDiscriminatorColumn2_3> + extends AbstractOrmVirtualNamedDiscriminatorColumn<ReadOnlyTenantDiscriminatorColumn2_3.Owner, ReadOnlyTenantDiscriminatorColumn2_3> implements OrmVirtualTenantDiscriminatorColumn2_3 { protected final ReadOnlyTenantDiscriminatorColumn2_3 overriddenColumn; @@ -37,7 +34,7 @@ public class GenericOrmVirtualTenantDiscriminatorColumn2_3 protected boolean defaultPrimaryKey; - public GenericOrmVirtualTenantDiscriminatorColumn2_3(XmlContextNode parent, OrmReadOnlyTenantDiscriminatorColumn2_3.Owner owner, ReadOnlyTenantDiscriminatorColumn2_3 overridenColumn) { + public GenericOrmVirtualTenantDiscriminatorColumn2_3(XmlContextNode parent, ReadOnlyTenantDiscriminatorColumn2_3.Owner owner, ReadOnlyTenantDiscriminatorColumn2_3 overridenColumn) { super(parent, owner); this.overriddenColumn = overridenColumn; } @@ -188,9 +185,4 @@ public class GenericOrmVirtualTenantDiscriminatorColumn2_3 public TextRange getTableTextRange() { return this.getValidationTextRange(); } - - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmTableColumnTextRangeResolver(this); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java index fcfe9537db..ddeb5749f6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java @@ -27,8 +27,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; @@ -344,8 +342,8 @@ public class OrmEclipseLinkArrayMapping2_3 this.converter.validate(messages, reporter); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, (TableColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, new EntityTableDescriptionProvider()); } // ********** completion proposals ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java index 30e6084c70..d65bc785d2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java @@ -17,7 +17,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.AbstractOrmConverter; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; @@ -181,8 +180,8 @@ public class OrmEclipseLinkConvert ((XmlConvertibleMapping) xmlMapping).setConvert(null); } - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { - return new EclipseLinkConvertValidator((EclipseLinkConvert) converter, textRangeResolver); + public JptValidator buildValidator(Converter converter) { + return new EclipseLinkConvertValidator((EclipseLinkConvert) converter); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddableImpl.java index ae750c9a2d..9107b562cb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddableImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddableImpl.java @@ -254,7 +254,7 @@ public class OrmEclipseLinkEmbeddableImpl if (this.isDynamicType()) { return new EclipseLinkDynamicTypeMappingValidator(this); } - return new EclipseLinkTypeMappingValidator(this, getJavaResourceType(), buildTextRangeResolver()); + return new EclipseLinkTypeMappingValidator(this, getJavaResourceType()); } protected boolean isDynamicType() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java index eb03727958..6343a35ece 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java @@ -425,7 +425,7 @@ public class OrmEclipseLinkEntityImpl @Override protected JptValidator buildPrimaryKeyValidator() { - return new EclipseLinkEntityPrimaryKeyValidator(this, buildTextRangeResolver()); + return new EclipseLinkEntityPrimaryKeyValidator(this); } @Override @@ -433,7 +433,7 @@ public class OrmEclipseLinkEntityImpl if (this.isDynamicType()) { return new EclipseLinkDynamicTypeMappingValidator(this); } - return new EclipseLinkTypeMappingValidator(this, getJavaResourceType(), buildTextRangeResolver()); + return new EclipseLinkTypeMappingValidator(this, getJavaResourceType()); } protected boolean isDynamicType() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java index c2e2e80170..947487d6f5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java @@ -43,7 +43,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFacto import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkDynamicTypeMappingValidator; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkMappedSuperclassPrimaryKeyValidator; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkMappedSuperclassValidator; -import org.eclipse.jpt.jpa.eclipselink.core.internal.plugin.JptJpaEclipseLinkCorePlugin; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass; import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -374,7 +373,7 @@ public class OrmEclipseLinkMappedSuperclassImpl @Override protected JptValidator buildPrimaryKeyValidator() { - return new EclipseLinkMappedSuperclassPrimaryKeyValidator(this, this.buildTextRangeResolver()); + return new EclipseLinkMappedSuperclassPrimaryKeyValidator(this); } @Override @@ -382,7 +381,7 @@ public class OrmEclipseLinkMappedSuperclassImpl if (this.isDynamicType()) { return new EclipseLinkDynamicTypeMappingValidator(this); } - return new EclipseLinkMappedSuperclassValidator(this, this.getJavaResourceType(), this.buildTextRangeResolver()); + return new EclipseLinkMappedSuperclassValidator(this, this.getJavaResourceType()); } protected boolean isDynamicType() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java index 2e54001c3f..256d00b8f4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java @@ -24,7 +24,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping; import org.eclipse.jpt.jpa.db.Table; @@ -72,7 +71,7 @@ public class OrmEclipseLinkMultitenancyImpl2_3 protected boolean defaultIncludeCriteria = DEFAULT_INCLUDE_CRITERIA; protected final ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3> specifiedTenantDiscriminatorColumnContainer; - protected final OrmReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner; + protected final ReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner; protected final ContextListContainer<OrmVirtualTenantDiscriminatorColumn2_3, ReadOnlyTenantDiscriminatorColumn2_3> defaultTenantDiscriminatorColumnContainer; @@ -373,7 +372,7 @@ public class OrmEclipseLinkMultitenancyImpl2_3 } } - protected OrmReadOnlyTenantDiscriminatorColumn2_3.Owner buildTenantDiscriminatorColumnOwner() { + protected ReadOnlyTenantDiscriminatorColumn2_3.Owner buildTenantDiscriminatorColumnOwner() { return new TenantDiscriminatorColumnOwner(); } @@ -515,7 +514,7 @@ public class OrmEclipseLinkMultitenancyImpl2_3 // ********** OrmReadOnlyTenantDiscriminatorColumn.Owner implementation ********** protected class TenantDiscriminatorColumnOwner - implements OrmReadOnlyTenantDiscriminatorColumn2_3.Owner + implements ReadOnlyTenantDiscriminatorColumn2_3.Owner { public String getDefaultContextPropertyName() { @@ -554,8 +553,8 @@ public class OrmEclipseLinkMultitenancyImpl2_3 return getTypeMapping().tableNameIsInvalid(tableName); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new TenantDiscriminatorColumnValidator2_3((ReadOnlyTenantDiscriminatorColumn2_3) column, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new TenantDiscriminatorColumnValidator2_3((ReadOnlyTenantDiscriminatorColumn2_3) column); } public TextRange getValidationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java index f69f857e75..eb45bdf12f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java @@ -19,12 +19,10 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitMetadata; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.AbstractOrmPersistenceUnitDefaults; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.jpt.jpa.eclipselink.core.context.ReadOnlyTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkPersistenceUnitDefaults; -import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmReadOnlyTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods; @@ -43,7 +41,7 @@ public class OrmEclipseLinkPersistenceUnitDefaults { protected final ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumnContainer; - protected final OrmReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner; + protected final ReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner; protected String specifiedGetMethod; protected String specifiedSetMethod; @@ -173,7 +171,7 @@ public class OrmEclipseLinkPersistenceUnitDefaults } } - protected OrmReadOnlyTenantDiscriminatorColumn2_3.Owner buildTenantDiscriminatorColumnOwner() { + protected ReadOnlyTenantDiscriminatorColumn2_3.Owner buildTenantDiscriminatorColumnOwner() { return new TenantDiscriminatorColumnOwner(); } @@ -191,7 +189,7 @@ public class OrmEclipseLinkPersistenceUnitDefaults // ********** OrmReadOnlyTenantDiscriminatorColumn.Owner implementation ********** protected class TenantDiscriminatorColumnOwner - implements OrmReadOnlyTenantDiscriminatorColumn2_3.Owner + implements ReadOnlyTenantDiscriminatorColumn2_3.Owner { public String getDefaultContextPropertyName() { @@ -239,7 +237,7 @@ public class OrmEclipseLinkPersistenceUnitDefaults /** * no column validation can be done in the context of the persistence unit defaults */ - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { return JptValidator.Null.instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistentAttribute.java index b95dd6f0e7..d28a73617b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistentAttribute.java @@ -138,6 +138,6 @@ public class OrmEclipseLinkPersistentAttribute @Override protected JptValidator buildAttibuteValidator() { - return new EclipseLinkPersistentAttributeValidator(this, buildTextRangeResolver()); + return new EclipseLinkPersistentAttributeValidator(this); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentAttribute.java index 2b687ad899..85e0f134c7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentAttribute.java @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; @@ -88,7 +87,7 @@ public class VirtualJavaPersistentAttribute return false; } - public boolean contains(int offset, CompilationUnit astRoot) { + public boolean contains(int offset) { throw new UnsupportedOperationException(); } @@ -178,7 +177,7 @@ public class VirtualJavaPersistentAttribute return null; } - public TextRange getValidationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange() { throw new UnsupportedOperationException(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java index dceae9c072..b0d353a7c2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java @@ -15,7 +15,6 @@ import java.util.List; import java.util.Map; import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; @@ -287,10 +286,6 @@ public class VirtualJavaPersistentType throw new UnsupportedOperationException(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - throw new UnsupportedOperationException(); - } - // ********** misc ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConverterAnnotation.java index ead46df6a2..3142e4e2aa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConverterAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConverterAnnotation.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary; import org.eclipse.jdt.core.IAnnotation; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink; @@ -77,8 +76,4 @@ public final class BinaryEclipseLinkConverterAnnotation public TextRange getConverterClassTextRange() { throw new UnsupportedOperationException(); } - - public boolean converterClassImplementsInterface(String interfaceName, CompilationUnit astRoot) { - throw new UnsupportedOperationException(); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCustomizerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCustomizerAnnotation.java index ee0e7da1b7..e5762439a7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCustomizerAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCustomizerAnnotation.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary; import org.eclipse.jdt.core.IAnnotation; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.core.utility.TextRange; @@ -72,8 +71,4 @@ public final class BinaryEclipseLinkCustomizerAnnotation public TextRange getValueTextRange() { throw new UnsupportedOperationException(); } - - public boolean customizerClassImplementsInterface(String interfaceName, CompilationUnit astRoot) { - throw new UnsupportedOperationException(); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConverterAnnotation.java index d783a77daf..e05df2e99e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConverterAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConverterAnnotation.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source; import org.eclipse.jdt.core.dom.Annotation; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools; import org.eclipse.jpt.common.core.internal.utility.jdt.CombinationIndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter; @@ -152,11 +151,6 @@ public final class SourceEclipseLinkConverterAnnotation return this.buildStringElementAdapter(this.converterClassDeclarationAdapter); } - public boolean converterClassImplementsInterface(String interfaceName, CompilationUnit astRoot) { - return (this.converterClass != null) - && ASTTools.typeImplementsInterface(this.converterClassAdapter.getExpression(astRoot), interfaceName); - } - // ***** fully-qualified converter class name public String getFullyQualifiedConverterClassName() { if (this.fqConverterClassNameStale) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCustomizerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCustomizerAnnotation.java index bf7b502369..0abb801c5f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCustomizerAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCustomizerAnnotation.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source; import org.eclipse.jdt.core.dom.Annotation; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation; import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools; import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter; @@ -123,11 +122,6 @@ public final class SourceEclipseLinkCustomizerAnnotation return this.getElementTextRange(VALUE_ADAPTER, astAnnotation); } - public boolean customizerClassImplementsInterface(String interfaceName, CompilationUnit astRoot) { - return (this.value != null) - && ASTTools.typeIsSubTypeOf(this.valueAdapter.getExpression(astRoot), interfaceName); - } - // ***** fully-qualified customizer class name public String getFullyQualifiedCustomizerClassName() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkNamedConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkNamedConverterAnnotation.java index c5e176cb7f..405e91c001 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkNamedConverterAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkNamedConverterAnnotation.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source; import org.eclipse.jdt.core.dom.Annotation; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation; import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter; import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter; @@ -114,8 +113,8 @@ abstract class SourceEclipseLinkNamedConverterAnnotation return this.getElementTextRange(this.nameDeclarationAdapter, astAnnotation); } - public boolean nameTouches(int pos, CompilationUnit astRoot) { - return this.elementTouches(this.nameDeclarationAdapter, pos, astRoot); + public boolean nameTouches(int pos) { + return this.textRangeTouches(this.nameTextRange, pos); } abstract String getNameElementName(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkWriteTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkWriteTransformerAnnotation.java index 83a0e27852..20c609285a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkWriteTransformerAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkWriteTransformerAnnotation.java @@ -38,7 +38,6 @@ public final class SourceEclipseLinkWriteTransformerAnnotation private final ElementAnnotationAdapter columnAdapter; private ColumnAnnotation column; private final ColumnAnnotation nullColumn; - private TextRange columnTextRange; public SourceEclipseLinkWriteTransformerAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) { @@ -59,14 +58,12 @@ public final class SourceEclipseLinkWriteTransformerAnnotation this.column = createColumn(this, this.annotatedElement, this.daa); this.column.initialize(columnAnnotation); } - this.columnTextRange = this.buildColumnTextRange(astRoot); } @Override public void synchronizeWith(CompilationUnit astRoot) { super.synchronizeWith(astRoot); this.syncColumn(astRoot); - this.columnTextRange = this.buildColumnTextRange(astRoot); } @Override @@ -144,17 +141,12 @@ public final class SourceEclipseLinkWriteTransformerAnnotation } public TextRange getColumnTextRange() { - return this.columnTextRange; - } - - private TextRange buildColumnTextRange(CompilationUnit astRoot) { if (this.column != null) { - return this.column.getTextRange(astRoot); + return this.column.getTextRange(); } - return this.getTextRange(astRoot); + return this.getTextRange(); } - // ********** static methods ********** private static DeclarationAnnotationAdapter buildColumnAnnotationAdapter(DeclarationAnnotationAdapter writeTransformerAnnotationAdapter) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java index d9b57c8e29..8da122a8f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; /** @@ -22,7 +21,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.1 */ public interface EclipseLinkConverterAnnotation @@ -59,11 +58,4 @@ public interface EclipseLinkConverterAnnotation * does not exist return the {@link TextRange} for the Converter annotation. */ TextRange getConverterClassTextRange(); - - /** - * Return whether the converter class implements the specified interface. - * @see org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomConverter#ECLIPSELINK_CONVERTER_CLASS_NAME - */ - boolean converterClassImplementsInterface(String interfaceName, CompilationUnit astRoot); - } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java index d705533cf0..0a42fe9f4a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.utility.TextRange; @@ -23,7 +22,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.1 */ public interface EclipseLinkCustomizerAnnotation @@ -60,10 +59,4 @@ public interface EclipseLinkCustomizerAnnotation * does not exist return the {@link TextRange} for the Customizer annotation. */ TextRange getValueTextRange(); - - /** - * Return whether the customizer class implements the specified interface. - * @see org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer#ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME - */ - boolean customizerClassImplementsInterface(String interfaceName, CompilationUnit astRoot); } |