diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa')
288 files changed, 1639 insertions, 3429 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java index 7d85127312..ed877ce541 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java @@ -19,8 +19,10 @@ import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.context.JpaRootContextNode; import org.eclipse.jpt.jpa.core.context.MappingFile; import org.eclipse.jpt.jpa.core.context.PersistentType; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.Table; @@ -64,8 +66,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaQuery; import org.eclipse.jpt.jpa.core.context.java.JavaQueryContainer; import org.eclipse.jpt.jpa.core.context.java.JavaQueryHint; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyBaseJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.jpa.core.context.java.JavaSequenceGenerator; import org.eclipse.jpt.jpa.core.context.java.JavaTable; @@ -136,7 +136,7 @@ import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; * * @see org.eclipse.jpt.jpa.core.internal.jpa1.GenericJpaFactory * - * @version 3.1 + * @version 3.3 * @since 2.0 */ public interface JpaFactory @@ -229,11 +229,11 @@ public interface JpaFactory JavaVirtualColumn buildJavaVirtualColumn(JavaJpaContextNode parent, JavaVirtualColumn.Owner owner); - JavaDiscriminatorColumn buildJavaDiscriminatorColumn(JavaEntity parent, JavaDiscriminatorColumn.Owner owner); + JavaDiscriminatorColumn buildJavaDiscriminatorColumn(JavaEntity parent, ReadOnlyNamedDiscriminatorColumn.Owner owner); - JavaJoinColumn buildJavaJoinColumn(JavaJpaContextNode parent, JavaReadOnlyJoinColumn.Owner owner, CompleteJoinColumnAnnotation joinColumnAnnotation); + JavaJoinColumn buildJavaJoinColumn(JavaJpaContextNode parent, ReadOnlyJoinColumn.Owner owner, CompleteJoinColumnAnnotation joinColumnAnnotation); - JavaVirtualJoinColumn buildJavaVirtualJoinColumn(JavaJpaContextNode parent, JavaReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn); + JavaVirtualJoinColumn buildJavaVirtualJoinColumn(JavaJpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn); JavaSecondaryTable buildJavaSecondaryTable(JavaEntity parent, Table.Owner owner, SecondaryTableAnnotation tableAnnotation); @@ -243,7 +243,7 @@ public interface JpaFactory JavaGeneratedValue buildJavaGeneratedValue(JavaIdMapping parent, GeneratedValueAnnotation generatedValueAnnotation); - JavaPrimaryKeyJoinColumn buildJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, JavaReadOnlyBaseJoinColumn.Owner owner, PrimaryKeyJoinColumnAnnotation pkJoinColumnAnnotation); + JavaPrimaryKeyJoinColumn buildJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, ReadOnlyBaseJoinColumn.Owner owner, PrimaryKeyJoinColumnAnnotation pkJoinColumnAnnotation); JavaAttributeOverrideContainer buildJavaAttributeOverrideContainer(JavaJpaContextNode parent, JavaAttributeOverrideContainer.Owner owner); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Converter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Converter.java index deb2a9c932..734307d3fe 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Converter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Converter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.context; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; /** * JPA attribute mapping converter. @@ -21,7 +20,7 @@ import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 2.1 */ public interface Converter @@ -46,7 +45,7 @@ public interface Converter /** * */ - JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver); + JptValidator buildValidator(Converter converter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/GeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/GeneratedValue.java index 934a08f609..025f79a387 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/GeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/GeneratedValue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 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. @@ -9,6 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; +import org.eclipse.jpt.common.core.utility.TextRange; + /** * JPA generated value * <p> @@ -18,7 +20,7 @@ package org.eclipse.jpt.jpa.core.context; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 3.3 * @since 2.0 */ public interface GeneratedValue @@ -38,4 +40,9 @@ public interface GeneratedValue String SPECIFIED_GENERATOR_PROPERTY = "specifiedGenerator"; //$NON-NLS-1$ String getDefaultGenerator(); String DEFAULT_GENERATOR_PROPERTY = "defaultGenerator"; //$NON-NLS-1$ + + /** + * Return the (best guess) text location of the generator. + */ + TextRange getGeneratorTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Generator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Generator.java index bb4bd3bde9..ec3ab91c85 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Generator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Generator.java @@ -9,6 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; @@ -36,6 +37,11 @@ public interface Generator { /** + * Return the (best guess) text location of the name. + */ + TextRange getNameTextRange(); + + /** * Return the generator's type. */ Class<? extends Generator> getType(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextNode.java index 9e1e97af66..8fbdc50d54 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextNode.java @@ -9,12 +9,17 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; +import java.util.List; + import org.eclipse.jpt.common.core.JptResourceTypeReference; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.JpaNode; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.Schema; import org.eclipse.jpt.jpa.db.SchemaContainer; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; /** * Common protocol for JPA objects that have a context, as opposed to @@ -26,7 +31,7 @@ import org.eclipse.jpt.jpa.db.SchemaContainer; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface JpaContextNode @@ -54,6 +59,16 @@ public interface JpaContextNode Schema getContextDefaultDbSchema(); + // ********** validation ********** + + TextRange getValidationTextRange(); + + /** + * Add to the list of current validation messages + */ + void validate(List<IMessage> messages, IReporter reporter); + + // ********** synchronize/update ********** /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaRootContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaRootContextNode.java index 878eb81f4d..6fa0853844 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaRootContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaRootContextNode.java @@ -9,10 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.List; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.eclipse.wst.validation.internal.provisional.core.IReporter; /** * Root of the Dali JPA context model. @@ -23,7 +20,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.0 */ public interface JpaRootContextNode @@ -44,11 +41,4 @@ public interface JpaRootContextNode */ PersistenceXml getPersistenceXml(); - - // ********** validation ********** - - /** - * Add validation messages to the specified list. - */ - public void validate(List<IMessage> messages, IReporter reporter); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java index 6823b93d08..450f2692d1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.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,10 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -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.db.Table; /** @@ -24,7 +23,7 @@ import org.eclipse.jpt.jpa.db.Table; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.0 + * @version 3.3 * @since 2.3 */ public interface OverrideContainer @@ -82,9 +81,9 @@ public interface OverrideContainer */ String getDefaultTableName(); - JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideTextRangeResolver textRangeResolver); + JptValidator buildOverrideValidator(ReadOnlyOverride override); - JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver); + JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner); // ********** overrides ********** @@ -210,8 +209,10 @@ public interface OverrideContainer */ Iterable<String> getCandidateTableNames(); - JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver); + TextRange getValidationTextRange(); - JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner, TableColumnTextRangeResolver textRangeResolver); + JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container); + + JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Query.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Query.java index 57a955034f..9ec381ee05 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Query.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Query.java @@ -9,6 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -27,7 +28,7 @@ import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.0 */ public interface Query @@ -93,4 +94,9 @@ public interface Query void moveHint(int targetIndex, int sourceIndex); QueryHint getHint(int i); + + + TextRange getNameTextRange(); + + TextRange getQueryTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyBaseJoinColumn.java index 6205b74167..0a87c1f5f6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyBaseJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyBaseJoinColumn.java @@ -9,6 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.db.Table; /** @@ -37,6 +38,12 @@ public interface ReadOnlyBaseJoinColumn String SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY = "specifiedReferencedColumnName"; //$NON-NLS-1$ String getDefaultReferencedColumnName(); String DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY = "defaultReferencedColumnName"; //$NON-NLS-1$ + + /** + * Return the (best guess) text location of the join column's + * referenced column name. + */ + TextRange getReferencedColumnNameTextRange(); // ********** misc ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinTableRelationshipStrategy.java index 3a35c3addf..4e3dc9f521 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinTableRelationshipStrategy.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.context; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; /** @@ -46,7 +45,7 @@ public interface ReadOnlyJoinTableRelationshipStrategy boolean validatesAgainstDatabase(); - JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner); - JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyNamedColumn.java index 936e49c0e0..4cdd7074c4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyNamedColumn.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.db.Table; /** @@ -43,6 +43,10 @@ public interface ReadOnlyNamedColumn String getDefaultName(); String DEFAULT_NAME_PROPERTY = "defaultName"; //$NON-NLS-1$ + /** + * Return the (best guess) text location of the column's name. + */ + TextRange getNameTextRange(); // ********** table ********** @@ -103,7 +107,13 @@ public interface ReadOnlyNamedColumn * Return the database table for the specified table name. */ Table resolveDbTable(String tableName); - - JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver); + + JptValidator buildColumnValidator(ReadOnlyNamedColumn column); + + /** + * Return the column owner's text range. This can be returned by the + * column when its annotation is not present. + */ + TextRange getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverride.java index 4e027a83c4..a12bfaf51e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverride.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. @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Table; @@ -68,5 +68,10 @@ public interface ReadOnlyOverride */ String getDefaultTableName(); - JptValidator buildColumnValidator(ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver); + /** + * Return the (best guess) text location of the override's name. + */ + TextRange getNameTextRange(); + + JptValidator buildColumnValidator(ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverrideRelationship.java index 079b3a282f..9178b88ccc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverrideRelationship.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.context; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Table; @@ -53,7 +52,7 @@ public interface ReadOnlyOverrideRelationship String getDefaultTableName(); - JptValidator buildColumnValidator(ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver); + JptValidator buildColumnValidator(ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner); void initializeOnSpecified(OverrideRelationship specifiedRelationship); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTable.java index 43a793961a..6cfad5b67b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTable.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,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.Schema; import org.eclipse.jpt.jpa.db.SchemaContainer; @@ -119,6 +119,12 @@ public interface ReadOnlyTable */ boolean validatesAgainstDatabase(); + TextRange getNameTextRange(); + + TextRange getSchemaTextRange(); + + TextRange getCatalogTextRange(); + // ********** owner ********** @@ -127,6 +133,6 @@ public interface ReadOnlyTable * (e.g. basic mappings and attribute overrides) */ interface Owner { - JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver); + JptValidator buildTableValidator(ReadOnlyTable table); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTableColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTableColumn.java index 9f7fc03f48..567978db40 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTableColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTableColumn.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,6 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; +import org.eclipse.jpt.common.core.utility.TextRange; + /** * Read-only @@ -32,6 +34,11 @@ public interface ReadOnlyTableColumn String getDefaultTable(); String DEFAULT_TABLE_PROPERTY = "defaultTable"; //$NON-NLS-1$ + /** + * Return the (best guess) text location of the column's table. + */ + TextRange getTableTextRange(); + // ********** misc ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlContextNode.java index b4901c8b09..1e0ddf1051 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlContextNode.java @@ -9,12 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.List; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.eclipse.wst.validation.internal.provisional.core.IReporter; - /** * XML JPA context node * <p> @@ -24,7 +18,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.1 */ // TODO bjv rename to XmlJpaContextNode @@ -37,10 +31,4 @@ public interface XmlContextNode */ Iterable<String> getXmlCompletionProposals(int pos); - /** - * Add to the list of current validation messages - */ - void validate(List<IMessage> messages, IReporter reporter); - - TextRange getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/Accessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/Accessor.java index d483ec56ad..1ac7a1b523 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/Accessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/Accessor.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 @@ -17,7 +17,6 @@ import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.PersistentAttributeTextRangeResolver; /** * Represents a JPA accessor (field/property). @@ -28,7 +27,7 @@ import org.eclipse.jpt.jpa.core.internal.context.PersistentAttributeTextRangeRes * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 3.1 */ public interface Accessor extends JpaContextNode @@ -51,5 +50,5 @@ public interface Accessor extends JpaContextNode AccessType getDefaultAccess(); - JptValidator buildAttributeValidator(PersistentAttribute persistentAttribute, PersistentAttributeTextRangeResolver textRangeResolver); + JptValidator buildAttributeValidator(PersistentAttribute persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaColumn.java index 786fc76b2d..44293c03d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaColumn.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. @@ -10,6 +10,7 @@ package org.eclipse.jpt.jpa.core.context.java; import org.eclipse.jpt.jpa.core.context.Column; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.resource.java.CompleteColumnAnnotation; /** @@ -21,7 +22,7 @@ import org.eclipse.jpt.jpa.core.resource.java.CompleteColumnAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface JavaColumn @@ -37,7 +38,7 @@ public interface JavaColumn * (e.g. basic mappings and attribute overrides) */ interface Owner - extends JavaReadOnlyBaseColumn.Owner + extends ReadOnlyBaseColumn.Owner { CompleteColumnAnnotation getColumnAnnotation(); void removeColumnAnnotation(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java index e56e77e046..6e5992da1a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java @@ -16,7 +16,6 @@ import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; /** * Java converter @@ -141,7 +140,7 @@ public interface JavaConverter protected Owner buildOwner() { return new Owner() { - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { + public JptValidator buildValidator(Converter converter) { return JptValidator.Null.instance(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDiscriminatorColumn.java index 995f0fc681..f7daf72fe4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDiscriminatorColumn.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. @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorColumnAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 2.0 */ public interface JavaDiscriminatorColumn @@ -29,15 +29,4 @@ public interface JavaDiscriminatorColumn { DiscriminatorColumnAnnotation getColumnAnnotation(); - - // ********** owner ********** - - /** - * interface allowing columns to be used in multiple places - */ - interface Owner - extends JavaReadOnlyNamedDiscriminatorColumn.Owner - { - // combine interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaGeneratedValue.java index d93495dd04..3f29656097 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaGeneratedValue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 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,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.GeneratedValue; import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; @@ -23,16 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.0 + * @version 3.3 * @since 2.0 */ public interface JavaGeneratedValue extends GeneratedValue, JavaJpaContextNode { GeneratedValueAnnotation getGeneratedValueAnnotation(); - - /** - * Return the (best guess) text location of the generator. - */ - TextRange getGeneratorTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaGenerator.java index 0d6b8abbce..ae3476a566 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaGenerator.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.core.resource.java.GeneratorAnnotation; @@ -24,7 +22,7 @@ import org.eclipse.jpt.jpa.core.resource.java.GeneratorAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.0 + * @version 3.3 * @since 2.0 */ public interface JavaGenerator @@ -32,8 +30,6 @@ public interface JavaGenerator { GeneratorAnnotation getGeneratorAnnotation(); - TextRange getNameTextRange(CompilationUnit astRoot); - //********* metadata conversion ********* /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java index 068f576114..84c4bb3702 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.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. @@ -9,13 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.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.Filter; import org.eclipse.jpt.jpa.core.context.JpaContextNode; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.eclipse.wst.validation.internal.provisional.core.IReporter; /** * Java JPA context node. @@ -26,7 +22,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.0 */ public interface JavaJpaContextNode @@ -38,13 +34,4 @@ public interface JavaJpaContextNode */ Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot); - - // ********** validation ********** - - /** - * Adds to the list of current validation messages - */ - void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot); - - TextRange getValidationTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java index b300c2b616..6814cba966 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.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,9 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; import org.eclipse.jpt.jpa.core.context.Override_; @@ -26,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.VirtualOverride; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface JavaOverrideContainer @@ -59,7 +57,5 @@ public interface JavaOverrideContainer extends OverrideContainer.Owner { JavaResourceMember getResourceMember(); - - TextRange getValidationTextRange(CompilationUnit astRoot); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentAttribute.java index b9fc81c592..3126e073b0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentAttribute.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; @@ -67,7 +66,7 @@ public interface JavaPersistentAttribute * Return whether the attribute contains the given offset into its Java * source code file. */ - boolean contains(int offset, CompilationUnit astRoot); + boolean contains(int offset); // ********** type ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQuery.java index 500c90e4ee..0bb932e97d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQuery.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.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.ListIterable; import org.eclipse.jpt.jpa.core.context.Query; import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer; @@ -29,7 +27,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.2 + * @version 3.3 * @since 2.0 */ public interface JavaQuery @@ -49,9 +47,7 @@ public interface JavaQuery // ********** validation ********** - void validate(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter, CompilationUnit astRoot); - - TextRange getNameTextRange(CompilationUnit astRoot); + void validate(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter); // ********** metadata conversion ********* diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseColumn.java index 530065b728..7f58a626e9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseColumn.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. @@ -24,15 +24,4 @@ public interface JavaReadOnlyBaseColumn extends ReadOnlyBaseColumn, JavaReadOnlyTableColumn { - // ********** owner ********** - - /** - * interface allowing columns to be used in multiple places - * (e.g. basic mappings and attribute overrides) - */ - interface Owner - extends ReadOnlyBaseColumn.Owner, JavaReadOnlyTableColumn.Owner - { - // combine interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseJoinColumn.java index e391b7f967..d3b0ea5dcd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseJoinColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; /** @@ -25,22 +23,5 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; public interface JavaReadOnlyBaseJoinColumn extends ReadOnlyBaseJoinColumn, JavaReadOnlyNamedColumn { - /** - * Return the (best guess) text location of the join column's - * referenced column name. - */ - TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot); - - // ********** owner ********** - - /** - * interface allowing join columns to be used in multiple places - * (e.g. 1:1 mappings and join tables) - */ - interface Owner - extends ReadOnlyBaseJoinColumn.Owner, JavaReadOnlyNamedColumn.Owner - { - // combine interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyJoinColumn.java index 8e7a5b4840..fb1e177c58 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyJoinColumn.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. @@ -20,17 +20,11 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface JavaReadOnlyJoinColumn extends ReadOnlyJoinColumn, JavaReadOnlyBaseJoinColumn, JavaReadOnlyBaseColumn { - // ********** owner ********** - interface Owner - extends ReadOnlyJoinColumn.Owner, JavaReadOnlyBaseJoinColumn.Owner, JavaReadOnlyBaseColumn.Owner - { - // combine interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedColumn.java index bd3002ad18..6ae887ccb1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; /** @@ -31,25 +29,5 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; public interface JavaReadOnlyNamedColumn extends ReadOnlyNamedColumn, JavaJpaContextNode { - /** - * Return the (best guess) text location of the column's name. - */ - TextRange getNameTextRange(CompilationUnit astRoot); - - // ********** owner ********** - - /** - * interface allowing columns to be used in multiple places - * (e.g. basic mappings and attribute overrides) - */ - interface Owner - extends ReadOnlyNamedColumn.Owner - { - /** - * Return the column owner's text range. This can be returned by the - * column when its annotation is not present. - */ - TextRange getValidationTextRange(CompilationUnit astRoot); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedDiscriminatorColumn.java index 7c0b582651..c958afd3fa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedDiscriminatorColumn.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. @@ -21,21 +21,11 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 3.1 */ public interface JavaReadOnlyNamedDiscriminatorColumn extends ReadOnlyNamedDiscriminatorColumn, JavaReadOnlyNamedColumn { - // ********** owner ********** - /** - * interface allowing discriminator columns to be used in multiple places - * (but pretty much just entities) - */ - interface Owner - extends ReadOnlyNamedDiscriminatorColumn.Owner, JavaReadOnlyNamedColumn.Owner - { - //combining interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyOverride.java index 651e56ff29..d44f3946e8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyOverride.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,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; /** @@ -25,8 +23,5 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; public interface JavaReadOnlyOverride extends ReadOnlyOverride, JavaJpaContextNode { - /** - * Return the (best guess) text location of the override's name. - */ - TextRange getNameTextRange(CompilationUnit astRoot); + } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTable.java index b2b2d342d7..c866e0faa1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; /** @@ -25,7 +23,5 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; public interface JavaReadOnlyTable extends ReadOnlyTable, JavaJpaContextNode { - TextRange getNameTextRange(CompilationUnit astRoot); - TextRange getSchemaTextRange(CompilationUnit astRoot); - TextRange getCatalogTextRange(CompilationUnit astRoot); + } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTableColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTableColumn.java index f878635d69..be6cfff6e1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTableColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTableColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn; /** @@ -25,21 +23,4 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn; public interface JavaReadOnlyTableColumn extends ReadOnlyTableColumn, JavaReadOnlyNamedColumn { - /** - * Return the (best guess) text location of the column's table. - */ - TextRange getTableTextRange(CompilationUnit astRoot); - - - // ********** owner ********** - - /** - * interface allowing columns to be used in multiple places - * (e.g. basic mappings and attribute overrides) - */ - interface Owner - extends ReadOnlyTableColumn.Owner, JavaReadOnlyNamedColumn.Owner - { - // combine interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTemporalConverter.java index 6e4311933d..7aa5171d01 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTemporalConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTemporalConverter.java @@ -14,7 +14,6 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.JavaElementCollectionTemporalConverterValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.JavaTemporalConverterValidator; import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation; @@ -70,8 +69,8 @@ public interface JavaTemporalConverter @Override protected Owner buildOwner() { return new Owner() { - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { - return new JavaTemporalConverterValidator((BaseTemporalConverter) converter, textRangeResolver); + public JptValidator buildValidator(Converter converter) { + return new JavaTemporalConverterValidator((BaseTemporalConverter) converter); } }; } @@ -92,8 +91,8 @@ public interface JavaTemporalConverter @Override protected Owner buildOwner() { return new Owner() { - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { - return new JavaElementCollectionTemporalConverterValidator((BaseTemporalConverter) converter, textRangeResolver); + public JptValidator buildValidator(Converter converter) { + return new JavaElementCollectionTemporalConverterValidator((BaseTemporalConverter) converter); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualColumn.java index 0841b9ccfe..fa5f1b1f3a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualColumn.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,6 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.VirtualColumn; @@ -35,7 +36,7 @@ public interface JavaVirtualColumn // ********** owner ********** interface Owner - extends VirtualColumn.Owner, JavaReadOnlyBaseColumn.Owner + extends VirtualColumn.Owner, ReadOnlyBaseColumn.Owner { /** * The overridden column can be either a Java column or an diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmColumn.java index 313fac9dd4..5cf62db7e9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmColumn.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. @@ -10,6 +10,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.jpt.jpa.core.context.Column; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn; /** @@ -37,7 +38,7 @@ public interface OrmColumn * (e.g. basic mappings and attribute overrides) */ interface Owner - extends OrmReadOnlyBaseColumn.Owner + extends ReadOnlyBaseColumn.Owner { XmlColumn getXmlColumn(); XmlColumn buildXmlColumn(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDiscriminatorColumn.java index a376a1da88..30ee19a5f0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDiscriminatorColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,6 +10,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.jpt.jpa.core.context.DiscriminatorColumn; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.resource.orm.XmlDiscriminatorColumn; /** @@ -21,7 +22,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlDiscriminatorColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 2.0 */ public interface OrmDiscriminatorColumn @@ -36,7 +37,7 @@ public interface OrmDiscriminatorColumn * interface allowing discriminator columns to be used in multiple places */ interface Owner - extends OrmReadOnlyNamedDiscriminatorColumn.Owner + extends ReadOnlyNamedDiscriminatorColumn.Owner { XmlDiscriminatorColumn getXmlColumn(); XmlDiscriminatorColumn buildXmlColumn(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEnumeratedConverter.java index 0a0f4875be..d0e16364ad 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEnumeratedConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEnumeratedConverter.java @@ -13,7 +13,6 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.EnumType; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping; @@ -64,7 +63,7 @@ public interface OrmEnumeratedConverter public TextRange getEnumTextRange() { return mapping.getEnumeratedTextRange(); } - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { + public JptValidator buildValidator(Converter converter) { return JptValidator.Null.instance(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmGeneratedValue.java index f42e8c098b..9b46749628 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmGeneratedValue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 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.context.orm; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.GeneratedValue; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue; @@ -23,7 +22,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 3.3 * @since 2.0 */ public interface OrmGeneratedValue @@ -31,8 +30,4 @@ public interface OrmGeneratedValue { XmlGeneratedValue getXmlGeneratedValue(); - /** - * Return the (best guess) text location of the generator. - */ - TextRange getGeneratorTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmGenerator.java index cd1791fd1f..75a644a795 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmGenerator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 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.context.orm; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.resource.orm.XmlGenerator; @@ -23,7 +22,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlGenerator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.0 + * @version 3.3 * @since 2.0 */ public interface OrmGenerator @@ -31,5 +30,4 @@ public interface OrmGenerator { XmlGenerator getXmlGenerator(); - TextRange getNameTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmLobConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmLobConverter.java index 75a4744fd1..dd1ecfd348 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmLobConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmLobConverter.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.context.orm; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.LobConverter; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping; @@ -63,7 +62,7 @@ public interface OrmLobConverter ((XmlConvertibleMapping) xmlMapping).setLob(false); } - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { + public JptValidator buildValidator(Converter converter) { return JptValidator.Null.instance(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java index 07357527d4..c86e8ece87 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.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.context.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; import org.eclipse.jpt.jpa.core.context.Override_; @@ -27,7 +26,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlOverride; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface OrmOverrideContainer @@ -73,8 +72,6 @@ public interface OrmOverrideContainer */ Iterable<String> getJavaOverrideNames(); - TextRange getValidationTextRange(); - OrmTypeMapping getTypeMapping(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQuery.java index f35bed776a..9d2ee47a71 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQuery.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.context.orm; import java.util.List; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.Query; import org.eclipse.jpt.jpa.core.context.XmlContextNode; @@ -28,7 +27,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.2 + * @version 3.3 * @since 2.0 */ public interface OrmQuery @@ -50,7 +49,4 @@ public interface OrmQuery void validate(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter); - TextRange getNameTextRange(); - - TextRange getQueryTextRange(); }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseColumn.java index 679d9ee1f5..b3710cb5e2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseColumn.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. @@ -24,15 +24,4 @@ public interface OrmReadOnlyBaseColumn extends ReadOnlyBaseColumn, OrmReadOnlyTableColumn { - // ********** owner ********** - - /** - * interface allowing columns to be used in multiple places - * (e.g. basic mappings and attribute overrides) - */ - interface Owner - extends ReadOnlyBaseColumn.Owner, OrmReadOnlyTableColumn.Owner - { - // combine two interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseJoinColumn.java index e31619f90c..60cce206d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseJoinColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; /** @@ -24,22 +23,5 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; public interface OrmReadOnlyBaseJoinColumn extends ReadOnlyBaseJoinColumn, OrmReadOnlyNamedColumn { - /** - * Return the (best guess) text location of the column's - * referenced column name. - */ - TextRange getReferencedColumnNameTextRange(); - - // ********** owner ********** - - /** - * interface allowing join columns to be used in multiple places - * (e.g. 1:1 mappings and join tables) - */ - interface Owner - extends ReadOnlyBaseJoinColumn.Owner, OrmReadOnlyNamedColumn.Owner - { - // combine two interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyJoinColumn.java index 25ab84a48e..3fe6158835 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyJoinColumn.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. @@ -20,17 +20,11 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface OrmReadOnlyJoinColumn extends ReadOnlyJoinColumn, OrmReadOnlyBaseJoinColumn, OrmReadOnlyBaseColumn { - // ********** owner ********** - interface Owner - extends ReadOnlyJoinColumn.Owner, OrmReadOnlyBaseJoinColumn.Owner, OrmReadOnlyBaseColumn.Owner - { - // combine interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedColumn.java index 736f6cdb7d..117f78d860 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; @@ -31,25 +30,5 @@ import org.eclipse.jpt.jpa.core.context.XmlContextNode; public interface OrmReadOnlyNamedColumn extends ReadOnlyNamedColumn, XmlContextNode { - /** - * Return the (best guess) text location of the column's name. - */ - TextRange getNameTextRange(); - - // ********** owner ********** - - /** - * interface allowing columns to be used in multiple places - * (e.g. basic mappings and attribute overrides) - */ - interface Owner - extends ReadOnlyNamedColumn.Owner - { - /** - * Return the column owner's text range. This can be returned by the - * column when its annotation is not present. - */ - TextRange getValidationTextRange(); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedDiscriminatorColumn.java index 1ec9da334d..fd31237410 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedDiscriminatorColumn.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. @@ -21,22 +21,11 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 3.1 */ public interface OrmReadOnlyNamedDiscriminatorColumn extends ReadOnlyNamedDiscriminatorColumn, OrmReadOnlyNamedColumn { - // ********** owner ********** - - /** - * interface allowing discriminator columns to be used in multiple places - * (but pretty much just entities) - */ - interface Owner - extends ReadOnlyNamedDiscriminatorColumn.Owner, OrmReadOnlyNamedColumn.Owner - { - //combining interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyOverride.java index e38c0ac1a3..857924cef7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyOverride.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.context.orm; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; import org.eclipse.jpt.jpa.core.context.XmlContextNode; @@ -25,8 +24,5 @@ import org.eclipse.jpt.jpa.core.context.XmlContextNode; public interface OrmReadOnlyOverride extends ReadOnlyOverride, XmlContextNode { - /** - * Return the (best guess) text location of the override's name. - */ - TextRange getNameTextRange(); + } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTable.java index d49312a8ac..14190cd74a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.XmlContextNode; @@ -25,7 +24,5 @@ import org.eclipse.jpt.jpa.core.context.XmlContextNode; public interface OrmReadOnlyTable extends ReadOnlyTable, XmlContextNode { - TextRange getNameTextRange(); - TextRange getSchemaTextRange(); - TextRange getCatalogTextRange(); + } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTableColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTableColumn.java index 1dcd63e64b..7ffb482617 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTableColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTableColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn; /** @@ -24,21 +23,5 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn; public interface OrmReadOnlyTableColumn extends ReadOnlyTableColumn, OrmReadOnlyNamedColumn { - /** - * Return the (best guess) text location of the column's table. - */ - TextRange getTableTextRange(); - - // ********** owner ********** - - /** - * interface allowing columns to be used in multiple places - * (e.g. basic mappings and attribute overrides) - */ - interface Owner - extends ReadOnlyTableColumn.Owner, OrmReadOnlyNamedColumn.Owner - { - // combine two interfaces - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTemporalConverter.java index 166231a94a..b851bfe044 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTemporalConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTemporalConverter.java @@ -13,7 +13,6 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmElementCollectionTemporalConverterValidator; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmTemporalConverterValidator; import org.eclipse.jpt.jpa.core.resource.orm.TemporalType; @@ -90,8 +89,8 @@ public interface OrmTemporalConverter public TextRange getTemporalTextRange() { return mapping.getTemporalTextRange(); } - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { - return new OrmTemporalConverterValidator((BaseTemporalConverter) converter, textRangeResolver); + public JptValidator buildValidator(Converter converter) { + return new OrmTemporalConverterValidator((BaseTemporalConverter) converter); } }; } @@ -121,8 +120,8 @@ public interface OrmTemporalConverter public TextRange getTemporalTextRange() { return mapping.getTemporalTextRange(); } - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { - return new OrmElementCollectionTemporalConverterValidator((BaseTemporalConverter) converter, textRangeResolver); + public JptValidator buildValidator(Converter converter) { + return new OrmElementCollectionTemporalConverterValidator((BaseTemporalConverter) converter); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualColumn.java index 1deafbb7a2..77ab5fd7ac 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualColumn.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,6 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.VirtualColumn; @@ -35,7 +36,7 @@ public interface OrmVirtualColumn // ********** owner ********** interface Owner - extends VirtualColumn.Owner, OrmReadOnlyBaseColumn.Owner + extends VirtualColumn.Owner, ReadOnlyBaseColumn.Owner { /** * The overridden column can be either a Java column or an diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextNodeFactory.java index c040b94603..974a1abbcf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextNodeFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextNodeFactory.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. @@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.core.context.orm; 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.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; @@ -61,7 +62,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlVersion; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ // TODO bjv we need a factory interface for a 1.0 orm.xml in a 2.0 project... @@ -115,17 +116,17 @@ public interface OrmXmlContextNodeFactory OrmVirtualSecondaryTable buildOrmVirtualSecondaryTable(OrmEntity parent, ReadOnlyTable.Owner owner, JavaSecondaryTable javaSecondaryTable); - OrmPrimaryKeyJoinColumn buildOrmPrimaryKeyJoinColumn(XmlContextNode parent, OrmReadOnlyBaseJoinColumn.Owner owner, XmlPrimaryKeyJoinColumn resourcePrimaryKeyJoinColumn); + OrmPrimaryKeyJoinColumn buildOrmPrimaryKeyJoinColumn(XmlContextNode parent, ReadOnlyBaseJoinColumn.Owner owner, XmlPrimaryKeyJoinColumn resourcePrimaryKeyJoinColumn); - OrmVirtualPrimaryKeyJoinColumn buildOrmVirtualPrimaryKeyJoinColumn(XmlContextNode parent, OrmReadOnlyBaseJoinColumn.Owner owner, JavaPrimaryKeyJoinColumn javaPrimaryKeyJoinColumn); + OrmVirtualPrimaryKeyJoinColumn buildOrmVirtualPrimaryKeyJoinColumn(XmlContextNode parent, ReadOnlyBaseJoinColumn.Owner owner, JavaPrimaryKeyJoinColumn javaPrimaryKeyJoinColumn); OrmJoinTable buildOrmJoinTable(OrmJoinTableRelationshipStrategy parent, Table.Owner owner); OrmVirtualJoinTable buildOrmVirtualJoinTable(OrmVirtualJoinTableRelationshipStrategy parent, ReadOnlyTable.Owner owner, ReadOnlyJoinTable overriddenTable); - OrmJoinColumn buildOrmJoinColumn(XmlContextNode parent, OrmReadOnlyJoinColumn.Owner owner, XmlJoinColumn resourceJoinColumn); + OrmJoinColumn buildOrmJoinColumn(XmlContextNode parent, ReadOnlyJoinColumn.Owner owner, XmlJoinColumn resourceJoinColumn); - OrmVirtualJoinColumn buildOrmVirtualJoinColumn(XmlContextNode parent, OrmReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn); + OrmVirtualJoinColumn buildOrmVirtualJoinColumn(XmlContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn); OrmAttributeOverrideContainer buildOrmAttributeOverrideContainer(XmlContextNode parent, OrmAttributeOverrideContainer.Owner owner); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java index 107c129ebe..3dcbea731e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java @@ -22,8 +22,10 @@ import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.JpaRootContextNode; import org.eclipse.jpt.jpa.core.context.PersistentType; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.Table; @@ -67,8 +69,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaQuery; import org.eclipse.jpt.jpa.core.context.java.JavaQueryContainer; import org.eclipse.jpt.jpa.core.context.java.JavaQueryHint; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyBaseJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.jpa.core.context.java.JavaSequenceGenerator; import org.eclipse.jpt.jpa.core.context.java.JavaTable; @@ -253,15 +253,15 @@ public abstract class AbstractJpaFactory return new GenericJavaVirtualColumn(parent, owner); } - public JavaDiscriminatorColumn buildJavaDiscriminatorColumn(JavaEntity parent, JavaDiscriminatorColumn.Owner owner) { + public JavaDiscriminatorColumn buildJavaDiscriminatorColumn(JavaEntity parent, ReadOnlyNamedDiscriminatorColumn.Owner owner) { return new GenericJavaDiscriminatorColumn(parent, owner); } - public JavaJoinColumn buildJavaJoinColumn(JavaJpaContextNode parent, JavaReadOnlyJoinColumn.Owner owner, CompleteJoinColumnAnnotation joinColumnAnnotation) { + public JavaJoinColumn buildJavaJoinColumn(JavaJpaContextNode parent, ReadOnlyJoinColumn.Owner owner, CompleteJoinColumnAnnotation joinColumnAnnotation) { return new GenericJavaJoinColumn(parent, owner, joinColumnAnnotation); } - public JavaVirtualJoinColumn buildJavaVirtualJoinColumn(JavaJpaContextNode parent, JavaReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { + public JavaVirtualJoinColumn buildJavaVirtualJoinColumn(JavaJpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { return new GenericJavaVirtualJoinColumn(parent, owner, overriddenColumn); } @@ -337,7 +337,7 @@ public abstract class AbstractJpaFactory return new GenericJavaGeneratedValue(parent, generatedValueAnnotation); } - public JavaPrimaryKeyJoinColumn buildJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, JavaReadOnlyBaseJoinColumn.Owner owner, PrimaryKeyJoinColumnAnnotation pkJoinColumnAnnotation) { + public JavaPrimaryKeyJoinColumn buildJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, ReadOnlyBaseJoinColumn.Owner owner, PrimaryKeyJoinColumnAnnotation pkJoinColumnAnnotation) { return new GenericJavaPrimaryKeyJoinColumn(parent, owner, pkJoinColumnAnnotation); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextNode.java index 65a7d0a264..a88c0924eb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextNode.java @@ -9,7 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context; +import java.util.List; + import org.eclipse.jpt.common.core.JptResourceType; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.JpaNode; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.MappingFile; @@ -18,6 +21,9 @@ import org.eclipse.jpt.jpa.core.internal.AbstractJpaNode; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.Schema; import org.eclipse.jpt.jpa.db.SchemaContainer; +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; public abstract class AbstractJpaContextNode extends AbstractJpaNode @@ -104,6 +110,45 @@ public abstract class AbstractJpaContextNode } + // ********** validation ********** + + /** + * All subclass implementations should be + * preceded by a "super" call to this method. + */ + public void validate(List<IMessage> messages, IReporter reporter) { + if (reporter.isCancelled()) { + throw new ValidationCancelledException(); + } + } + + /** + * Return the specified text range if it is not <code>null</code>; if it is + * <code>null</code>, return the node's validation text range. + */ + protected TextRange getValidationTextRange(TextRange textRange) { + return (textRange != null) ? textRange : this.getValidationTextRange(); + } + + /** + * Validate the specified node if it is not <code>null</code>. + */ + protected void validateNode(JpaContextNode node, List<IMessage> messages, IReporter reporter) { + if (node != null) { + node.validate(messages, reporter); + } + } + + /** + * Validate the specified nodes. + */ + protected void validateNodes(Iterable<? extends JpaContextNode> nodes, List<IMessage> messages, IReporter reporter) { + for (JpaContextNode node : nodes) { + node.validate(messages, reporter); + } + } + + // ********** database stuff ********** public Schema getContextDefaultDbSchema() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractXmlContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractXmlContextNode.java index 0af1269cc8..d9dccef777 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractXmlContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractXmlContextNode.java @@ -9,13 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context; -import java.util.List; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.XmlContextNode; -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; public abstract class AbstractXmlContextNode extends AbstractJpaContextNode @@ -26,43 +21,6 @@ public abstract class AbstractXmlContextNode } - // ********** validation ********** - - /** - * All subclass implementations should be have a "super" call to this method. - */ - public void validate(List<IMessage> messages, IReporter reporter) { - if (reporter.isCancelled()) { - throw new ValidationCancelledException(); - } - } - - /** - * Validate the specified node if it is not <code>null</code>. - */ - protected void validateNode(XmlContextNode node, List<IMessage> messages, IReporter reporter) { - if (node != null) { - node.validate(messages, reporter); - } - } - - /** - * Validate the specified nodes. - */ - protected void validateNodes(Iterable<? extends XmlContextNode> nodes, List<IMessage> messages, IReporter reporter) { - for (XmlContextNode node : nodes) { - node.validate(messages, reporter); - } - } - - /** - * Return the specified text range if it is not <code>null</code>; if it is - * <code>null</code>, return the node's validation text range. - */ - protected TextRange getValidationTextRange(TextRange textRange) { - return (textRange != null) ? textRange : this.getValidationTextRange(); - } - // *********** completion proposals *********** public Iterable<String> getXmlCompletionProposals(int pos) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/BaseJoinColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/BaseJoinColumnTextRangeResolver.java deleted file mode 100644 index 8918e1ce48..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/BaseJoinColumnTextRangeResolver.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context; - -import org.eclipse.jpt.common.core.utility.TextRange; - -/** - * Interface to resolve text ranges on join columns - */ -public interface BaseJoinColumnTextRangeResolver extends NamedColumnTextRangeResolver -{ - TextRange getReferencedColumnNameTextRange(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/EntityTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/EntityTextRangeResolver.java deleted file mode 100644 index 19b118f3b4..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/EntityTextRangeResolver.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context; - - -public interface EntityTextRangeResolver - extends PrimaryKeyTextRangeResolver -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/JoinColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/JoinColumnTextRangeResolver.java deleted file mode 100644 index 3d237dc6ca..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/JoinColumnTextRangeResolver.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context; - -/** - * Interface to resolve text ranges on join columns - */ -public interface JoinColumnTextRangeResolver - extends BaseJoinColumnTextRangeResolver, TableColumnTextRangeResolver -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/NamedColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/NamedColumnTextRangeResolver.java deleted file mode 100644 index da477387e9..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/NamedColumnTextRangeResolver.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context; - -import org.eclipse.jpt.common.core.utility.TextRange; - -/** - * Interface to resolve text ranges on named columns - */ -public interface NamedColumnTextRangeResolver -{ - TextRange getNameTextRange(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/OverrideTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/OverrideTextRangeResolver.java deleted file mode 100644 index 901eae1c02..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/OverrideTextRangeResolver.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context; - -import org.eclipse.jpt.common.core.utility.TextRange; - -/** - * Interface to resolve text ranges on named columns - */ -public interface OverrideTextRangeResolver -{ - TextRange getNameTextRange(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/PersistentAttributeTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/PersistentAttributeTextRangeResolver.java deleted file mode 100644 index a2345cc459..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/PersistentAttributeTextRangeResolver.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context; - -import org.eclipse.jpt.common.core.utility.TextRange; - -/** - * Interface to resolve text ranges on persistent attributes - */ -public interface PersistentAttributeTextRangeResolver -{ - TextRange getAttributeTextRange(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/PrimaryKeyTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/PrimaryKeyTextRangeResolver.java deleted file mode 100644 index 8a759ea107..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/PrimaryKeyTextRangeResolver.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context; - -import org.eclipse.jpt.common.core.utility.TextRange; - -/** - * Interface to resolve text ranges on persistent type mappings that can define primary keys - */ -public interface PrimaryKeyTextRangeResolver extends TypeMappingTextRangeResolver -{ - - TextRange getIdClassTextRange(); - - TextRange getAttributeMappingTextRange(String attributeName); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TableColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TableColumnTextRangeResolver.java deleted file mode 100644 index 877b397111..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TableColumnTextRangeResolver.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context; - -import org.eclipse.jpt.common.core.utility.TextRange; - -/** - * Interface to resolve text ranges on named columns - */ -public interface TableColumnTextRangeResolver extends NamedColumnTextRangeResolver -{ - TextRange getTableTextRange(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TableTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TableTextRangeResolver.java deleted file mode 100644 index adb744dcfd..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TableTextRangeResolver.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context; - -import org.eclipse.jpt.common.core.utility.TextRange; - -/** - * Interface to resolve text ranges on tables. - */ -public interface TableTextRangeResolver -{ - TextRange getNameTextRange(); - - TextRange getSchemaTextRange(); - - TextRange getCatalogTextRange(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTextRangeResolver.java deleted file mode 100644 index a30cac215c..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTextRangeResolver.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context; - -import org.eclipse.jpt.common.core.utility.TextRange; - -/** - * Interface to resolve text ranges on persistent type mappings - */ -public interface TypeMappingTextRangeResolver -{ - TextRange getTypeMappingTextRange(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java index 88b544a886..f43907ce37 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.HashMap; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.resource.java.source.SourceNode; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; @@ -166,9 +165,9 @@ public abstract class AbstractAccessor return this.member.isFor(memberName, occurrence); } - public TextRange getTextRange(CompilationUnit astRoot) { + public TextRange getTextRange() { // should never be null - return this.member.getTextRange(astRoot); + return this.member.getTextRange(); } public TextRange getNameTextRange() { @@ -176,9 +175,9 @@ public abstract class AbstractAccessor return this.member.getNameTextRange(); } - public TextRange getTextRange(String nestableAnnotationName, CompilationUnit astRoot) { + public TextRange getTextRange(String nestableAnnotationName) { // should never be null - return this.member.getTextRange(nestableAnnotationName, astRoot); + return this.member.getTextRange(nestableAnnotationName); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java index 01e404334b..a458615f16 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.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. @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.ArrayList; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; @@ -296,12 +295,12 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation> // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateMappingType(messages, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateMappingType(messages); } - protected void validateMappingType(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateMappingType(List<IMessage> messages) { if ( ! this.getTypeMapping().attributeMappingKeyAllowed(this.getKey())) { messages.add( DefaultJpaValidationMessages.buildMessage( @@ -309,19 +308,19 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation> JpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_MAPPING, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getMappingAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getPersistentAttribute().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getMappingAnnotationTextRange(); + return (textRange != null) ? textRange : this.getPersistentAttribute().getValidationTextRange(); } - protected TextRange getMappingAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getMappingAnnotationTextRange() { A annotation = this.getMappingAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java index 3b12b80f90..79e8e32744 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java @@ -17,14 +17,12 @@ import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.java.JavaBaseColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyBaseColumn; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.java.BaseColumnAnnotation; /** * Java column or join column */ -public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O extends JavaReadOnlyBaseColumn.Owner> +public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O extends ReadOnlyBaseColumn.Owner> extends AbstractJavaNamedColumn<A, O> implements JavaBaseColumn { @@ -134,8 +132,8 @@ public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O e return this.owner.getDefaultTableName(); } - public TextRange getTableTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getColumnAnnotation().getTableTextRange(), astRoot); + public TextRange getTableTextRange() { + return this.getValidationTextRange(this.getColumnAnnotation().getTableTextRange()); } @@ -365,9 +363,4 @@ public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O e public boolean tableNameIsInvalid() { return this.owner.tableNameIsInvalid(this.getTable()); } - - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaTableColumnTextRangeResolver(this, astRoot); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java index ef53809060..214c3f7f6a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java @@ -33,10 +33,8 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaBaseEmbeddedMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; 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.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.jpa1.context.AttributeOverrideColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AttributeOverrideValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EmbeddableOverrideDescriptionProvider; @@ -207,15 +205,15 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> // ********** 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.validateTargetEmbeddable(messages, astRoot)) { - this.validateOverrides(messages, reporter, astRoot); + if (this.validateTargetEmbeddable(messages)) { + this.validateOverrides(messages, reporter); } } - protected boolean validateTargetEmbeddable(List<IMessage> messages, CompilationUnit astRoot) { + protected boolean validateTargetEmbeddable(List<IMessage> messages) { if (this.targetEmbeddable != null) { return true; } @@ -227,7 +225,7 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> JpaValidationMessages.VIRTUAL_ATTRIBUTE_TARGET_NOT_AN_EMBEDDABLE, new String[] {this.getName(), targetEmbeddableTypeName}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -238,15 +236,15 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> JpaValidationMessages.TARGET_NOT_AN_EMBEDDABLE, new String[] {targetEmbeddableTypeName}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } return false; } - protected void validateOverrides(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - this.attributeOverrideContainer.validate(messages, reporter, astRoot); + protected void validateOverrides(List<IMessage> messages, IReporter reporter) { + this.attributeOverrideContainer.validate(messages, reporter); } @@ -314,16 +312,16 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> return true; } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return AbstractJavaBaseEmbeddedMapping.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return AbstractJavaBaseEmbeddedMapping.this.getValidationTextRange(); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new AttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new EmbeddableOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new AttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new EmbeddableOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return new AttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner) { + return new AttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, new EntityTableDescriptionProvider()); } protected JavaPersistentAttribute getPersistentAttribute() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java index 92290de84f..32f6ba3ded 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java @@ -30,9 +30,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.java.JavaLobConverter; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaTemporalConverter; -import org.eclipse.jpt.jpa.core.internal.context.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.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.NullJavaConverter; @@ -346,8 +344,8 @@ public abstract class AbstractJavaBasicMapping return this.getTypeMapping().getAllAssociatedTableNames(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, (TableColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, new EntityTableDescriptionProvider()); } @@ -374,9 +372,9 @@ public abstract class AbstractJavaBasicMapping // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.column.validate(messages, reporter, astRoot); - this.converter.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.column.validate(messages, reporter); + this.converter.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java index b256d72998..7822d98eab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java @@ -13,7 +13,6 @@ import java.io.Serializable; import java.util.List; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -104,8 +103,8 @@ public abstract class AbstractJavaEmbeddedIdMapping // ********** 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); // [JPA 2.0] if the embedded id is mapped by a relationship, then any specified // attribute overrides are in error @@ -119,7 +118,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.VIRTUAL_ATTRIBUTE_EMBEDDED_ID_MAPPING_MAPPED_BY_RELATIONSHIP_AND_ATTRIBUTE_OVERRIDES_SPECIFIED, new String[] {this.getName()}, this.attributeOverrideContainer, - this.attributeOverrideContainer.getValidationTextRange(astRoot) + this.attributeOverrideContainer.getValidationTextRange() ) ); } else { @@ -129,20 +128,20 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.EMBEDDED_ID_MAPPING_MAPPED_BY_RELATIONSHIP_AND_ATTRIBUTE_OVERRIDES_SPECIFIED, EMPTY_STRING_ARRAY, this.attributeOverrideContainer, - this.attributeOverrideContainer.getValidationTextRange(astRoot) + this.attributeOverrideContainer.getValidationTextRange() ) ); } } - validateTargetEmbeddableImplementsSerializable(messages, reporter, astRoot); - validateNoRelationshipMappingsOnTargetEmbeddable(messages, reporter, astRoot); - validateTargetEmbeddableImplementsEqualsAndHashcode(messages, reporter, astRoot); - validateTargetEmbeddableIsPublic(messages, reporter, astRoot); - validateTargetEmbeddableImplementsZeroArgConstructor(messages, reporter, astRoot); + validateTargetEmbeddableImplementsSerializable(messages, reporter); + validateNoRelationshipMappingsOnTargetEmbeddable(messages, reporter); + validateTargetEmbeddableImplementsEqualsAndHashcode(messages, reporter); + validateTargetEmbeddableIsPublic(messages, reporter); + validateTargetEmbeddableImplementsZeroArgConstructor(messages, reporter); } - protected void validateTargetEmbeddableImplementsZeroArgConstructor(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateTargetEmbeddableImplementsZeroArgConstructor(List<IMessage> messages, IReporter reporter) { if (this.getTargetEmbeddable() != null) { String targetEmbeddableClassName = this.getTargetEmbeddable().getPersistentType().getName(); IJavaProject javaProject = getJpaProject().getJavaProject(); @@ -154,7 +153,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.VIRTUAL_ATTRIBUTE_EMBEDDED_ID_CLASS_SHOULD_IMPLEMENT_NO_ARG_CONSTRUCTOR, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -164,7 +163,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.EMBEDDED_ID_CLASS_SHOULD_IMPLEMENT_NO_ARG_CONSTRUCTOR, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -172,7 +171,7 @@ public abstract class AbstractJavaEmbeddedIdMapping } } - protected void validateTargetEmbeddableImplementsEqualsAndHashcode(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateTargetEmbeddableImplementsEqualsAndHashcode(List<IMessage> messages, IReporter reporter) { if (this.getTargetEmbeddable() != null) { JavaResourceType resourceType = getTargetEmbeddable().getJavaResourceType(); if (resourceType != null @@ -185,7 +184,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.VIRTUAL_ATTRIBUTE_EMBEDDED_ID_CLASS_SHOULD_IMPLEMENT_EQUALS_HASHCODE, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -195,7 +194,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.EMBEDDED_ID_CLASS_SHOULD_IMPLEMENT_EQUALS_HASHCODE, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -203,7 +202,7 @@ public abstract class AbstractJavaEmbeddedIdMapping } } - protected void validateTargetEmbeddableIsPublic(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateTargetEmbeddableIsPublic(List<IMessage> messages, IReporter reporter) { if (this.getTargetEmbeddable() != null) { if (!getTargetEmbeddable().getJavaResourceType().isPublic()) { if (getPersistentAttribute().isVirtual()) { @@ -213,7 +212,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.VIRTUAL_ATTRIBUTE_EMBEDDED_ID_CLASS_SHOULD_BE_PUBLIC, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -223,7 +222,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.EMBEDDED_ID_CLASS_SHOULD_BE_PUBLIC, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -231,7 +230,7 @@ public abstract class AbstractJavaEmbeddedIdMapping } } - protected void validateTargetEmbeddableImplementsSerializable(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateTargetEmbeddableImplementsSerializable(List<IMessage> messages, IReporter reporter) { if (this.getTargetEmbeddable() != null) { String targetEmbeddableClassName = this.getTargetEmbeddable().getPersistentType().getName(); IJavaProject javaProject = getJpaProject().getJavaProject(); @@ -243,7 +242,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.VIRTUAL_ATTRIBUTE_EMBEDDED_ID_CLASS_SHOULD_IMPLEMENT_SERIALIZABLE, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -253,7 +252,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.EMBEDDED_ID_CLASS_SHOULD_IMPLEMENT_SERIALIZABLE, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -261,7 +260,7 @@ public abstract class AbstractJavaEmbeddedIdMapping } } - protected void validateNoRelationshipMappingsOnTargetEmbeddable(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateNoRelationshipMappingsOnTargetEmbeddable(List<IMessage> messages, IReporter reporter) { if (this.getTargetEmbeddable() != null) { TypeMapping targetEmbeddableTypeMapping = this.getTargetEmbeddable().getPersistentType().getMapping(); if (targetEmbeddableTypeMapping.getAllAttributeMappings(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY).iterator().hasNext() @@ -275,7 +274,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.VIRTUAL_ATTRIBUTE_EMBEDDED_ID_CLASS_SHOULD_NOT_CONTAIN_RELATIONSHIP_MAPPINGS, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -285,7 +284,7 @@ public abstract class AbstractJavaEmbeddedIdMapping JpaValidationMessages.EMBEDDED_ID_CLASS_SHOULD_NOT_CONTAIN_RELATIONSHIP_MAPPINGS, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java index 149053efa3..a3c1a18e17 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.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. @@ -33,12 +33,8 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; 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.java.AbstractJavaBaseEmbeddedMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideInverseJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideJoinColumnValidator; @@ -203,9 +199,9 @@ public abstract class AbstractJavaEmbeddedMapping // ********** validation ********** @Override - protected void validateOverrides(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validateOverrides(messages, reporter, astRoot); - this.associationOverrideContainer.validate(messages, reporter, astRoot); + protected void validateOverrides(List<IMessage> messages, IReporter reporter) { + super.validateOverrides(messages, reporter); + this.associationOverrideContainer.validate(messages, reporter); } @@ -273,28 +269,28 @@ public abstract class AbstractJavaEmbeddedMapping return true; } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return AbstractJavaEmbeddedMapping.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return AbstractJavaEmbeddedMapping.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 JavaPersistentAttribute getPersistentAttribute() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java index 31067eeefc..4fc14e78b9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java @@ -74,19 +74,11 @@ import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaQueryContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.jpa.core.context.java.JavaTable; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.EntityTextRangeResolver; -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.context.OverrideTextRangeResolver; -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.TypeMappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideInverseJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideJoinColumnValidator; @@ -879,7 +871,7 @@ public abstract class AbstractJavaEntity return this.getJpaFactory().buildJavaDiscriminatorColumn(this, this.buildDiscriminatorColumnOwner()); } - protected JavaDiscriminatorColumn.Owner buildDiscriminatorColumnOwner() { + protected ReadOnlyNamedDiscriminatorColumn.Owner buildDiscriminatorColumnOwner() { return new DiscriminatorColumnOwner(); } @@ -1313,24 +1305,24 @@ public abstract class AbstractJavaEntity // ********** 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); - this.validatePrimaryKey(messages, reporter, astRoot); - this.validateTable(messages, reporter, astRoot); + this.validatePrimaryKey(messages, reporter); + this.validateTable(messages, reporter); for (JavaSecondaryTable secondaryTable : this.getSecondaryTables()) { - secondaryTable.validate(messages, reporter, astRoot); + secondaryTable.validate(messages, reporter); } - this.validateInheritance(messages, reporter, astRoot); + this.validateInheritance(messages, reporter); for (JavaPrimaryKeyJoinColumn pkJoinColumn : this.getPrimaryKeyJoinColumns()) { - pkJoinColumn.validate(messages, reporter, astRoot); + pkJoinColumn.validate(messages, reporter); } - this.generatorContainer.validate(messages, reporter, astRoot); - this.queryContainer.validate(messages, reporter, astRoot); - this.attributeOverrideContainer.validate(messages, reporter, astRoot); - this.associationOverrideContainer.validate(messages, reporter, astRoot); + this.generatorContainer.validate(messages, reporter); + this.queryContainer.validate(messages, reporter); + this.attributeOverrideContainer.validate(messages, reporter); + this.associationOverrideContainer.validate(messages, reporter); this.validateEntityName(messages); - this.idClassReference.validate(messages, reporter, astRoot); + this.idClassReference.validate(messages, reporter); } @Override @@ -1352,20 +1344,15 @@ public abstract class AbstractJavaEntity } } - protected void validatePrimaryKey(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - this.buildPrimaryKeyValidator(astRoot).validate(messages, reporter); + protected void validatePrimaryKey(List<IMessage> messages, IReporter reporter) { + this.buildPrimaryKeyValidator().validate(messages, reporter); } - protected JptValidator buildPrimaryKeyValidator(CompilationUnit astRoot) { - return new GenericEntityPrimaryKeyValidator(this, this.buildTextRangeResolver(astRoot)); + protected JptValidator buildPrimaryKeyValidator() { + return new GenericEntityPrimaryKeyValidator(this); } - @Override - protected EntityTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaEntityTextRangeResolver(this, astRoot); - } - - protected void validateTable(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateTable(List<IMessage> messages, IReporter reporter) { if (this.isAbstractTablePerClass()) { if (this.table.isSpecifiedInResource()) { messages.add( @@ -1374,7 +1361,7 @@ public abstract class AbstractJavaEntity JpaValidationMessages.ENTITY_ABSTRACT_TABLE_PER_CLASS_DEFINES_TABLE, new String[] {this.getName()}, this, - this.table.getValidationTextRange(astRoot) + this.table.getValidationTextRange() ) ); } @@ -1388,13 +1375,13 @@ public abstract class AbstractJavaEntity JpaValidationMessages.ENTITY_SINGLE_TABLE_DESCENDANT_DEFINES_TABLE, new String[] {this.getName()}, this, - this.table.getValidationTextRange(astRoot) + this.table.getValidationTextRange() ) ); } return; } - this.table.validate(messages, reporter, astRoot); + this.table.validate(messages, reporter); } /** @@ -1406,15 +1393,15 @@ public abstract class AbstractJavaEntity (this.table.getDbTable() != this.getRootEntity().getTable().getDbTable()); } - protected void validateInheritance(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - this.validateInheritanceStrategy(messages, astRoot); - this.validateDiscriminatorColumn(messages, reporter, astRoot); - this.validateDiscriminatorValue(messages, astRoot); + protected void validateInheritance(List<IMessage> messages, IReporter reporter) { + this.validateInheritanceStrategy(messages); + this.validateDiscriminatorColumn(messages, reporter); + this.validateDiscriminatorValue(messages); } - protected void validateDiscriminatorColumn(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateDiscriminatorColumn(List<IMessage> messages, IReporter reporter) { if (this.specifiedDiscriminatorColumnIsAllowed && ! this.discriminatorColumnIsUndefined) { - this.discriminatorColumn.validate(messages, reporter, astRoot); + this.discriminatorColumn.validate(messages, reporter); } else if (!this.discriminatorColumn.isVirtual()) { if (this.isDescendant()) { @@ -1424,7 +1411,7 @@ public abstract class AbstractJavaEntity JpaValidationMessages.ENTITY_NON_ROOT_DISCRIMINATOR_COLUMN_DEFINED, new String[] {this.getName()}, this, - this.getDiscriminatorColumnTextRange(astRoot) + this.getDiscriminatorColumnTextRange() ) ); } @@ -1435,14 +1422,14 @@ public abstract class AbstractJavaEntity JpaValidationMessages.ENTITY_TABLE_PER_CLASS_DISCRIMINATOR_COLUMN_DEFINED, new String[] {this.getName()}, this, - this.getDiscriminatorColumnTextRange(astRoot) + this.getDiscriminatorColumnTextRange() ) ); } } } - protected void validateDiscriminatorValue(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateDiscriminatorValue(List<IMessage> messages) { if (this.discriminatorValueIsUndefined && (this.specifiedDiscriminatorValue != null)) { if (this.isAbstract()) { messages.add( @@ -1451,7 +1438,7 @@ public abstract class AbstractJavaEntity JpaValidationMessages.ENTITY_ABSTRACT_DISCRIMINATOR_VALUE_DEFINED, new String[] {this.getName()}, this, - this.getDiscriminatorValueTextRange(astRoot) + this.getDiscriminatorValueTextRange() ) ); } @@ -1462,14 +1449,14 @@ public abstract class AbstractJavaEntity JpaValidationMessages.ENTITY_TABLE_PER_CLASS_DISCRIMINATOR_VALUE_DEFINED, new String[] {this.getName()}, this, - this.getDiscriminatorValueTextRange(astRoot) + this.getDiscriminatorValueTextRange() ) ); } } } - protected void validateInheritanceStrategy(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateInheritanceStrategy(List<IMessage> messages) { Supported tablePerConcreteClassInheritanceIsSupported = this.getJpaPlatformVariation().getTablePerConcreteClassInheritanceIsSupported(); if (tablePerConcreteClassInheritanceIsSupported == Supported.YES) { return; @@ -1482,7 +1469,7 @@ public abstract class AbstractJavaEntity JpaValidationMessages.ENTITY_TABLE_PER_CLASS_NOT_SUPPORTED_ON_PLATFORM, new String[] {this.getName()}, this, - this.getInheritanceStrategyTextRange(astRoot) + this.getInheritanceStrategyTextRange() ) ); } @@ -1493,23 +1480,23 @@ public abstract class AbstractJavaEntity JpaValidationMessages.ENTITY_TABLE_PER_CLASS_NOT_PORTABLE_ON_PLATFORM, new String[] {this.getName()}, this, - this.getInheritanceStrategyTextRange(astRoot) + this.getInheritanceStrategyTextRange() ) ); } } } - protected TextRange getDiscriminatorValueTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getDiscriminatorValueAnnotation().getTextRange(astRoot), astRoot); + protected TextRange getDiscriminatorValueTextRange() { + return this.getValidationTextRange(this.getDiscriminatorValueAnnotation().getTextRange()); } - protected TextRange getDiscriminatorColumnTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.discriminatorColumn.getValidationTextRange(astRoot), astRoot); + protected TextRange getDiscriminatorColumnTextRange() { + return this.getValidationTextRange(this.discriminatorColumn.getValidationTextRange()); } - protected TextRange getInheritanceStrategyTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getInheritanceAnnotation().getStrategyTextRange(), astRoot); + protected TextRange getInheritanceStrategyTextRange() { + return this.getValidationTextRange(this.getInheritanceAnnotation().getStrategyTextRange()); } @@ -1529,8 +1516,8 @@ public abstract class AbstractJavaEntity return AbstractJavaEntity.this; } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return AbstractJavaEntity.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return AbstractJavaEntity.this.getValidationTextRange(); } public TypeMapping getOverridableTypeMapping() { @@ -1599,12 +1586,12 @@ public abstract class AbstractJavaEntity return MappingTools.resolveOverriddenColumn(this.getOverridableTypeMapping(), attributeName); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new AttributeOverrideValidator((ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new MappedSuperclassOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new AttributeOverrideValidator((ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new MappedSuperclassOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return new AttributeOverrideColumnValidator((ReadOnlyAttributeOverride) override, column, textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner) { + return new AttributeOverrideColumnValidator((ReadOnlyAttributeOverride) override, column, new EntityTableDescriptionProvider()); } } @@ -1624,24 +1611,24 @@ public abstract class AbstractJavaEntity return MappingTools.resolveOverriddenRelationship(this.getOverridableTypeMapping(), attributeName); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new AssociationOverrideValidator((ReadOnlyAssociationOverride) override, (AssociationOverrideContainer) container, textRangeResolver, new MappedSuperclassOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new AssociationOverrideValidator((ReadOnlyAssociationOverride) override, (AssociationOverrideContainer) container, new MappedSuperclassOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinColumnValidator((ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) owner, (JoinColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner) { + return new AssociationOverrideJoinColumnValidator((ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) owner, new EntityTableDescriptionProvider()); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinColumnValidator(override, column, owner, textRangeResolver, new JoinTableTableDescriptionProvider()); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return new AssociationOverrideJoinColumnValidator(override, column, owner, new JoinTableTableDescriptionProvider()); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideInverseJoinColumnValidator(override, column, owner, textRangeResolver, new JoinTableTableDescriptionProvider()); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return new AssociationOverrideInverseJoinColumnValidator(override, column, owner, new JoinTableTableDescriptionProvider()); } - public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable t, TableTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinTableValidator(override, (ReadOnlyJoinTable) t, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable t) { + return new AssociationOverrideJoinTableValidator(override, (ReadOnlyJoinTable) t); } } @@ -1662,8 +1649,8 @@ public abstract class AbstractJavaEntity return AbstractJavaEntity.this.resolveDbTable(tableName); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return AbstractJavaEntity.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return AbstractJavaEntity.this.getValidationTextRange(); } } @@ -1672,7 +1659,7 @@ public abstract class AbstractJavaEntity protected class PrimaryKeyJoinColumnOwner extends NamedColumnOwner - implements JavaReadOnlyBaseJoinColumn.Owner + implements ReadOnlyBaseJoinColumn.Owner { public org.eclipse.jpt.jpa.db.Table getReferencedColumnDbTable() { Entity parentEntity = AbstractJavaEntity.this.getParentEntity(); @@ -1691,8 +1678,8 @@ public abstract class AbstractJavaEntity return (parentEntity == null) ? AbstractJavaEntity.this.getPrimaryKeyColumnName() : parentEntity.getPrimaryKeyColumnName(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new EntityPrimaryKeyJoinColumnValidator((ReadOnlyBaseJoinColumn) column, this, (BaseJoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new EntityPrimaryKeyJoinColumnValidator((ReadOnlyBaseJoinColumn) column, this); } } @@ -1701,7 +1688,7 @@ public abstract class AbstractJavaEntity protected class DiscriminatorColumnOwner extends NamedColumnOwner - implements JavaDiscriminatorColumn.Owner + implements ReadOnlyNamedDiscriminatorColumn.Owner { public String getDefaultColumnName(ReadOnlyNamedColumn column) { return this.isDescendant() ? @@ -1733,8 +1720,8 @@ public abstract class AbstractJavaEntity return AbstractJavaEntity.this.discriminatorColumnIsUndefined; } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new DiscriminatorColumnValidator(column, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new DiscriminatorColumnValidator(column); } } @@ -1744,8 +1731,8 @@ public abstract class AbstractJavaEntity protected class TableOwner implements ReadOnlyTable.Owner { - public JptValidator buildTableValidator(ReadOnlyTable t, TableTextRangeResolver textRangeResolver) { - return new TableValidator(t, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable t) { + return new TableValidator(t); } } @@ -1755,8 +1742,8 @@ public abstract class AbstractJavaEntity protected class SecondaryTableOwner implements ReadOnlyTable.Owner { - public JptValidator buildTableValidator(ReadOnlyTable t, TableTextRangeResolver textRangeResolver) { - return new SecondaryTableValidator((ReadOnlySecondaryTable) t, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable t) { + return new SecondaryTableValidator((ReadOnlySecondaryTable) t); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java index ce719f84df..d47ae6e6ca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; @@ -73,8 +72,8 @@ public abstract class AbstractJavaGenerator<A extends GeneratorAnnotation> // ********** 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 (StringTools.stringIsEmpty(this.name)){ messages.add( @@ -83,19 +82,19 @@ public abstract class AbstractJavaGenerator<A extends GeneratorAnnotation> JpaValidationMessages.GENERATOR_NAME_UNDEFINED, EMPTY_STRING_ARRAY, this, - this.getNameTextRange(astRoot) + this.getNameTextRange() ) ); } } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.generatorAnnotation.getTextRange(astRoot); - return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.generatorAnnotation.getTextRange(); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.generatorAnnotation.getNameTextRange(), astRoot); + public TextRange getNameTextRange() { + return this.getValidationTextRange(this.generatorAnnotation.getNameTextRange()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java index 7f3ae83366..1c85bfdd19 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java @@ -34,9 +34,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaTemporalConverter; -import org.eclipse.jpt.jpa.core.internal.context.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.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.NullJavaConverter; @@ -397,8 +395,8 @@ public abstract class AbstractJavaIdMapping return this.getTypeMapping().getAllAssociatedTableNames(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, (TableColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, new EntityTableDescriptionProvider()); } @@ -439,36 +437,36 @@ public abstract class AbstractJavaIdMapping // ********** 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); // JPA 2.0: If the column is specified or if the ID is not mapped by a relationship, // the column is validated. // JPA 1.0: The column is always be validated, since the ID is never mapped by a // relationship. if (this.columnIsSpecified() || ! this.derived) { - this.column.validate(messages, reporter, astRoot); + this.column.validate(messages, reporter); } // JPA 2.0: If the column is specified and the ID is mapped by a relationship, // we have an error. // JPA 1.0: The ID cannot be mapped by a relationship. if (this.columnIsSpecified() && this.derived) { - messages.add(this.buildColumnSpecifiedAndDerivedMessage(astRoot)); + messages.add(this.buildColumnSpecifiedAndDerivedMessage()); } - this.generatorContainer.validate(messages, reporter, astRoot); + this.generatorContainer.validate(messages, reporter); if (this.generatedValue != null) { - this.generatedValue.validate(messages, reporter, astRoot); + this.generatedValue.validate(messages, reporter); } - this.converter.validate(messages, reporter, astRoot); + this.converter.validate(messages, reporter); } - protected IMessage buildColumnSpecifiedAndDerivedMessage(CompilationUnit astRoot) { + protected IMessage buildColumnSpecifiedAndDerivedMessage() { return this.buildMessage( JpaValidationMessages.ID_MAPPING_MAPPED_BY_RELATIONSHIP_AND_COLUMN_SPECIFIED, EMPTY_STRING_ARRAY, - this.column.getValidationTextRange(astRoot) + this.column.getValidationTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java index bd400ef1fe..3208673c87 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java @@ -24,7 +24,6 @@ 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.JavaJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -35,7 +34,7 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy implements JavaJoinColumnRelationshipStrategy { protected final ContextListContainer<JavaJoinColumn, JoinColumnAnnotation> specifiedJoinColumnContainer; - protected final JavaReadOnlyJoinColumn.Owner joinColumnOwner; + protected final ReadOnlyJoinColumn.Owner joinColumnOwner; protected JavaJoinColumn defaultJoinColumn; @@ -170,7 +169,7 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy } } - protected abstract JavaReadOnlyJoinColumn.Owner buildJoinColumnOwner(); + protected abstract ReadOnlyJoinColumn.Owner buildJoinColumnOwner(); // ********** default join column ********** @@ -317,10 +316,10 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy // ********** 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 (JavaJoinColumn joinColumn : this.getJoinColumns()) { - joinColumn.validate(messages, reporter, astRoot); + joinColumn.validate(messages, reporter); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java index 2b5f2622d9..d66bb74e56 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java @@ -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. @@ -186,10 +186,10 @@ public abstract class AbstractJavaJoinTableRelationshipStrategy // ********** 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.joinTable != null) { - this.joinTable.validate(messages, reporter, astRoot); + this.joinTable.validate(messages, reporter); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java index d462f5cbf7..494412bda8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java @@ -9,17 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.context.AbstractJpaContextNode; -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; public abstract class AbstractJavaJpaContextNode extends AbstractJpaContextNode @@ -55,42 +50,5 @@ public abstract class AbstractJavaJpaContextNode protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { return null; } - - // ********** validation ********** - - /** - * All subclass implementations - * should be preceded by a "super" call to this method. - */ - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - if (reporter.isCancelled()) { - throw new ValidationCancelledException(); - } - } - /** - * Validate the specified node if it is not <code>null</code>. - */ - protected void validateNode(JavaJpaContextNode node, List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - if (node != null) { - node.validate(messages, reporter, astRoot); - } - } - - /** - * Validate the specified nodes. - */ - protected void validateNodes(Iterable<? extends JavaJpaContextNode> nodes, List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - for (JavaJpaContextNode node : nodes) { - node.validate(messages, reporter, astRoot); - } - } - - /** - * Return the specified text range if it is not <code>null</code>; if it is - * <code>null</code>, return the node's validation text range. - */ - protected TextRange getValidationTextRange(TextRange textRange, CompilationUnit astRoot) { - return (textRange != null) ? textRange : this.getValidationTextRange(astRoot); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappedSuperclass.java index ebf34ebef6..1756057ae4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappedSuperclass.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. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Query; @@ -19,7 +18,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaQueryContainer; 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.jpa1.context.GenericMappedSuperclassPrimaryKeyValidator; import org.eclipse.jpt.jpa.core.resource.java.MappedSuperclassAnnotation; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -112,11 +110,11 @@ public abstract class AbstractJavaMappedSuperclass // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validatePrimaryKey(messages, reporter, astRoot); - this.idClassReference.validate(messages, reporter, astRoot); - this.queryContainer.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validatePrimaryKey(messages, reporter); + this.idClassReference.validate(messages, reporter); + this.queryContainer.validate(messages, reporter); } @Override @@ -124,17 +122,12 @@ public abstract class AbstractJavaMappedSuperclass return false; } - protected void validatePrimaryKey(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - this.buildPrimaryKeyValidator(astRoot).validate(messages, reporter); + protected void validatePrimaryKey(List<IMessage> messages, IReporter reporter) { + this.buildPrimaryKeyValidator().validate(messages, reporter); } - protected JptValidator buildPrimaryKeyValidator(CompilationUnit astRoot) { - return new GenericMappedSuperclassPrimaryKeyValidator(this, this.buildTextRangeResolver(astRoot)); + protected JptValidator buildPrimaryKeyValidator() { + return new GenericMappedSuperclassPrimaryKeyValidator(this); // TODO - JPA 2.0 validation } - - @Override - protected PrimaryKeyTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaMappedSuperclassTextRangeResolver(this, astRoot); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappingRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappingRelationship.java index 629387495a..0da8c8de73 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappingRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappingRelationship.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.context.java; -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.MappedByRelationship; @@ -126,7 +125,7 @@ public abstract class AbstractJavaMappingRelationship<M extends JavaRelationship // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getMapping().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java index 270fd3cc60..118f1e7611 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java @@ -52,14 +52,9 @@ import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaMultiRelationshipMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOrderable; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipStrategy; -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.context.OverrideTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EmbeddableOverrideDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.MapKeyAttributeOverrideColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.MapKeyAttributeOverrideValidator; @@ -111,7 +106,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi protected JavaConverter mapKeyConverter; // map key converter - never null protected final ContextListContainer<JavaJoinColumn, MapKeyJoinColumn2_0Annotation> specifiedMapKeyJoinColumnContainer; - protected final JavaReadOnlyJoinColumn.Owner mapKeyJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner mapKeyJoinColumnOwner; protected JavaJoinColumn defaultMapKeyJoinColumn; @@ -776,7 +771,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi } } - protected JavaReadOnlyJoinColumn.Owner buildMapKeyJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildMapKeyJoinColumnOwner() { return new MapKeyJoinColumnOwner(); } @@ -969,15 +964,15 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateAttributeType(messages, reporter, astRoot); - this.validateMapKeyClass(messages, astRoot); - this.orderable.validate(messages, reporter, astRoot); - this.validateMapKey(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateAttributeType(messages, reporter); + this.validateMapKeyClass(messages); + this.orderable.validate(messages, reporter); + this.validateMapKey(messages, reporter); } - protected void validateAttributeType(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateAttributeType(List<IMessage> messages, IReporter reporter) { JavaPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); if ((javaAttribute != null) && !javaAttribute.getJpaContainerDefinition().isContainer()) { if (this.getPersistentAttribute().isVirtual()) { @@ -987,7 +982,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi JpaValidationMessages.VIRTUAL_ATTRIBUTE_ATTRIBUTE_TYPE_IS_NOT_SUPPORTED_COLLECTION_TYPE, new String[] {getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -998,49 +993,49 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi JpaValidationMessages.ATTRIBUTE_TYPE_IS_NOT_SUPPORTED_COLLECTION_TYPE, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } } } - protected TextRange getMapKeyClassTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getMapKeyClassAnnotationTextRange(astRoot), astRoot); + protected TextRange getMapKeyClassTextRange() { + return this.getValidationTextRange(this.getMapKeyClassAnnotationTextRange()); } - protected TextRange getMapKeyClassAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getMapKeyClassAnnotationTextRange() { MapKeyClass2_0Annotation annotation = this.getMapKeyClassAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } - protected void validateMapKey(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateMapKey(List<IMessage> messages, IReporter reporter) { if (this.getMapKeyAnnotation() != null) {//If MapKey annotation specified, no other MapKey* annotations can be specified, don't validate them //TODO validate that the map key refers to an existing attribute return; } if (this.getKeyType() == Type.BASIC_TYPE) { - this.mapKeyColumn.validate(messages, reporter, astRoot); - this.mapKeyConverter.validate(messages, reporter, astRoot); + this.mapKeyColumn.validate(messages, reporter); + this.mapKeyConverter.validate(messages, reporter); } else if (this.getKeyType() == Type.ENTITY_TYPE) { for (JavaJoinColumn joinColumn : this.getMapKeyJoinColumns()) { - joinColumn.validate(messages, reporter, astRoot); + joinColumn.validate(messages, reporter); } } else if (this.getKeyType() == Type.EMBEDDABLE_TYPE) { - this.mapKeyAttributeOverrideContainer.validate(messages, reporter, astRoot); + this.mapKeyAttributeOverrideContainer.validate(messages, reporter); //validate map key association overrides - for eclipselink } } - protected void validateMapKeyClass(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateMapKeyClass(List<IMessage> messages) { if (this.isJpa2_0Compatible() && this.getPersistentAttribute().getJpaContainerDefinition().isMap()) { - this.validateMapKeyClass_(messages, astRoot); + this.validateMapKeyClass_(messages); } } - protected void validateMapKeyClass_(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateMapKeyClass_(List<IMessage> messages) { if (this.getMapKeyClass() == null) { if (this.getPersistentAttribute().isVirtual()) { messages.add( @@ -1049,7 +1044,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi JpaValidationMessages.VIRTUAL_ATTRIBUTE_MAP_KEY_CLASS_NOT_DEFINED, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -1059,7 +1054,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi JpaValidationMessages.MAP_KEY_CLASS_NOT_DEFINED, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -1078,7 +1073,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi JpaValidationMessages.VIRTUAL_ATTRIBUTE_MAP_KEY_CLASS_MUST_BE_ENTITY_EMBEDDABLE_OR_BASIC_TYPE, new String[] {this.getName(), this.getFullyQualifiedMapKeyClass()}, this, - this.getMapKeyClassTextRange(astRoot) + this.getMapKeyClassTextRange() ) ); } @@ -1089,7 +1084,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi JpaValidationMessages.MAP_KEY_CLASS_MUST_BE_ENTITY_EMBEDDABLE_OR_BASIC_TYPE, new String[] {this.getFullyQualifiedMapKeyClass()}, this, - this.getMapKeyClassTextRange(astRoot) + this.getMapKeyClassTextRange() ) ); } @@ -1121,8 +1116,8 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return EmptyIterable.instance(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return AbstractJavaMultiRelationshipMapping.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return AbstractJavaMultiRelationshipMapping.this.getValidationTextRange(); } protected RelationshipStrategy getRelationshipStrategy() { @@ -1157,8 +1152,8 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return this.getRelationshipStrategy().tableNameIsInvalid(tableName); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new MapKeyColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, (TableColumnTextRangeResolver) textRangeResolver, new RelationshipStrategyTableDescriptionProvider(this.getRelationshipStrategy())); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new MapKeyColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, new RelationshipStrategyTableDescriptionProvider(this.getRelationshipStrategy())); } } @@ -1209,12 +1204,12 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return MappingTools.resolveOverriddenColumn(this.getOverridableTypeMapping(), attributeName); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new MapKeyAttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new EmbeddableOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new MapKeyAttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new EmbeddableOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return new MapKeyAttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, textRangeResolver, new RelationshipStrategyTableDescriptionProvider(this.getRelationshipStrategy())); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner) { + return new MapKeyAttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, new RelationshipStrategyTableDescriptionProvider(this.getRelationshipStrategy())); } } @@ -1222,7 +1217,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi // ********** map key join column owner ********** protected class MapKeyJoinColumnOwner - implements JavaReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected MapKeyJoinColumnOwner() { super(); @@ -1272,16 +1267,15 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return AbstractJavaMultiRelationshipMapping.this.getMapKeyJoinColumnsSize(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return AbstractJavaMultiRelationshipMapping.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return AbstractJavaMultiRelationshipMapping.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { return new MapKeyJoinColumnValidator( this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, - this, - (JoinColumnTextRangeResolver) textRangeResolver, + this, new RelationshipStrategyTableDescriptionProvider(getRelationship().getStrategy())); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java index 662ffbadd0..c9ea6f80f4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java @@ -21,7 +21,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaNamedColumn; 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.resource.java.NamedColumnAnnotation; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -247,26 +246,22 @@ public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.buildValidator(astRoot).validate(messages, reporter); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.buildValidator().validate(messages, reporter); } - protected JptValidator buildValidator(CompilationUnit astRoot) { - return this.owner.buildColumnValidator(this, this.buildTextRangeResolver(astRoot)); + protected JptValidator buildValidator() { + return this.owner.buildColumnValidator(this); } - protected NamedColumnTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaNamedColumnTextRangeResolver(this, astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getColumnAnnotation().getTextRange(); + return (textRange != null) ? textRange : this.owner.getValidationTextRange(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getColumnAnnotation().getTextRange(astRoot); - return (textRange != null) ? textRange : this.owner.getValidationTextRange(astRoot); - } - - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getColumnAnnotation().getNameTextRange(), astRoot); + public TextRange getNameTextRange() { + return this.getValidationTextRange(this.getColumnAnnotation().getNameTextRange()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumnTextRangeResolver.java deleted file mode 100644 index a8139f49d2..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumnTextRangeResolver.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.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.JavaReadOnlyNamedColumn; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; - -public abstract class AbstractJavaNamedColumnTextRangeResolver<C extends JavaReadOnlyNamedColumn> - implements NamedColumnTextRangeResolver -{ - protected final C column; - - protected final CompilationUnit astRoot; - - - protected AbstractJavaNamedColumnTextRangeResolver(C column, CompilationUnit astRoot) { - super(); - this.column = column; - this.astRoot = astRoot; - } - - public TextRange getNameTextRange() { - return this.column.getNameTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java index 83595c5711..b42fd98fd5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java @@ -23,8 +23,6 @@ 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.JavaVirtualOverride; 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.jpa2.context.java.JavaOverrideContainer2_0; import org.eclipse.jpt.jpa.core.resource.java.OverrideAnnotation; import org.eclipse.jpt.jpa.db.Table; @@ -161,8 +159,8 @@ public abstract class AbstractJavaOverride<C extends JavaOverrideContainer, A ex 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); } protected String prefix(String oldName) { @@ -215,26 +213,22 @@ public abstract class AbstractJavaOverride<C extends JavaOverrideContainer, A ex // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.buildValidator(astRoot).validate(messages, reporter); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.buildValidator().validate(messages, reporter); } - protected JptValidator buildValidator(CompilationUnit astRoot) { - return this.getContainer().buildOverrideValidator(this, buildTextRangeResolver(astRoot)); + protected JptValidator buildValidator() { + return this.getContainer().buildOverrideValidator(this); } - protected OverrideTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaOverrideTextRangeResolver(this, astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.overrideAnnotation.getTextRange(); + return (textRange != null) ? textRange : this.getContainer().getValidationTextRange(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.overrideAnnotation.getTextRange(astRoot); - return (textRange != null) ? textRange : this.getContainer().getValidationTextRange(astRoot); - } - - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.overrideAnnotation.getNameTextRange(), astRoot); + public TextRange getNameTextRange() { + return this.getValidationTextRange(this.overrideAnnotation.getNameTextRange()); } public boolean tableNameIsInvalid(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java index 075af3cd83..cdd5354400 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java @@ -38,7 +38,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; 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.PersistentAttributeTextRangeResolver; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; @@ -596,8 +595,8 @@ public abstract class AbstractJavaPersistentAttribute return null; } - public boolean contains(int offset, CompilationUnit astRoot) { - TextRange fullTextRange = this.getResourceAttribute().getTextRange(astRoot); + public boolean contains(int offset) { + TextRange fullTextRange = this.getResourceAttribute().getTextRange(); // 'fullTextRange' will be null if the attribute no longer exists in the java; // the context model can be out of sync with the resource model // when a selection event occurs before the context model has a @@ -613,28 +612,24 @@ public abstract class AbstractJavaPersistentAttribute // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange() { return this.isVirtual() ? this.getOwningPersistentType().getValidationTextRange() : this.getSelectionTextRange(); } @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateAttribute(messages, reporter, astRoot); - this.mapping.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateAttribute(messages, reporter); + this.mapping.validate(messages, reporter); } - protected void validateAttribute(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - this.buildAttributeValidator(astRoot).validate(messages, reporter); + protected void validateAttribute(List<IMessage> messages, IReporter reporter) { + this.buildAttributeValidator().validate(messages, reporter); } - protected abstract JptValidator buildAttributeValidator(CompilationUnit astRoot); - - protected PersistentAttributeTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaPersistentAttributeTextRangeResolver(this, astRoot); - } + protected abstract JptValidator buildAttributeValidator(); /** * If the attribute's owning type is an <code>orm.xml</code> persistent diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java index e5ab9be8d6..6b4d04b97e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java @@ -53,7 +53,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; -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; @@ -569,7 +568,7 @@ public abstract class AbstractJavaPersistentType private void syncFieldAccessAttributes() { HashSet<JavaPersistentAttribute> contextAttributes = CollectionTools.set(this.getAttributes()); - this.syncFieldAttributes(contextAttributes, this.buildNonTransientNonStaticResourceFieldsFilter()); + this.syncFieldAttributes(contextAttributes, buildNonTransientNonStaticResourceFieldsFilter()); this.syncAnnotatedPropertyAttributes(contextAttributes); } @@ -939,13 +938,10 @@ public abstract class AbstractJavaPersistentType return JavaPersistentType.class; } - // TODO when we start caching text ranges we can stop building the ASTRoot. public JpaStructureNode getStructureNode(int offset) { - CompilationUnit astRoot = this.buildASTRoot(); - - if (this.contains(offset, astRoot)) { + if (this.contains(offset)) { for (JavaPersistentAttribute persistentAttribute : this.getAttributes()) { - if (persistentAttribute.contains(offset, astRoot)) { + if (persistentAttribute.contains(offset)) { return persistentAttribute; } } @@ -954,8 +950,8 @@ public abstract class AbstractJavaPersistentType return null; } - protected boolean contains(int offset, CompilationUnit astRoot) { - TextRange fullTextRange = this.resourceType.getTextRange(astRoot); + protected boolean contains(int offset) { + TextRange fullTextRange = this.resourceType.getTextRange(); // 'fullTextRange' will be null if the type no longer exists in the java; // the context model can be out of sync with the resource model // when a selection event occurs before the context model has a @@ -1013,49 +1009,37 @@ public abstract class AbstractJavaPersistentType // ********** validation ********** + @Override public void validate(List<IMessage> messages, IReporter reporter) { - if (reporter.isCancelled()) { - throw new ValidationCancelledException(); - } + super.validate(messages, reporter); if (MappingTools.nodeIsInternalSource(this, this.resourceType)) { - // build the AST root here to pass down - this.validate(messages, reporter, this.buildASTRoot()); + this.validateMapping(messages, reporter); + this.validateAttributes(messages, reporter); } } - @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateMapping(messages, reporter, astRoot); - this.validateAttributes(messages, reporter, astRoot); - } - - protected void validateMapping(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateMapping(List<IMessage> messages, IReporter reporter) { try { - this.mapping.validate(messages, reporter, astRoot); + this.mapping.validate(messages, reporter); } catch(Throwable t) { JptJpaCorePlugin.instance().logError(t); } } - protected void validateAttributes(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateAttributes(List<IMessage> messages, IReporter reporter) { for (JavaPersistentAttribute attribute : this.getAttributes()) { - this.validateAttribute(attribute, reporter, messages, astRoot); + this.validateAttribute(attribute, reporter, messages); } } - protected void validateAttribute(JavaPersistentAttribute attribute, IReporter reporter, List<IMessage> messages, CompilationUnit astRoot) { + protected void validateAttribute(JavaPersistentAttribute attribute, IReporter reporter, List<IMessage> messages) { try { - attribute.validate(messages, reporter, astRoot); + attribute.validate(messages, reporter); } catch(Throwable t) { JptJpaCorePlugin.instance().logError(t); } } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(); - } - public TextRange getValidationTextRange() { return this.getSelectionTextRange(); } @@ -1085,10 +1069,6 @@ public abstract class AbstractJavaPersistentType return this.getParent().getDefaultPersistentTypeAccess(); } - protected CompilationUnit buildASTRoot() { - return this.resourceType.getJavaResourceCompilationUnit().buildASTRoot(); - } - protected JpaFile getJpaFile() { return this.getJpaFile(this.resourceType.getFile()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java index 9c0e210eab..1c358154c6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.ArrayList; 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.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -191,13 +190,13 @@ public abstract class AbstractJavaQuery<A extends QueryAnnotation> // ********** validation ********** - public void validate(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateName(messages, astRoot); - this.validateQuery(queryHelper, messages, reporter, astRoot); + public void validate(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateName(messages); + this.validateQuery(queryHelper, messages, reporter); } - protected void validateName(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateName(List<IMessage> messages) { if (StringTools.stringIsEmpty(this.name)) { messages.add( DefaultJpaValidationMessages.buildMessage( @@ -205,13 +204,13 @@ public abstract class AbstractJavaQuery<A extends QueryAnnotation> JpaValidationMessages.QUERY_NAME_UNDEFINED, EMPTY_STRING_ARRAY, this, - this.getNameTextRange(astRoot) + this.getNameTextRange() ) ); } } - public void validateQuery(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + public void validateQuery(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter) { if (StringTools.stringIsEmpty(this.query)){ messages.add( DefaultJpaValidationMessages.buildMessage( @@ -219,7 +218,7 @@ public abstract class AbstractJavaQuery<A extends QueryAnnotation> JpaValidationMessages.QUERY_STATEMENT_UNDEFINED, new String[] {this.name}, this, - this.getNameTextRange(astRoot) + this.getNameTextRange() ) ); } else { @@ -229,13 +228,17 @@ public abstract class AbstractJavaQuery<A extends QueryAnnotation> protected abstract void validateQuery_(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter); - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.queryAnnotation.getTextRange(astRoot); - return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.queryAnnotation.getTextRange(); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.queryAnnotation.getNameTextRange(), astRoot); + public TextRange getNameTextRange() { + return this.getValidationTextRange(this.queryAnnotation.getNameTextRange()); + } + + public TextRange getQueryTextRange() { + return this.getValidationTextRange(this.queryAnnotation.getQueryTextRange()); } public boolean isEquivalentTo(JpaNamedContextNode node) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java index a87afee3be..bbd66f5847 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java @@ -319,13 +319,13 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateTargetEntity(messages, astRoot); - this.relationship.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateTargetEntity(messages); + this.relationship.validate(messages, reporter); } - protected void validateTargetEntity(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateTargetEntity(List<IMessage> messages) { if (this.getTargetEntity() == null) { String msg = this.getPersistentAttribute().isVirtual() ? JpaValidationMessages.VIRTUAL_ATTRIBUTE_TARGET_ENTITY_NOT_DEFINED : @@ -336,7 +336,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp msg, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); return; @@ -355,7 +355,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp JpaValidationMessages.VIRTUAL_ATTRIBUTE_TARGET_ENTITY_IS_NOT_AN_ENTITY, new String[] {this.getName(), this.getFullyQualifiedTargetEntity()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -365,15 +365,15 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp JpaValidationMessages.TARGET_ENTITY_IS_NOT_AN_ENTITY, new String[] {this.getFullyQualifiedTargetEntity()}, this, - this.getTargetEntityTextRange(astRoot) + this.getTargetEntityTextRange() ) ); } } } - protected TextRange getTargetEntityTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getAnnotationTargetEntityTextRange(), astRoot); + protected TextRange getTargetEntityTextRange() { + return this.getValidationTextRange(this.getAnnotationTargetEntityTextRange()); } protected TextRange getAnnotationTargetEntityTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java index bc2e214ecf..abd87dc939 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java @@ -148,8 +148,8 @@ public abstract class AbstractJavaSingleRelationshipMapping<A extends SingleRela // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.derivedIdentity.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.derivedIdentity.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java index d327a92f32..662abdb1af 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java @@ -25,7 +25,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaTable; import org.eclipse.jpt.jpa.core.context.java.JavaUniqueConstraint; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.java.BaseTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; import org.eclipse.jpt.jpa.db.Catalog; @@ -484,34 +483,30 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.buildTableValidator(astRoot).validate(messages, reporter); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.buildTableValidator().validate(messages, reporter); } - protected JptValidator buildTableValidator(CompilationUnit astRoot) { - return this.owner.buildTableValidator(this, buildTextRangeResolver(astRoot)); + protected JptValidator buildTableValidator() { + return this.owner.buildTableValidator(this); } - protected TableTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaTableTextRangeResolver(this, astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getTableAnnotation().getTextRange(); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getTableAnnotation().getTextRange(astRoot); - return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); + public TextRange getNameTextRange() { + return this.getValidationTextRange(this.getTableAnnotation().getNameTextRange()); } - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getTableAnnotation().getNameTextRange(), astRoot); + public TextRange getSchemaTextRange() { + return this.getValidationTextRange(this.getTableAnnotation().getSchemaTextRange()); } - public TextRange getSchemaTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getTableAnnotation().getSchemaTextRange(), astRoot); - } - - public TextRange getCatalogTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getTableAnnotation().getCatalogTextRange(), astRoot); + public TextRange getCatalogTextRange() { + return this.getValidationTextRange(this.getTableAnnotation().getCatalogTextRange()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java index e53a0c0279..444303f100 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; @@ -36,7 +35,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; 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.context.TypeMappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.GenericTypeMappingValidator; import org.eclipse.jpt.jpa.db.Schema; @@ -298,29 +296,25 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateType(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateType(messages, reporter); } - protected void validateType(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - this.buildTypeMappingValidator(astRoot).validate(messages, reporter); + protected void validateType(List<IMessage> messages, IReporter reporter) { + this.buildTypeMappingValidator().validate(messages, reporter); } - protected JptValidator buildTypeMappingValidator(CompilationUnit astRoot) { - return new GenericTypeMappingValidator(this, this.getJavaResourceType(), buildTextRangeResolver(astRoot)); - } - - protected TypeMappingTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaTypeMappingTextRangeResolver(this, astRoot); + protected JptValidator buildTypeMappingValidator() { + return new GenericTypeMappingValidator(this, this.getJavaResourceType()); } public boolean validatesAgainstDatabase() { return this.getPersistenceUnit().validatesAgainstDatabase(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.mappingAnnotation.getTextRange(astRoot); - return (textRange != null) ? textRange : this.getPersistentType().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.mappingAnnotation.getTextRange(); + return (textRange != null) ? textRange : this.getPersistentType().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java index e8bb4821e1..26695518b9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.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. @@ -28,9 +28,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaTemporalConverter; import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping; -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.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.NullJavaConverter; @@ -248,8 +246,8 @@ public abstract class AbstractJavaVersionMapping return this.getTypeMapping().getAllAssociatedTableNames(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, (TableColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, new EntityTableDescriptionProvider()); } @@ -275,14 +273,14 @@ public abstract class AbstractJavaVersionMapping // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.column.validate(messages, reporter, astRoot); - this.converter.validate(messages, reporter, astRoot); - this.validateAttributeType(messages, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.column.validate(messages, reporter); + this.converter.validate(messages, reporter); + this.validateAttributeType(messages); } - protected void validateAttributeType(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateAttributeType(List<IMessage> messages) { if (!ArrayTools.contains(SUPPORTED_TYPE_NAMES, this.getPersistentAttribute().getTypeName())) { messages.add( DefaultJpaValidationMessages.buildMessage( @@ -290,7 +288,7 @@ public abstract class AbstractJavaVersionMapping JpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_VERSION_MAPPING_TYPE, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java index f6718b2611..d187bebd1a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.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,15 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.VirtualBaseColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyBaseColumn; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; -public abstract class AbstractJavaVirtualBaseColumn<O extends JavaReadOnlyBaseColumn.Owner, C extends ReadOnlyBaseColumn> +public abstract class AbstractJavaVirtualBaseColumn<O extends ReadOnlyBaseColumn.Owner, C extends ReadOnlyBaseColumn> extends AbstractJavaVirtualNamedColumn<O, C> implements VirtualBaseColumn, JavaReadOnlyBaseColumn { @@ -254,12 +252,7 @@ public abstract class AbstractJavaVirtualBaseColumn<O extends JavaReadOnlyBaseCo // ********** validation ********** - public TextRange getTableTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); - } - - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaTableColumnTextRangeResolver(this, astRoot); + public TextRange getTableTextRange() { + return this.getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java index f51541a3ac..7a38bb6d0a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java @@ -10,14 +10,12 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.VirtualNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; 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.db.Column; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -150,25 +148,21 @@ public abstract class AbstractJavaVirtualNamedColumn<O extends ReadOnlyNamedColu // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.buildValidator(astRoot).validate(messages, reporter); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.buildValidator().validate(messages, reporter); } - protected JptValidator buildValidator(CompilationUnit astRoot) { - return this.owner.buildColumnValidator(this, this.buildTextRangeResolver(astRoot)); + protected JptValidator buildValidator() { + return this.owner.buildColumnValidator(this); } - protected NamedColumnTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaNamedColumnTextRangeResolver(this, astRoot); + public TextRange getValidationTextRange() { + return this.getParent().getValidationTextRange(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getParent().getValidationTextRange(astRoot); - } - - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); + public TextRange getNameTextRange() { + return this.getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedDiscriminatorColumn.java index 2d44d0ad45..0ad85f39a8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedDiscriminatorColumn.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,7 @@ import org.eclipse.jpt.jpa.core.context.VirtualNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedDiscriminatorColumn; -public abstract class AbstractJavaVirtualNamedDiscriminatorColumn<O extends JavaReadOnlyNamedDiscriminatorColumn.Owner, C extends ReadOnlyNamedDiscriminatorColumn> +public abstract class AbstractJavaVirtualNamedDiscriminatorColumn<O extends ReadOnlyNamedDiscriminatorColumn.Owner, C extends ReadOnlyNamedDiscriminatorColumn> extends AbstractJavaVirtualNamedColumn<O, C> implements VirtualNamedDiscriminatorColumn, JavaReadOnlyNamedDiscriminatorColumn { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualOverride.java index be591b8022..ece272b1aa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualOverride.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.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.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn.Owner; @@ -18,9 +17,7 @@ import org.eclipse.jpt.jpa.core.context.TypeMapping; 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.JavaVirtualOverride; -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.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -74,8 +71,8 @@ public abstract class AbstractJavaVirtualOverride<C extends JavaOverrideContaine 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 @@ -87,25 +84,21 @@ public abstract class AbstractJavaVirtualOverride<C extends JavaOverrideContaine // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.buildValidator(astRoot).validate(messages, reporter); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.buildValidator().validate(messages, reporter); } - protected JptValidator buildValidator(CompilationUnit astRoot) { - return this.getContainer().buildOverrideValidator(this, this.buildTextRangeResolver(astRoot)); + protected JptValidator buildValidator() { + return this.getContainer().buildOverrideValidator(this); } - protected OverrideTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaOverrideTextRangeResolver(this, astRoot); + public TextRange getValidationTextRange() { + return this.getContainer().getValidationTextRange(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getContainer().getValidationTextRange(astRoot); - } - - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); + public TextRange getNameTextRange() { + return this.getValidationTextRange(); } public boolean tableNameIsInvalid(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java index b89f1a2db8..b92578cd5d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.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.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; @@ -20,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.VirtualReferenceTable; 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.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -30,7 +28,7 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere implements VirtualReferenceTable { protected final ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; - protected final JavaReadOnlyJoinColumn.Owner joinColumnOwner; + protected final ReadOnlyJoinColumn.Owner joinColumnOwner; protected JavaVirtualJoinColumn defaultJoinColumn; @@ -175,11 +173,11 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere return this.buildJoinColumn(this.joinColumnOwner, joinColumn); } - protected JavaVirtualJoinColumn buildJoinColumn(JavaReadOnlyJoinColumn.Owner columnOwner, ReadOnlyJoinColumn joinColumn) { + protected JavaVirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn.Owner columnOwner, ReadOnlyJoinColumn joinColumn) { return this.getJpaFactory().buildJavaVirtualJoinColumn(this, columnOwner, joinColumn); } - protected abstract JavaReadOnlyJoinColumn.Owner buildJoinColumnOwner(); + protected abstract ReadOnlyJoinColumn.Owner buildJoinColumnOwner(); @Override protected String buildDefaultSchema() { @@ -195,18 +193,18 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere // ********** 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/context/java/AbstractJavaVirtualTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java index 3adde36a20..234f06dadf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.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.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.NameTools; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -22,7 +21,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyTable; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.Schema; import org.eclipse.jpt.jpa.db.SchemaContainer; @@ -317,33 +315,29 @@ public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.buildTableValidator(astRoot).validate(messages, reporter); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.buildTableValidator().validate(messages, reporter); } - protected JptValidator buildTableValidator(CompilationUnit astRoot) { - return this.owner.buildTableValidator(this, buildTextRangeResolver(astRoot)); + protected JptValidator buildTableValidator() { + return this.owner.buildTableValidator(this); } - protected TableTextRangeResolver buildTextRangeResolver(CompilationUnit astRoot) { - return new JavaTableTextRangeResolver(this, astRoot); + public TextRange getValidationTextRange() { + return this.getParent().getValidationTextRange(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getParent().getValidationTextRange(astRoot); + public TextRange getNameTextRange() { + return this.getValidationTextRange(); } - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); + public TextRange getSchemaTextRange() { + return this.getValidationTextRange(); } - public TextRange getSchemaTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); - } - - public TextRange getCatalogTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); + public TextRange getCatalogTextRange() { + return this.getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java index 831c48c2bf..137f21895d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java @@ -9,7 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.dom.FieldDeclaration; import org.eclipse.jdt.core.dom.VariableDeclarationFragment; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; @@ -22,7 +21,6 @@ import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; 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.jpa1.context.PersistentFieldValidator; public class FieldAccessor @@ -63,11 +61,11 @@ public class FieldAccessor return this.resourceField.isFinal(); } - public JptValidator buildAttributeValidator(PersistentAttribute persistentAttribute, PersistentAttributeTextRangeResolver textRangeResolver) { - return new PersistentFieldValidator(persistentAttribute, this, textRangeResolver); + public JptValidator buildAttributeValidator(PersistentAttribute persistentAttribute) { + return new PersistentFieldValidator(persistentAttribute, this); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange() { return this.getResourceAttribute().getNameTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java index 06634f886b..3c77a2b887 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; @@ -248,12 +247,12 @@ public class GenericJavaIdClassReference // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateIdClass(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateIdClass(messages, reporter); } - protected void validateIdClass(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateIdClass(List<IMessage> messages, IReporter reporter) { if (this.isSpecified()) { JavaResourceType jrt = this.getIdClassJavaResourceType(); if (jrt != null) { @@ -265,7 +264,7 @@ public class GenericJavaIdClassReference JpaValidationMessages.TYPE_MAPPING_ID_CLASS_NOT_PUBLIC, new String[] {jrt.getTypeBinding().getQualifiedName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -277,7 +276,7 @@ public class GenericJavaIdClassReference JpaValidationMessages.TYPE_MAPPING_ID_CLASS_NOT_IMPLEMENT_SERIALIZABLE, new String[] {jrt.getTypeBinding().getQualifiedName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -289,7 +288,7 @@ public class GenericJavaIdClassReference JpaValidationMessages.TYPE_MAPPING_ID_CLASS_MISSING_EQUALS_METHOD, new String[] {jrt.getTypeBinding().getQualifiedName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -301,7 +300,7 @@ public class GenericJavaIdClassReference JpaValidationMessages.TYPE_MAPPING_ID_CLASS_MISSING_HASHCODE_METHOD, new String[] {jrt.getTypeBinding().getQualifiedName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -309,13 +308,13 @@ public class GenericJavaIdClassReference } } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getAnnotationTextRange() { IdClassAnnotation annotation = this.getIdClassAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java index efbf688c40..58751beb54 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.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. @@ -191,9 +191,9 @@ public class GenericJavaManyToManyRelationship // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.mappedByStrategy.validate(messages, reporter, astRoot); - this.joinTableStrategy.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.mappedByStrategy.validate(messages, reporter); + this.joinTableStrategy.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java index d2a4bff421..d0c5cc8c05 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.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. @@ -187,9 +187,9 @@ public class GenericJavaManyToOneRelationship // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.joinColumnStrategy.validate(messages, reporter, astRoot); - this.joinTableStrategy.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.joinColumnStrategy.validate(messages, reporter); + this.joinTableStrategy.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java index 15c2bdf220..762088dcc8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java @@ -198,8 +198,8 @@ public class GenericJavaMappedByRelationshipStrategy // ********** 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.mappedByAttribute == null) { return; @@ -216,8 +216,7 @@ public class GenericJavaMappedByRelationshipStrategy messages.add( this.buildMessage( JpaValidationMessages.MAPPING_UNRESOLVED_MAPPED_BY, - new String[] {this.mappedByAttribute}, - astRoot + new String[] {this.mappedByAttribute} ) ); return; @@ -227,8 +226,7 @@ public class GenericJavaMappedByRelationshipStrategy messages.add( this.buildMessage( JpaValidationMessages.MAPPING_INVALID_MAPPED_BY, - new String[] {this.mappedByAttribute}, - astRoot + new String[] {this.mappedByAttribute} ) ); return; @@ -240,14 +238,13 @@ public class GenericJavaMappedByRelationshipStrategy messages.add( this.buildMessage( JpaValidationMessages.MAPPING_MAPPED_BY_ON_BOTH_SIDES, - new String[] {this.mappedByAttribute}, - astRoot + new String[] {this.mappedByAttribute} ) ); } } - protected IMessage buildMessage(String msgID, String[] parms, CompilationUnit astRoot) { + protected IMessage buildMessage(String msgID, String[] parms) { PersistentAttribute attribute = this.getRelationshipMapping().getPersistentAttribute(); String attributeDescription = attribute.isVirtual() ? JpaValidationDescriptionMessages.VIRTUAL_ATTRIBUTE_DESC : @@ -259,13 +256,13 @@ public class GenericJavaMappedByRelationshipStrategy msgID, parms, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange() { TextRange textRange = this.getAnnotationMappedByTextRange(); - return (textRange != null) ? textRange : this.getRelationship().getValidationTextRange(astRoot); + return (textRange != null) ? textRange : this.getRelationship().getValidationTextRange(); } protected TextRange getAnnotationMappedByTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java index b817526c82..c60e214277 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; @@ -24,10 +23,8 @@ import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaMappingJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; -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.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.resource.java.NullJoinColumnAnnotation; @@ -101,7 +98,7 @@ public class GenericJavaMappingJoinColumnRelationshipStrategy } @Override - protected JavaReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -143,15 +140,15 @@ public class GenericJavaMappingJoinColumnRelationshipStrategy return JpaValidationDescriptionMessages.NOT_VALID_FOR_THIS_ENTITY; } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getRelationship().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); } // ********** join column owner ********** protected class JoinColumnOwner - implements JavaReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected JoinColumnOwner() { super(); @@ -203,12 +200,12 @@ public class GenericJavaMappingJoinColumnRelationshipStrategy return GenericJavaMappingJoinColumnRelationshipStrategy.this.getJoinColumnsSize(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return GenericJavaMappingJoinColumnRelationshipStrategy.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return GenericJavaMappingJoinColumnRelationshipStrategy.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new JoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new JoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, this, new EntityTableDescriptionProvider()); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java index e49cb1576d..815f50a3e0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.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. @@ -265,10 +265,10 @@ public class GenericJavaOneToManyRelationship // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.mappedByStrategy.validate(messages, reporter, astRoot); - this.joinTableStrategy.validate(messages, reporter, astRoot); - this.joinColumnStrategy.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.mappedByStrategy.validate(messages, reporter); + this.joinTableStrategy.validate(messages, reporter); + this.joinColumnStrategy.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java index c0335f4611..ae00df91e4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.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. @@ -293,11 +293,11 @@ public class GenericJavaOneToOneRelationship // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.mappedByStrategy.validate(messages, reporter, astRoot); - this.primaryKeyJoinColumnStrategy.validate(messages, reporter, astRoot); - this.joinColumnStrategy.validate(messages, reporter, astRoot); - this.joinTableStrategy.validate(messages, reporter, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.mappedByStrategy.validate(messages, reporter); + this.primaryKeyJoinColumnStrategy.validate(messages, reporter); + this.joinColumnStrategy.validate(messages, reporter); + this.joinTableStrategy.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java index 5a2dfa5b02..8dfc6f76ee 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; @@ -20,11 +19,8 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; -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.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.AssociationOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; @@ -73,7 +69,7 @@ public class GenericJavaOverrideJoinColumnRelationshipStrategy // ********** misc ********** @Override - protected JavaReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -158,15 +154,15 @@ public class GenericJavaOverrideJoinColumnRelationshipStrategy // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getRelationship().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); } // ********** join column owner adapter ********** protected class JoinColumnOwner - implements JavaReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected JoinColumnOwner() { super(); @@ -213,12 +209,12 @@ public class GenericJavaOverrideJoinColumnRelationshipStrategy return GenericJavaOverrideJoinColumnRelationshipStrategy.this.getJoinColumnsSize(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return GenericJavaOverrideJoinColumnRelationshipStrategy.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return GenericJavaOverrideJoinColumnRelationshipStrategy.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return GenericJavaOverrideJoinColumnRelationshipStrategy.this.getRelationship().buildColumnValidator((ReadOnlyBaseColumn) column, this, (TableColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return GenericJavaOverrideJoinColumnRelationshipStrategy.this.getRelationship().buildColumnValidator((ReadOnlyBaseColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java index 4d4c15732a..a208be5d5e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java @@ -21,16 +21,14 @@ import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; +import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumnRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; -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.jpa1.context.OneToOnePrimaryKeyJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; @@ -45,7 +43,7 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy implements JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 { protected final ContextListContainer<JavaPrimaryKeyJoinColumn, PrimaryKeyJoinColumnAnnotation> primaryKeyJoinColumnContainer; - protected final JavaReadOnlyJoinColumn.Owner primaryKeyJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner primaryKeyJoinColumnOwner; public GenericJavaPrimaryKeyJoinColumnRelationshipStrategy(JavaPrimaryKeyJoinColumnRelationship parent) { @@ -145,7 +143,7 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy } } - protected JavaReadOnlyJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { return new PrimaryKeyJoinColumnOwner(); } @@ -258,22 +256,22 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy // ********** 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 (JavaPrimaryKeyJoinColumn pkJoinColumn : this.getPrimaryKeyJoinColumns()) { - pkJoinColumn.validate(messages, reporter, astRoot); + pkJoinColumn.validate(messages, reporter); } } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getRelationship().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); } // ********** join column owner ********** protected class PrimaryKeyJoinColumnOwner - implements JavaReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected PrimaryKeyJoinColumnOwner() { super(); @@ -326,16 +324,16 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy return null; } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.this.getValidationTextRange(); } public int getJoinColumnsSize() { return GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.this.getPrimaryKeyJoinColumnsSize(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new OneToOnePrimaryKeyJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseJoinColumn) column, this, (BaseJoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new OneToOnePrimaryKeyJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseJoinColumn) column, this); } protected JavaRelationshipMapping getRelationshipMapping() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java index bcfe509caa..192cb73136 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -25,15 +24,12 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; 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.JavaVirtualJoinTable; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualRelationship; -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.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -46,7 +42,7 @@ public class GenericJavaVirtualJoinTable { protected final ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> specifiedInverseJoinColumnContainer; - protected final JavaReadOnlyJoinColumn.Owner inverseJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner inverseJoinColumnOwner; protected JavaVirtualJoinColumn defaultInverseJoinColumn; @@ -197,11 +193,11 @@ public class GenericJavaVirtualJoinTable } @Override - protected JavaReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } - protected JavaReadOnlyJoinColumn.Owner buildInverseJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildInverseJoinColumnOwner() { return new InverseJoinColumnOwner(); } @@ -226,9 +222,9 @@ public class GenericJavaVirtualJoinTable // ********** 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() { @@ -242,7 +238,7 @@ public class GenericJavaVirtualJoinTable * just a little common behavior */ protected abstract class AbstractJoinColumnOwner - implements JavaReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected AbstractJoinColumnOwner() { super(); @@ -281,8 +277,8 @@ public class GenericJavaVirtualJoinTable return GenericJavaVirtualJoinTable.this.getName(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return GenericJavaVirtualJoinTable.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return GenericJavaVirtualJoinTable.this.getValidationTextRange(); } protected JavaVirtualRelationship getRelationship() { @@ -322,8 +318,8 @@ public class GenericJavaVirtualJoinTable return GenericJavaVirtualJoinTable.this.getJoinColumnsSize(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return GenericJavaVirtualJoinTable.this.getRelationshipStrategy().buildJoinTableJoinColumnValidator((ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return GenericJavaVirtualJoinTable.this.getRelationshipStrategy().buildJoinTableJoinColumnValidator((ReadOnlyJoinColumn) column, this); } } @@ -358,8 +354,8 @@ public class GenericJavaVirtualJoinTable return GenericJavaVirtualJoinTable.this.getInverseJoinColumnsSize(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return GenericJavaVirtualJoinTable.this.getRelationshipStrategy().buildJoinTableInverseJoinColumnValidator((ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return GenericJavaVirtualJoinTable.this.getRelationshipStrategy().buildJoinTableInverseJoinColumnValidator((ReadOnlyJoinColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEntityTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEntityTextRangeResolver.java deleted file mode 100644 index af74224308..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEntityTextRangeResolver.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.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.JavaEntity; -import org.eclipse.jpt.jpa.core.internal.context.EntityTextRangeResolver; - -public class JavaEntityTextRangeResolver - implements EntityTextRangeResolver -{ - private JavaEntity entity; - - private CompilationUnit astRoot; - - - public JavaEntityTextRangeResolver(JavaEntity entity, CompilationUnit astRoot) { - this.entity = entity; - this.astRoot = astRoot; - } - - - public TextRange getTypeMappingTextRange() { - return this.entity.getValidationTextRange(this.astRoot); - } - - public TextRange getIdClassTextRange() { - return this.entity.getIdClassReference().getValidationTextRange(this.astRoot); - } - - public TextRange getAttributeMappingTextRange(String attributeName) { - return this.entity.getPersistentType(). - getAttributeNamed(attributeName).getMapping().getValidationTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaJoinColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaJoinColumnTextRangeResolver.java deleted file mode 100644 index 5d1f33cb37..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaJoinColumnTextRangeResolver.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.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.JavaReadOnlyJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; - -public class JavaJoinColumnTextRangeResolver - extends AbstractJavaNamedColumnTextRangeResolver<JavaReadOnlyJoinColumn> - implements JoinColumnTextRangeResolver -{ - public JavaJoinColumnTextRangeResolver(JavaReadOnlyJoinColumn column, CompilationUnit astRoot) { - super(column, astRoot); - } - - public TextRange getTableTextRange() { - return this.column.getTableTextRange(this.astRoot); - } - - public TextRange getReferencedColumnNameTextRange() { - return this.column.getReferencedColumnNameTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaMappedSuperclassTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaMappedSuperclassTextRangeResolver.java deleted file mode 100644 index c9319716ea..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaMappedSuperclassTextRangeResolver.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.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.JavaMappedSuperclass; -import org.eclipse.jpt.jpa.core.internal.context.PrimaryKeyTextRangeResolver; - -public class JavaMappedSuperclassTextRangeResolver - implements PrimaryKeyTextRangeResolver -{ - private JavaMappedSuperclass mappedSuperclass; - - private CompilationUnit astRoot; - - - public JavaMappedSuperclassTextRangeResolver( - JavaMappedSuperclass mappedSuperclass, CompilationUnit astRoot) { - - this.mappedSuperclass = mappedSuperclass; - this.astRoot = astRoot; - } - - - public TextRange getTypeMappingTextRange() { - return this.mappedSuperclass.getValidationTextRange(this.astRoot); - } - - public TextRange getIdClassTextRange() { - return this.mappedSuperclass.getIdClassReference().getValidationTextRange(this.astRoot); - } - - public TextRange getAttributeMappingTextRange(String attributeName) { - return this.mappedSuperclass.getPersistentType(). - getAttributeNamed(attributeName).getMapping().getValidationTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNamedColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNamedColumnTextRangeResolver.java deleted file mode 100644 index 6dbf8d9884..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNamedColumnTextRangeResolver.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context.java; - -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; - -public class JavaNamedColumnTextRangeResolver - extends AbstractJavaNamedColumnTextRangeResolver<JavaReadOnlyNamedColumn> -{ - public JavaNamedColumnTextRangeResolver(JavaReadOnlyNamedColumn column, CompilationUnit astRoot) { - super(column, astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java index 1b98aeaff2..66f3bfefeb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.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. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -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.common.utility.internal.iterables.EmptyIterable; @@ -64,15 +63,15 @@ public class JavaNullTypeMapping * We could also add a quick fix for this error. */ @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); messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENCE_UNIT_INVALID_CLASS, new String[] {this.getPersistentType().getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -83,7 +82,7 @@ public class JavaNullTypeMapping } @Override - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getPersistentType().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getPersistentType().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOverrideTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOverrideTextRangeResolver.java deleted file mode 100644 index cc39280cb8..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOverrideTextRangeResolver.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.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.JavaReadOnlyOverride; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; - -public class JavaOverrideTextRangeResolver - implements OverrideTextRangeResolver -{ - protected final JavaReadOnlyOverride javaOverride; - - protected final CompilationUnit astRoot; - - public JavaOverrideTextRangeResolver(JavaReadOnlyOverride javaOverride, CompilationUnit astRoot) { - this.javaOverride = javaOverride; - this.astRoot = astRoot; - } - - public TextRange getNameTextRange() { - return this.javaOverride.getNameTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaPersistentAttributeTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaPersistentAttributeTextRangeResolver.java deleted file mode 100644 index 83fe6f95ca..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaPersistentAttributeTextRangeResolver.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.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.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.PersistentAttributeTextRangeResolver; - -public class JavaPersistentAttributeTextRangeResolver - implements PersistentAttributeTextRangeResolver -{ - private JavaPersistentAttribute javaPersistentAttribute; - - private CompilationUnit astRoot; - - public JavaPersistentAttributeTextRangeResolver(JavaPersistentAttribute javaPersistentAttribute, CompilationUnit astRoot) { - this.javaPersistentAttribute = javaPersistentAttribute; - this.astRoot = astRoot; - } - - public TextRange getAttributeTextRange() { - return this.javaPersistentAttribute.getValidationTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaPrimaryKeyJoinColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaPrimaryKeyJoinColumnTextRangeResolver.java deleted file mode 100644 index 5c48c75400..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaPrimaryKeyJoinColumnTextRangeResolver.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.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.JavaPrimaryKeyJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; - -public class JavaPrimaryKeyJoinColumnTextRangeResolver - extends AbstractJavaNamedColumnTextRangeResolver<JavaPrimaryKeyJoinColumn> - implements BaseJoinColumnTextRangeResolver -{ - - public JavaPrimaryKeyJoinColumnTextRangeResolver(JavaPrimaryKeyJoinColumn column, CompilationUnit astRoot) { - super(column, astRoot); - } - - public TextRange getReferencedColumnNameTextRange() { - return this.column.getReferencedColumnNameTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTableColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTableColumnTextRangeResolver.java deleted file mode 100644 index 4b51f79094..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTableColumnTextRangeResolver.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.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.JavaReadOnlyTableColumn; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; - -public class JavaTableColumnTextRangeResolver - extends AbstractJavaNamedColumnTextRangeResolver<JavaReadOnlyTableColumn> - implements TableColumnTextRangeResolver -{ - public JavaTableColumnTextRangeResolver(JavaReadOnlyTableColumn column, CompilationUnit astRoot) { - super(column, astRoot); - } - - public TextRange getTableTextRange() { - return this.column.getTableTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTableTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTableTextRangeResolver.java deleted file mode 100644 index 8d42bc6983..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTableTextRangeResolver.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.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.JavaReadOnlyTable; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; - -public class JavaTableTextRangeResolver - implements TableTextRangeResolver -{ - protected final JavaReadOnlyTable table; - - protected final CompilationUnit astRoot; - - - public JavaTableTextRangeResolver(JavaReadOnlyTable table, CompilationUnit astRoot) { - super(); - this.table = table; - this.astRoot = astRoot; - } - - public TextRange getNameTextRange() { - return this.table.getNameTextRange(this.astRoot); - } - - public TextRange getCatalogTextRange() { - return this.table.getCatalogTextRange(this.astRoot); - } - - public TextRange getSchemaTextRange() { - return this.table.getSchemaTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTypeMappingTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTypeMappingTextRangeResolver.java deleted file mode 100644 index 174e6b2b7a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTypeMappingTextRangeResolver.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.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.JavaTypeMapping; -import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver; - -public class JavaTypeMappingTextRangeResolver - implements TypeMappingTextRangeResolver -{ - private JavaTypeMapping typeMapping; - - private CompilationUnit astRoot; - - public JavaTypeMappingTextRangeResolver(JavaTypeMapping typeMapping, CompilationUnit astRoot) { - this.typeMapping = typeMapping; - this.astRoot = astRoot; - } - - public TextRange getTypeMappingTextRange() { - return this.typeMapping.getValidationTextRange(this.astRoot); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java index c4186584fd..cb415a6c5c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java @@ -9,7 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; @@ -23,7 +22,6 @@ import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; 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.jpa1.context.PersistentPropertyValidator; public class PropertyAccessor @@ -90,11 +88,11 @@ public class PropertyAccessor } - public JptValidator buildAttributeValidator(PersistentAttribute persistentAttribute, PersistentAttributeTextRangeResolver textRangeResolver) { - return new PersistentPropertyValidator(persistentAttribute, this, textRangeResolver); + public JptValidator buildAttributeValidator(PersistentAttribute persistentAttribute) { + return new PersistentPropertyValidator(persistentAttribute, this); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange() { return this.getResourceAttribute().getNameTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java index 5c215f88d2..272f7c1f16 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java @@ -13,14 +13,12 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmBaseColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseColumn; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.XmlBaseColumn; /** * <code>orm.xml</code> column or join column */ -public abstract class AbstractOrmBaseColumn<X extends XmlBaseColumn, O extends OrmReadOnlyBaseColumn.Owner> +public abstract class AbstractOrmBaseColumn<X extends XmlBaseColumn, O extends ReadOnlyBaseColumn.Owner> extends AbstractOrmNamedColumn<X, O> implements OrmBaseColumn { @@ -294,11 +292,6 @@ public abstract class AbstractOrmBaseColumn<X extends XmlBaseColumn, O extends O X xmlColumn = this.getXmlColumn(); return (xmlColumn == null) ? null : xmlColumn.getTableTextRange(); } - - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmTableColumnTextRangeResolver(this); - } // ********** completion proposals ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java index 7e641415e8..751246c4d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java @@ -34,8 +34,6 @@ 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.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.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AttributeOverrideColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AttributeOverrideValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EmbeddableOverrideDescriptionProvider; @@ -300,12 +298,12 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd return this.getTypeMapping().getPrimaryTableName(); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new AttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new EmbeddableOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new AttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new EmbeddableOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return new AttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner) { + return new AttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, new EntityTableDescriptionProvider()); } public TextRange getValidationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java index 8e0b48cf95..54edef49d7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java @@ -27,8 +27,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmConverter; @@ -365,8 +363,8 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic> this.converter.validate(messages, reporter); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, (TableColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, new EntityTableDescriptionProvider()); } // ********** completion proposals ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java index a94e4ce07f..4690e3b2ab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java @@ -86,22 +86,14 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmSecondaryTable; import org.eclipse.jpt.jpa.core.context.orm.OrmTable; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualSecondaryTable; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.ContextContainerTools; -import org.eclipse.jpt.jpa.core.internal.context.EntityTextRangeResolver; -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.context.OverrideTextRangeResolver; -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.TypeMappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideInverseJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideJoinColumnValidator; @@ -493,8 +485,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> protected static class TableOwner implements ReadOnlyTable.Owner { - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return new TableValidator(table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return new TableValidator(table); } } @@ -759,8 +751,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> protected static class SecondaryTableOwner implements ReadOnlyTable.Owner { - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return new SecondaryTableValidator((ReadOnlySecondaryTable) table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return new SecondaryTableValidator((ReadOnlySecondaryTable) table); } } @@ -1797,15 +1789,10 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> } protected JptValidator buildPrimaryKeyValidator() { - return new GenericEntityPrimaryKeyValidator(this, this.buildTextRangeResolver()); + return new GenericEntityPrimaryKeyValidator(this); // TODO - JPA 2.0 validation } - @Override - protected EntityTextRangeResolver buildTextRangeResolver() { - return new OrmEntityTextRangeResolver(this); - } - protected void validateTable(List<IMessage> messages, IReporter reporter) { if (this.isAbstractTablePerClass()) { if (this.resourceTableIsSpecified()) { @@ -2090,12 +2077,12 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> return AbstractOrmEntity.this.xmlTypeMapping.getAttributeOverrides(); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new AttributeOverrideValidator((ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new MappedSuperclassOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new AttributeOverrideValidator((ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new MappedSuperclassOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return new AttributeOverrideColumnValidator((ReadOnlyAttributeOverride) override, column, textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner) { + return new AttributeOverrideColumnValidator((ReadOnlyAttributeOverride) override, column, new EntityTableDescriptionProvider()); } public ReadOnlyColumn resolveOverriddenColumn(String attributeName) { @@ -2134,24 +2121,24 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> AbstractOrmEntity.this.resolveOverriddenRelationshipForAssociationOverride(attributeName); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new AssociationOverrideValidator((ReadOnlyAssociationOverride) override, (AssociationOverrideContainer) container, textRangeResolver, new MappedSuperclassOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new AssociationOverrideValidator((ReadOnlyAssociationOverride) override, (AssociationOverrideContainer) container, new MappedSuperclassOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinColumnValidator((ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) owner, (JoinColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner) { + return new AssociationOverrideJoinColumnValidator((ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) owner, new EntityTableDescriptionProvider()); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinColumnValidator(override, column, owner, textRangeResolver, new JoinTableTableDescriptionProvider()); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return new AssociationOverrideJoinColumnValidator(override, column, owner, new JoinTableTableDescriptionProvider()); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideInverseJoinColumnValidator(override, column, owner, textRangeResolver, new JoinTableTableDescriptionProvider()); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return new AssociationOverrideInverseJoinColumnValidator(override, column, owner, new JoinTableTableDescriptionProvider()); } - public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable t, TableTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinTableValidator(override, (ReadOnlyJoinTable) t, textRangeResolver); + public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable t) { + return new AssociationOverrideJoinTableValidator(override, (ReadOnlyJoinTable) t); } } @@ -2182,7 +2169,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> protected class PrimaryKeyJoinColumnOwner extends NamedColumnOwner - implements OrmReadOnlyBaseJoinColumn.Owner + implements ReadOnlyBaseJoinColumn.Owner { public org.eclipse.jpt.jpa.db.Table getReferencedColumnDbTable() { Entity parentEntity = AbstractOrmEntity.this.getParentEntity(); @@ -2201,8 +2188,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> return (parentEntity == null) ? AbstractOrmEntity.this.getPrimaryKeyColumnName() : parentEntity.getPrimaryKeyColumnName(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new EntityPrimaryKeyJoinColumnValidator((ReadOnlyBaseJoinColumn) column, this, (BaseJoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new EntityPrimaryKeyJoinColumnValidator((ReadOnlyBaseJoinColumn) column, this); } } @@ -2258,8 +2245,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> this.isTablePerClass() ? null : ReadOnlyNamedDiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE; } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new DiscriminatorColumnValidator(column, textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new DiscriminatorColumnValidator(column); } public XmlDiscriminatorColumn getXmlColumn() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java index 4fd92d485b..b9e8cc7918 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java @@ -29,8 +29,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmConverter; @@ -446,8 +444,8 @@ public abstract class AbstractOrmIdMapping<X extends XmlId> return JpaValidationDescriptionMessages.ATTRIBUTE_DESC; } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, (TableColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, new EntityTableDescriptionProvider()); } // ********** completion proposals ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java index 043b819a69..f294d1322a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java @@ -23,7 +23,6 @@ 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.OrmJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn; import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumnContainer; @@ -36,7 +35,7 @@ public abstract class AbstractOrmJoinColumnRelationshipStrategy implements OrmJoinColumnRelationshipStrategy { protected final ContextListContainer<OrmJoinColumn, XmlJoinColumn> specifiedJoinColumnContainer; - protected final OrmReadOnlyJoinColumn.Owner joinColumnOwner; + protected final ReadOnlyJoinColumn.Owner joinColumnOwner; protected OrmJoinColumn defaultJoinColumn; @@ -185,7 +184,7 @@ public abstract class AbstractOrmJoinColumnRelationshipStrategy } } - 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/context/orm/AbstractOrmMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java index 94da3f2d40..6bc760edc2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.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. @@ -24,7 +24,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmIdClassReference; import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; 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.jpa1.context.GenericMappedSuperclassPrimaryKeyValidator; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; import org.eclipse.jpt.jpa.core.resource.orm.XmlIdClassContainer; @@ -211,12 +210,7 @@ public abstract class AbstractOrmMappedSuperclass<X extends XmlMappedSuperclass> } protected JptValidator buildPrimaryKeyValidator() { - return new GenericMappedSuperclassPrimaryKeyValidator(this, this.buildTextRangeResolver()); + return new GenericMappedSuperclassPrimaryKeyValidator(this); // TODO - JPA 2.0 validation } - - @Override - protected PrimaryKeyTextRangeResolver buildTextRangeResolver() { - return new OrmMappedSuperclassTextRangeResolver(this); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java index 8cc63ff444..0ccc534292 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java @@ -52,16 +52,11 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmMultiRelationshipMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOrderable; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; -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.context.OverrideTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EmbeddableOverrideDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.MapKeyAttributeOverrideColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.MapKeyAttributeOverrideValidator; @@ -116,7 +111,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM protected final OrmAttributeOverrideContainer mapKeyAttributeOverrideContainer; protected final ContextListContainer<OrmJoinColumn, XmlJoinColumn> specifiedMapKeyJoinColumnContainer; - protected final OrmReadOnlyJoinColumn.Owner mapKeyJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner mapKeyJoinColumnOwner; protected OrmJoinColumn defaultMapKeyJoinColumn; @@ -802,7 +797,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM return this.getContextNodeFactory().buildOrmJoinColumn(this, this.mapKeyJoinColumnOwner, xmlJoinColumn); } - protected OrmReadOnlyJoinColumn.Owner buildMapKeyJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildMapKeyJoinColumnOwner() { return new MapKeyJoinColumnOwner(); } @@ -1173,8 +1168,8 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM AbstractOrmMultiRelationshipMapping.this.removeXmlMapKeyColumn(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new MapKeyColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, (TableColumnTextRangeResolver) textRangeResolver, new RelationshipStrategyTableDescriptionProvider(this.getRelationshipStrategy())); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new MapKeyColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, new RelationshipStrategyTableDescriptionProvider(this.getRelationshipStrategy())); } } @@ -1218,12 +1213,12 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new MapKeyAttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new EmbeddableOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new MapKeyAttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new EmbeddableOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner, TableColumnTextRangeResolver textRangeResolver) { - return new MapKeyAttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, textRangeResolver, new RelationshipStrategyTableDescriptionProvider(this.getRelationshipStrategy())); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner owner) { + return new MapKeyAttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, new RelationshipStrategyTableDescriptionProvider(this.getRelationshipStrategy())); } } @@ -1231,7 +1226,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM // ********** map key join column owner ********** protected class MapKeyJoinColumnOwner - implements OrmReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected MapKeyJoinColumnOwner() { super(); @@ -1285,12 +1280,11 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM return AbstractOrmMultiRelationshipMapping.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { return new MapKeyJoinColumnValidator( this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, - this, - (JoinColumnTextRangeResolver) textRangeResolver, + this, new RelationshipStrategyTableDescriptionProvider(getRelationship().getStrategy())); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java index 99df4a66f6..cca2a36030 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java @@ -15,9 +15,7 @@ import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmNamedColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlNamedColumn; import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedColumn; import org.eclipse.jpt.jpa.db.Column; @@ -43,7 +41,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * Typically, a column belonging to a list of columns will directly hold its XML * column; since the context column only exists if the XML column exists. */ -public abstract class AbstractOrmNamedColumn<X extends XmlNamedColumn, O extends OrmReadOnlyNamedColumn.Owner> +public abstract class AbstractOrmNamedColumn<X extends XmlNamedColumn, O extends ReadOnlyNamedColumn.Owner> extends AbstractOrmXmlContextNode implements OrmNamedColumn { @@ -227,11 +225,7 @@ public abstract class AbstractOrmNamedColumn<X extends XmlNamedColumn, O extends } protected JptValidator buildColumnValidator() { - return this.owner.buildColumnValidator(this, this.buildTextRangeResolver()); - } - - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmNamedColumnTextRangeResolver(this); + return this.owner.buildColumnValidator(this); } public TextRange getValidationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumnTextRangeResolver.java deleted file mode 100644 index 73f81db31f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumnTextRangeResolver.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; - -public abstract class AbstractOrmNamedColumnTextRangeResolver<C extends OrmReadOnlyNamedColumn> - implements NamedColumnTextRangeResolver -{ - protected final C column; - - - protected AbstractOrmNamedColumnTextRangeResolver(C column) { - super(); - this.column = column; - } - - public TextRange getNameTextRange() { - return this.column.getNameTextRange(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java index 300920b453..2dd10bb563 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java @@ -23,7 +23,6 @@ import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmTable; import org.eclipse.jpt.jpa.core.context.orm.OrmUniqueConstraint; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlTable; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlUniqueConstraint; @@ -426,11 +425,7 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable> } protected JptValidator buildTableValidator() { - return this.owner.buildTableValidator(this, this.buildTextRangeResolver()); - } - - protected TableTextRangeResolver buildTextRangeResolver() { - return new OrmTableTextRangeResolver(this); + return this.owner.buildTableValidator(this); } public TextRange getValidationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java index ffb0353267..4c7d6324d6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java @@ -39,7 +39,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; 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.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.GenericTypeMappingValidator; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; @@ -583,11 +582,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> } protected JptValidator buildTypeMappingValidator() { - return new GenericTypeMappingValidator(this, this.getJavaResourceType(), this.buildTextRangeResolver()); - } - - protected TypeMappingTextRangeResolver buildTextRangeResolver() { - return new OrmTypeMappingTextRangeResolver(this); + return new GenericTypeMappingValidator(this, this.getJavaResourceType()); } public boolean validatesAgainstDatabase() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java index 91c75ad2a7..6d8a4248e3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java @@ -25,8 +25,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmConverter; @@ -288,8 +286,8 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion> } } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, (TableColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn col) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) col, new EntityTableDescriptionProvider()); } // ********** completion proposals ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java index e362a7160e..33f7ca4688 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.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,9 +14,8 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.VirtualBaseColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseColumn; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; -public abstract class AbstractOrmVirtualBaseColumn<O extends OrmReadOnlyBaseColumn.Owner, C extends ReadOnlyBaseColumn> +public abstract class AbstractOrmVirtualBaseColumn<O extends ReadOnlyBaseColumn.Owner, C extends ReadOnlyBaseColumn> extends AbstractOrmVirtualNamedColumn<O, C> implements VirtualBaseColumn, OrmReadOnlyBaseColumn { @@ -255,9 +254,4 @@ public abstract class AbstractOrmVirtualBaseColumn<O extends OrmReadOnlyBaseColu public TextRange getTableTextRange() { return this.getValidationTextRange(); } - - @Override - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmTableColumnTextRangeResolver(this); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java index 93ba7dc0a4..9ad6e61483 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.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. @@ -16,7 +16,6 @@ import org.eclipse.jpt.jpa.core.context.VirtualNamedColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -148,11 +147,7 @@ public abstract class AbstractOrmVirtualNamedColumn<O extends ReadOnlyNamedColum } protected JptValidator buildColumnValidator() { - return this.owner.buildColumnValidator(this, this.buildTextRangeResolver()); - } - - protected NamedColumnTextRangeResolver buildTextRangeResolver() { - return new OrmNamedColumnTextRangeResolver(this); + return this.owner.buildColumnValidator(this); } public TextRange getValidationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedDiscriminatorColumn.java index 2ab7e94013..89f42a85df 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedDiscriminatorColumn.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. @@ -15,7 +15,7 @@ import org.eclipse.jpt.jpa.core.context.VirtualNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedDiscriminatorColumn; -public abstract class AbstractOrmVirtualNamedDiscriminatorColumn<O extends OrmReadOnlyNamedDiscriminatorColumn.Owner, C extends ReadOnlyNamedDiscriminatorColumn> +public abstract class AbstractOrmVirtualNamedDiscriminatorColumn<O extends ReadOnlyNamedDiscriminatorColumn.Owner, C extends ReadOnlyNamedDiscriminatorColumn> extends AbstractOrmVirtualNamedColumn<O, C> implements VirtualNamedDiscriminatorColumn, OrmReadOnlyNamedDiscriminatorColumn { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java index 54bb896f70..ce598a0456 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.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. @@ -18,7 +18,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyReferenceTable; import org.eclipse.jpt.jpa.core.context.VirtualReferenceTable; 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.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -28,7 +27,7 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen implements VirtualReferenceTable { protected final ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; - protected final OrmReadOnlyJoinColumn.Owner joinColumnOwner; + protected final ReadOnlyJoinColumn.Owner joinColumnOwner; protected OrmVirtualJoinColumn defaultJoinColumn; @@ -173,11 +172,11 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen return this.buildJoinColumn(this.joinColumnOwner, joinColumn); } - protected OrmVirtualJoinColumn buildJoinColumn(OrmReadOnlyJoinColumn.Owner columnOwner, ReadOnlyJoinColumn joinColumn) { + protected OrmVirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn.Owner columnOwner, ReadOnlyJoinColumn joinColumn) { return this.getContextNodeFactory().buildOrmVirtualJoinColumn(this, columnOwner, joinColumn); } - protected abstract OrmReadOnlyJoinColumn.Owner buildJoinColumnOwner(); + protected abstract ReadOnlyJoinColumn.Owner buildJoinColumnOwner(); @Override protected String buildDefaultSchema() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java index 6024883875..2330cb9d7e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.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. @@ -21,7 +21,6 @@ import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyTable; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.Schema; import org.eclipse.jpt.jpa.db.SchemaContainer; @@ -322,11 +321,7 @@ public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> } protected JptValidator buildTableValidator() { - return this.owner.buildTableValidator(this, this.buildTextRangeResolver()); - } - - protected TableTextRangeResolver buildTextRangeResolver() { - return new OrmTableTextRangeResolver(this); + return this.owner.buildTableValidator(this); } public TextRange getValidationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java index bb750eb8f8..5d73b1af9b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java @@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; 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.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; @@ -59,8 +60,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmQuery; import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmQueryHint; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmSecondaryTable; import org.eclipse.jpt.jpa.core.context.orm.OrmSequenceGenerator; @@ -220,11 +219,11 @@ public abstract class AbstractOrmXmlContextNodeFactory return new GenericOrmVirtualSecondaryTable(parent, owner, javaSecondaryTable); } - public OrmPrimaryKeyJoinColumn buildOrmPrimaryKeyJoinColumn(XmlContextNode parent, OrmReadOnlyBaseJoinColumn.Owner owner, XmlPrimaryKeyJoinColumn resourcePrimaryKeyJoinColumn) { + public OrmPrimaryKeyJoinColumn buildOrmPrimaryKeyJoinColumn(XmlContextNode parent, ReadOnlyBaseJoinColumn.Owner owner, XmlPrimaryKeyJoinColumn resourcePrimaryKeyJoinColumn) { return new GenericOrmPrimaryKeyJoinColumn(parent, owner, resourcePrimaryKeyJoinColumn); } - public OrmVirtualPrimaryKeyJoinColumn buildOrmVirtualPrimaryKeyJoinColumn(XmlContextNode parent, OrmReadOnlyBaseJoinColumn.Owner owner, JavaPrimaryKeyJoinColumn javaPrimaryKeyJoinColumn) { + public OrmVirtualPrimaryKeyJoinColumn buildOrmVirtualPrimaryKeyJoinColumn(XmlContextNode parent, ReadOnlyBaseJoinColumn.Owner owner, JavaPrimaryKeyJoinColumn javaPrimaryKeyJoinColumn) { return new GenericOrmVirtualPrimaryKeyJoinColumn(parent, owner, javaPrimaryKeyJoinColumn); } @@ -236,11 +235,11 @@ public abstract class AbstractOrmXmlContextNodeFactory return new GenericOrmVirtualJoinTable(parent, owner, overriddenTable); } - public OrmJoinColumn buildOrmJoinColumn(XmlContextNode parent, OrmReadOnlyJoinColumn.Owner owner, XmlJoinColumn xmlJoinColumn) { + public OrmJoinColumn buildOrmJoinColumn(XmlContextNode parent, ReadOnlyJoinColumn.Owner owner, XmlJoinColumn xmlJoinColumn) { return new GenericOrmJoinColumn(parent, owner, xmlJoinColumn); } - public OrmVirtualJoinColumn buildOrmVirtualJoinColumn(XmlContextNode parent, OrmReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { + public OrmVirtualJoinColumn buildOrmVirtualJoinColumn(XmlContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { return new GenericOrmVirtualJoinColumn(parent, owner, overriddenColumn); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java index 29557dd400..1543de4494 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java @@ -18,11 +18,8 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmMappingJoinColumnRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; -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.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; @@ -51,7 +48,7 @@ public class GenericOrmMappingJoinColumnRelationshipStrategy @Override - protected OrmReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -101,7 +98,7 @@ public class GenericOrmMappingJoinColumnRelationshipStrategy // ********** join column owner ********** protected class JoinColumnOwner - implements OrmReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected JoinColumnOwner() { super(); @@ -154,8 +151,8 @@ public class GenericOrmMappingJoinColumnRelationshipStrategy return GenericOrmMappingJoinColumnRelationshipStrategy.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new JoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver, new EntityTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new JoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, this, new EntityTableDescriptionProvider()); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinTableRelationshipStrategy.java index 38e575d0c0..bab7e57557 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinTableRelationshipStrategy.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. @@ -16,9 +16,7 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.orm.OrmMappingJoinTableRelationship; -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.jpa1.context.InverseJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinTableTableDescriptionProvider; @@ -58,15 +56,15 @@ public class GenericOrmMappingJoinTableRelationshipStrategy return getRelationshipMapping().getPersistentAttribute(); } - 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()); } - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return new JoinTableValidator(this.getPersistentAttribute(), (ReadOnlyJoinTable) table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return new JoinTableValidator(this.getPersistentAttribute(), (ReadOnlyJoinTable) table); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java index a5e10e902c..036df5bda3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java @@ -18,11 +18,8 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOverrideRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; -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.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.db.Table; public class GenericOrmOverrideJoinColumnRelationshipStrategy @@ -33,7 +30,7 @@ public class GenericOrmOverrideJoinColumnRelationshipStrategy } @Override - protected OrmReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -123,7 +120,7 @@ public class GenericOrmOverrideJoinColumnRelationshipStrategy // ********** join column owner ********** protected class JoinColumnOwner - implements OrmReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected JoinColumnOwner() { super(); @@ -174,8 +171,8 @@ public class GenericOrmOverrideJoinColumnRelationshipStrategy return GenericOrmOverrideJoinColumnRelationshipStrategy.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return GenericOrmOverrideJoinColumnRelationshipStrategy.this.getRelationship().buildColumnValidator((ReadOnlyBaseColumn) column, this, (TableColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return GenericOrmOverrideJoinColumnRelationshipStrategy.this.getRelationship().buildColumnValidator((ReadOnlyBaseColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java index 053052e25d..e94602d64d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java @@ -17,16 +17,14 @@ import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; +import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumnRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; -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.jpa1.context.OneToOnePrimaryKeyJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; @@ -43,7 +41,7 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy implements OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 { protected final ContextListContainer<OrmPrimaryKeyJoinColumn, XmlPrimaryKeyJoinColumn> primaryKeyJoinColumnContainer; - protected final OrmReadOnlyJoinColumn.Owner primaryKeyJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner primaryKeyJoinColumnOwner; public GenericOrmPrimaryKeyJoinColumnRelationshipStrategy(OrmPrimaryKeyJoinColumnRelationship parent) { @@ -149,7 +147,7 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy } } - protected OrmReadOnlyJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { return new PrimaryKeyJoinColumnOwner(); } @@ -258,7 +256,7 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy // ********** join column owner ********** protected class PrimaryKeyJoinColumnOwner - implements OrmReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected PrimaryKeyJoinColumnOwner() { super(); @@ -316,8 +314,8 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy return GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new OneToOnePrimaryKeyJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseJoinColumn) column, this, (BaseJoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new OneToOnePrimaryKeyJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseJoinColumn) column, this); } protected RelationshipMapping getRelationshipMapping() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java index 7febe03324..55bf49a7f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java @@ -24,15 +24,12 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualRelationship; -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.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -45,7 +42,7 @@ public class GenericOrmVirtualJoinTable { protected final ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> specifiedInverseJoinColumnContainer; - protected final OrmReadOnlyJoinColumn.Owner inverseJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner inverseJoinColumnOwner; protected OrmVirtualJoinColumn defaultInverseJoinColumn; @@ -196,11 +193,11 @@ public class GenericOrmVirtualJoinTable } @Override - protected OrmReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } - protected OrmReadOnlyJoinColumn.Owner buildInverseJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildInverseJoinColumnOwner() { return new InverseJoinColumnOwner(); } @@ -241,7 +238,7 @@ public class GenericOrmVirtualJoinTable * just a little common behavior */ protected abstract class AbstractJoinColumnOwner - implements OrmReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected AbstractJoinColumnOwner() { super(); @@ -331,8 +328,8 @@ public class GenericOrmVirtualJoinTable return GenericOrmVirtualJoinTable.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); } } @@ -377,8 +374,8 @@ public class GenericOrmVirtualJoinTable return GenericOrmVirtualJoinTable.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/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java index fb73c1b27f..737e39d26b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java @@ -25,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.orm.OrmReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverrideRelationship; -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.MappingTools; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; 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; @@ -42,7 +39,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy implements OrmVirtualJoinColumnRelationshipStrategy { protected final ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; - protected final OrmReadOnlyJoinColumn.Owner joinColumnOwner; + protected final ReadOnlyJoinColumn.Owner joinColumnOwner; protected OrmVirtualJoinColumn defaultJoinColumn; @@ -132,7 +129,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy } } - protected OrmReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -315,7 +312,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy // ********** join column owner ********** protected class JoinColumnOwner - implements OrmReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected JoinColumnOwner() { super(); @@ -361,8 +358,8 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy return GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.this.getRelationship().buildColumnValidator((ReadOnlyBaseColumn) column, this, (TableColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.this.getRelationship().buildColumnValidator((ReadOnlyBaseColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualSecondaryTable.java index dd57b2b8ae..326d102d35 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualSecondaryTable.java @@ -20,12 +20,9 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualSecondaryTable; -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.jpa1.context.SecondaryTablePrimaryKeyJoinColumnValidator; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -40,7 +37,7 @@ public class GenericOrmVirtualSecondaryTable { protected final ContextListContainer<OrmVirtualPrimaryKeyJoinColumn, JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumnContainer; - protected final OrmReadOnlyBaseJoinColumn.Owner primaryKeyJoinColumnOwner; + protected final ReadOnlyBaseJoinColumn.Owner primaryKeyJoinColumnOwner; protected OrmVirtualPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn; @@ -191,7 +188,7 @@ public class GenericOrmVirtualSecondaryTable return true; } - protected OrmReadOnlyBaseJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { + protected ReadOnlyBaseJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { return new PrimaryKeyJoinColumnOwner(); } @@ -243,7 +240,7 @@ public class GenericOrmVirtualSecondaryTable // ********** primary key join column owner ********** protected class PrimaryKeyJoinColumnOwner - implements OrmReadOnlyBaseJoinColumn.Owner + implements ReadOnlyBaseJoinColumn.Owner { protected OrmEntity getEntity() { return GenericOrmVirtualSecondaryTable.this.getEntity(); @@ -279,8 +276,8 @@ public class GenericOrmVirtualSecondaryTable return GenericOrmVirtualSecondaryTable.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new SecondaryTablePrimaryKeyJoinColumnValidator(GenericOrmVirtualSecondaryTable.this, (ReadOnlyBaseJoinColumn) column, this, (BaseJoinColumnTextRangeResolver) textRangeResolver); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new SecondaryTablePrimaryKeyJoinColumnValidator(GenericOrmVirtualSecondaryTable.this, (ReadOnlyBaseJoinColumn) column, this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/NullOrmJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/NullOrmJoinTableRelationshipStrategy.java index 9902535c1d..06a161c6b2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/NullOrmJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/NullOrmJoinTableRelationshipStrategy.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.ReadOnlyJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationship; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinTableRelationshipStrategy2_0; @@ -59,11 +58,11 @@ public class NullOrmJoinTableRelationshipStrategy return this.getRelationship().getValidationTextRange(); } - 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/context/orm/OrmEntityTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEntityTextRangeResolver.java deleted file mode 100644 index af7d7c03c4..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEntityTextRangeResolver.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.EntityTextRangeResolver; - -public class OrmEntityTextRangeResolver - implements EntityTextRangeResolver -{ - private OrmEntity entity; - - - public OrmEntityTextRangeResolver(OrmEntity entity) { - this.entity = entity; - } - - - public TextRange getTypeMappingTextRange() { - return this.entity.getValidationTextRange(); - } - - public TextRange getIdClassTextRange() { - return this.entity.getIdClassReference().getValidationTextRange(); - } - - public TextRange getAttributeMappingTextRange(String attributeName) { - return this.getAttributeNamed(attributeName).getValidationTextRange(); - } - - protected OrmReadOnlyPersistentAttribute getAttributeNamed(String attributeName) { - return this.entity.getPersistentType().getAttributeNamed(attributeName); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmJoinColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmJoinColumnTextRangeResolver.java deleted file mode 100644 index 269baad85c..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmJoinColumnTextRangeResolver.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.JoinColumnTextRangeResolver; - -public class OrmJoinColumnTextRangeResolver - extends AbstractOrmNamedColumnTextRangeResolver<OrmReadOnlyJoinColumn> - implements JoinColumnTextRangeResolver -{ - - public OrmJoinColumnTextRangeResolver(OrmReadOnlyJoinColumn column) { - super(column); - } - - public TextRange getTableTextRange() { - return this.column.getTableTextRange(); - } - - public TextRange getReferencedColumnNameTextRange() { - return this.column.getReferencedColumnNameTextRange(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmMappedSuperclassTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmMappedSuperclassTextRangeResolver.java deleted file mode 100644 index 03c139a93e..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmMappedSuperclassTextRangeResolver.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.PrimaryKeyTextRangeResolver; - -public class OrmMappedSuperclassTextRangeResolver - implements PrimaryKeyTextRangeResolver -{ - private OrmMappedSuperclass mappedSuperclass; - - - public OrmMappedSuperclassTextRangeResolver(OrmMappedSuperclass mappedSuperclass) { - this.mappedSuperclass = mappedSuperclass; - } - - - public TextRange getTypeMappingTextRange() { - return this.mappedSuperclass.getValidationTextRange(); - } - - public TextRange getIdClassTextRange() { - return this.mappedSuperclass.getIdClassReference().getValidationTextRange(); - } - - public TextRange getAttributeMappingTextRange(String attributeName) { - return this.getAttributeNamed(attributeName).getValidationTextRange(); - } - - protected OrmReadOnlyPersistentAttribute getAttributeNamed(String attributeName) { - return this.mappedSuperclass.getPersistentType().getAttributeNamed(attributeName); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmNamedColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmNamedColumnTextRangeResolver.java deleted file mode 100644 index 0b1cd614c1..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmNamedColumnTextRangeResolver.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn; - -public class OrmNamedColumnTextRangeResolver - extends AbstractOrmNamedColumnTextRangeResolver<OrmReadOnlyNamedColumn> -{ - public OrmNamedColumnTextRangeResolver(OrmReadOnlyNamedColumn column) { - super(column); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOverrideTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOverrideTextRangeResolver.java deleted file mode 100644 index 5f90af8a8d..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOverrideTextRangeResolver.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyOverride; -import org.eclipse.jpt.jpa.core.internal.context.OverrideTextRangeResolver; - -public class OrmOverrideTextRangeResolver - implements OverrideTextRangeResolver -{ - protected final OrmReadOnlyOverride ormOverride; - - public OrmOverrideTextRangeResolver(OrmReadOnlyOverride ormOverride) { - this.ormOverride = ormOverride; - } - - public TextRange getNameTextRange() { - return this.ormOverride.getNameTextRange(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmPersistentAttributeTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmPersistentAttributeTextRangeResolver.java deleted file mode 100644 index fe9b812e24..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmPersistentAttributeTextRangeResolver.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.PersistentAttributeTextRangeResolver; - -public class OrmPersistentAttributeTextRangeResolver - implements PersistentAttributeTextRangeResolver -{ - private OrmPersistentAttribute persistentAttribute; - - public OrmPersistentAttributeTextRangeResolver(OrmPersistentAttribute persistentAttribute) { - this.persistentAttribute = persistentAttribute; - } - - public TextRange getAttributeTextRange() { - return this.persistentAttribute.getValidationTextRange(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmPrimaryKeyJoinColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmPrimaryKeyJoinColumnTextRangeResolver.java deleted file mode 100644 index 385aef2de5..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmPrimaryKeyJoinColumnTextRangeResolver.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseJoinColumn; -import org.eclipse.jpt.jpa.core.internal.context.BaseJoinColumnTextRangeResolver; - -public class OrmPrimaryKeyJoinColumnTextRangeResolver - extends AbstractOrmNamedColumnTextRangeResolver<OrmReadOnlyBaseJoinColumn> - implements BaseJoinColumnTextRangeResolver -{ - - public OrmPrimaryKeyJoinColumnTextRangeResolver(OrmReadOnlyBaseJoinColumn column) { - super(column); - } - - public TextRange getReferencedColumnNameTextRange() { - return this.column.getReferencedColumnNameTextRange(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTableColumnTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTableColumnTextRangeResolver.java deleted file mode 100644 index dc950eb995..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTableColumnTextRangeResolver.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyTableColumn; -import org.eclipse.jpt.jpa.core.internal.context.TableColumnTextRangeResolver; - -public class OrmTableColumnTextRangeResolver - extends AbstractOrmNamedColumnTextRangeResolver<OrmReadOnlyTableColumn> - implements TableColumnTextRangeResolver -{ - - public OrmTableColumnTextRangeResolver(OrmReadOnlyTableColumn column) { - super(column); - } - - public TextRange getTableTextRange() { - return this.column.getTableTextRange(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTableTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTableTextRangeResolver.java deleted file mode 100644 index 62ef537690..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTableTextRangeResolver.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyTable; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; - -public class OrmTableTextRangeResolver - implements TableTextRangeResolver -{ - protected final OrmReadOnlyTable table; - - - public OrmTableTextRangeResolver(OrmReadOnlyTable table) { - super(); - this.table = table; - } - - public TextRange getNameTextRange() { - return this.table.getNameTextRange(); - } - - public TextRange getCatalogTextRange() { - return this.table.getCatalogTextRange(); - } - - public TextRange getSchemaTextRange() { - return this.table.getSchemaTextRange(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTypeMappingTextRangeResolver.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTypeMappingTextRangeResolver.java deleted file mode 100644 index 3a769597e7..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTypeMappingTextRangeResolver.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; -import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver; - -public class OrmTypeMappingTextRangeResolver - implements TypeMappingTextRangeResolver -{ - private OrmTypeMapping typeMapping; - - public OrmTypeMappingTextRangeResolver(OrmTypeMapping typeMapping) { - this.typeMapping = typeMapping; - } - - public TextRange getTypeMappingTextRange() { - return this.typeMapping.getValidationTextRange(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java index 47dc36ef6c..87774cdcab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java @@ -35,7 +35,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; 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.context.java.AbstractJavaPersistentType; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; @@ -500,10 +499,6 @@ public abstract class SpecifiedOrmPersistentAttribute } } - protected PersistentAttributeTextRangeResolver buildTextRangeResolver() { - return new OrmPersistentAttributeTextRangeResolver(this); - } - protected abstract JptValidator buildAttibuteValidator(); public TextRange getValidationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java index 060ceec39f..04e1026a90 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java @@ -328,7 +328,7 @@ public class VirtualOrmPersistentAttribute public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); // the Java attribute should not need an AST for validation from here - this.getJavaPersistentAttribute().validate(messages, reporter, null); + this.getJavaPersistentAttribute().validate(messages, reporter); } public TextRange getValidationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java index 6553ee94a9..588a98fc16 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java @@ -2513,7 +2513,7 @@ public abstract class AbstractPersistenceUnit JpaValidationMessages.GENERATOR_DUPLICATE_NAME, parms, dup, - this.extractNameTextRange(dup) + dup.getNameTextRange() ) ); } @@ -2529,20 +2529,13 @@ public abstract class AbstractPersistenceUnit } // TODO bjv isn't it obvious? - protected TextRange extractNameTextRange(Generator generator) { - return (generator instanceof OrmGenerator) ? - ((OrmGenerator) generator).getNameTextRange() : - ((JavaGenerator) generator).getNameTextRange(null); - } - - // TODO bjv isn't it obvious? protected void validate(Generator generator, List<IMessage> messages, IReporter reporter) { if (generator instanceof OrmGenerator) { ((OrmGenerator) generator).validate(messages, reporter); } else { JavaGenerator javaGenerator = (JavaGenerator) generator; if (this.generatorSupportsValidationMessages(javaGenerator)) { - javaGenerator.validate(messages, reporter, null); + javaGenerator.validate(messages, reporter); } } } @@ -2584,7 +2577,7 @@ public abstract class AbstractPersistenceUnit JpaValidationMessages.QUERY_DUPLICATE_NAME, parms, dup, - this.extractNameTextRange(dup) + dup.getNameTextRange() ) ); } @@ -2600,20 +2593,13 @@ public abstract class AbstractPersistenceUnit } // TODO bjv isn't it obvious? - protected TextRange extractNameTextRange(Query query) { - return (query instanceof OrmQuery) ? - ((OrmQuery) query).getNameTextRange() : - ((JavaQuery) query).getNameTextRange(null); - } - - // TODO bjv isn't it obvious? protected void validate(Query query, JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter) { if (query instanceof OrmQuery) { ((OrmQuery) query).validate(queryHelper, messages, reporter); } else { JavaQuery javaQuery = (JavaQuery) query; if (this.querySupportsValidationMessages(javaQuery)) { - javaQuery.validate(queryHelper, messages, reporter, null); + javaQuery.validate(queryHelper, messages, reporter); } } } 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(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/CollectionTableValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/CollectionTableValidator.java index f3e45023da..ae6dcfba65 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/CollectionTableValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/CollectionTableValidator.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.jpa2.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractTableValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.core.jpa2.context.CollectionTable2_0; @@ -18,8 +17,8 @@ import org.eclipse.jpt.jpa.core.jpa2.context.CollectionTable2_0; public class CollectionTableValidator extends AbstractTableValidator { - public CollectionTableValidator(ReadOnlyPersistentAttribute persistentAttribute, CollectionTable2_0 table, TableTextRangeResolver textRangeResolver) { - super(persistentAttribute, table, textRangeResolver); + public CollectionTableValidator(ReadOnlyPersistentAttribute persistentAttribute, CollectionTable2_0 table) { + super(persistentAttribute, table); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/MapKeyJoinColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/MapKeyJoinColumnValidator.java index 082cd49b87..ff43925cbc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/MapKeyJoinColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/MapKeyJoinColumnValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,29 +11,26 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.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.jpa1.context.BaseJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; public class MapKeyJoinColumnValidator - extends BaseJoinColumnValidator<ReadOnlyJoinColumn, JoinColumnTextRangeResolver> + extends BaseJoinColumnValidator<ReadOnlyJoinColumn> { protected MapKeyJoinColumnValidator( ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner joinColumnOwner, - JoinColumnTextRangeResolver textRangeResolver, TableDescriptionProvider provider) { - super(column, joinColumnOwner, textRangeResolver, provider); + super(column, joinColumnOwner, provider); } public MapKeyJoinColumnValidator( 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/jpa2/context/OrderColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/OrderColumnValidator.java index 4714555ae3..872d2952c2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/OrderColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/OrderColumnValidator.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,19 +10,17 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractNamedColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.core.jpa2.context.OrderColumn2_0; public class OrderColumnValidator - extends AbstractNamedColumnValidator<OrderColumn2_0, NamedColumnTextRangeResolver> + extends AbstractNamedColumnValidator<OrderColumn2_0> { public OrderColumnValidator( ReadOnlyPersistentAttribute persistentAttribute, - OrderColumn2_0 column, - NamedColumnTextRangeResolver textRangeResolver) { - super(persistentAttribute, column, textRangeResolver); + OrderColumn2_0 column) { + super(persistentAttribute, column); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java index 36d824fafa..1381216ddb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java @@ -69,16 +69,10 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaLobConverter; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaTemporalConverter; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; -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.context.OverrideTextRangeResolver; -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.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideValidator; @@ -164,7 +158,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 protected final JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer; protected final ContextListContainer<JavaJoinColumn, MapKeyJoinColumn2_0Annotation> specifiedMapKeyJoinColumnContainer; - protected final JavaReadOnlyJoinColumn.Owner mapKeyJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner mapKeyJoinColumnOwner; protected JavaJoinColumn defaultMapKeyJoinColumn; @@ -432,8 +426,8 @@ public abstract class AbstractJavaElementCollectionMapping2_0 protected class CollectionTableOwner implements ReadOnlyTable.Owner { - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return new CollectionTableValidator(AbstractJavaElementCollectionMapping2_0.this.getPersistentAttribute(), (CollectionTable2_0) table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return new CollectionTableValidator(AbstractJavaElementCollectionMapping2_0.this.getPersistentAttribute(), (CollectionTable2_0) table); } } @@ -1149,7 +1143,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return this.getJpaFactory().buildJavaJoinColumn(this, this.mapKeyJoinColumnOwner, joinColumnAnnotation); } - protected JavaReadOnlyJoinColumn.Owner buildMapKeyJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildMapKeyJoinColumnOwner() { return new MapKeyJoinColumnOwner(); } @@ -1471,43 +1465,43 @@ public abstract class AbstractJavaElementCollectionMapping2_0 // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateAttributeType(messages, reporter, astRoot); - this.validateTargetClass(messages, astRoot); - this.validateMapKeyClass(messages, astRoot); - this.orderable.validate(messages, reporter, astRoot); - this.collectionTable.validate(messages, reporter, astRoot); - this.validateValue(messages, reporter, astRoot); - this.validateMapKey(messages, reporter, astRoot); - this.validateNoEmbeddableInMappingContainsProhibitedMapping(messages, astRoot); - } - - protected void validateNoEmbeddableInMappingContainsProhibitedMapping(List<IMessage> messages, CompilationUnit astRoot) { + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateAttributeType(messages, reporter); + this.validateTargetClass(messages); + this.validateMapKeyClass(messages); + this.orderable.validate(messages, reporter); + this.collectionTable.validate(messages, reporter); + this.validateValue(messages, reporter); + this.validateMapKey(messages, reporter); + this.validateNoEmbeddableInMappingContainsProhibitedMapping(messages); + } + + protected void validateNoEmbeddableInMappingContainsProhibitedMapping(List<IMessage> messages) { Embeddable embeddableClass = getResolvedTargetEmbeddable(); if (embeddableClass != null) { - embeddableContainsElementCollection(messages, astRoot, embeddableClass); - embeddableContainsProhibitedRelationshipMapping(messages, astRoot, embeddableClass); - embeddableHierarchyContainsProhibitedMapping(messages, astRoot, embeddableClass, new ArrayList<Embeddable>()); + embeddableContainsElementCollection(messages, embeddableClass); + embeddableContainsProhibitedRelationshipMapping(messages, embeddableClass); + embeddableHierarchyContainsProhibitedMapping(messages, embeddableClass, new ArrayList<Embeddable>()); } embeddableClass = getResolvedMapKeyEmbeddable(); if (embeddableClass != null) { - embeddableContainsElementCollection(messages, astRoot, embeddableClass); - embeddableContainsProhibitedRelationshipMapping(messages, astRoot, embeddableClass); - embeddableHierarchyContainsProhibitedMapping(messages, astRoot, embeddableClass, new ArrayList<Embeddable>()); + embeddableContainsElementCollection(messages, embeddableClass); + embeddableContainsProhibitedRelationshipMapping(messages, embeddableClass); + embeddableHierarchyContainsProhibitedMapping(messages, embeddableClass, new ArrayList<Embeddable>()); } } - private void embeddableHierarchyContainsProhibitedMapping(List<IMessage> messages, CompilationUnit astRoot, Embeddable parentEmbeddable, List<Embeddable> visited) { + private void embeddableHierarchyContainsProhibitedMapping(List<IMessage> messages, Embeddable parentEmbeddable, List<Embeddable> visited) { Iterable<AttributeMapping> embeddedIterable = parentEmbeddable.getAllAttributeMappings(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); for(AttributeMapping mapping : embeddedIterable) { Embeddable embeddable = ((BaseEmbeddedMapping)mapping).getTargetEmbeddable(); if (embeddable != null && embeddable != parentEmbeddable) { - embeddableContainsElementCollection(messages, astRoot, embeddable); - embeddableContainsProhibitedRelationshipMapping(messages, astRoot, embeddable); + embeddableContainsElementCollection(messages, embeddable); + embeddableContainsProhibitedRelationshipMapping(messages, embeddable); if (!CollectionTools.contains(visited, embeddable)) { visited.add(embeddable); - embeddableHierarchyContainsProhibitedMapping(messages, astRoot, embeddable, visited); + embeddableHierarchyContainsProhibitedMapping(messages, embeddable, visited); } } } @@ -1515,17 +1509,17 @@ public abstract class AbstractJavaElementCollectionMapping2_0 for(AttributeMapping mapping : embeddedIdIterable) { Embeddable embeddable = ((BaseEmbeddedMapping)mapping).getTargetEmbeddable(); if (embeddable != null && embeddable != parentEmbeddable) { - embeddableContainsElementCollection(messages, astRoot, embeddable); - embeddableContainsProhibitedRelationshipMapping(messages, astRoot, embeddable); + embeddableContainsElementCollection(messages, embeddable); + embeddableContainsProhibitedRelationshipMapping(messages, embeddable); if (!CollectionTools.contains(visited, embeddable)) { visited.add(embeddable); - embeddableHierarchyContainsProhibitedMapping(messages, astRoot, embeddable, visited); + embeddableHierarchyContainsProhibitedMapping(messages, embeddable, visited); } } } } - private void embeddableContainsProhibitedRelationshipMapping(List<IMessage> messages, CompilationUnit astRoot, Embeddable embeddable) { + private void embeddableContainsProhibitedRelationshipMapping(List<IMessage> messages, Embeddable embeddable) { boolean prohibitedMappingFound = false; RelationshipMapping relationshipMapping = null; Iterable<AttributeMapping> manyToManyMappings = embeddable.getAllAttributeMappings(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); @@ -1563,7 +1557,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 new String[] {this.getName(), embeddable.getName(), relationshipMapping.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -1573,14 +1567,14 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.ELEMENT_COLLECTION_CONTAINS_EMBEDDABLE_WITH_PROHIBITED_RELATIONSHIP_MAPPING, new String[] {embeddable.getName(), relationshipMapping.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } } } - private void embeddableContainsElementCollection(List<IMessage> messages, CompilationUnit astRoot, Embeddable embeddable) { + private void embeddableContainsElementCollection(List<IMessage> messages, Embeddable embeddable) { Iterable<AttributeMapping> elementCollectionMappings = embeddable.getAllAttributeMappings(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); if (elementCollectionMappings.iterator().hasNext()) { if (getPersistentAttribute().isVirtual()) { @@ -1590,7 +1584,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.VIRTUAL_ATTRIBUTE_ELEMENT_COLLECTION_CONTAINS_EMBEDDABLE_WITH_ELEMENT_COLLECTION_MAPPING, new String[] {this.getName(), embeddable.getName(), elementCollectionMappings.iterator().next().getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -1600,14 +1594,14 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.ELEMENT_COLLECTION_CONTAINS_EMBEDDABLE_WITH_ELEMENT_COLLECTION_MAPPING, new String[] {embeddable.getName(), elementCollectionMappings.iterator().next().getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } } } - protected void validateAttributeType(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateAttributeType(List<IMessage> messages, IReporter reporter) { JavaPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); if ((javaAttribute != null) && !javaAttribute.getJpaContainerDefinition().isContainer()) { if (this.getPersistentAttribute().isVirtual()) { @@ -1617,7 +1611,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.VIRTUAL_ATTRIBUTE_ATTRIBUTE_TYPE_IS_NOT_SUPPORTED_COLLECTION_TYPE, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -1628,14 +1622,14 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.ATTRIBUTE_TYPE_IS_NOT_SUPPORTED_COLLECTION_TYPE, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } } } - protected void validateTargetClass(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateTargetClass(List<IMessage> messages) { String targetClass = this.getFullyQualifiedTargetClass(); if (targetClass == null) { if (this.getPersistentAttribute().isVirtual()) { @@ -1645,7 +1639,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.VIRTUAL_ATTRIBUTE_ELEMENT_COLLECTION_TARGET_CLASS_NOT_DEFINED, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -1655,7 +1649,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.ELEMENT_COLLECTION_TARGET_CLASS_NOT_DEFINED, EMPTY_STRING_ARRAY, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } @@ -1673,7 +1667,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.VIRTUAL_ATTRIBUTE_ELEMENT_COLLECTION_TARGET_CLASS_MUST_BE_EMBEDDABLE_OR_BASIC_TYPE, new String[] {this.getName(), targetClass}, this, - this.getTargetClassTextRange(astRoot) + this.getTargetClassTextRange() ) ); } else { @@ -1683,15 +1677,15 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.ELEMENT_COLLECTION_TARGET_CLASS_MUST_BE_EMBEDDABLE_OR_BASIC_TYPE, new String[] {targetClass}, this, - this.getTargetClassTextRange(astRoot) + this.getTargetClassTextRange() ) ); } } } - protected TextRange getTargetClassTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(this.getAnnotationTargetClassTextRange(), astRoot); + protected TextRange getTargetClassTextRange() { + return this.getValidationTextRange(this.getAnnotationTargetClassTextRange()); } protected TextRange getAnnotationTargetClassTextRange() { @@ -1699,18 +1693,18 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return (annotation == null) ? null : annotation.getTargetClassTextRange(); } - protected TextRange getMapKeyClassTextRange(CompilationUnit astRoot) { + protected TextRange getMapKeyClassTextRange() { MapKeyClass2_0Annotation annotation = this.getMapKeyClassAnnotation(); - return annotation == null ? getMappingAnnotationTextRange(astRoot) : annotation.getTextRange(astRoot); + return annotation == null ? getMappingAnnotationTextRange() : annotation.getTextRange(); } - protected void validateMapKeyClass(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateMapKeyClass(List<IMessage> messages) { if (this.getPersistentAttribute().getJpaContainerDefinition().isMap()) { - this.validateMapKeyClass_(messages, astRoot); + this.validateMapKeyClass_(messages); } } - protected void validateMapKeyClass_(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateMapKeyClass_(List<IMessage> messages) { if (this.getMapKeyClass() == null) { if (this.getPersistentAttribute().isVirtual()) { messages.add( @@ -1719,7 +1713,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.VIRTUAL_ATTRIBUTE_MAP_KEY_CLASS_NOT_DEFINED, new String[] {this.getName()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -1729,7 +1723,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.MAP_KEY_CLASS_NOT_DEFINED, EMPTY_STRING_ARRAY, this, - this.getMapKeyClassTextRange(astRoot) + this.getMapKeyClassTextRange() ) ); } @@ -1747,7 +1741,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.VIRTUAL_ATTRIBUTE_MAP_KEY_CLASS_MUST_BE_ENTITY_EMBEDDABLE_OR_BASIC_TYPE, new String[] {this.getName(), this.getFullyQualifiedMapKeyClass()}, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ) ); } else { @@ -1757,51 +1751,51 @@ public abstract class AbstractJavaElementCollectionMapping2_0 JpaValidationMessages.MAP_KEY_CLASS_MUST_BE_ENTITY_EMBEDDABLE_OR_BASIC_TYPE, new String[] {this.getFullyQualifiedMapKeyClass()}, this, - this.getMapKeyClassTextRange(astRoot) + this.getMapKeyClassTextRange() ) ); } } } - protected void validateValue(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - this.converter.validate(messages, reporter, astRoot); + protected void validateValue(List<IMessage> messages, IReporter reporter) { + this.converter.validate(messages, reporter); //TODO should we handle validation when the type is embeddable, //but a value column is specified, or things like that if that is invalid? switch (this.valueType) { case BASIC_TYPE : - this.valueColumn.validate(messages, reporter, astRoot); + this.valueColumn.validate(messages, reporter); break; case EMBEDDABLE_TYPE : - this.valueAttributeOverrideContainer.validate(messages, reporter, astRoot); - this.valueAssociationOverrideContainer.validate(messages, reporter, astRoot); + this.valueAttributeOverrideContainer.validate(messages, reporter); + this.valueAssociationOverrideContainer.validate(messages, reporter); break; default : break; } } - protected void validateMapKey(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateMapKey(List<IMessage> messages, IReporter reporter) { if (this.getMapKey() == null) { - this.validateMapKey_(messages, reporter, astRoot); + this.validateMapKey_(messages, reporter); } else { //TODO validate that the map key refers to an existing attribute } } - protected void validateMapKey_(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { + protected void validateMapKey_(List<IMessage> messages, IReporter reporter) { switch (this.keyType) { case BASIC_TYPE : - this.mapKeyColumn.validate(messages, reporter, astRoot); - this.mapKeyConverter.validate(messages, reporter, astRoot); + this.mapKeyColumn.validate(messages, reporter); + this.mapKeyConverter.validate(messages, reporter); break; case ENTITY_TYPE : for (JavaJoinColumn joinColumn : this.getMapKeyJoinColumns()) { - joinColumn.validate(messages, reporter, astRoot); + joinColumn.validate(messages, reporter); } break; case EMBEDDABLE_TYPE : - this.mapKeyAttributeOverrideContainer.validate(messages, reporter, astRoot); + this.mapKeyAttributeOverrideContainer.validate(messages, reporter); //validate map key association overrides - for eclipselink break; default : @@ -1847,8 +1841,8 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return AbstractJavaElementCollectionMapping2_0.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return AbstractJavaElementCollectionMapping2_0.this.getValidationTextRange(); } protected String getMappingName() { @@ -1883,8 +1877,8 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return this.getMappingName(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, (TableColumnTextRangeResolver) textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, new CollectionTableTableDescriptionProvider()); } } @@ -1907,8 +1901,8 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return this.getMappingName() + "_KEY"; //$NON-NLS-1$ } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new MapKeyColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, (TableColumnTextRangeResolver) textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new MapKeyColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, new CollectionTableTableDescriptionProvider()); } } @@ -1959,12 +1953,12 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return MappingTools.resolveOverriddenColumn(this.getOverridableTypeMapping(), attributeName); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new AttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new EmbeddableOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new AttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new EmbeddableOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner, TableColumnTextRangeResolver textRangeResolver) { - return new AttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner) { + return new AttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, new CollectionTableTableDescriptionProvider()); } } @@ -1984,23 +1978,23 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return MappingTools.resolveOverriddenRelationship(this.getOverridableTypeMapping(), attributeName); } - 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 columnOwner, TableColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) columnOwner, (JoinColumnTextRangeResolver) textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner) { + return new AssociationOverrideJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) columnOwner, new CollectionTableTableDescriptionProvider()); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { return JptValidator.Null.instance(); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { return JptValidator.Null.instance(); } - public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { + public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table) { return JptValidator.Null.instance(); } } @@ -2008,7 +2002,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 // ********** map key join column owner ********** protected class MapKeyJoinColumnOwner - implements JavaReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected MapKeyJoinColumnOwner() { super(); @@ -2058,16 +2052,15 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return AbstractJavaElementCollectionMapping2_0.this.getMapKeyJoinColumnsSize(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return AbstractJavaElementCollectionMapping2_0.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return AbstractJavaElementCollectionMapping2_0.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { return new MapKeyJoinColumnValidator( this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, this, - (JoinColumnTextRangeResolver) textRangeResolver, new CollectionTableTableDescriptionProvider()); } } @@ -2112,12 +2105,12 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return MappingTools.resolveOverriddenColumn(this.getOverridableTypeMapping(), attributeName); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new MapKeyAttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new EmbeddableOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new MapKeyAttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new EmbeddableOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner, TableColumnTextRangeResolver textRangeResolver) { - return new MapKeyAttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner) { + return new MapKeyAttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, new CollectionTableTableDescriptionProvider()); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java index 5b8595bab7..aab221ccde 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.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.jpa2.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; @@ -158,13 +157,13 @@ public class GenericJavaCacheable2_0 // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getCacheableHolder().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getCacheableHolder().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getAnnotationTextRange() { Cacheable2_0Annotation annotation = this.getCacheableAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java index dbcea8372c..3f9022e1bb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; @@ -19,11 +18,8 @@ import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; -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.jpa1.context.CollectionTableTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaReferenceTable; @@ -43,7 +39,7 @@ public class GenericJavaCollectionTable2_0 } @Override - protected JavaReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -96,7 +92,7 @@ public class GenericJavaCollectionTable2_0 * these point at the source/owning entity */ protected class JoinColumnOwner - implements JavaReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected JoinColumnOwner() { super(); @@ -124,8 +120,8 @@ public class GenericJavaCollectionTable2_0 return GenericJavaCollectionTable2_0.this.getName(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return GenericJavaCollectionTable2_0.this.getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return GenericJavaCollectionTable2_0.this.getValidationTextRange(); } public org.eclipse.jpt.jpa.db.Table getReferencedColumnDbTable() { @@ -164,8 +160,8 @@ public class GenericJavaCollectionTable2_0 return GenericJavaCollectionTable2_0.this.getJoinColumnsSize(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new JoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new JoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, this, new CollectionTableTableDescriptionProvider()); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java index 6050364ba3..3d4720bece 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.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. @@ -175,14 +175,14 @@ public class GenericJavaDerivedIdentity2_0 // ********** 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.strategy != null) { - ((JavaJpaContextNode) this.strategy).validate(messages, reporter, astRoot); + ((JavaJpaContextNode) this.strategy).validate(messages, reporter); } } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getMapping().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getMapping().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java index bdd4cd8ed6..679087ba11 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.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. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.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.internal.context.java.AbstractJavaJpaContextNode; @@ -125,18 +124,18 @@ public class GenericJavaIdDerivedIdentityStrategy2_0 // ********** 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); // no validation rules } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getDerivedIdentity().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getDerivedIdentity().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { + protected TextRange getAnnotationTextRange() { IdAnnotation annotation = this.getAnnotation(); - return (annotation == null) ? null : annotation.getTextRange(astRoot); + return (annotation == null) ? null : annotation.getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java index 6ba8363949..75a15ea9e8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java @@ -310,31 +310,31 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 // ********** validation ********** @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateMapsId(messages, astRoot); + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + this.validateMapsId(messages); } - protected void validateMapsId(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateMapsId(List<IMessage> messages) { if (this.getDerivedIdentity().usesMapsIdDerivedIdentityStrategy()) { - this.validateMapsId_(messages, astRoot); + this.validateMapsId_(messages); } } - protected void validateMapsId_(List<IMessage> messages, CompilationUnit astRoot) { + protected void validateMapsId_(List<IMessage> messages) { // test whether id attribute name can be resolved AttributeMapping attributeMapping = this.getDerivedIdAttributeMapping(); if (attributeMapping == null) { // if id attribute name is not specified, use that message if (this.specifiedIdAttributeName == null) { - messages.add(this.buildMessage(JpaValidationMessages.MAPS_ID_VALUE_NOT_SPECIFIED, EMPTY_STRING_ARRAY, astRoot)); + messages.add(this.buildMessage(JpaValidationMessages.MAPS_ID_VALUE_NOT_SPECIFIED, EMPTY_STRING_ARRAY)); } else { - messages.add(this.buildMessage(JpaValidationMessages.MAPS_ID_VALUE_NOT_RESOLVED, new String[] {this.getIdAttributeName()}, astRoot)); + messages.add(this.buildMessage(JpaValidationMessages.MAPS_ID_VALUE_NOT_RESOLVED, new String[] {this.getIdAttributeName()})); } } else { // test whether attribute mapping is allowable if ( ! CollectionTools.contains(this.getValidAttributeMappingChoices(), attributeMapping)) { - messages.add(this.buildMessage(JpaValidationMessages.MAPS_ID_VALUE_INVALID, new String[] {this.getIdAttributeName()}, astRoot)); + messages.add(this.buildMessage(JpaValidationMessages.MAPS_ID_VALUE_INVALID, new String[] {this.getIdAttributeName()})); } } } @@ -343,7 +343,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 return this.buildAttributeMappingChoices(this.getIdAttributeMappings()); } - protected IMessage buildMessage(String msgID, String[] parms, CompilationUnit astRoot) { + protected IMessage buildMessage(String msgID, String[] parms) { PersistentAttribute attribute = this.getPersistentAttribute(); String attributeDescription = attribute.isVirtual() ? JpaValidationDescriptionMessages.VIRTUAL_ATTRIBUTE_DESC : @@ -355,16 +355,16 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 msgID, parms, this, - this.getValidationTextRange(astRoot) + this.getValidationTextRange() ); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - TextRange textRange = this.getAnnotationTextRange(astRoot); - return (textRange != null) ? textRange : this.getDerivedIdentity().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + TextRange textRange = this.getAnnotationTextRange(); + return (textRange != null) ? textRange : this.getDerivedIdentity().getValidationTextRange(); } - protected TextRange getAnnotationTextRange(CompilationUnit astRoot) { - return this.getAnnotation().getTextRange(astRoot); + protected TextRange getAnnotationTextRange() { + return this.getAnnotation().getTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java index bc15a0356b..c73f0f454e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.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.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; @@ -114,9 +113,9 @@ public class GenericJavaOrphanRemoval2_0 // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange() { TextRange textRange = this.getAnnotationTextRange(); - return (textRange != null) ? textRange : this.getMapping().getValidationTextRange(astRoot); + return (textRange != null) ? textRange : this.getMapping().getValidationTextRange(); } protected TextRange getAnnotationTextRange() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableRelationshipStrategy2_0.java index c4a7ab7f72..d20a993672 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableRelationshipStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableRelationshipStrategy2_0.java @@ -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,14 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.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.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; -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.jpa2.context.java.JavaOverrideRelationship2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.AssociationOverride2_0Annotation; @@ -75,19 +72,19 @@ public class GenericJavaOverrideJoinTableRelationshipStrategy2_0 return this.getRelationship().getTypeMapping().validatesAgainstDatabase(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getRelationship().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); } - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableValidator((ReadOnlyJoinTable) table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return this.getRelationship().buildJoinTableValidator((ReadOnlyJoinTable) table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getRelationship().buildJoinTableJoinColumnValidator(column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getRelationship().buildJoinTableInverseJoinColumnValidator(column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0.java index 4bdd41b7a4..8d9b3ee559 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0.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.jpa2.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.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; @@ -20,10 +19,8 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTable; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationshipStrategy; -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.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaVirtualOverrideRelationship2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -124,10 +121,10 @@ public class GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0 // ********** 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.joinTable != null) { - this.joinTable.validate(messages, reporter, astRoot); + this.joinTable.validate(messages, reporter); } } @@ -135,19 +132,19 @@ public class GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0 return this.getRelationship().getTypeMapping().validatesAgainstDatabase(); } - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getRelationship().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getRelationship().getValidationTextRange(); } - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableValidator((ReadOnlyJoinTable) table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return this.getRelationship().buildJoinTableValidator((ReadOnlyJoinTable) table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getRelationship().buildJoinTableJoinColumnValidator(column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getRelationship().buildJoinTableInverseJoinColumnValidator(column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaMapKeyTemporalConverterValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaMapKeyTemporalConverterValidator.java index ec9d7da35b..77062871c7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaMapKeyTemporalConverterValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaMapKeyTemporalConverterValidator.java @@ -11,15 +11,14 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.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.JavaCollectionMapping2_0; public class JavaMapKeyTemporalConverterValidator extends AbstractTemporalConverterValidator { - public JavaMapKeyTemporalConverterValidator(BaseTemporalConverter converter, ConverterTextRangeResolver textRangeResolver) { - super(converter, textRangeResolver); + public JavaMapKeyTemporalConverterValidator(BaseTemporalConverter converter) { + super(converter); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java index cedad0cb21..87d119352f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.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.jpa2.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0; @@ -60,7 +59,7 @@ public class NullJavaCacheable2_0 // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getCacheableHolder().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getCacheableHolder().getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaDerivedIdentity2_0.java index c0259aea44..10256531ee 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaDerivedIdentity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaDerivedIdentity2_0.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.jpa2.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.JavaSingleRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; @@ -87,7 +86,7 @@ public class NullJavaDerivedIdentity2_0 return null; } - 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/jpa2/context/java/NullJavaMapKeyColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java index 223f805202..9a7a1bdd80 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.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.EmptyIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; @@ -260,16 +259,16 @@ public class NullJavaMapKeyColumn2_0 // ********** validation ********** - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.getParent().getValidationTextRange(astRoot); + public TextRange getValidationTextRange() { + return this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); + public TextRange getNameTextRange() { + return this.getValidationTextRange(); } - public TextRange getTableTextRange(CompilationUnit astRoot) { - return this.getValidationTextRange(astRoot); + public TextRange getTableTextRange() { + return this.getValidationTextRange(); } public boolean tableNameIsInvalid() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java index 200f20541b..89ae8ab11a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.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.jpa2.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovable2_0; @@ -55,7 +54,7 @@ public class NullJavaOrphanRemoval2_0 // ********** 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/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java index 1afa139065..9f333f7fb6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java @@ -72,13 +72,8 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; -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.context.OverrideTextRangeResolver; -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.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.AssociationOverrideValidator; @@ -163,7 +158,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen protected final OrmAttributeOverrideContainer mapKeyAttributeOverrideContainer; protected final ContextListContainer<OrmJoinColumn, XmlJoinColumn> specifiedMapKeyJoinColumnContainer; - protected final OrmReadOnlyJoinColumn.Owner mapKeyJoinColumnOwner; + protected final ReadOnlyJoinColumn.Owner mapKeyJoinColumnOwner; protected OrmJoinColumn defaultMapKeyJoinColumn; @@ -438,8 +433,8 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen protected class CollectionTableOwner implements ReadOnlyTable.Owner { - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return new CollectionTableValidator(AbstractOrmElementCollectionMapping2_0.this.getPersistentAttribute(), (CollectionTable2_0) table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return new CollectionTableValidator(AbstractOrmElementCollectionMapping2_0.this.getPersistentAttribute(), (CollectionTable2_0) table); } } @@ -1128,7 +1123,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return this.getContextNodeFactory().buildOrmJoinColumn(this, this.mapKeyJoinColumnOwner, xmlJoinColumn); } - protected OrmReadOnlyJoinColumn.Owner buildMapKeyJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildMapKeyJoinColumnOwner() { return new MapKeyJoinColumnOwner(); } @@ -1886,8 +1881,8 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return this.getMappingName(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, (TableColumnTextRangeResolver) textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new NamedColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, new CollectionTableTableDescriptionProvider()); } } @@ -1916,8 +1911,8 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return this.getMappingName() + "_KEY"; //$NON-NLS-1$ } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new MapKeyColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, (TableColumnTextRangeResolver) textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new MapKeyColumnValidator(this.getPersistentAttribute(), (ReadOnlyBaseColumn) column, new CollectionTableTableDescriptionProvider()); } } @@ -1945,23 +1940,23 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return MappingTools.resolveOverriddenRelationship(this.getOverridableTypeMapping(), attributeName); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner, TableColumnTextRangeResolver textRangeResolver) { - return new AssociationOverrideJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) columnOwner, (JoinColumnTextRangeResolver) textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner) { + return new AssociationOverrideJoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyAssociationOverride) override, (ReadOnlyJoinColumn) column, (ReadOnlyJoinColumn.Owner) columnOwner, new CollectionTableTableDescriptionProvider()); } - 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 buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { return JptValidator.Null.instance(); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { return JptValidator.Null.instance(); } - public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { + public JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table) { return JptValidator.Null.instance(); } } @@ -1990,12 +1985,12 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return MappingTools.resolveOverriddenColumn(this.getOverridableTypeMapping(), attributeName); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new AttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new EmbeddableOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new AttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new EmbeddableOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner, TableColumnTextRangeResolver textRangeResolver) { - return new AttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner) { + return new AttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, new CollectionTableTableDescriptionProvider()); } } @@ -2023,19 +2018,19 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return MappingTools.resolveOverriddenColumn(this.getOverridableTypeMapping(), attributeName); } - public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver) { - return new MapKeyAttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, textRangeResolver, new EmbeddableOverrideDescriptionProvider()); + public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { + return new MapKeyAttributeOverrideValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, (AttributeOverrideContainer) container, new EmbeddableOverrideDescriptionProvider()); } - public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner, TableColumnTextRangeResolver textRangeResolver) { - return new MapKeyAttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyOverride override, ReadOnlyBaseColumn column, ReadOnlyBaseColumn.Owner columnOwner) { + return new MapKeyAttributeOverrideColumnValidator(this.getPersistentAttribute(), (ReadOnlyAttributeOverride) override, column, new CollectionTableTableDescriptionProvider()); } } // ********** map key join column owner ********** protected class MapKeyJoinColumnOwner - implements OrmReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected MapKeyJoinColumnOwner() { super(); @@ -2089,12 +2084,11 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return AbstractOrmElementCollectionMapping2_0.this.getValidationTextRange(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { return new MapKeyJoinColumnValidator( this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, - this, - (JoinColumnTextRangeResolver) textRangeResolver, + this, new CollectionTableTableDescriptionProvider()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java index cb2c10dd87..fa916e2d85 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java @@ -17,11 +17,8 @@ import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; -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.jpa1.context.CollectionTableTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmReferenceTable; @@ -44,7 +41,7 @@ public class GenericOrmCollectionTable2_0 } @Override - protected OrmReadOnlyJoinColumn.Owner buildJoinColumnOwner() { + protected ReadOnlyJoinColumn.Owner buildJoinColumnOwner() { return new JoinColumnOwner(); } @@ -112,7 +109,7 @@ public class GenericOrmCollectionTable2_0 * these point at the source/owning entity */ protected class JoinColumnOwner - implements OrmReadOnlyJoinColumn.Owner + implements ReadOnlyJoinColumn.Owner { protected JoinColumnOwner() { super(); @@ -192,8 +189,8 @@ public class GenericOrmCollectionTable2_0 return GenericOrmCollectionTable2_0.this.getElementCollectionMapping(); } - public JptValidator buildColumnValidator(ReadOnlyNamedColumn column, NamedColumnTextRangeResolver textRangeResolver) { - return new JoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, this, (JoinColumnTextRangeResolver) textRangeResolver, new CollectionTableTableDescriptionProvider()); + public JptValidator buildColumnValidator(ReadOnlyNamedColumn column) { + return new JoinColumnValidator(this.getPersistentAttribute(), (ReadOnlyJoinColumn) column, this, new CollectionTableTableDescriptionProvider()); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOverrideJoinTableRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOverrideJoinTableRelationshipStrategy2_0.java index ce3c95d40b..ee7a6d513b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOverrideJoinTableRelationshipStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOverrideJoinTableRelationshipStrategy2_0.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. @@ -13,9 +13,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; -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.AbstractOrmJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOverrideRelationship2_0; @@ -47,15 +45,15 @@ public class GenericOrmOverrideJoinTableRelationshipStrategy2_0 return this.getRelationship().getValidationTextRange(); } - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableValidator((ReadOnlyJoinTable) table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return this.getRelationship().buildJoinTableValidator((ReadOnlyJoinTable) table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getRelationship().buildJoinTableJoinColumnValidator(column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getRelationship().buildJoinTableInverseJoinColumnValidator(column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0.java index 79133360e8..0b4c77e23e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0.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. @@ -19,10 +19,8 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTableRelationshipStrategy; -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.internal.context.orm.AbstractOrmXmlContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmVirtualOverrideRelationship2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -138,15 +136,15 @@ public class GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0 return this.getRelationship().getValidationTextRange(); } - public JptValidator buildTableValidator(ReadOnlyTable table, TableTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableValidator((ReadOnlyJoinTable) table, textRangeResolver); + public JptValidator buildTableValidator(ReadOnlyTable table) { + return this.getRelationship().buildJoinTableValidator((ReadOnlyJoinTable) table); } - public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getRelationship().buildJoinTableJoinColumnValidator(column, owner); } - public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) { - return this.getRelationship().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver); + public JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner) { + return this.getRelationship().buildJoinTableInverseJoinColumnValidator(column, owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionTemporalConverterValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionTemporalConverterValidator.java index eb31b52553..1dfb78781f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionTemporalConverterValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionTemporalConverterValidator.java @@ -11,15 +11,14 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; 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.orm.OrmElementCollectionMapping2_0; public class OrmElementCollectionTemporalConverterValidator extends AbstractTemporalConverterValidator { - public OrmElementCollectionTemporalConverterValidator(BaseTemporalConverter converter, ConverterTextRangeResolver textRangeResolver) { - super(converter, textRangeResolver); + public OrmElementCollectionTemporalConverterValidator(BaseTemporalConverter converter) { + super(converter); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmMapKeyTemporalConverterValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmMapKeyTemporalConverterValidator.java index 1e37f03c99..97331a5545 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmMapKeyTemporalConverterValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmMapKeyTemporalConverterValidator.java @@ -11,15 +11,14 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; 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.orm.OrmCollectionMapping2_0; public class OrmMapKeyTemporalConverterValidator extends AbstractTemporalConverterValidator { - public OrmMapKeyTemporalConverterValidator(BaseTemporalConverter converter, ConverterTextRangeResolver textRangeResolver) { - super(converter, textRangeResolver); + public OrmMapKeyTemporalConverterValidator(BaseTemporalConverter converter) { + super(converter); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmTemporalConverterValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmTemporalConverterValidator.java index 15a5e743bb..c14931fe69 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmTemporalConverterValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmTemporalConverterValidator.java @@ -11,14 +11,13 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; 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 OrmTemporalConverterValidator extends AbstractTemporalConverterValidator { - public OrmTemporalConverterValidator(BaseTemporalConverter converter, ConverterTextRangeResolver textRangeResolver) { - super(converter, textRangeResolver); + public OrmTemporalConverterValidator(BaseTemporalConverter converter) { + super(converter); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/AssociationOverrideContainer2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/AssociationOverrideContainer2_0.java index b7050489d9..293854fa33 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/AssociationOverrideContainer2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/AssociationOverrideContainer2_0.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,9 +13,7 @@ import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; -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; /** * JPA 2.0 @@ -31,11 +29,11 @@ import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; public interface AssociationOverrideContainer2_0 extends AssociationOverrideContainer { - JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table, TableTextRangeResolver textRangeResolver); + JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table); - JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owne); - JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner); // ********** owner ********** @@ -43,10 +41,10 @@ public interface AssociationOverrideContainer2_0 interface Owner extends AssociationOverrideContainer.Owner { - JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table, TableTextRangeResolver textRangeResolver); + JptValidator buildJoinTableValidator(ReadOnlyAssociationOverride override, ReadOnlyTable table); - JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner); - JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyAssociationOverride override, ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ReadOnlyAssociationOverride2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ReadOnlyAssociationOverride2_0.java index ca67250ac0..0c0d64e03b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ReadOnlyAssociationOverride2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ReadOnlyAssociationOverride2_0.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. @@ -12,9 +12,7 @@ package org.eclipse.jpt.jpa.core.jpa2.context; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; -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; /** * JPA 2.0 @@ -29,9 +27,9 @@ import org.eclipse.jpt.jpa.core.internal.context.TableTextRangeResolver; public interface ReadOnlyAssociationOverride2_0 extends ReadOnlyAssociationOverride { - JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner); - JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner); - JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver); + JptValidator buildJoinTableValidator(ReadOnlyJoinTable table); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ReadOnlyOverrideRelationship2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ReadOnlyOverrideRelationship2_0.java index da67243391..90bc2dec08 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ReadOnlyOverrideRelationship2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ReadOnlyOverrideRelationship2_0.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,9 +14,7 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverrideRelationship; -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; /** * JPA 2.0 association override relationship @@ -33,9 +31,9 @@ public interface ReadOnlyOverrideRelationship2_0 extends ReadOnlyOverrideRelationship, ReadOnlyJoinTableRelationship { - JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner); - JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver); + JptValidator buildJoinTableInverseJoinColumnValidator(ReadOnlyJoinColumn column, ReadOnlyJoinColumn.Owner owner); - JptValidator buildJoinTableValidator(ReadOnlyJoinTable table, TableTextRangeResolver textRangeResolver); + JptValidator buildJoinTableValidator(ReadOnlyJoinTable table); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaDerivedIdentity2_0.java index 8deb0ade29..b43f1cc2a6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaDerivedIdentity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaDerivedIdentity2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 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,12 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.jpa2.context.java; -import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.DerivedIdentity2_0; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.eclipse.wst.validation.internal.provisional.core.IReporter; /** * Java derived identity @@ -25,7 +21,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface JavaDerivedIdentity2_0 @@ -36,6 +32,4 @@ public interface JavaDerivedIdentity2_0 JavaIdDerivedIdentityStrategy2_0 getIdDerivedIdentityStrategy(); JavaMapsIdDerivedIdentityStrategy2_0 getMapsIdDerivedIdentityStrategy(); - - void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyTemporalConverter2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyTemporalConverter2_0.java index 2b0793d0f3..14cb26ee5f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyTemporalConverter2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyTemporalConverter2_0.java @@ -17,7 +17,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaMapKeyTemporalConverterValidator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyTemporal2_0Annotation; @@ -63,8 +62,8 @@ public interface JavaMapKeyTemporalConverter2_0 @Override protected Owner buildOwner() { return new Owner() { - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { - return new JavaMapKeyTemporalConverterValidator((BaseTemporalConverter) converter, textRangeResolver); + public JptValidator buildValidator(Converter converter) { + return new JavaMapKeyTemporalConverterValidator((BaseTemporalConverter) converter); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyEnumeratedConverter2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyEnumeratedConverter2_0.java index ce24f390f1..3e24e49527 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyEnumeratedConverter2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyEnumeratedConverter2_0.java @@ -17,7 +17,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmBaseEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.resource.orm.EnumType; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlMapKeyConvertibleMapping_2_0; @@ -71,7 +70,7 @@ public interface OrmMapKeyEnumeratedConverter2_0 return mapping.getMapKeyEnumeratedTextRange(); } - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { + public JptValidator buildValidator(Converter converter) { return JptValidator.Null.instance(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyTemporalConverter2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyTemporalConverter2_0.java index b63d328a81..b5daa9c67f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyTemporalConverter2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyTemporalConverter2_0.java @@ -17,7 +17,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmMapKeyTemporalConverterValidator; import org.eclipse.jpt.jpa.core.resource.orm.TemporalType; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -72,8 +71,8 @@ public interface OrmMapKeyTemporalConverter2_0 return mapping.getMapKeyTemporalTextRange(); } - public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) { - return new OrmMapKeyTemporalConverterValidator((BaseTemporalConverter) converter, textRangeResolver); + public JptValidator buildValidator(Converter converter) { + return new OrmMapKeyTemporalConverterValidator((BaseTemporalConverter) converter); } }; } |