diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context')
93 files changed, 533 insertions, 827 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractEntityPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractEntityPrimaryKeyValidator.java index 6cb8ecdbf1..2f87bde464 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractEntityPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractEntityPrimaryKeyValidator.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. @@ -13,8 +13,6 @@ import java.util.List; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.IdClassReference; -import org.eclipse.jpt.jpa.core.internal.context.PrimaryKeyTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -23,20 +21,14 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public abstract class AbstractEntityPrimaryKeyValidator extends AbstractPrimaryKeyValidator { - protected AbstractEntityPrimaryKeyValidator(Entity entity, - PrimaryKeyTextRangeResolver textRangeResolver) { - super(entity, textRangeResolver); + protected AbstractEntityPrimaryKeyValidator(Entity entity) { + super(entity); } protected Entity entity() { return (Entity) this.typeMapping(); } - @Override - protected IdClassReference idClassReference() { - return entity().getIdClassReference(); - } - public boolean validate(List<IMessage> messages, IReporter reporter) { // if an entity is non-root, it is not allowed to define primary keys if (! entity().isRootEntity()) { @@ -65,7 +57,7 @@ public abstract class AbstractEntityPrimaryKeyValidator extends JpaValidationMessages.ENTITY_NO_PK, EMPTY_STRING_ARRAY, entity(), - textRangeResolver().getTypeMappingTextRange())); + entity().getValidationTextRange())); } // if primary key is composite, it may either use an id class or embedded id, not both @@ -90,7 +82,7 @@ public abstract class AbstractEntityPrimaryKeyValidator extends JpaValidationMessages.ENTITY_NON_ROOT_ID_CLASS_SPECIFIED, EMPTY_STRING_ARRAY, entity(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } } @@ -102,7 +94,7 @@ public abstract class AbstractEntityPrimaryKeyValidator extends JpaValidationMessages.ENTITY_NON_ROOT_ID_ATTRIBUTE_SPECIFIED, EMPTY_STRING_ARRAY, each, - textRangeResolver().getAttributeMappingTextRange(each.getName()))); + getAttributeMappingTextRange(each.getName()))); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractJoinTableValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractJoinTableValidator.java index 56d9ae3421..7c290b0840 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractJoinTableValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractJoinTableValidator.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,18 +11,17 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public abstract class AbstractJoinTableValidator extends AbstractTableValidator { - protected AbstractJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - super(table, textRangeResolver); + protected AbstractJoinTableValidator(ReadOnlyJoinTable table) { + super(table); } - protected AbstractJoinTableValidator(ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - super(persistentAttribute, table, textRangeResolver); + protected AbstractJoinTableValidator(ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyJoinTable table) { + super(persistentAttribute, table); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractMappedSuperclassPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractMappedSuperclassPrimaryKeyValidator.java index 48440aac5e..74fd1c7b24 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractMappedSuperclassPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractMappedSuperclassPrimaryKeyValidator.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,9 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import java.util.List; -import org.eclipse.jpt.jpa.core.context.IdClassReference; import org.eclipse.jpt.jpa.core.context.MappedSuperclass; -import org.eclipse.jpt.jpa.core.internal.context.PrimaryKeyTextRangeResolver; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -20,9 +18,9 @@ public abstract class AbstractMappedSuperclassPrimaryKeyValidator extends AbstractPrimaryKeyValidator { protected AbstractMappedSuperclassPrimaryKeyValidator( - MappedSuperclass mappedSuperclass, PrimaryKeyTextRangeResolver textRangeResolver) { + MappedSuperclass mappedSuperclass) { - super(mappedSuperclass, textRangeResolver); + super(mappedSuperclass); } @@ -30,11 +28,6 @@ public abstract class AbstractMappedSuperclassPrimaryKeyValidator return (MappedSuperclass) this.typeMapping(); } - @Override - protected IdClassReference idClassReference() { - return mappedSuperclass().getIdClassReference(); - } - public boolean validate(List<IMessage> messages, IReporter reporter) { validatePrimaryKeyIsNotRedefined(messages, reporter); validateIdClassIsUsedIfNecessary(messages, reporter); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractNamedColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractNamedColumnValidator.java index 0c5ee3d935..8198b71376 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractNamedColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractNamedColumnValidator.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. @@ -14,16 +14,14 @@ import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; 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.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; -public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn, R extends NamedColumnTextRangeResolver> +public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn> implements JptValidator { /** this is <code>null</code> for columns defined on entities and secondary tables */ @@ -31,41 +29,34 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn protected final C column; - protected final R textRangeResolver; - protected final TableDescriptionProvider tableDescriptionProvider; protected final JptValidator tableValidator; protected AbstractNamedColumnValidator( - C column, - R textRangeResolver) { - this(null, column, textRangeResolver); + C column) { + this(null, column); } protected AbstractNamedColumnValidator( C column, - R textRangeResolver, TableDescriptionProvider provider) { - this(null, column, textRangeResolver, provider); + this(null, column, provider); } protected AbstractNamedColumnValidator( ReadOnlyPersistentAttribute persistentAttribute, - C column, - R textRangeResolver) { - this(persistentAttribute, column, textRangeResolver, TableDescriptionProvider.Null.instance()); + C column) { + this(persistentAttribute, column, TableDescriptionProvider.Null.instance()); } protected AbstractNamedColumnValidator( ReadOnlyPersistentAttribute persistentAttribute, C column, - R textRangeResolver, TableDescriptionProvider tableDescriptionProvider) { this.persistentAttribute = persistentAttribute; this.column = column; - this.textRangeResolver = textRangeResolver; this.tableDescriptionProvider = tableDescriptionProvider; this.tableValidator = this.buildTableValidator(); } @@ -104,7 +95,7 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -120,7 +111,7 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -208,7 +199,7 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getTextRangeResolver().getTableTextRange() + this.getColumn().getTableTextRange() ); } @@ -219,10 +210,6 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn protected String getColumnTableDescriptionMessage() { return AbstractNamedColumnValidator.this.tableDescriptionProvider.getColumnTableDescriptionMessage(); } - - protected TableColumnTextRangeResolver getTextRangeResolver() { - return (TableColumnTextRangeResolver) AbstractNamedColumnValidator.this.textRangeResolver; - } protected IMessage buildVirtualAttributeTableNotValidMessage() { return DefaultJpaValidationMessages.buildMessage( @@ -235,7 +222,7 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getTextRangeResolver().getTableTextRange() + this.getColumn().getTableTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPersistentAttributeValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPersistentAttributeValidator.java index 3cf01eabc4..9e154faed2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPersistentAttributeValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPersistentAttributeValidator.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. @@ -13,7 +13,6 @@ import java.util.List; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.PersistentAttributeTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -23,13 +22,10 @@ public abstract class AbstractPersistentAttributeValidator { protected ReadOnlyPersistentAttribute persistentAttribute; - protected PersistentAttributeTextRangeResolver textRangeResolver; - protected AbstractPersistentAttributeValidator( - ReadOnlyPersistentAttribute persistentAttribute, PersistentAttributeTextRangeResolver textRangeResolver) { + ReadOnlyPersistentAttribute persistentAttribute) { this.persistentAttribute = persistentAttribute; - this.textRangeResolver = textRangeResolver; } public final boolean validate(List<IMessage> messages, IReporter reporter) { @@ -47,7 +43,7 @@ public abstract class AbstractPersistentAttributeValidator msgID, new String[] {this.persistentAttribute.getName()}, this.persistentAttribute, - this.textRangeResolver.getAttributeTextRange() + this.persistentAttribute.getValidationTextRange() ); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java index 7d9605e3b8..5d92c9e19a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java @@ -13,6 +13,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ClassName; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.HashBag; @@ -29,12 +30,12 @@ import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.IdClassReference; import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.IdTypeMapping; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; 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.PrimaryKeyTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.PropertyAccessor; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; @@ -45,30 +46,30 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public abstract class AbstractPrimaryKeyValidator implements JptValidator { - private final TypeMapping typeMapping; - - private final PrimaryKeyTextRangeResolver textRangeResolver; + private final IdTypeMapping typeMapping; public static final String[] EMPTY_STRING_ARRAY = StringTools.EMPTY_STRING_ARRAY; - protected AbstractPrimaryKeyValidator( - TypeMapping typeMapping, PrimaryKeyTextRangeResolver textRangeResolver) { + protected AbstractPrimaryKeyValidator(IdTypeMapping typeMapping) { this.typeMapping = typeMapping; - this.textRangeResolver = textRangeResolver; } - protected TypeMapping typeMapping() { + protected IdTypeMapping typeMapping() { return this.typeMapping; } - protected abstract IdClassReference idClassReference(); - - protected PrimaryKeyTextRangeResolver textRangeResolver() { - return this.textRangeResolver; + protected IdClassReference idClassReference() { + return typeMapping().getIdClassReference(); + } - + + protected TextRange getAttributeMappingTextRange(String attributeName) { + return this.typeMapping().getPersistentType(). + getAttributeNamed(attributeName).getMapping().getValidationTextRange(); + } + // for JPA portability, a hierarchy must define its primary key on one class // (entity *or* mapped superclass) protected void validatePrimaryKeyIsNotRedefined(List<IMessage> messages, IReporter reporter) { @@ -80,7 +81,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_PK_REDEFINED_ID_CLASS, EMPTY_STRING_ARRAY, typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } for (AttributeMapping each : getPrimaryKeyMappingsDefinedLocally(typeMapping())) { messages.add( @@ -89,7 +90,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_PK_REDEFINED_ID_ATTRIBUTE, EMPTY_STRING_ARRAY, each, - textRangeResolver().getAttributeMappingTextRange(each.getName()))); + getAttributeMappingTextRange(each.getName()))); } return; } @@ -104,7 +105,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_REQUIRED, EMPTY_STRING_ARRAY, typeMapping(), - textRangeResolver().getTypeMappingTextRange())); + typeMapping().getValidationTextRange())); } } @@ -118,7 +119,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_AND_EMBEDDED_ID_BOTH_USED, EMPTY_STRING_ARRAY, typeMapping(), - textRangeResolver().getTypeMappingTextRange())); + typeMapping().getValidationTextRange())); } } @@ -131,7 +132,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_AND_EMBEDDED_ID_BOTH_USED, EMPTY_STRING_ARRAY, typeMapping(), - textRangeResolver().getTypeMappingTextRange())); + typeMapping().getValidationTextRange())); } } @@ -144,7 +145,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_MULTIPLE_EMBEDDED_ID, EMPTY_STRING_ARRAY, typeMapping(), - textRangeResolver().getTypeMappingTextRange())); + typeMapping().getValidationTextRange())); } } @@ -157,7 +158,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_WITH_MAPS_ID, new String[] {mapsIdRelationshipMapping.getName()}, mapsIdRelationshipMapping, - textRangeResolver().getAttributeMappingTextRange(mapsIdRelationshipMapping.getName()))); + getAttributeMappingTextRange(mapsIdRelationshipMapping.getName()))); } AttributeMapping resolvedAttributeMapping = @@ -171,7 +172,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_MAPS_ID_ATTRIBUTE_TYPE_DOES_NOT_AGREE, new String[] {mapsIdRelationshipMapping.getName()}, mapsIdRelationshipMapping, - textRangeResolver().getAttributeMappingTextRange(mapsIdRelationshipMapping.getName()))); + getAttributeMappingTextRange(mapsIdRelationshipMapping.getName()))); } } } @@ -200,7 +201,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_NOT_PRIMARY_KEY, new String[] {idClassAttribute.getName()}, typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } // the matching attribute's type should agree @@ -214,7 +215,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_TYPE_DOES_NOT_AGREE, new String[] {idClassAttribute.getName(), idClassAttributeTypeName}, typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } } } @@ -225,7 +226,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_NO_MATCH, new String[] {idClassAttribute.getName()}, typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } } @@ -244,7 +245,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_DOES_NOT_EXIST, new String[] {attributeMapping.getName()}, typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } else { // Validation for missing property methods is only for generic platform checkMissingAttributeWithPropertyAccess(idClass, attributeMapping, messages, reporter); @@ -268,7 +269,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_DOES_NOT_EXIST, new String[] {attributeMapping.getName()}, typeMapping(), - textRangeResolver().getIdClassTextRange()) + idClassReference().getValidationTextRange()) ); } } @@ -286,7 +287,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_MISSING_NO_ARG_CONSTRUCTOR, new String[] {idClass.getName()}, typeMapping(), - textRangeResolver().getIdClassTextRange()) + idClassReference().getValidationTextRange()) ); } } @@ -330,7 +331,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_MAPPING_NO_MATCH, new String[] {attributeMapping.getName()}, typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } protected void addDuplicateIdClassAttributeMatchError(AttributeMapping attributeMapping, List<IMessage> messages) { @@ -339,7 +340,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_MAPPING_DUPLICATE_MATCH, new String[] {attributeMapping.getName()}, typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } protected void validateIdClassPropertyMethods( @@ -373,7 +374,7 @@ public abstract class AbstractPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_PROPERTY_METHOD_NOT_PUBLIC, new String[] {idClass.getJavaResourceType().getTypeBinding().getQualifiedName(), methodName}, typeMapping(), - textRangeResolver().getIdClassTextRange() + idClassReference().getValidationTextRange() )); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTableValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTableValidator.java index da999a22e5..b1926fa628 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTableValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTableValidator.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. @@ -13,7 +13,6 @@ import java.util.List; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -26,26 +25,17 @@ public abstract class AbstractTableValidator protected final ReadOnlyTable table; - protected final TableTextRangeResolver textRangeResolver; - protected AbstractTableValidator( - ReadOnlyTable table, - TableTextRangeResolver textRangeResolver) { - this(null, table, textRangeResolver); + ReadOnlyTable table) { + this(null, table); } protected AbstractTableValidator( ReadOnlyPersistentAttribute persistentAttribute, - ReadOnlyTable table, - TableTextRangeResolver textRangeResolver) { + ReadOnlyTable table) { super(); this.persistentAttribute = persistentAttribute; this.table = table; - this.textRangeResolver = textRangeResolver; - } - - protected TableTextRangeResolver getTextRangeResolver() { - return this.textRangeResolver; } public boolean validate(List<IMessage> messages, IReporter reporter) { @@ -94,7 +84,7 @@ public abstract class AbstractTableValidator this.table.getName() }, this.table, - this.textRangeResolver.getCatalogTextRange() + this.table.getCatalogTextRange() ); } @@ -108,7 +98,7 @@ public abstract class AbstractTableValidator this.table.getName() }, this.table, - this.textRangeResolver.getCatalogTextRange() + this.table.getCatalogTextRange() ); } @@ -131,7 +121,7 @@ public abstract class AbstractTableValidator this.table.getName() }, this.table, - this.textRangeResolver.getSchemaTextRange() + this.table.getSchemaTextRange() ); } @@ -145,7 +135,7 @@ public abstract class AbstractTableValidator this.table.getName() }, this.table, - this.textRangeResolver.getSchemaTextRange() + this.table.getSchemaTextRange() ); } @@ -165,7 +155,7 @@ public abstract class AbstractTableValidator message, new String[] {this.table.getName()}, this.table, - this.textRangeResolver.getNameTextRange() + this.table.getNameTextRange() ); } @@ -178,7 +168,7 @@ public abstract class AbstractTableValidator this.table.getName() }, this.table, - this.textRangeResolver.getNameTextRange() + this.table.getNameTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java index 353e98aa69..7f1491f88e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java @@ -25,16 +25,9 @@ public abstract class AbstractTemporalConverterValidator { protected final BaseTemporalConverter converter; - protected final ConverterTextRangeResolver textRangeResolver; - - protected AbstractTemporalConverterValidator(BaseTemporalConverter converter, ConverterTextRangeResolver textRangeResolver) { + protected AbstractTemporalConverterValidator(BaseTemporalConverter converter) { super(); this.converter = converter; - this.textRangeResolver = textRangeResolver; - } - - protected ConverterTextRangeResolver getTextRangeResolver() { - return this.textRangeResolver; } protected AttributeMapping getAttributeMapping() { @@ -76,7 +69,7 @@ public abstract class AbstractTemporalConverterValidator this.getInvalidTemporalMappingType(), StringTools.EMPTY_STRING_ARRAY, this.converter, - this.getTextRangeResolver().getConverterTextRange() + this.converter.getValidationTextRange() ); } @@ -88,7 +81,7 @@ public abstract class AbstractTemporalConverterValidator this.getVirtualAttributeInvalidTemporalMappingType(), new String[] {this.getPersistentAttribute().getName()}, this.converter, - this.getTextRangeResolver().getConverterTextRange() + this.converter.getValidationTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTypeMappingValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTypeMappingValidator.java index cba68a1093..4bdb6968b8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTypeMappingValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTypeMappingValidator.java @@ -14,7 +14,6 @@ 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.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -26,14 +25,11 @@ public abstract class AbstractTypeMappingValidator<T extends TypeMapping> protected JavaResourceType jrt; - protected TypeMappingTextRangeResolver textRangeResolver; - protected AbstractTypeMappingValidator( - T typeMapping, JavaResourceType jrt, TypeMappingTextRangeResolver textRangeResolver) { + T typeMapping, JavaResourceType jrt) { this.typeMapping = typeMapping; this.jrt = jrt; - this.textRangeResolver = textRangeResolver; } @@ -85,7 +81,7 @@ public abstract class AbstractTypeMappingValidator<T extends TypeMapping> msgID, new String[] {this.typeMapping.getName()}, this.typeMapping, - this.textRangeResolver.getTypeMappingTextRange() + this.typeMapping.getValidationTextRange() ); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideInverseJoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideInverseJoinColumnValidator.java index d7df3d59c4..a07e31550c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideInverseJoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideInverseJoinColumnValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; @@ -27,9 +26,8 @@ public class AssociationOverrideInverseJoinColumnValidator ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner joinColumnOwner, - JoinColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(column, joinColumnOwner, textRangeResolver, provider); + super(column, joinColumnOwner, provider); this.override = override; } @@ -38,9 +36,8 @@ public class AssociationOverrideInverseJoinColumnValidator ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner joinColumnOwner, - JoinColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(persistentAttribute, column, joinColumnOwner, textRangeResolver, provider); + super(persistentAttribute, column, joinColumnOwner, provider); this.override = override; } @@ -66,7 +63,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -82,7 +79,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -108,7 +105,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.column.getReferencedColumnDbTable().getName() }, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -124,7 +121,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.column.getReferencedColumnDbTable().getName() }, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -146,7 +143,7 @@ public class AssociationOverrideInverseJoinColumnValidator JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS, new String[] {this.override.getName()}, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -160,7 +157,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.override.getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -182,7 +179,7 @@ public class AssociationOverrideInverseJoinColumnValidator JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS, new String[] {this.override.getName()}, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -196,7 +193,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.override.getName() }, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -233,7 +230,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getTextRangeResolver().getTableTextRange() + this.getColumn().getTableTextRange() ); } @@ -254,7 +251,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getTextRangeResolver().getTableTextRange() + this.getColumn().getTableTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideJoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideJoinColumnValidator.java index a495440ed5..b2af74f775 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideJoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideJoinColumnValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; @@ -28,9 +27,8 @@ public class AssociationOverrideJoinColumnValidator ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner joinColumnOwner, - JoinColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(column, joinColumnOwner, textRangeResolver, provider); + super(column, joinColumnOwner, provider); this.override = override; } @@ -39,9 +37,8 @@ public class AssociationOverrideJoinColumnValidator ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner joinColumnOwner, - JoinColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(persistentAttribute, column, joinColumnOwner, textRangeResolver, provider); + super(persistentAttribute, column, joinColumnOwner, provider); this.override = override; } @@ -67,7 +64,7 @@ public class AssociationOverrideJoinColumnValidator this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -83,7 +80,7 @@ public class AssociationOverrideJoinColumnValidator this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -109,7 +106,7 @@ public class AssociationOverrideJoinColumnValidator this.column.getReferencedColumnDbTable().getName() }, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -125,7 +122,7 @@ public class AssociationOverrideJoinColumnValidator this.column.getReferencedColumnDbTable().getName() }, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -147,7 +144,7 @@ public class AssociationOverrideJoinColumnValidator JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS, new String[] {this.override.getName()}, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -161,7 +158,7 @@ public class AssociationOverrideJoinColumnValidator this.override.getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -183,7 +180,7 @@ public class AssociationOverrideJoinColumnValidator JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS, new String[] {this.override.getName()}, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -197,7 +194,7 @@ public class AssociationOverrideJoinColumnValidator this.override.getName() }, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -234,7 +231,7 @@ public class AssociationOverrideJoinColumnValidator this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getTextRangeResolver().getTableTextRange() + this.getColumn().getTableTextRange() ); } @@ -255,7 +252,7 @@ public class AssociationOverrideJoinColumnValidator this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getTextRangeResolver().getTableTextRange() + this.getColumn().getTableTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideJoinTableValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideJoinTableValidator.java index 24731b8de4..7acdd11b03 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideJoinTableValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideJoinTableValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -24,18 +23,16 @@ public class AssociationOverrideJoinTableValidator public AssociationOverrideJoinTableValidator( ReadOnlyAssociationOverride override, - ReadOnlyJoinTable table, - TableTextRangeResolver textRangeResolver) { - super(table, textRangeResolver); + ReadOnlyJoinTable table) { + super(table); this.override = override; } public AssociationOverrideJoinTableValidator( ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyAssociationOverride override, - ReadOnlyJoinTable table, - TableTextRangeResolver textRangeResolver) { - super(persistentAttribute, table, textRangeResolver); + ReadOnlyJoinTable table) { + super(persistentAttribute, table); this.override = override; } @@ -55,7 +52,7 @@ public class AssociationOverrideJoinTableValidator this.table.getName() }, this.table, - this.getTextRangeResolver().getNameTextRange() + this.table.getNameTextRange() ); } @@ -75,7 +72,7 @@ public class AssociationOverrideJoinTableValidator this.table.getCatalog() }, this.table, - this.getTextRangeResolver().getCatalogTextRange() + this.table.getCatalogTextRange() ); } @@ -95,7 +92,7 @@ public class AssociationOverrideJoinTableValidator this.table.getSchema() }, this.table, - this.getTextRangeResolver().getSchemaTextRange() + this.table.getSchemaTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideValidator.java index b8417c6248..8341adaf4f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AssociationOverrideValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class AssociationOverrideValidator @@ -21,18 +20,16 @@ public class AssociationOverrideValidator public AssociationOverrideValidator( ReadOnlyAssociationOverride override, AssociationOverrideContainer container, - OverrideTextRangeResolver textRangeResolver, OverrideDescriptionProvider overrideDescriptionProvider) { - super(override, container, textRangeResolver, overrideDescriptionProvider); + super(override, container, overrideDescriptionProvider); } public AssociationOverrideValidator( ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyAssociationOverride override, AssociationOverrideContainer container, - OverrideTextRangeResolver textRangeResolver, OverrideDescriptionProvider overrideDescriptionProvider) { - super(persistentAttribute, override, container, textRangeResolver, overrideDescriptionProvider); + super(persistentAttribute, override, container, overrideDescriptionProvider); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AttributeOverrideColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AttributeOverrideColumnValidator.java index 7f514740be..cbcfec0d98 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AttributeOverrideColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AttributeOverrideColumnValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; @@ -26,9 +25,8 @@ public class AttributeOverrideColumnValidator public AttributeOverrideColumnValidator( ReadOnlyAttributeOverride override, ReadOnlyBaseColumn column, - TableColumnTextRangeResolver textRangeResolver, TableDescriptionProvider message) { - super(column, textRangeResolver, message); + super(column, message); this.override = override; } @@ -36,9 +34,8 @@ public class AttributeOverrideColumnValidator ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyAttributeOverride override, ReadOnlyBaseColumn column, - TableColumnTextRangeResolver textRangeResolver, TableDescriptionProvider message) { - super(persistentAttribute, column, textRangeResolver, message); + super(persistentAttribute, column, message); this.override = override; } @@ -64,7 +61,7 @@ public class AttributeOverrideColumnValidator this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -84,7 +81,7 @@ public class AttributeOverrideColumnValidator this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -121,7 +118,7 @@ public class AttributeOverrideColumnValidator this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getTextRangeResolver().getTableTextRange() + this.getColumn().getTableTextRange() ); } @@ -142,7 +139,7 @@ public class AttributeOverrideColumnValidator this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getTextRangeResolver().getTableTextRange() + this.getColumn().getTableTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AttributeOverrideValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AttributeOverrideValidator.java index 7f820a41c4..fb1de8b57e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AttributeOverrideValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AttributeOverrideValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class AttributeOverrideValidator @@ -21,18 +20,16 @@ public class AttributeOverrideValidator public AttributeOverrideValidator( ReadOnlyAttributeOverride override, AttributeOverrideContainer container, - OverrideTextRangeResolver textRangeResolver, OverrideDescriptionProvider overrideDescriptionProvider) { - super(override, container, textRangeResolver, overrideDescriptionProvider); + super(override, container, overrideDescriptionProvider); } public AttributeOverrideValidator( ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyAttributeOverride override, AttributeOverrideContainer container, - OverrideTextRangeResolver textRangeResolver, OverrideDescriptionProvider overrideDescriptionProvider) { - super(persistentAttribute, override, container, textRangeResolver, overrideDescriptionProvider); + super(persistentAttribute, override, container, overrideDescriptionProvider); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/BaseJoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/BaseJoinColumnValidator.java index 5bab03af96..967c3525ab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/BaseJoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/BaseJoinColumnValidator.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. @@ -13,21 +13,19 @@ import java.util.List; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn, R extends BaseJoinColumnTextRangeResolver> - extends AbstractNamedColumnValidator<C, R> +public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn> + extends AbstractNamedColumnValidator<C> { private final ReadOnlyBaseJoinColumn.Owner joinColumnOwner; protected BaseJoinColumnValidator( C column, ReadOnlyBaseJoinColumn.Owner joinColumnOwner, - R textRangeResolver, TableDescriptionProvider provider) { - super(column, textRangeResolver, provider); + super(column, provider); this.joinColumnOwner = joinColumnOwner; } @@ -35,9 +33,8 @@ public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn, ReadOnlyPersistentAttribute persistentAttribute, C column, ReadOnlyBaseJoinColumn.Owner joinColumnOwner, - R textRangeResolver, TableDescriptionProvider provider) { - super(persistentAttribute, column, textRangeResolver, provider); + super(persistentAttribute, column, provider); this.joinColumnOwner = joinColumnOwner; } @@ -94,7 +91,7 @@ public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn, this.column.getReferencedColumnDbTable().getName() }, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -108,7 +105,7 @@ public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn, this.column.getReferencedColumnDbTable().getName() }, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -128,7 +125,7 @@ public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn, message, StringTools.EMPTY_STRING_ARRAY, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -138,7 +135,7 @@ public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn, this.getVirtualAttributeUnspecifiedNameMultipleJoinColumnsMessage(), new String[] {this.persistentAttribute.getName()}, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -158,7 +155,7 @@ public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn, message, StringTools.EMPTY_STRING_ARRAY, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -168,7 +165,7 @@ public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn, this.getVirtualAttributeUnspecifiedReferencedColumnNameMultipleJoinColumnsMessage(), new String[] {this.persistentAttribute.getName()}, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/ConverterTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/ConverterTextRangeResolver.java deleted file mode 100644 index 793fd8dc46..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/ConverterTextRangeResolver.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.jpa1.context; - -import org.eclipse.jpt.common.core.utility.TextRange; - -/** - * Interface to resolve text ranges on converters. - */ -public interface ConverterTextRangeResolver -{ - TextRange getConverterTextRange(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/DiscriminatorColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/DiscriminatorColumnValidator.java index c993c07889..c32a75a6e7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/DiscriminatorColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/DiscriminatorColumnValidator.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. @@ -10,16 +10,14 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class DiscriminatorColumnValidator - extends AbstractNamedColumnValidator<ReadOnlyNamedColumn, NamedColumnTextRangeResolver> + extends AbstractNamedColumnValidator<ReadOnlyNamedColumn> { public DiscriminatorColumnValidator( - ReadOnlyNamedColumn namedColumn, - NamedColumnTextRangeResolver textRangeResolver) { - super(namedColumn, textRangeResolver); + ReadOnlyNamedColumn namedColumn) { + super(namedColumn); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/EntityPrimaryKeyJoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/EntityPrimaryKeyJoinColumnValidator.java index cafc2d9552..9d45cd357b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/EntityPrimaryKeyJoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/EntityPrimaryKeyJoinColumnValidator.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. @@ -10,16 +10,14 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; public class EntityPrimaryKeyJoinColumnValidator extends PrimaryKeyJoinColumnValidator { public EntityPrimaryKeyJoinColumnValidator( ReadOnlyBaseJoinColumn column, - ReadOnlyBaseJoinColumn.Owner owner, - BaseJoinColumnTextRangeResolver textRangeResolver) { - super(column, owner, textRangeResolver); + ReadOnlyBaseJoinColumn.Owner owner) { + super(column, owner); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericEntityPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericEntityPrimaryKeyValidator.java index 058f7b010f..3c1816170b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericEntityPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericEntityPrimaryKeyValidator.java @@ -14,7 +14,6 @@ import java.util.List; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; 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.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -23,8 +22,8 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericEntityPrimaryKeyValidator extends AbstractEntityPrimaryKeyValidator { - public GenericEntityPrimaryKeyValidator(Entity entity, PrimaryKeyTextRangeResolver textRangeResolver) { - super(entity, textRangeResolver); + public GenericEntityPrimaryKeyValidator(Entity entity) { + super(entity); } @Override @@ -47,7 +46,7 @@ public class GenericEntityPrimaryKeyValidator JpaValidationMessages.TYPE_MAPPING_ID_CLASS_MISSING_PUBLIC_NO_ARG_CONSTRUCTOR, new String[] {idClass.getName()}, typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericMappedSuperclassPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericMappedSuperclassPrimaryKeyValidator.java index c431490852..21cda0fbd2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericMappedSuperclassPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericMappedSuperclassPrimaryKeyValidator.java @@ -14,7 +14,6 @@ import java.util.List; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedSuperclass; 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.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -23,8 +22,8 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericMappedSuperclassPrimaryKeyValidator extends AbstractMappedSuperclassPrimaryKeyValidator { - public GenericMappedSuperclassPrimaryKeyValidator(MappedSuperclass mappedSuperclass, PrimaryKeyTextRangeResolver textRangeResolver) { - super(mappedSuperclass, textRangeResolver); + public GenericMappedSuperclassPrimaryKeyValidator(MappedSuperclass mappedSuperclass) { + super(mappedSuperclass); } @Override @@ -47,7 +46,7 @@ public class GenericMappedSuperclassPrimaryKeyValidator extends JpaValidationMessages.TYPE_MAPPING_ID_CLASS_MISSING_PUBLIC_NO_ARG_CONSTRUCTOR, new String[] {idClass.getName()}, typeMapping(), - textRangeResolver().getIdClassTextRange())); + idClassReference().getValidationTextRange())); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java index c8112546d8..d071191ce7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.HashBag; import org.eclipse.jpt.jpa.core.JpaProject; @@ -33,7 +34,6 @@ import org.eclipse.jpt.jpa.core.jpa2.MetamodelSynchronizer; import org.eclipse.jpt.jpa.core.jpa2.context.JpaRootContextNode2_0; import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceXml2_0; import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence; -import org.eclipse.jst.j2ee.model.internal.validation.ValidationCancelledException; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -228,10 +228,13 @@ public class GenericRootContextNode // ********** validation ********** + public TextRange getValidationTextRange() { + return TextRange.Empty.instance(); //? + } + + @Override public void validate(List<IMessage> messages, IReporter reporter) { - if (reporter.isCancelled()) { - throw new ValidationCancelledException(); - } + super.validate(messages, reporter); if (this.persistenceXml == null) { messages.add(buildPersistenceXmlValidationMessage()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericTypeMappingValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericTypeMappingValidator.java index 21e505ec43..d099c804c5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericTypeMappingValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericTypeMappingValidator.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.core.internal.jpa1.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.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; public class GenericTypeMappingValidator extends AbstractTypeMappingValidator<TypeMapping> { - public GenericTypeMappingValidator(TypeMapping typeMapping, JavaResourceType jrt, TypeMappingTextRangeResolver textRangeResolver) { - super(typeMapping, jrt, textRangeResolver); + public GenericTypeMappingValidator(TypeMapping typeMapping, JavaResourceType jrt) { + super(typeMapping, jrt); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/InverseJoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/InverseJoinColumnValidator.java index a495cc48ed..06c8da2964 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/InverseJoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/InverseJoinColumnValidator.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,28 +11,25 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class InverseJoinColumnValidator - extends BaseJoinColumnValidator<ReadOnlyJoinColumn, JoinColumnTextRangeResolver> + extends BaseJoinColumnValidator<ReadOnlyJoinColumn> { protected InverseJoinColumnValidator( ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner joinColumnOwner, - JoinColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(column, joinColumnOwner, textRangeResolver, provider); + super(column, joinColumnOwner, provider); } public InverseJoinColumnValidator( ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner joinColumnOwner, - JoinColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(persistentAttribute, column, joinColumnOwner, textRangeResolver, provider); + super(persistentAttribute, column, joinColumnOwner, provider); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/JoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/JoinColumnValidator.java index 87ddf14046..c5d2a48111 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/JoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/JoinColumnValidator.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,28 +11,25 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class JoinColumnValidator - extends BaseJoinColumnValidator<ReadOnlyJoinColumn, JoinColumnTextRangeResolver> + extends BaseJoinColumnValidator<ReadOnlyJoinColumn> { protected JoinColumnValidator( ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner joinColumnOwner, - JoinColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(column, joinColumnOwner, textRangeResolver, provider); + super(column, joinColumnOwner, provider); } public JoinColumnValidator( ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner joinColumnOwner, - JoinColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(persistentAttribute, column, joinColumnOwner, textRangeResolver, provider); + super(persistentAttribute, column, joinColumnOwner, provider); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/JoinTableValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/JoinTableValidator.java index 982d7c16c4..57794bf272 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/JoinTableValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/JoinTableValidator.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,14 +11,13 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class JoinTableValidator extends AbstractJoinTableValidator { - public JoinTableValidator(ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - super(persistentAttribute, table, textRangeResolver); + public JoinTableValidator(ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyJoinTable table) { + super(persistentAttribute, table); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyAttributeOverrideColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyAttributeOverrideColumnValidator.java index d9c3c2f232..857fdea471 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyAttributeOverrideColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyAttributeOverrideColumnValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; @@ -23,9 +22,8 @@ public class MapKeyAttributeOverrideColumnValidator ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyAttributeOverride override, ReadOnlyBaseColumn column, - TableColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(persistentAttribute, override, column, textRangeResolver, provider); + super(persistentAttribute, override, column, provider); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyAttributeOverrideValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyAttributeOverrideValidator.java index 951bd5634b..ae5ee1e32e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyAttributeOverrideValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyAttributeOverrideValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class MapKeyAttributeOverrideValidator @@ -22,9 +21,8 @@ public class MapKeyAttributeOverrideValidator ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyAttributeOverride override, AttributeOverrideContainer container, - OverrideTextRangeResolver textRangeResolver, OverrideDescriptionProvider overrideDescriptionProvider) { - super(persistentAttribute, override, container, textRangeResolver, overrideDescriptionProvider); + super(persistentAttribute, override, container, overrideDescriptionProvider); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyColumnValidator.java index ceced2be43..88792bae63 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/MapKeyColumnValidator.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,19 +11,17 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class MapKeyColumnValidator - extends AbstractNamedColumnValidator<ReadOnlyBaseColumn, TableColumnTextRangeResolver> + extends AbstractNamedColumnValidator<ReadOnlyBaseColumn> { public MapKeyColumnValidator( ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyBaseColumn column, - TableColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(persistentAttribute, column, textRangeResolver, provider); + super(persistentAttribute, column, provider); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/NamedColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/NamedColumnValidator.java index 0487f75ba9..1a54fdd1bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/NamedColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/NamedColumnValidator.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,27 +11,24 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class NamedColumnValidator - extends AbstractNamedColumnValidator<ReadOnlyBaseColumn, TableColumnTextRangeResolver> + extends AbstractNamedColumnValidator<ReadOnlyBaseColumn> { protected NamedColumnValidator( ReadOnlyBaseColumn column, - TableColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(column, textRangeResolver, provider); + super(column, provider); } public NamedColumnValidator( ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyBaseColumn column, - TableColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(persistentAttribute, column, textRangeResolver, provider); + super(persistentAttribute, column, provider); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OneToOnePrimaryKeyJoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OneToOnePrimaryKeyJoinColumnValidator.java index 5f29dd78dc..066ca4ec61 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OneToOnePrimaryKeyJoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OneToOnePrimaryKeyJoinColumnValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class OneToOnePrimaryKeyJoinColumnValidator @@ -20,9 +19,8 @@ public class OneToOnePrimaryKeyJoinColumnValidator public OneToOnePrimaryKeyJoinColumnValidator( ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyBaseJoinColumn column, - ReadOnlyBaseJoinColumn.Owner owner, - BaseJoinColumnTextRangeResolver textRangeResolver) { - super(persistentAttribute, column, owner, textRangeResolver); + ReadOnlyBaseJoinColumn.Owner owner) { + super(persistentAttribute, column, owner); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java index 30605494ce..2c9dee4b08 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.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. @@ -15,7 +15,6 @@ import org.eclipse.jpt.jpa.core.context.OverrideContainer; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -31,16 +30,13 @@ public abstract class OverrideValidator protected final OverrideContainer container; - protected final OverrideTextRangeResolver textRangeResolver; - protected final OverrideDescriptionProvider overrideDescriptionProvider; protected OverrideValidator( ReadOnlyOverride override, OverrideContainer container, - OverrideTextRangeResolver textRangeResolver, OverrideDescriptionProvider overrideDescriptionProvider) { - this(null, override, container, textRangeResolver, overrideDescriptionProvider); + this(null, override, container, overrideDescriptionProvider); } @@ -48,12 +44,10 @@ public abstract class OverrideValidator ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyOverride override, OverrideContainer container, - OverrideTextRangeResolver textRangeResolver, OverrideDescriptionProvider overrideDescriptionProvider) { this.persistentAttribute = persistentAttribute; this.override = override; this.container = container; - this.textRangeResolver = textRangeResolver; this.overrideDescriptionProvider = overrideDescriptionProvider; } @@ -83,7 +77,7 @@ public abstract class OverrideValidator this.getUnresolvedOverrideTypeMessage(), new String[] {this.override.getName()}, this.override, - this.textRangeResolver.getNameTextRange() + this.override.getNameTextRange() ); } @@ -123,7 +117,7 @@ public abstract class OverrideValidator this.container.getOverridableTypeMapping().getName() }, this.override, - this.textRangeResolver.getNameTextRange() + this.override.getNameTextRange() ); } @@ -139,7 +133,7 @@ public abstract class OverrideValidator this.container.getOverridableTypeMapping().getName() }, this.override, - this.textRangeResolver.getNameTextRange() + this.override.getNameTextRange() ); } @@ -156,7 +150,7 @@ public abstract class OverrideValidator this.container.getOverridableTypeMapping().getName() }, this.override, - this.textRangeResolver.getNameTextRange() + this.override.getNameTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PersistentFieldValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PersistentFieldValidator.java index 6d06448154..6c6a1d61cb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PersistentFieldValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PersistentFieldValidator.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.core.internal.jpa1.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.context.java.FieldAccessor; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -23,9 +22,9 @@ public class PersistentFieldValidator protected FieldAccessor fieldAccessor; public PersistentFieldValidator( - ReadOnlyPersistentAttribute persistentAttribute, FieldAccessor fieldAccessor, PersistentAttributeTextRangeResolver textRangeResolver) + ReadOnlyPersistentAttribute persistentAttribute, FieldAccessor fieldAccessor) { - super(persistentAttribute, textRangeResolver); + super(persistentAttribute); this.fieldAccessor = fieldAccessor; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PersistentPropertyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PersistentPropertyValidator.java index b4444380b2..cad66b37fb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PersistentPropertyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PersistentPropertyValidator.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.core.internal.jpa1.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.context.java.PropertyAccessor; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -23,9 +22,9 @@ public class PersistentPropertyValidator protected PropertyAccessor propertyAccessor; public PersistentPropertyValidator( - ReadOnlyPersistentAttribute persistentAttribute, PropertyAccessor propertyAccessor, PersistentAttributeTextRangeResolver textRangeResolver) + ReadOnlyPersistentAttribute persistentAttribute, PropertyAccessor propertyAccessor) { - super(persistentAttribute, textRangeResolver); + super(persistentAttribute); this.propertyAccessor = propertyAccessor; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PrimaryKeyJoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PrimaryKeyJoinColumnValidator.java index c531b28f01..84da4f8f0b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PrimaryKeyJoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/PrimaryKeyJoinColumnValidator.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,26 +11,23 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; public abstract class PrimaryKeyJoinColumnValidator - extends BaseJoinColumnValidator<ReadOnlyBaseJoinColumn, BaseJoinColumnTextRangeResolver> + extends BaseJoinColumnValidator<ReadOnlyBaseJoinColumn> { protected PrimaryKeyJoinColumnValidator( ReadOnlyBaseJoinColumn column, - ReadOnlyBaseJoinColumn.Owner owner, - BaseJoinColumnTextRangeResolver textRangeResolver) { - super(column, owner, textRangeResolver, TableDescriptionProvider.Null.instance()); + ReadOnlyBaseJoinColumn.Owner owner) { + super(column, owner, TableDescriptionProvider.Null.instance()); } protected PrimaryKeyJoinColumnValidator( ReadOnlyPersistentAttribute persistentAttribute, ReadOnlyBaseJoinColumn column, - ReadOnlyBaseJoinColumn.Owner owner, - BaseJoinColumnTextRangeResolver textRangeResolver) { - super(persistentAttribute, column, owner, textRangeResolver, TableDescriptionProvider.Null.instance()); + ReadOnlyBaseJoinColumn.Owner owner) { + super(persistentAttribute, column, owner, TableDescriptionProvider.Null.instance()); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/SecondaryTablePrimaryKeyJoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/SecondaryTablePrimaryKeyJoinColumnValidator.java index 7ecf62d72b..1c56c3c39e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/SecondaryTablePrimaryKeyJoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/SecondaryTablePrimaryKeyJoinColumnValidator.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.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlySecondaryTable; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -24,9 +23,8 @@ public class SecondaryTablePrimaryKeyJoinColumnValidator public SecondaryTablePrimaryKeyJoinColumnValidator( ReadOnlySecondaryTable secondaryTable, ReadOnlyBaseJoinColumn column, - ReadOnlyBaseJoinColumn.Owner owner, - BaseJoinColumnTextRangeResolver textRangeResolver) { - super(column, owner, textRangeResolver); + ReadOnlyBaseJoinColumn.Owner owner) { + super(column, owner); this.secondaryTable = secondaryTable; } @@ -55,7 +53,7 @@ public class SecondaryTablePrimaryKeyJoinColumnValidator this.column.getDbTable().getName() }, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -81,7 +79,7 @@ public class SecondaryTablePrimaryKeyJoinColumnValidator this.column.getReferencedColumnDbTable().getName() }, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } @@ -103,7 +101,7 @@ public class SecondaryTablePrimaryKeyJoinColumnValidator JpaValidationMessages.VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS, new String[] {this.getSecondaryTableName()}, this.column, - this.textRangeResolver.getNameTextRange() + this.column.getNameTextRange() ); } @@ -125,7 +123,7 @@ public class SecondaryTablePrimaryKeyJoinColumnValidator JpaValidationMessages.VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_REFERENCED_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS, new String[] {this.getSecondaryTableName()}, this.column, - this.textRangeResolver.getReferencedColumnNameTextRange() + this.column.getReferencedColumnNameTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/SecondaryTableValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/SecondaryTableValidator.java index ff7cbe3139..a976ea6ee8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/SecondaryTableValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/SecondaryTableValidator.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. @@ -10,14 +10,13 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlySecondaryTable; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class SecondaryTableValidator extends AbstractTableValidator { - public SecondaryTableValidator(ReadOnlySecondaryTable table, TableTextRangeResolver textRangeResolver) { - super(table, textRangeResolver); + public SecondaryTableValidator(ReadOnlySecondaryTable table) { + super(table); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/TableValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/TableValidator.java index 6a099e58b6..f9428360c4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/TableValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/TableValidator.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. @@ -10,14 +10,13 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class TableValidator extends AbstractTableValidator { - public TableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - super(table, textRangeResolver); + public TableValidator(ReadOnlyTable table) { + super(table); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaConverter.java index 413f615d76..0c25be7646 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaConverter.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. @@ -10,13 +10,11 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -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; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -36,27 +34,18 @@ public abstract class AbstractJavaConverter // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.owner.buildValidator(this, this.buildConverterTextRangeResolver(astRoot)).validate(messages, reporter); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.owner.buildValidator(this).validate(messages, reporter); } - - protected ConverterTextRangeResolver buildConverterTextRangeResolver(final CompilationUnit astRoot) { - return new ConverterTextRangeResolver() { - public TextRange getConverterTextRange() { - return getValidationTextRange(astRoot); - } - }; - } - - 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) { - return this.getConverterAnnotation().getTextRange(astRoot); + protected TextRange getAnnotationTextRange() { + return this.getConverterAnnotation().getTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaNamedDiscriminatorColumn.java index b4a8322cb5..4522137905 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaNamedDiscriminatorColumn.java @@ -10,16 +10,16 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.jpa.core.context.DiscriminatorType; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.java.JavaNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaNamedColumn; import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorColumnAnnotation; /** * Java named discriminator column */ -public abstract class AbstractJavaNamedDiscriminatorColumn<A extends DiscriminatorColumnAnnotation, O extends JavaReadOnlyNamedDiscriminatorColumn.Owner> +public abstract class AbstractJavaNamedDiscriminatorColumn<A extends DiscriminatorColumnAnnotation, O extends ReadOnlyNamedDiscriminatorColumn.Owner> extends AbstractJavaNamedColumn<A, O> implements JavaNamedDiscriminatorColumn { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java index 9671612069..18fcd8875a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.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. @@ -38,10 +38,8 @@ import org.eclipse.jpt.jpa.core.context.java.JavaOverride; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverride; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.ContextContainerTools; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOverrideContainer2_0; import org.eclipse.jpt.jpa.core.resource.java.OverrideAnnotation; @@ -515,12 +513,12 @@ public abstract class AbstractJavaOverrideContainer< return this.owner.getDefaultTableName(); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideTextRangeResolver textRangeResolver) { - return this.owner.buildOverrideValidator(override, this, textRangeResolver); + public JptValidator buildOverrideValidator(ReadOnlyOverride override) { + return this.owner.buildOverrideValidator(override, this); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner, TableColumnTextRangeResolver textRangeResolver) { - return this.owner.buildColumnValidator(override, column, columnOwner, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner) { + return this.owner.buildColumnValidator(override, column, columnOwner); } public String getPossiblePrefix() { @@ -569,21 +567,21 @@ public abstract class AbstractJavaOverrideContainer< // ********** 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); for (R override: this.getOverrides()) { - override.validate(messages, reporter, astRoot); + override.validate(messages, reporter); } } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getValidationAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.owner.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getValidationAnnotationTextRange(); + return (textRange != null) ? textRange : this.owner.getValidationTextRange(); } - protected TextRange getValidationAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getValidationAnnotationTextRange() { Annotation annotation = this.getValidationAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } protected Annotation getValidationAnnotation() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java index 55f80de86c..0bb359f33b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.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. @@ -19,9 +19,7 @@ import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOverride; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAssociationOverride2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAssociationOverrideContainer2_0; @@ -125,20 +123,20 @@ public class GenericJavaAssociationOverride // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.relationship.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.relationship.validate(messages, reporter); } - public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableValidator(this, table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table) { + return this.getContainer2_0().buildJoinTableValidator(this, table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableJoinColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getContainer2_0().buildJoinTableJoinColumnValidator(this, column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableInverseJoinColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getContainer2_0().buildJoinTableInverseJoinColumnValidator(this, column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java index 215fc57d2d..1b8c6d2e94 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.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. @@ -20,10 +20,8 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAssociationOverrideContainer2_0; import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; @@ -62,16 +60,16 @@ public class GenericJavaAssociationOverrideContainer return (JavaAssociationOverrideContainer2_0.Owner) super.getOwner2_0(); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner o, JoinColumnTextRangeResolver textRangeResolver) { - return this.getOwner2_0().buildJoinTableJoinColumnValidator(override, column, o, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner o) { + return this.getOwner2_0().buildJoinTableJoinColumnValidator(override, column, o); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner o, JoinColumnTextRangeResolver textRangeResolver) { - return this.getOwner2_0().buildJoinTableInverseJoinColumnValidator(override, column, o, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner o) { + return this.getOwner2_0().buildJoinTableInverseJoinColumnValidator(override, column, o); } - public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return this.getOwner2_0().buildJoinTableValidator(override, table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table) { + return this.getOwner2_0().buildJoinTableValidator(override, table); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java index 0f7fbabdfb..944f081e09 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -19,9 +19,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaColumn; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; 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.AbstractJavaOverride; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; @@ -99,8 +97,8 @@ public class GenericJavaAttributeOverride return this.name; } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return this.getContainer().buildColumnValidator(this, (ReadOnlyBaseColumn) col, this, (TableColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return this.getContainer().buildColumnValidator(this, (ReadOnlyBaseColumn) col, this); } public CompleteColumnAnnotation getColumnAnnotation() { @@ -143,8 +141,8 @@ public class GenericJavaAttributeOverride // ********** 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 (this.attributeIsDerivedId()) { messages.add( @@ -153,16 +151,16 @@ public class GenericJavaAttributeOverride JpaValidationMessages.ATTRIBUTE_OVERRIDE_DERIVED_AND_SPECIFIED, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); // validate the column if it is specified if (this.columnAnnotationIsSpecified()) { - this.column.validate(messages, reporter, astRoot); + this.column.validate(messages, reporter); } } else { - this.column.validate(messages, reporter, astRoot); + this.column.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java index 7a26de7fea..408252677e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.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.JavaRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; @@ -248,9 +247,9 @@ public class GenericJavaCascade return (RelationshipMapping2_0Annotation) this.getMappingAnnotationForUpdate(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange() { TextRange textRange = this.getAnnotationCascadeTextRange(); - return (textRange != null) ? textRange : this.getMapping().getValidationTextRange(astRoot); + return (textRange != null) ? textRange : this.getMapping().getValidationTextRange(); } protected TextRange getAnnotationCascadeTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaDiscriminatorColumn.java index 4d2f68696b..835f23f0bf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaDiscriminatorColumn.java @@ -10,6 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.java.JavaDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; @@ -19,11 +20,11 @@ import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorColumnAnnotation; * Java discriminator column */ public class GenericJavaDiscriminatorColumn - extends AbstractJavaNamedDiscriminatorColumn<DiscriminatorColumnAnnotation, JavaDiscriminatorColumn.Owner> + extends AbstractJavaNamedDiscriminatorColumn<DiscriminatorColumnAnnotation, ReadOnlyNamedDiscriminatorColumn.Owner> implements JavaDiscriminatorColumn { - public GenericJavaDiscriminatorColumn(JavaEntity parent, JavaDiscriminatorColumn.Owner owner) { + public GenericJavaDiscriminatorColumn(JavaEntity parent, ReadOnlyNamedDiscriminatorColumn.Owner owner) { super(parent, owner); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java index 4f8f3082fe..00eaff0d3d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java @@ -193,8 +193,8 @@ public class GenericJavaGeneratedValue // ********** 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); String generator = this.getGenerator(); if (generator == null) { @@ -213,21 +213,21 @@ public class GenericJavaGeneratedValue JpaValidationMessages.ID_MAPPING_UNRESOLVED_GENERATOR_NAME, new String[] {generator}, this.getIdMapping(), - this.getGeneratorTextRange(astRoot) + this.getGeneratorTextRange() ) ); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getIdMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getIdMapping().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { - return this.generatedValueAnnotation.getTextRange(astRoot); + protected TextRange getAnnotationTextRange() { + return this.generatedValueAnnotation.getTextRange(); } - public TextRange getGeneratorTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.generatedValueAnnotation.getGeneratorTextRange(), astRoot); + public TextRange getGeneratorTextRange() { + return this.getValidationTextRange(this.generatedValueAnnotation.getGeneratorTextRange()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java index 350c7b1cb3..23827c028f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java @@ -228,18 +228,18 @@ public class GenericJavaGeneratorContainer * @see org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnit#validateGenerators(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); // generators are validated in the persistence unit } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getResourceTextRange(astRoot); - return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getResourceTextRange(); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(); } - protected TextRange getResourceTextRange(CompilationUnit astRoot) { - return this.parentAdapter.getResourceAnnotatedElement().getTextRange(astRoot); + protected TextRange getResourceTextRange() { + return this.parentAdapter.getResourceAnnotatedElement().getTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java index 9669a2ae3f..b3e3fdeb20 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java @@ -18,12 +18,9 @@ import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBaseColumn; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaNamedColumn; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.java.CompleteJoinColumnAnnotation; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -32,7 +29,7 @@ import org.eclipse.jpt.jpa.db.Table; * Java join column */ public class GenericJavaJoinColumn - extends AbstractJavaBaseColumn<CompleteJoinColumnAnnotation, JavaReadOnlyJoinColumn.Owner> + extends AbstractJavaBaseColumn<CompleteJoinColumnAnnotation, ReadOnlyJoinColumn.Owner> implements JavaJoinColumn { /** @see AbstractJavaNamedColumn#AbstractJavaNamedColumn(JavaJpaContextNode, org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn.Owner, org.eclipse.jpt.jpa.core.resource.java.NamedColumnAnnotation) */ @@ -42,7 +39,7 @@ public class GenericJavaJoinColumn protected String defaultReferencedColumnName; - public GenericJavaJoinColumn(JavaJpaContextNode parent, JavaReadOnlyJoinColumn.Owner owner, CompleteJoinColumnAnnotation columnAnnotation) { + public GenericJavaJoinColumn(JavaJpaContextNode parent, ReadOnlyJoinColumn.Owner owner, CompleteJoinColumnAnnotation columnAnnotation) { super(parent, owner, columnAnnotation); } @@ -190,12 +187,7 @@ public class GenericJavaJoinColumn // ********** validation ********** - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaJoinColumnTextRangeResolver(this, astRoot); - } - - public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getColumnAnnotation().getReferencedColumnNameTextRange(), astRoot); + public TextRange getReferencedColumnNameTextRange() { + return this.getValidationTextRange(this.getColumnAnnotation().getReferencedColumnNameTextRange()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java index 9dad944af2..920e2a7f83 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java @@ -29,12 +29,9 @@ import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaRelationship; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.resource.java.NullJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; @@ -53,7 +50,7 @@ public class GenericJavaJoinTable implements JavaJoinTable { protected final ContextListContainer<JavaJoinColumn, JoinColumnAnnotation> specifiedInverseJoinColumnContainer; - protected final JavaReadOnlyJoinColumn.Owner inverseJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner inverseJoinColumnOwner; protected JavaJoinColumn defaultInverseJoinColumn; @@ -65,7 +62,7 @@ public class GenericJavaJoinTable } @Override - protected JavaReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -197,7 +194,7 @@ public class GenericJavaJoinTable } } - protected JavaReadOnlyJoinColumn.Owner buildInverseJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildInverseJoinColumnOwner() { return new InverseJoinColumnOwner(); } @@ -310,9 +307,9 @@ public class GenericJavaJoinTable // ********** validation ********** @Override - protected void validateJoinColumns(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validateJoinColumns(messages, reporter, astRoot); - this.validateNodes(this.getInverseJoinColumns(), messages, reporter, astRoot); + protected void validateJoinColumns(List<IMessage> messages, IReporter reporter) { + super.validateJoinColumns(messages, reporter); + this.validateNodes(this.getInverseJoinColumns(), messages, reporter); } public boolean validatesAgainstDatabase() { @@ -326,7 +323,7 @@ public class GenericJavaJoinTable * just a little common behavior */ protected abstract class AbstractJoinColumnOwner - implements JavaReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected AbstractJoinColumnOwner() { super(); @@ -365,8 +362,8 @@ public class GenericJavaJoinTable return GenericJavaJoinTable.this.getName(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return GenericJavaJoinTable.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return GenericJavaJoinTable.this.getValidationTextRange(); } protected JavaRelationship getRelationship() { @@ -410,8 +407,8 @@ public class GenericJavaJoinTable return GenericJavaJoinTable.this.getJoinColumnsSize(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return this.getRelationshipStrategy().buildJoinTableJoinColumnValidator((ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return this.getRelationshipStrategy().buildJoinTableJoinColumnValidator((ReadOnlyJoinColumn) column, this); } } @@ -446,8 +443,8 @@ public class GenericJavaJoinTable return GenericJavaJoinTable.this.getInverseJoinColumnsSize(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return this.getRelationshipStrategy().buildJoinTableInverseJoinColumnValidator((ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return this.getRelationshipStrategy().buildJoinTableInverseJoinColumnValidator((ReadOnlyJoinColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java index d088cf32c9..a0d566ce93 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 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.core.internal.jpa1.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.JoinTable; @@ -18,9 +17,7 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.java.JavaMappingJoinTableRelationship; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.jpa1.context.InverseJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; @@ -87,23 +84,23 @@ public class GenericJavaMappingJoinTableRelationshipStrategy return this.getRelationshipMapping().validatesAgainstDatabase(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getRelationship().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); } protected PersistentAttribute getPersistentAttribute() { return this.getRelationshipMapping().getPersistentAttribute(); } - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return new JoinTableValidator(this.getPersistentAttribute(), (JoinTable) table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return new JoinTableValidator(this.getPersistentAttribute(), (JoinTable) table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return new JoinColumnValidator(this.getPersistentAttribute(), column, owner, textRangeResolver, new JoinTableTableDescriptionProvider()); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return new JoinColumnValidator(this.getPersistentAttribute(), column, owner, new JoinTableTableDescriptionProvider()); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return new InverseJoinColumnValidator(this.getPersistentAttribute(), column, owner, textRangeResolver, new JoinTableTableDescriptionProvider()); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return new InverseJoinColumnValidator(this.getPersistentAttribute(), column, owner, new JoinTableTableDescriptionProvider()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java index ba9d430fdc..b6beaffb6f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java @@ -19,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; 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.core.internal.jpa2.context.OrderColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaOrderColumn2_0; @@ -416,19 +415,19 @@ public class GenericJavaOrderable // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getOrderByAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getOrderByAnnotationTextRange(); + return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(); } - protected TextRange getOrderByAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getOrderByAnnotationTextRange() { OrderByAnnotation orderByAnnotation = this.getOrderByAnnotation(); - return (orderByAnnotation == null) ? null : orderByAnnotation.getTextRange(astRoot); + return (orderByAnnotation == null) ? null : orderByAnnotation.getTextRange(); } @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 (this.orderColumnAnnotationIsPresent() && (this.getOrderByAnnotation() != null)) { messages.add( DefaultJpaValidationMessages.buildMessage( @@ -436,13 +435,13 @@ public class GenericJavaOrderable JpaValidationMessages.ORDER_COLUMN_AND_ORDER_BY_BOTH_SPECIFIED, new String[] {this.getPersistentAttribute().getName()}, this.getAttributeMapping(), - this.getOrderByAnnotationTextRange(astRoot) + this.getOrderByAnnotationTextRange() ) ); } if (this.orderColumnOrdering) { //TODO validation message if type is not List - this.orderColumn.validate(messages, reporter, astRoot); + this.orderColumn.validate(messages, reporter); } } @@ -464,12 +463,12 @@ public class GenericJavaOrderable return this.getPersistentAttribute().getName() + "_ORDER"; //$NON-NLS-1$ } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return GenericJavaOrderable.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return GenericJavaOrderable.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new OrderColumnValidator(this.getPersistentAttribute(), (OrderColumn2_0) column, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new OrderColumnValidator(this.getPersistentAttribute(), (OrderColumn2_0) column); } protected JavaPersistentAttribute getPersistentAttribute() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java index 47085a1fde..4b8352f93d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 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. @@ -31,10 +31,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipStrategy; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.context.java.GenericJavaOverrideJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaOverrideJoinTableRelationshipStrategy2_0; @@ -259,8 +256,8 @@ public class GenericJavaOverrideRelationship return this.getAssociationOverride().getDefaultTableName(); } - public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride().buildColumnValidator(column, owner, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner) { + return this.getAssociationOverride().buildColumnValidator(column, owner); } public AssociationOverrideAnnotation getOverrideAnnotation() { @@ -296,25 +293,25 @@ public class GenericJavaOverrideRelationship // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getAssociationOverride().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getAssociationOverride().getValidationTextRange(); } @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.strategy.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.strategy.validate(messages, reporter); } - public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableValidator(table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table) { + return this.getAssociationOverride2_0().buildJoinTableValidator(table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getAssociationOverride2_0().buildJoinTableJoinColumnValidator(column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getAssociationOverride2_0().buildJoinTableInverseJoinColumnValidator(column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPersistentAttribute.java index a1c781c011..3f496ed5c0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPersistentAttribute.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 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.core.internal.jpa1.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.jpa.core.context.PersistentType; @@ -39,7 +38,7 @@ public class GenericJavaPersistentAttribute // ********** validation ********** @Override - protected JptValidator buildAttributeValidator(CompilationUnit astRoot) { - return getAccessor().buildAttributeValidator(this, this.buildTextRangeResolver(astRoot)); + protected JptValidator buildAttributeValidator() { + return getAccessor().buildAttributeValidator(this); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java index fefc5bcb9a..479581ac9f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java @@ -15,12 +15,10 @@ import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyBaseJoinColumn; -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.JavaPrimaryKeyJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -29,7 +27,7 @@ import org.eclipse.jpt.jpa.db.Table; * Java primary key join column */ public class GenericJavaPrimaryKeyJoinColumn - extends AbstractJavaNamedColumn<PrimaryKeyJoinColumnAnnotation, JavaReadOnlyBaseJoinColumn.Owner> + extends AbstractJavaNamedColumn<PrimaryKeyJoinColumnAnnotation, ReadOnlyBaseJoinColumn.Owner> implements JavaPrimaryKeyJoinColumn { /** @see AbstractJavaNamedColumn#AbstractJavaNamedColumn(org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode, org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn.Owner, org.eclipse.jpt.jpa.core.resource.java.NamedColumnAnnotation) */ @@ -39,7 +37,7 @@ public class GenericJavaPrimaryKeyJoinColumn protected String defaultReferencedColumnName; - public GenericJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, JavaReadOnlyBaseJoinColumn.Owner owner, PrimaryKeyJoinColumnAnnotation columnAnnotation) { + public GenericJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, ReadOnlyBaseJoinColumn.Owner owner, PrimaryKeyJoinColumnAnnotation columnAnnotation) { super(parent, owner, columnAnnotation); } @@ -185,13 +183,8 @@ public class GenericJavaPrimaryKeyJoinColumn // ********** validation ********** - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaPrimaryKeyJoinColumnTextRangeResolver(this, astRoot); - } - - public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.columnAnnotation.getReferencedColumnNameTextRange(), astRoot); + public TextRange getReferencedColumnNameTextRange() { + return this.getValidationTextRange(this.columnAnnotation.getReferencedColumnNameTextRange()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java index 3b77df2586..afb406a2ba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; @@ -252,14 +251,14 @@ public class GenericJavaQueryContainer * @see org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnit#validateQueries(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); // queries are validated in the persistence unit } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.owner.getResourceAnnotatedElement().getTextRange(astRoot); - return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.owner.getResourceAnnotatedElement().getTextRange(); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java index a5a5c469c1..639cf4d929 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -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.context.QueryHint; @@ -87,9 +86,9 @@ public class GenericJavaQueryHint // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.queryHintAnnotation.getTextRange(astRoot); - return (textRange != null) ? textRange : this.getQuery().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.queryHintAnnotation.getTextRange(); + return (textRange != null) ? textRange : this.getQuery().getValidationTextRange(); } public boolean isEquivalentTo(QueryHint hint) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java index ffef9ec507..b2bf515610 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java @@ -38,7 +38,7 @@ public abstract class GenericJavaReferenceTable<A extends ReferenceTableAnnotati implements JavaReferenceTable { protected final ContextListContainer<JavaJoinColumn, JoinColumnAnnotation> specifiedJoinColumnContainer; - protected final JavaReadOnlyJoinColumn.Owner joinColumnOwner; + protected final ReadOnlyJoinColumn.Owner joinColumnOwner; protected JavaJoinColumn defaultJoinColumn; @@ -165,7 +165,7 @@ public abstract class GenericJavaReferenceTable<A extends ReferenceTableAnnotati } } - protected abstract JavaReadOnlyJoinColumn.Owner buildJoinColumnOwner(); + protected abstract ReadOnlyJoinColumn.Owner buildJoinColumnOwner(); protected ContextListContainer<JavaJoinColumn, JoinColumnAnnotation> buildSpecifiedJoinColumnContainer(){ SpecifiedJoinColumnContainer container = new SpecifiedJoinColumnContainer(); @@ -232,7 +232,7 @@ public abstract class GenericJavaReferenceTable<A extends ReferenceTableAnnotati return this.buildJoinColumn(this.joinColumnOwner, joinColumnAnnotation); } - protected JavaJoinColumn buildJoinColumn(JavaReadOnlyJoinColumn.Owner jcOwner, JoinColumnAnnotation joinColumnAnnotation) { + protected JavaJoinColumn buildJoinColumn(ReadOnlyJoinColumn.Owner jcOwner, JoinColumnAnnotation joinColumnAnnotation) { return this.getJpaFactory().buildJavaJoinColumn(this, jcOwner, joinColumnAnnotation); } @@ -268,19 +268,19 @@ public abstract class GenericJavaReferenceTable<A extends ReferenceTableAnnotati // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - boolean continueValidating = this.buildTableValidator(astRoot).validate(messages, reporter); + public void validate(List<IMessage> messages, IReporter reporter) { + boolean continueValidating = this.buildTableValidator().validate(messages, reporter); //join column validation will handle the check for whether to validate against the database //some validation messages are not database specific. If the database validation for the //table fails we will stop there and not validate the join columns at all if (continueValidating) { - this.validateJoinColumns(messages, reporter, astRoot); + this.validateJoinColumns(messages, reporter); } } - protected void validateJoinColumns(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - this.validateNodes(this.getJoinColumns(), messages, reporter, astRoot); + protected void validateJoinColumns(List<IMessage> messages, IReporter reporter) { + this.validateNodes(this.getJoinColumns(), messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java index 425f950fbb..c780b8cc14 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java @@ -21,11 +21,8 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; 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.AbstractJavaTable; import org.eclipse.jpt.jpa.core.internal.jpa1.context.SecondaryTablePrimaryKeyJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.resource.java.NullPrimaryKeyJoinColumnAnnotation; @@ -46,7 +43,7 @@ public class GenericJavaSecondaryTable protected /* final */ SecondaryTableAnnotation tableAnnotation; protected final ContextListContainer<JavaPrimaryKeyJoinColumn, PrimaryKeyJoinColumnAnnotation> specifiedPrimaryKeyJoinColumnContainer; - protected final JavaReadOnlyBaseJoinColumn.Owner primaryKeyJoinColumnOwner; + protected final ReadOnlyBaseJoinColumn.Owner primaryKeyJoinColumnOwner; protected JavaPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn; @@ -209,7 +206,7 @@ public class GenericJavaSecondaryTable } } - protected JavaReadOnlyBaseJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { + protected ReadOnlyBaseJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { return new PrimaryKeyJoinColumnOwner(); } @@ -320,15 +317,15 @@ public class GenericJavaSecondaryTable // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - boolean continueValidating = this.buildTableValidator(astRoot).validate(messages, reporter); + public void validate(List<IMessage> messages, IReporter reporter) { + boolean continueValidating = this.buildTableValidator().validate(messages, reporter); //join column validation will handle the check for whether to validate against the database //some validation messages are not database specific. If the database validation for the //table fails we will stop there and not validate the join columns at all if (continueValidating) { for (JavaPrimaryKeyJoinColumn pkJoinColumn : this.getPrimaryKeyJoinColumns()) { - pkJoinColumn.validate(messages, reporter, astRoot); + pkJoinColumn.validate(messages, reporter); } } } @@ -341,7 +338,7 @@ public class GenericJavaSecondaryTable // ********** primary key join column owner adapter ********** protected class PrimaryKeyJoinColumnOwner - implements JavaReadOnlyBaseJoinColumn.Owner + implements ReadOnlyBaseJoinColumn.Owner { protected JavaEntity getEntity() { return GenericJavaSecondaryTable.this.getEntity(); @@ -370,12 +367,12 @@ public class GenericJavaSecondaryTable return this.getEntity().getPrimaryKeyColumnName(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return GenericJavaSecondaryTable.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return GenericJavaSecondaryTable.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new SecondaryTablePrimaryKeyJoinColumnValidator(GenericJavaSecondaryTable.this, (ReadOnlyBaseJoinColumn) column, this, (BaseJoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new SecondaryTablePrimaryKeyJoinColumnValidator(GenericJavaSecondaryTable.this, (ReadOnlyBaseJoinColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java index 0fc14bdb45..b4f4d88c0d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java @@ -116,9 +116,9 @@ public class GenericJavaUniqueConstraint // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.uniqueConstraintAnnotation.getTextRange(astRoot); - return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.uniqueConstraintAnnotation.getTextRange(); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(); } public boolean isEquivalentTo(UniqueConstraint uniqueConstraint) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java index d7f6b3b98d..d0a88fe697 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.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. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; @@ -18,9 +17,7 @@ import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverrideRelationship; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVirtualOverride; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAssociationOverrideContainer2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaVirtualAssociationOverride2_0; @@ -84,20 +81,20 @@ public class GenericJavaVirtualAssociationOverride // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.relationship.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.relationship.validate(messages, reporter); } - public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableValidator(this, table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table) { + return this.getContainer2_0().buildJoinTableValidator(this, table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableJoinColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getContainer2_0().buildJoinTableJoinColumnValidator(this, column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableInverseJoinColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getContainer2_0().buildJoinTableInverseJoinColumnValidator(this, column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAttributeOverride.java index a4c5705f52..76ede6942a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAttributeOverride.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. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; @@ -18,9 +17,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualColumn; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; 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.AbstractJavaVirtualOverride; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -95,16 +92,16 @@ public class GenericJavaVirtualAttributeOverride return this.getContainer().resolveOverriddenColumn(this.name); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return this.getContainer().buildColumnValidator(this, (ReadOnlyBaseColumn) col, this, (TableColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return this.getContainer().buildColumnValidator(this, (ReadOnlyBaseColumn) col, this); } // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.column.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.column.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualJoinColumn.java index 61d73f863a..d4ea8d0c21 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualJoinColumn.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. @@ -9,16 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumn; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVirtualBaseColumn; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -26,7 +22,7 @@ import org.eclipse.jpt.jpa.db.Table; * Java virtual join column */ public class GenericJavaVirtualJoinColumn - extends AbstractJavaVirtualBaseColumn<JavaReadOnlyJoinColumn.Owner, ReadOnlyJoinColumn> + extends AbstractJavaVirtualBaseColumn<ReadOnlyJoinColumn.Owner, ReadOnlyJoinColumn> implements JavaVirtualJoinColumn { protected final ReadOnlyJoinColumn overriddenColumn; @@ -35,7 +31,7 @@ public class GenericJavaVirtualJoinColumn protected String defaultReferencedColumnName; - public GenericJavaVirtualJoinColumn(JavaJpaContextNode parent, JavaReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { + public GenericJavaVirtualJoinColumn(JavaJpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { super(parent, owner); this.overriddenColumn = overriddenColumn; } @@ -113,12 +109,7 @@ public class GenericJavaVirtualJoinColumn // ********** validation ********** - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaJoinColumnTextRangeResolver(this, astRoot); - } - - public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); + public TextRange getReferencedColumnNameTextRange() { + return this.getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java index 71ef4b44d9..4de05f67a5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.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. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.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.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; @@ -26,14 +25,11 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverrideRelationship; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -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.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -44,7 +40,7 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy implements JavaVirtualJoinColumnRelationshipStrategy { protected final ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; - protected final JavaReadOnlyJoinColumn.Owner joinColumnOwner; + protected final ReadOnlyJoinColumn.Owner joinColumnOwner; protected JavaVirtualJoinColumn defaultJoinColumn; @@ -130,7 +126,7 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy } } - protected JavaReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -290,8 +286,8 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy return (typeMapping != null) ? typeMapping.getAllAssociatedTableNames() : EmptyIterable.<String>instance(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getRelationship().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); } protected String getAttributeName() { @@ -306,10 +302,10 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy // ********** 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); for (JavaVirtualJoinColumn joinColumn : this.getJoinColumns()) { - joinColumn.validate(messages, reporter, astRoot); + joinColumn.validate(messages, reporter); } } @@ -317,7 +313,7 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy // ********** join column owner ********** protected class JoinColumnOwner - implements JavaReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected JoinColumnOwner() { super(); @@ -359,12 +355,12 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.getJoinColumnsSize(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.getRelationship().buildColumnValidator((ReadOnlyBaseColumn) column, this, (TableColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.getRelationship().buildColumnValidator((ReadOnlyBaseColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java index 073d0ca591..f0d8c9f3ec 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.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. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.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.core.context.Entity; import org.eclipse.jpt.jpa.core.context.OverrideRelationship; @@ -26,10 +25,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualRelationshipStrategy; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; @@ -208,8 +204,8 @@ public class GenericJavaVirtualOverrideRelationship return this.getAssociationOverride().getDefaultTableName(); } - public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride().buildColumnValidator(column, owner, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner) { + return this.getAssociationOverride().buildColumnValidator(column, owner); } public Entity getEntity() { @@ -232,25 +228,25 @@ public class GenericJavaVirtualOverrideRelationship // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getAssociationOverride().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getAssociationOverride().getValidationTextRange(); } @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.strategy.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.strategy.validate(messages, reporter); } - public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableValidator(table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table) { + return this.getAssociationOverride2_0().buildJoinTableValidator(table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getAssociationOverride2_0().buildJoinTableJoinColumnValidator(column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getAssociationOverride2_0().buildJoinTableInverseJoinColumnValidator(column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualUniqueConstraint.java index 0b5c080248..10a836d69c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualUniqueConstraint.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.core.internal.jpa1.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; @@ -40,8 +39,8 @@ public class GenericJavaVirtualUniqueConstraint // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getParent().getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/JavaElementCollectionTemporalConverterValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/JavaElementCollectionTemporalConverterValidator.java index 981ebaf258..313255e3de 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/JavaElementCollectionTemporalConverterValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/JavaElementCollectionTemporalConverterValidator.java @@ -11,15 +11,14 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractTemporalConverterValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0; public class JavaElementCollectionTemporalConverterValidator extends AbstractTemporalConverterValidator { - public JavaElementCollectionTemporalConverterValidator(BaseTemporalConverter converter, ConverterTextRangeResolver textRangeResolver) { - super(converter, textRangeResolver); + public JavaElementCollectionTemporalConverterValidator(BaseTemporalConverter converter) { + super(converter); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/JavaTemporalConverterValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/JavaTemporalConverterValidator.java index fa5ddd6626..000860fa09 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/JavaTemporalConverterValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/JavaTemporalConverterValidator.java @@ -11,14 +11,13 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractTemporalConverterValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class JavaTemporalConverterValidator extends AbstractTemporalConverterValidator { - public JavaTemporalConverterValidator(BaseTemporalConverter converter, ConverterTextRangeResolver textRangeResolver) { - super(converter, textRangeResolver); + public JavaTemporalConverterValidator(BaseTemporalConverter converter) { + super(converter); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java index 90d1ba4ff9..e37bb8d68e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.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. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.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; import org.eclipse.jpt.jpa.core.context.Converter; @@ -42,7 +41,7 @@ public class NullJavaConverter // NOP } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getParent().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java index 1787c7655b..301ec25716 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.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; @@ -169,8 +168,8 @@ public class NullJavaJoinColumnRelationshipStrategy // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getRelationship().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); } public String getColumnTableNotValidDescription() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinTableRelationshipStrategy.java index 547a93fa4c..abbe86491b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinTableRelationshipStrategy.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. @@ -9,14 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationship; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; @@ -46,8 +44,8 @@ public class NullJavaJoinTableRelationshipStrategy // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getRelationship().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); } @@ -110,11 +108,11 @@ public class NullJavaJoinTableRelationshipStrategy return false; } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { throw new UnsupportedOperationException(); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { throw new UnsupportedOperationException(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmConverter.java index d4457f3730..3805f25344 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmConverter.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. @@ -14,7 +14,6 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -55,17 +54,9 @@ public abstract class AbstractOrmConverter @Override public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); - this.owner.buildValidator(this, this.buildConverterTextRangeResolver()).validate(messages, reporter); + this.owner.buildValidator(this).validate(messages, reporter); } - - protected ConverterTextRangeResolver buildConverterTextRangeResolver() { - return new ConverterTextRangeResolver() { - public TextRange getConverterTextRange() { - return getValidationTextRange(); - } - }; - } public TextRange getValidationTextRange() { TextRange textRange = this.getXmlValidationTextRange(); return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java index a1cb23f604..2aefecf3bb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java @@ -36,12 +36,8 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmBaseEmbeddedMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideInverseJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideJoinColumnValidator; @@ -298,24 +294,24 @@ public abstract class AbstractOrmEmbeddedMapping<X extends XmlEmbedded> return AbstractOrmEmbeddedMapping.this.getValidationTextRange(); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new AssociationOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAssociationOverride) override, (AssociationOverrideContainer) container, textRangeResolver, new EmbeddableOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new AssociationOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAssociationOverride) override, (AssociationOverrideContainer) container, new EmbeddableOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) owner, (JoinColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner) { + return new AssociationOverrideJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) owner, new EntityTableDescriptionProvider()); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinColumnValidator(this.getPersistentAttribute(), override, column, owner, textRangeResolver, new JoinTableTableDescriptionProvider()); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return new AssociationOverrideJoinColumnValidator(this.getPersistentAttribute(), override, column, owner, new JoinTableTableDescriptionProvider()); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideInverseJoinColumnValidator(this.getPersistentAttribute(), override, column, owner, textRangeResolver, new JoinTableTableDescriptionProvider()); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return new AssociationOverrideInverseJoinColumnValidator(this.getPersistentAttribute(), override, column, owner, new JoinTableTableDescriptionProvider()); } - public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinTableValidator(this.getPersistentAttribute(), override, (ReadOnlyJoinTable) table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table) { + return new AssociationOverrideJoinTableValidator(this.getPersistentAttribute(), override, (ReadOnlyJoinTable) table); } protected OrmPersistentAttribute getPersistentAttribute() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java index 2a5aecc2ac..3b38cfba39 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java @@ -10,16 +10,16 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.jpa.core.context.DiscriminatorType; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmNamedDiscriminatorColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmNamedColumn; import org.eclipse.jpt.jpa.core.resource.orm.XmlBaseDiscriminatorColumn; /** * <code>orm.xml</code> named discriminator column */ -public abstract class AbstractOrmNamedDiscriminatorColumn<X extends XmlBaseDiscriminatorColumn, O extends OrmReadOnlyNamedDiscriminatorColumn.Owner> +public abstract class AbstractOrmNamedDiscriminatorColumn<X extends XmlBaseDiscriminatorColumn, O extends ReadOnlyNamedDiscriminatorColumn.Owner> extends AbstractOrmNamedColumn<X, O> implements OrmNamedDiscriminatorColumn { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java index 93c19b4866..b41cbc93f8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java @@ -19,10 +19,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverride; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOverrideTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.XmlOverride; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -121,8 +118,8 @@ public abstract class AbstractOrmOverride<C extends OrmOverrideContainer, X exte return this.getContainer().getDefaultTableName(); } - public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return this.getContainer().buildColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner) { + return this.getContainer().buildColumnValidator(this, column, owner); } @Override @@ -140,11 +137,7 @@ public abstract class AbstractOrmOverride<C extends OrmOverrideContainer, X exte } protected JptValidator buildValidator() { - return this.getContainer().buildOverrideValidator(this, this.buildTextRangeResolver()); - } - - protected OverrideTextRangeResolver buildTextRangeResolver() { - return new OrmOverrideTextRangeResolver(this); + return this.getContainer().buildOverrideValidator(this); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java index 038e1f2e30..7ab0fe394b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java @@ -30,8 +30,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverride; import org.eclipse.jpt.jpa.core.internal.context.ContextContainerTools; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; import org.eclipse.jpt.jpa.core.resource.orm.XmlOverride; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -431,12 +429,12 @@ public abstract class AbstractOrmOverrideContainer< return this.owner.getDefaultTableName(); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideTextRangeResolver textRangeResolver) { - return this.owner.buildOverrideValidator(override, this, textRangeResolver); + public JptValidator buildOverrideValidator(ReadOnlyOverride override) { + return this.owner.buildOverrideValidator(override, this); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner, TableColumnTextRangeResolver textRangeResolver) { - return this.owner.buildColumnValidator(override, column, columnOwner, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner) { + return this.owner.buildColumnValidator(override, column, columnOwner); } protected R selectOverrideNamed(Iterable<R> overrides, String name) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmVirtualOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmVirtualOverride.java index 2a46f57e60..5f53f120d4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmVirtualOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmVirtualOverride.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. @@ -17,11 +17,8 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn.Owner; import org.eclipse.jpt.jpa.core.context.orm.OrmOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverride; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOverrideTextRangeResolver; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -75,8 +72,8 @@ public abstract class AbstractOrmVirtualOverride<C extends OrmOverrideContainer> return this.getContainer().getDefaultTableName(); } - public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return this.getContainer().buildColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner) { + return this.getContainer().buildColumnValidator(this, column, owner); } @Override @@ -94,11 +91,7 @@ public abstract class AbstractOrmVirtualOverride<C extends OrmOverrideContainer> } protected JptValidator buildValidator() { - return this.getContainer().buildOverrideValidator(this, this.buildTextRangeResolver()); - } - - protected OverrideTextRangeResolver buildTextRangeResolver() { - return new OrmOverrideTextRangeResolver(this); + return this.getContainer().buildOverrideValidator(this); } public TextRange getValidationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java index af85f006d0..6bfa16dba8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java @@ -17,9 +17,7 @@ import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmOverrideRelationship; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAssociationOverride; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmAssociationOverride2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmAssociationOverrideContainer2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride; @@ -105,16 +103,16 @@ public class GenericOrmAssociationOverride this.relationship.validate(messages, reporter); } - public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableValidator(this, table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table) { + return this.getContainer2_0().buildJoinTableValidator(this, table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableJoinColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getContainer2_0().buildJoinTableJoinColumnValidator(this, column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableInverseJoinColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getContainer2_0().buildJoinTableInverseJoinColumnValidator(this, column, owner); } // ********** completion proposals ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java index f0d01182d3..a0c014fe39 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 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. @@ -20,10 +20,8 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAssociationOverride; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmAssociationOverrideContainer2_0; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride; @@ -58,16 +56,16 @@ public class GenericOrmAssociationOverrideContainer return (OrmAssociationOverrideContainer2_0.Owner) this.owner; } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner columnOwner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getOwner2_0().buildJoinTableJoinColumnValidator(override, column, columnOwner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner columnOwner) { + return this.getOwner2_0().buildJoinTableJoinColumnValidator(override, column, columnOwner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner columnOwner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getOwner2_0().buildJoinTableInverseJoinColumnValidator(override, column, columnOwner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner columnOwner) { + return this.getOwner2_0().buildJoinTableInverseJoinColumnValidator(override, column, columnOwner); } - public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return this.getOwner2_0().buildJoinTableValidator(override, table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table) { + return this.getOwner2_0().buildJoinTableValidator(override, table); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java index 22ea7a8b00..c6c768f403 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java @@ -18,8 +18,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAttributeOverride; 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.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; @@ -97,8 +95,8 @@ public class GenericOrmAttributeOverride return this.name; } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return this.getContainer().buildColumnValidator(this, (ReadOnlyBaseColumn) col, this, (TableColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return this.getContainer().buildColumnValidator(this, (ReadOnlyBaseColumn) col, this); } public XmlColumn getXmlColumn() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java index 82c9b8b39a..25bdf524e1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java @@ -14,11 +14,8 @@ import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmBaseColumn; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -27,7 +24,7 @@ import org.eclipse.jpt.jpa.db.Table; * <code>orm.xml</code> join column */ public class GenericOrmJoinColumn - extends AbstractOrmBaseColumn<XmlJoinColumn, OrmReadOnlyJoinColumn.Owner> + extends AbstractOrmBaseColumn<XmlJoinColumn, ReadOnlyJoinColumn.Owner> implements OrmJoinColumn { /** @see org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmNamedColumn#AbstractOrmNamedColumn(XmlContextNode, org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn.Owner, org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlNamedColumn) */ @@ -37,11 +34,11 @@ public class GenericOrmJoinColumn protected String defaultReferencedColumnName; - public GenericOrmJoinColumn(XmlContextNode parent, OrmReadOnlyJoinColumn.Owner owner) { + public GenericOrmJoinColumn(XmlContextNode parent, ReadOnlyJoinColumn.Owner owner) { this(parent, owner, null); } - public GenericOrmJoinColumn(XmlContextNode parent, OrmReadOnlyJoinColumn.Owner owner, XmlJoinColumn xmlColumn) { + public GenericOrmJoinColumn(XmlContextNode parent, ReadOnlyJoinColumn.Owner owner, XmlJoinColumn xmlColumn) { super(parent, owner, xmlColumn); this.specifiedReferencedColumnName = this.buildSpecifiedReferencedColumnName(); } @@ -170,11 +167,6 @@ public class GenericOrmJoinColumn return this.getValidationTextRange(this.xmlColumn.getReferencedColumnNameTextRange()); } - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmJoinColumnTextRangeResolver(this); - } - // ********** completion proposals ********** @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java index 6a69301767..e81482812d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java @@ -28,12 +28,9 @@ import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmRelationship; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn; import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTable; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -47,7 +44,7 @@ public class GenericOrmJoinTable implements OrmJoinTable { protected final ContextListContainer<OrmJoinColumn, XmlJoinColumn> specifiedInverseJoinColumnContainer; - protected final OrmReadOnlyJoinColumn.Owner inverseJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner inverseJoinColumnOwner; protected OrmJoinColumn defaultInverseJoinColumn; @@ -59,7 +56,7 @@ public class GenericOrmJoinTable } @Override - protected OrmReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -208,7 +205,7 @@ public class GenericOrmJoinTable } } - protected OrmReadOnlyJoinColumn.Owner buildInverseJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildInverseJoinColumnOwner() { return new InverseJoinColumnOwner(); } @@ -330,7 +327,7 @@ public class GenericOrmJoinTable * just a little common behavior */ protected abstract class AbstractJoinColumnOwner - implements OrmReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected AbstractJoinColumnOwner() { super(); @@ -420,8 +417,8 @@ public class GenericOrmJoinTable return GenericOrmJoinTable.this.getJoinColumnsSize(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return this.getRelationshipStrategy().buildJoinTableJoinColumnValidator((ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return this.getRelationshipStrategy().buildJoinTableJoinColumnValidator((ReadOnlyJoinColumn) column, this); } } @@ -466,8 +463,8 @@ public class GenericOrmJoinTable return GenericOrmJoinTable.this.getInverseJoinColumnsSize(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return this.getRelationshipStrategy().buildJoinTableInverseJoinColumnValidator((ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return this.getRelationshipStrategy().buildJoinTableInverseJoinColumnValidator((ReadOnlyJoinColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java index 45656e8bf3..18203e77d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java @@ -15,7 +15,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; 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.internal.jpa2.context.OrderColumnValidator; import org.eclipse.jpt.jpa.core.jpa2.context.OrderColumn2_0; @@ -440,8 +439,8 @@ public class GenericOrmOrderable return GenericOrmOrderable.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new OrderColumnValidator(this.getPersistentAttribute(), (OrderColumn2_0) column, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new OrderColumnValidator(this.getPersistentAttribute(), (OrderColumn2_0) column); } public XmlOrderColumn getXmlColumn() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java index 0f010df5af..3b8657c647 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java @@ -29,10 +29,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipStrategy; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; import org.eclipse.jpt.jpa.core.internal.context.orm.GenericOrmOverrideJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.orm.NullOrmJoinTableRelationshipStrategy; @@ -264,8 +261,8 @@ public class GenericOrmOverrideRelationship return this.getAssociationOverride().getDefaultTableName(); } - public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride().buildColumnValidator(column, owner, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner) { + return this.getAssociationOverride().buildColumnValidator(column, owner); } public Entity getEntity() { @@ -294,16 +291,16 @@ public class GenericOrmOverrideRelationship this.strategy.validate(messages, reporter); } - public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableValidator(table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table) { + return this.getAssociationOverride2_0().buildJoinTableValidator(table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getAssociationOverride2_0().buildJoinTableJoinColumnValidator(column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getAssociationOverride2_0().buildJoinTableInverseJoinColumnValidator(column, owner); } // ********** completion proposals ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentAttribute.java index 83ce2991a7..5bf20e8562 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentAttribute.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 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. @@ -57,6 +57,6 @@ public class GenericOrmPersistentAttribute @Override protected JptValidator buildAttibuteValidator() { - return this.getJavaPersistentAttribute().getAccessor().buildAttributeValidator(this, buildTextRangeResolver()); + return this.getJavaPersistentAttribute().getAccessor().buildAttributeValidator(this); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java index 26c08d3df7..8d22194f05 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java @@ -11,13 +11,11 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmNamedColumn; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmPrimaryKeyJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.XmlPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -26,7 +24,7 @@ import org.eclipse.jpt.jpa.db.Table; * <code>orm.xml</code> primary key join column */ public class GenericOrmPrimaryKeyJoinColumn - extends AbstractOrmNamedColumn<XmlPrimaryKeyJoinColumn, OrmReadOnlyBaseJoinColumn.Owner> + extends AbstractOrmNamedColumn<XmlPrimaryKeyJoinColumn, ReadOnlyBaseJoinColumn.Owner> implements OrmPrimaryKeyJoinColumn { /** @see org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmNamedColumn#AbstractOrmNamedColumn(XmlContextNode, org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn.Owner, org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlNamedColumn) */ @@ -36,7 +34,7 @@ public class GenericOrmPrimaryKeyJoinColumn protected String defaultReferencedColumnName; - public GenericOrmPrimaryKeyJoinColumn(XmlContextNode parent, OrmReadOnlyBaseJoinColumn.Owner owner, XmlPrimaryKeyJoinColumn xmlColumn) { + public GenericOrmPrimaryKeyJoinColumn(XmlContextNode parent, ReadOnlyBaseJoinColumn.Owner owner, XmlPrimaryKeyJoinColumn xmlColumn) { super(parent, owner, xmlColumn); this.specifiedReferencedColumnName = this.buildSpecifiedReferencedColumnName(); } @@ -162,11 +160,6 @@ public class GenericOrmPrimaryKeyJoinColumn // ********** validation ********** - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmPrimaryKeyJoinColumnTextRangeResolver(this); - } - public TextRange getReferencedColumnNameTextRange() { return this.getValidationTextRange(this.xmlColumn.getReferencedColumnNameTextRange()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java index 1c99fd10df..ca18fc757d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java @@ -19,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyReferenceTable; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmReferenceTable; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmTable; @@ -37,7 +36,7 @@ public abstract class GenericOrmReferenceTable<X extends AbstractXmlReferenceTab implements OrmReferenceTable { protected final ContextListContainer<OrmJoinColumn, XmlJoinColumn> specifiedJoinColumnContainer; - protected final OrmReadOnlyJoinColumn.Owner joinColumnOwner; + protected final ReadOnlyJoinColumn.Owner joinColumnOwner; protected OrmJoinColumn defaultJoinColumn; @@ -176,7 +175,7 @@ public abstract class GenericOrmReferenceTable<X extends AbstractXmlReferenceTab } } - protected abstract OrmReadOnlyJoinColumn.Owner buildJoinColumnOwner(); + protected abstract ReadOnlyJoinColumn.Owner buildJoinColumnOwner(); // ********** default join column ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java index 11ab77c427..8947aad617 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java @@ -23,11 +23,8 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlySecondaryTable; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmSecondaryTable; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; 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.AbstractOrmTable; import org.eclipse.jpt.jpa.core.internal.jpa1.context.SecondaryTablePrimaryKeyJoinColumnValidator; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; @@ -48,7 +45,7 @@ public class GenericOrmSecondaryTable protected /* final */ XmlSecondaryTable xmlSecondaryTable; protected final ContextListContainer<OrmPrimaryKeyJoinColumn, XmlPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumnContainer; - protected final OrmReadOnlyBaseJoinColumn.Owner primaryKeyJoinColumnOwner; + protected final ReadOnlyBaseJoinColumn.Owner primaryKeyJoinColumnOwner; protected OrmPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn; @@ -230,7 +227,7 @@ public class GenericOrmSecondaryTable } } - protected OrmReadOnlyBaseJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { + protected ReadOnlyBaseJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { return new PrimaryKeyJoinColumnOwner(); } @@ -360,7 +357,7 @@ public class GenericOrmSecondaryTable // ********** primary key join column owner adapter ********** protected class PrimaryKeyJoinColumnOwner - implements OrmReadOnlyBaseJoinColumn.Owner + implements ReadOnlyBaseJoinColumn.Owner { protected OrmEntity getEntity() { return GenericOrmSecondaryTable.this.getEntity(); @@ -396,8 +393,8 @@ public class GenericOrmSecondaryTable return GenericOrmSecondaryTable.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new SecondaryTablePrimaryKeyJoinColumnValidator(GenericOrmSecondaryTable.this, (ReadOnlyBaseJoinColumn) column, this, (BaseJoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new SecondaryTablePrimaryKeyJoinColumnValidator(GenericOrmSecondaryTable.this, (ReadOnlyBaseJoinColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java index 4618e9f0cc..a549c171d2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.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. @@ -17,9 +17,7 @@ import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverrideRelationship; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmAssociationOverrideContainer2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmVirtualAssociationOverride2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -87,15 +85,15 @@ public class GenericOrmVirtualAssociationOverride this.relationship.validate(messages, reporter); } - public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableValidator(this, table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table) { + return this.getContainer2_0().buildJoinTableValidator(this, table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableJoinColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getContainer2_0().buildJoinTableJoinColumnValidator(this, column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getContainer2_0().buildJoinTableInverseJoinColumnValidator(this, column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getContainer2_0().buildJoinTableInverseJoinColumnValidator(this, column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java index ca5d64aba2..e9e188e5f5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.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. @@ -17,9 +17,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualColumn; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -93,8 +91,8 @@ public class GenericOrmVirtualAttributeOverride return this.getContainer().resolveOverriddenColumn(this.name); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return this.getContainer().buildColumnValidator(this, (ReadOnlyBaseColumn) col, this, (TableColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return this.getContainer().buildColumnValidator(this, (ReadOnlyBaseColumn) col, this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualJoinColumn.java index 25909adac9..477f89721d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualJoinColumn.java @@ -12,12 +12,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumn; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmVirtualBaseColumn; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -25,7 +22,7 @@ import org.eclipse.jpt.jpa.db.Table; * <code>orm.xml</code> virtual join column */ public class GenericOrmVirtualJoinColumn - extends AbstractOrmVirtualBaseColumn<OrmReadOnlyJoinColumn.Owner, ReadOnlyJoinColumn> + extends AbstractOrmVirtualBaseColumn<ReadOnlyJoinColumn.Owner, ReadOnlyJoinColumn> implements OrmVirtualJoinColumn { protected final ReadOnlyJoinColumn overriddenColumn; @@ -34,7 +31,7 @@ public class GenericOrmVirtualJoinColumn protected String defaultReferencedColumnName; - public GenericOrmVirtualJoinColumn(XmlContextNode parent, OrmReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { + public GenericOrmVirtualJoinColumn(XmlContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { super(parent, owner); this.overriddenColumn = overriddenColumn; } @@ -115,9 +112,4 @@ public class GenericOrmVirtualJoinColumn public TextRange getReferencedColumnNameTextRange() { return this.getValidationTextRange(); } - - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmJoinColumnTextRangeResolver(this); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java index e77e69ed0c..ee60d5f28c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java @@ -25,10 +25,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualRelationshipStrategy; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; import org.eclipse.jpt.jpa.core.internal.context.orm.GenericOrmVirtualOverrideJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0; @@ -208,8 +205,8 @@ public class GenericOrmVirtualOverrideRelationship return this.getAssociationOverride().getDefaultTableName(); } - public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride().buildColumnValidator(column, owner, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyBaseColumn column, Owner owner) { + return this.getAssociationOverride().buildColumnValidator(column, owner); } public Entity getEntity() { @@ -242,15 +239,15 @@ public class GenericOrmVirtualOverrideRelationship this.strategy.validate(messages, reporter); } - public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableValidator(table, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table) { + return this.getAssociationOverride2_0().buildJoinTableValidator(table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getAssociationOverride2_0().buildJoinTableJoinColumnValidator(column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getAssociationOverride2_0().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getAssociationOverride2_0().buildJoinTableInverseJoinColumnValidator(column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualPrimaryKeyJoinColumn.java index 03c99592bb..a3caa4e015 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualPrimaryKeyJoinColumn.java @@ -10,13 +10,11 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualPrimaryKeyJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmVirtualNamedColumn; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmPrimaryKeyJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -24,7 +22,7 @@ import org.eclipse.jpt.jpa.db.Table; * <code>orm.xml</code> virtual primary key join column */ public class GenericOrmVirtualPrimaryKeyJoinColumn - extends AbstractOrmVirtualNamedColumn<OrmReadOnlyBaseJoinColumn.Owner, JavaPrimaryKeyJoinColumn> + extends AbstractOrmVirtualNamedColumn<ReadOnlyBaseJoinColumn.Owner, JavaPrimaryKeyJoinColumn> implements OrmVirtualPrimaryKeyJoinColumn { protected final JavaPrimaryKeyJoinColumn javaColumn; @@ -33,7 +31,7 @@ public class GenericOrmVirtualPrimaryKeyJoinColumn protected String defaultReferencedColumnName; - public GenericOrmVirtualPrimaryKeyJoinColumn(XmlContextNode parent, OrmReadOnlyBaseJoinColumn.Owner owner, JavaPrimaryKeyJoinColumn javaColumn) { + public GenericOrmVirtualPrimaryKeyJoinColumn(XmlContextNode parent, ReadOnlyBaseJoinColumn.Owner owner, JavaPrimaryKeyJoinColumn javaColumn) { super(parent, owner); this.javaColumn = javaColumn; } @@ -118,11 +116,6 @@ public class GenericOrmVirtualPrimaryKeyJoinColumn // ********** validation ********** - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmPrimaryKeyJoinColumnTextRangeResolver(this); - } - public TextRange getReferencedColumnNameTextRange() { return this.getValidationTextRange(); } |