diff options
author | Tran Le | 2013-02-12 16:05:58 +0000 |
---|---|---|
committer | Tran Le | 2013-02-12 16:06:38 +0000 |
commit | 89c451f6d4f7d4b51e250ef2afb37b50c6bd4f0e (patch) | |
tree | d9744e31e30c827153ce05c15176ce265891cd44 | |
parent | 52498b07ba94d28dfd73cf466515fb5fdc535ee2 (diff) | |
download | webtools.dali-89c451f6d4f7d4b51e250ef2afb37b50c6bd4f0e.tar.gz webtools.dali-89c451f6d4f7d4b51e250ef2afb37b50c6bd4f0e.tar.xz webtools.dali-89c451f6d4f7d4b51e250ef2afb37b50c6bd4f0e.zip |
390868 - Code assist doesn't work properly for nested join
column/inverse join column of join table
37 files changed, 242 insertions, 102 deletions
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 e69f54030e..7ec9b81cd9 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -46,7 +46,7 @@ public interface ReadOnlyNamedColumn /** * Return the (best guess) text location of the column's name. */ - TextRange getNameTextRange(); + TextRange getNameValidationTextRange(); // ********** table ********** 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 44497879d4..f0629672c0 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 @@ -139,11 +139,11 @@ public interface ReadOnlyTable */ boolean validatesAgainstDatabase(); - TextRange getNameTextRange(); + TextRange getNameValidationTextRange(); + + TextRange getSchemaValidationTextRange(); - TextRange getSchemaTextRange(); - - TextRange getCatalogTextRange(); + TextRange getCatalogValidationTextRange(); // ********** owner ********** 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 cbea457a48..82e3244350 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2006, 2013 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. @@ -37,7 +37,7 @@ public interface ReadOnlyTableColumn /** * Return the (best guess) text location of the column's table name. */ - TextRange getTableNameTextRange(); + TextRange getTableNameValidationTextRange(); // ********** misc ********** 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 a13e6bb7c5..36a943bce8 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -130,7 +130,7 @@ public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O e return this.owner.getDefaultTableName(); } - public TextRange getTableNameTextRange() { + public TextRange getTableNameValidationTextRange() { return this.getValidationTextRange(this.getColumnAnnotation().getTableTextRange()); } 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 d4167654dc..0fcced9ec2 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -264,8 +264,8 @@ public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O return (textRange != null) ? textRange : this.owner.getValidationTextRange(); } - public TextRange getNameTextRange() { - return this.getValidationTextRange(this.getColumnAnnotation().getNameTextRange()); + public TextRange getNameValidationTextRange() { + return this.getValidationTextRange(this.getColumnAnnotation().getNameValidationTextRange()); } 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 cd74d8c58f..8129ea0344 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -486,16 +486,16 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> return (textRange != null) ? textRange : this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange() { - return this.getValidationTextRange(this.getTableAnnotation().getNameTextRange()); + public TextRange getNameValidationTextRange() { + return this.getValidationTextRange(this.getTableAnnotation().getNameValidationTextRange()); } - public TextRange getSchemaTextRange() { - return this.getValidationTextRange(this.getTableAnnotation().getSchemaTextRange()); + public TextRange getSchemaValidationTextRange() { + return this.getValidationTextRange(this.getTableAnnotation().getSchemaValidationTextRange()); } - public TextRange getCatalogTextRange() { - return this.getValidationTextRange(this.getTableAnnotation().getCatalogTextRange()); + public TextRange getCatalogValidationTextRange() { + return this.getValidationTextRange(this.getTableAnnotation().getCatalogValidationTextRange()); } 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 ac6982791e..60cb4b27f2 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -251,7 +251,7 @@ public abstract class AbstractJavaVirtualBaseColumn<O extends ReadOnlyBaseColumn // ********** validation ********** - public TextRange getTableNameTextRange() { + public TextRange getTableNameValidationTextRange() { 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 a2dc915fc7..62a8dd5ea1 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -173,7 +173,7 @@ public abstract class AbstractJavaVirtualNamedColumn<O extends ReadOnlyNamedColu return this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange() { + public TextRange getNameValidationTextRange() { return this.getValidationTextRange(); } 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 2feabd3142..0c776ec1b5 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -327,15 +327,15 @@ public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> return this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange() { + public TextRange getNameValidationTextRange() { return this.getValidationTextRange(); } - public TextRange getSchemaTextRange() { + public TextRange getSchemaValidationTextRange() { return this.getValidationTextRange(); } - public TextRange getCatalogTextRange() { + public TextRange getCatalogValidationTextRange() { return this.getValidationTextRange(); } 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 a1a1c39744..e4060959dc 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -284,7 +284,7 @@ public abstract class AbstractOrmBaseColumn<X extends XmlBaseColumn, O extends R // ********** validation ********** - public TextRange getTableNameTextRange() { + public TextRange getTableNameValidationTextRange() { return this.getValidationTextRange(this.getXmlColumnTableTextRange()); } 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 9effb07777..ef2a2603ea 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -248,7 +248,7 @@ public abstract class AbstractOrmNamedColumn<X extends XmlNamedColumn, O extends return (xmlColumn == null) ? null : xmlColumn.getValidationTextRange(); } - public TextRange getNameTextRange() { + public TextRange getNameValidationTextRange() { return this.getValidationTextRange(this.getXmlColumnNameTextRange()); } 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 0411a98aa9..2b01422e58 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 @@ -438,7 +438,7 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable> return (xmlTable == null) ? null : xmlTable.getValidationTextRange(); } - public TextRange getNameTextRange() { + public TextRange getNameValidationTextRange() { return this.getValidationTextRange(this.getXmlTableNameTextRange()); } @@ -447,7 +447,7 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable> return (xmlTable == null) ? null : xmlTable.getNameTextRange(); } - public TextRange getSchemaTextRange() { + public TextRange getSchemaValidationTextRange() { return this.getValidationTextRange(this.getXmlTableSchemaTextRange()); } @@ -456,7 +456,7 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable> return (xmlTable == null) ? null : xmlTable.getSchemaTextRange(); } - public TextRange getCatalogTextRange() { + public TextRange getCatalogValidationTextRange() { return this.getValidationTextRange(this.getXmlTableCatalogTextRange()); } 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 08d8aff0c5..7ac6ee0f6e 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -250,7 +250,7 @@ public abstract class AbstractOrmVirtualBaseColumn<O extends ReadOnlyBaseColumn. // ********** validation ********** - public TextRange getTableNameTextRange() { + public TextRange getTableNameValidationTextRange() { return this.getValidationTextRange(); } } 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 8b7167c875..72aa1c3241 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -165,7 +165,7 @@ public abstract class AbstractOrmVirtualNamedColumn<O extends ReadOnlyNamedColum return this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange() { + public TextRange getNameValidationTextRange() { return this.getValidationTextRange(); } 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 0013583b79..167349fb68 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -327,15 +327,15 @@ public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> return this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange() { + public TextRange getNameValidationTextRange() { return this.getValidationTextRange(); } - public TextRange getSchemaTextRange() { + public TextRange getSchemaValidationTextRange() { return this.getValidationTextRange(); } - public TextRange getCatalogTextRange() { + public TextRange getCatalogValidationTextRange() { return this.getValidationTextRange(); } 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 bc675fadc7..bcd0adb7dc 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -97,7 +97,7 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn this.column.getDbTable().getName() }, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } @@ -204,7 +204,7 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getColumn().getTableNameTextRange() + this.getColumn().getTableNameValidationTextRange() ); } 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 31f24a982f..6941b14acb 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -86,7 +86,7 @@ public abstract class AbstractTableValidator this.table.getName() }, this.table, - this.table.getCatalogTextRange() + this.table.getCatalogValidationTextRange() ); } @@ -127,7 +127,7 @@ public abstract class AbstractTableValidator this.table.getName() }, this.table, - this.table.getSchemaTextRange() + this.table.getSchemaValidationTextRange() ); } @@ -161,7 +161,7 @@ public abstract class AbstractTableValidator message, new String[] {this.table.getName()}, this.table, - this.table.getNameTextRange() + this.table.getNameValidationTextRange() ); } 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 c5bda8ffce..bcefdba658 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -63,7 +63,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.column.getDbTable().getName() }, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } @@ -143,7 +143,7 @@ public class AssociationOverrideInverseJoinColumnValidator JptJpaCoreValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_INVERSE_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_INVERSE_JOIN_COLUMNS, new String[] {this.override.getName()}, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } @@ -230,7 +230,7 @@ public class AssociationOverrideInverseJoinColumnValidator this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getColumn().getTableNameTextRange() + this.getColumn().getTableNameValidationTextRange() ); } 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 2bb3d5daea..48dec10375 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -64,7 +64,7 @@ public class AssociationOverrideJoinColumnValidator this.column.getDbTable().getName() }, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } @@ -144,7 +144,7 @@ public class AssociationOverrideJoinColumnValidator JptJpaCoreValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS, new String[] {this.override.getName()}, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } @@ -231,7 +231,7 @@ public class AssociationOverrideJoinColumnValidator this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getColumn().getTableNameTextRange() + this.getColumn().getTableNameValidationTextRange() ); } 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 3f19ff3c73..de45ad3b59 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -52,7 +52,7 @@ public class AssociationOverrideJoinTableValidator this.table.getName() }, this.table, - this.table.getNameTextRange() + this.table.getNameValidationTextRange() ); } @@ -72,7 +72,7 @@ public class AssociationOverrideJoinTableValidator this.table.getCatalog() }, this.table, - this.table.getCatalogTextRange() + this.table.getCatalogValidationTextRange() ); } @@ -92,7 +92,7 @@ public class AssociationOverrideJoinTableValidator this.table.getSchema() }, this.table, - this.table.getSchemaTextRange() + this.table.getSchemaValidationTextRange() ); } 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 7e2dc93ae5..b08ffe30a5 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -61,7 +61,7 @@ public class AttributeOverrideColumnValidator this.column.getDbTable().getName() }, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } @@ -118,7 +118,7 @@ public class AttributeOverrideColumnValidator this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getColumn().getTableNameTextRange() + this.getColumn().getTableNameValidationTextRange() ); } 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 4f67149760..e6200e9e17 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -125,7 +125,7 @@ public abstract class BaseJoinColumnValidator<C extends ReadOnlyBaseJoinColumn> message, StringTools.EMPTY_STRING_ARRAY, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } 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 a652e17139..6f0f50f516 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, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -53,7 +53,7 @@ public class SecondaryTablePrimaryKeyJoinColumnValidator this.column.getDbTable().getName() }, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } @@ -101,7 +101,7 @@ public class SecondaryTablePrimaryKeyJoinColumnValidator JptJpaCoreValidationMessages.VIRTUAL_SECONDARY_TABLE_PRIMARY_KEY_JOIN_COLUMN_NAME_MUST_BE_SPECIFIED_MULTIPLE_JOIN_COLUMNS, new String[] {this.getSecondaryTableName()}, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } 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 3d2406e53f..667a9e5991 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 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. @@ -263,11 +263,11 @@ public class NullJavaMapKeyColumn2_0 return this.getParent().getValidationTextRange(); } - public TextRange getNameTextRange() { + public TextRange getNameValidationTextRange() { return this.getValidationTextRange(); } - public TextRange getTableNameTextRange() { + public TextRange getTableNameValidationTextRange() { return this.getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullBaseTableAnnotation.java index bf160a56ec..dd4ea38081 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullBaseTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullBaseTableAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -46,15 +46,23 @@ public abstract class NullBaseTableAnnotation<A extends BaseTableAnnotation> this.addAnnotation().setName(name); } } - + public TextRange getNameTextRange() { return null; } + public TextRange getNameValidationTextRange() { + return null; + } + public boolean nameTouches(int pos) { return false; } + public boolean nameValidationTouches(int pos) { + return false; + } + // ***** schema public String getSchema() { return null; @@ -65,15 +73,23 @@ public abstract class NullBaseTableAnnotation<A extends BaseTableAnnotation> this.addAnnotation().setSchema(schema); } } - + public TextRange getSchemaTextRange() { return null; } + public TextRange getSchemaValidationTextRange() { + return null; + } + public boolean schemaTouches(int pos) { return false; } + public boolean schemaValidationTouches(int pos) { + return false; + } + // ***** catalog public String getCatalog() { return null; @@ -84,15 +100,23 @@ public abstract class NullBaseTableAnnotation<A extends BaseTableAnnotation> this.addAnnotation().setCatalog(catalog); } } - + public TextRange getCatalogTextRange() { return null; } + public TextRange getCatalogValidationTextRange() { + return null; + } + public boolean catalogTouches(int pos) { return false; } + public boolean catalogValidationTouches(int pos) { + return false; + } + // ***** unique constraints public ListIterable<UniqueConstraintAnnotation> getUniqueConstraints() { return EmptyListIterable.instance(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullNamedColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullNamedColumnAnnotation.java index 8632a4ff23..389fce3b4e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullNamedColumnAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullNamedColumnAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -56,6 +56,14 @@ public abstract class NullNamedColumnAnnotation<A extends NamedColumnAnnotation> return false; } + public TextRange getNameValidationTextRange() { + return null; + } + + public boolean nameValidationTouches(int pos) { + return false; + } + // ***** column definition public String getColumnDefinition() { return null; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java index ba7b3ddf66..7182e8f342 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java @@ -86,15 +86,23 @@ public abstract class BinaryBaseTableAnnotation } protected abstract String getNameElementName(); - + public TextRange getNameTextRange() { throw new UnsupportedOperationException(); } + public TextRange getNameValidationTextRange() { + throw new UnsupportedOperationException(); + } + public boolean nameTouches(int pos) { throw new UnsupportedOperationException(); } + public boolean nameValidationTouches(int pos) { + throw new UnsupportedOperationException(); + } + // ***** schema public String getSchema() { return this.schema; @@ -115,15 +123,23 @@ public abstract class BinaryBaseTableAnnotation } protected abstract String getSchemaElementName(); - + public TextRange getSchemaTextRange() { throw new UnsupportedOperationException(); } + public TextRange getSchemaValidationTextRange() { + throw new UnsupportedOperationException(); + } + public boolean schemaTouches(int pos) { throw new UnsupportedOperationException(); } + public boolean schemaValidationTouches(int pos) { + throw new UnsupportedOperationException(); + } + // ***** catalog public String getCatalog() { return this.catalog; @@ -144,15 +160,23 @@ public abstract class BinaryBaseTableAnnotation } protected abstract String getCatalogElementName(); - + public TextRange getCatalogTextRange() { throw new UnsupportedOperationException(); } + public TextRange getCatalogValidationTextRange() { + throw new UnsupportedOperationException(); + } + public boolean catalogTouches(int pos) { throw new UnsupportedOperationException(); } + public boolean catalogValidationTouches(int pos) { + throw new UnsupportedOperationException(); + } + // ***** unique constraints public ListIterable<UniqueConstraintAnnotation> getUniqueConstraints() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryNamedColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryNamedColumnAnnotation.java index 3cafb6b4b6..22f4970e1c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryNamedColumnAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryNamedColumnAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -88,6 +88,14 @@ public abstract class BinaryNamedColumnAnnotation throw new UnsupportedOperationException(); } + public TextRange getNameValidationTextRange() { + throw new UnsupportedOperationException(); + } + + public boolean nameValidationTouches(int pos) { + throw new UnsupportedOperationException(); + } + // ***** column definition public String getColumnDefinition() { return null; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceBaseTableAnnotation.java index 9e709201ca..5838e3b407 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceBaseTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceBaseTableAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -43,16 +43,19 @@ public abstract class SourceBaseTableAnnotation AnnotationElementAdapter<String> nameAdapter; String name; TextRange nameTextRange; + TextRange nameValidationTextRange; DeclarationAnnotationElementAdapter<String> schemaDeclarationAdapter; AnnotationElementAdapter<String> schemaAdapter; String schema; TextRange schemaTextRange; + TextRange schemaValidationTextRange; DeclarationAnnotationElementAdapter<String> catalogDeclarationAdapter; AnnotationElementAdapter<String> catalogAdapter; String catalog; TextRange catalogTextRange; + TextRange catalogValidationTextRange; final UniqueConstraintsAnnotationContainer uniqueConstraintsContainer = new UniqueConstraintsAnnotationContainer(); @@ -78,12 +81,15 @@ public abstract class SourceBaseTableAnnotation this.name = this.buildName(astAnnotation); this.nameTextRange = this.buildNameTextRange(astAnnotation); + this.nameValidationTextRange = this.buildNameValidationTextRange(astAnnotation); this.schema = this.buildSchema(astAnnotation); this.schemaTextRange = this.buildSchemaTextRange(astAnnotation); + this.schemaValidationTextRange = this.buildSchemaValidationTextRange(astAnnotation); this.catalog = this.buildCatalog(astAnnotation); this.catalogTextRange = this.buildCatalogTextRange(astAnnotation); + this.catalogValidationTextRange = this.buildCatalogValidationTextRange(astAnnotation); this.uniqueConstraintsContainer.initializeFromContainerAnnotation(astAnnotation); } @@ -94,12 +100,15 @@ public abstract class SourceBaseTableAnnotation this.syncName(this.buildName(astAnnotation)); this.nameTextRange = this.buildNameTextRange(astAnnotation); + this.nameValidationTextRange = this.buildNameValidationTextRange(astAnnotation); this.syncSchema(this.buildSchema(astAnnotation)); this.schemaTextRange = this.buildSchemaTextRange(astAnnotation); + this.schemaValidationTextRange = this.buildSchemaValidationTextRange(astAnnotation); this.syncCatalog(this.buildCatalog(astAnnotation)); this.catalogTextRange = this.buildCatalogTextRange(astAnnotation); + this.catalogValidationTextRange = this.buildCatalogValidationTextRange(astAnnotation); this.uniqueConstraintsContainer.synchronize(astAnnotation); } @@ -142,7 +151,15 @@ public abstract class SourceBaseTableAnnotation return this.nameTextRange; } + public TextRange getNameValidationTextRange() { + return this.nameValidationTextRange; + } + private TextRange buildNameTextRange(Annotation astAnnotation) { + return this.getAnnotationElementTextRange(this.nameDeclarationAdapter, astAnnotation); + } + + private TextRange buildNameValidationTextRange(Annotation astAnnotation) { return this.getElementTextRange(this.nameDeclarationAdapter, astAnnotation); } @@ -150,6 +167,10 @@ public abstract class SourceBaseTableAnnotation return this.textRangeTouches(this.nameTextRange, pos); } + public boolean nameValidationTouches(int pos) { + return this.textRangeTouches(this.nameValidationTextRange, pos); + } + /** * Build a declaration element adapter for the table's 'name' element. */ @@ -185,7 +206,15 @@ public abstract class SourceBaseTableAnnotation return this.schemaTextRange; } + public TextRange getSchemaValidationTextRange() { + return this.schemaValidationTextRange; + } + private TextRange buildSchemaTextRange(Annotation astAnnotation) { + return this.getAnnotationElementTextRange(this.schemaDeclarationAdapter, astAnnotation); + } + + private TextRange buildSchemaValidationTextRange(Annotation astAnnotation) { return this.getElementTextRange(this.schemaDeclarationAdapter, astAnnotation); } @@ -193,6 +222,10 @@ public abstract class SourceBaseTableAnnotation return this.textRangeTouches(this.schemaTextRange, pos); } + public boolean schemaValidationTouches(int pos) { + return this.textRangeTouches(this.schemaValidationTextRange, pos); + } + /** * Build a declaration element adapter for the table's 'schema' element. */ @@ -228,7 +261,15 @@ public abstract class SourceBaseTableAnnotation return this.catalogTextRange; } + public TextRange getCatalogValidationTextRange() { + return this.catalogValidationTextRange; + } + private TextRange buildCatalogTextRange(Annotation astAnnotation) { + return this.getAnnotationElementTextRange(this.catalogDeclarationAdapter, astAnnotation); + } + + private TextRange buildCatalogValidationTextRange(Annotation astAnnotation) { return this.getElementTextRange(this.catalogDeclarationAdapter, astAnnotation); } @@ -236,6 +277,10 @@ public abstract class SourceBaseTableAnnotation return this.textRangeTouches(this.catalogTextRange, pos); } + public boolean catalogValidationTouches(int pos) { + return this.textRangeTouches(this.catalogValidationTextRange, pos); + } + /** * Build a declaration element adapter for the table's 'catalog' element */ diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceNamedColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceNamedColumnAnnotation.java index 27bff1a685..156934723e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceNamedColumnAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceNamedColumnAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -40,6 +40,7 @@ public abstract class SourceNamedColumnAnnotation private AnnotationElementAdapter<String> nameAdapter; private String name; private TextRange nameTextRange; + private TextRange nameValidationTextRange; private DeclarationAnnotationElementAdapter<String> columnDefinitionDeclarationAdapter; private AnnotationElementAdapter<String> columnDefinitionAdapter; @@ -64,6 +65,7 @@ public abstract class SourceNamedColumnAnnotation super.initialize(astAnnotation); this.name = this.buildName(astAnnotation); this.nameTextRange = this.buildNameTextRange(astAnnotation); + this.nameValidationTextRange = this.buildNameValidationTextRange(astAnnotation); this.columnDefinition = this.buildColumnDefinition(astAnnotation); this.columnDefinitionTextRange = this.buildColumnDefinitionTextRange(astAnnotation); @@ -74,6 +76,7 @@ public abstract class SourceNamedColumnAnnotation super.synchronizeWith(astAnnotation); this.syncName(this.buildName(astAnnotation)); this.nameTextRange = this.buildNameTextRange(astAnnotation); + this.nameValidationTextRange = this.buildNameValidationTextRange(astAnnotation); this.syncColumnDefinition(this.buildColumnDefinition(astAnnotation)); this.columnDefinitionTextRange = this.buildColumnDefinitionTextRange(astAnnotation); @@ -112,7 +115,15 @@ public abstract class SourceNamedColumnAnnotation return this.nameTextRange; } + public TextRange getNameValidationTextRange() { + return this.nameValidationTextRange; + } + private TextRange buildNameTextRange(Annotation astAnnotation) { + return this.getAnnotationElementTextRange(this.nameDeclarationAdapter, astAnnotation); + } + + private TextRange buildNameValidationTextRange(Annotation astAnnotation) { return this.getElementTextRange(this.nameDeclarationAdapter, astAnnotation); } @@ -120,6 +131,10 @@ public abstract class SourceNamedColumnAnnotation return this.textRangeTouches(this.nameTextRange, pos); } + public boolean nameValidationTouches(int pos) { + return this.textRangeTouches(this.nameValidationTextRange, pos); + } + private DeclarationAnnotationElementAdapter<String> buildNameDeclarationAdapter() { return this.buildStringElementAdapter(this.getNameElementName()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/BaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/BaseTableAnnotation.java index e39b32b3f1..394f95a49f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/BaseTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/BaseTableAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -58,13 +58,17 @@ public interface BaseTableAnnotation * does not exist return the {@link TextRange} for the *Table annotation. */ TextRange getNameTextRange(); - + /** * Return whether the specified position touches the 'name' element. * Return false if the element does not exist. */ boolean nameTouches(int pos); + TextRange getNameValidationTextRange(); + + boolean nameValidationTouches(int pos); + // ********** schema ********** @@ -86,12 +90,16 @@ public interface BaseTableAnnotation * does not exist return the {@link TextRange} for the *Table annotation. */ TextRange getSchemaTextRange(); - + /** * Return whether the specified position touches the 'schema' element. * Return false if the element does not exist. */ boolean schemaTouches(int pos); + + TextRange getSchemaValidationTextRange(); + + boolean schemaValidationTouches(int pos); // ********** catalog ********** @@ -114,12 +122,16 @@ public interface BaseTableAnnotation * does not exist return the {@link TextRange} for the *Table annotation. */ TextRange getCatalogTextRange(); - + /** * Return whether the specified position touches the 'catalog' element. * Return false if the element does not exist. */ boolean catalogTouches(int pos); + + TextRange getCatalogValidationTextRange(); + + boolean catalogValidationTouches(int pos); // ********** unique constraints ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/NamedColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/NamedColumnAnnotation.java index 360db4e6ab..4b9324b512 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/NamedColumnAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/NamedColumnAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -54,19 +54,23 @@ public interface NamedColumnAnnotation * Set to null to remove the element. */ void setName(String name); - + /** * Return the {@link TextRange} for the 'name' element. If the element * does not exist return the {@link TextRange} for the *Column annotation. */ TextRange getNameTextRange(); - + /** * Return whether the specified position touches the 'name' element. * Return false if the element does not exist. */ boolean nameTouches(int pos); + TextRange getNameValidationTextRange(); + + boolean nameValidationTouches(int pos); + // ********** column definition ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/TenantDiscriminatorColumnValidator2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/TenantDiscriminatorColumnValidator2_3.java index b1e9b5f4b4..0d2471fe49 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/TenantDiscriminatorColumnValidator2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/TenantDiscriminatorColumnValidator2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 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. @@ -40,7 +40,7 @@ public class TenantDiscriminatorColumnValidator2_3 this.column.getDbTable().getName() }, this.column, - this.column.getNameTextRange() + this.column.getNameValidationTextRange() ); } @@ -91,7 +91,7 @@ public class TenantDiscriminatorColumnValidator2_3 this.getColumnTableDescriptionMessage() }, this.getColumn(), - this.getColumn().getTableNameTextRange() + this.getColumn().getTableNameValidationTextRange() ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java index 09c0fefe54..fd56fdf948 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 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. @@ -125,7 +125,7 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3 return this.owner.getDefaultTableName(); } - public TextRange getTableNameTextRange() { + public TextRange getTableNameValidationTextRange() { return this.getValidationTextRange(this.getColumnAnnotation().getTableTextRange()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java index 62234ce613..1e5d4f80bf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 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. @@ -182,7 +182,7 @@ public class EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3 // ********** validation ********** - public TextRange getTableNameTextRange() { + public TextRange getTableNameValidationTextRange() { return this.getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java index f2980f842e..2ce0a2de63 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Oracle. All rights reserved. + * Copyright (c) 2012, 2013 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. @@ -234,7 +234,7 @@ public class EclipseLinkOrmTenantDiscriminatorColumn2_3 return this.owner.tableNameIsInvalid(this.getTableName()); } - public TextRange getTableNameTextRange() { + public TextRange getTableNameValidationTextRange() { return this.getValidationTextRange(this.getXmlColumnTableTextRange()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/GenericOrmVirtualTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/GenericOrmVirtualTenantDiscriminatorColumn2_3.java index d21f0b5564..a912f6c434 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/GenericOrmVirtualTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/GenericOrmVirtualTenantDiscriminatorColumn2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 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. @@ -182,7 +182,7 @@ public class GenericOrmVirtualTenantDiscriminatorColumn2_3 // ********** validation ********** - public TextRange getTableNameTextRange() { + public TextRange getTableNameValidationTextRange() { return this.getValidationTextRange(); } } |