use JPA static strings, hardcoded strings left in a few places

16 files changed, 62 insertions, 21 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java
index f73e8e651b..3085767c3d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java
@@ -76,16 +76,21 @@ public abstract class AbstractNamedQuery extends AbstractResourceAnnotation<Type
 	}
 
 	protected DeclarationAnnotationElementAdapter<String> nameAdapter(DeclarationAnnotationAdapter daa) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, nameElementName());
+		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, getNameElementName());
 	}
 
 	protected DeclarationAnnotationElementAdapter<String> queryAdapter(DeclarationAnnotationAdapter daa) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, queryElementName());
+		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, getQueryElementName());
 	}
 
-	protected abstract String nameElementName();
+	protected abstract String getNameElementName();
 
-	protected abstract String queryElementName();
+	protected abstract String getQueryElementName();
+
+	/**
+	 * Return the uniqueConstraints element name
+	 */
+	protected abstract String getHintsElementName();
 
 	public String getName() {
 		return this.name;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java
index 76381127c6..9c9d43c162 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java
@@ -95,6 +95,10 @@ public abstract class AbstractResourceTable extends AbstractResourceAnnotation<M
 	 */
 	protected abstract DeclarationAnnotationElementAdapter<String> catalogAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter);
 
+	/**
+	 * Return the uniqueConstraints element name
+	 */
+	protected abstract String getUniqueConstraintsElementName();
 	
 	public String getName() {
 		return this.name;
@@ -332,7 +336,7 @@ public abstract class AbstractResourceTable extends AbstractResourceAnnotation<M
 		}
 		
 		public String getElementName() {
-			return "uniqueConstraints";
+			return AbstractResourceTable.this.getUniqueConstraintsElementName();
 		}
 
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java
index 0fa1e787b1..5ee0743585 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java
@@ -246,7 +246,7 @@ public class AssociationOverrideImpl
 		}
 		
 		public String getElementName() {
-			return "joinColumns";
+			return JPA.ASSOCIATION_OVERRIDE__JOIN_COLUMNS;
 		}
 
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java
index 393e49852c..006c3a99a0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdap
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
 import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
 import org.eclipse.jpt.core.resource.java.AssociationOverridesAnnotation;
+import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.resource.java.NestableAssociationOverride;
@@ -107,7 +108,7 @@ public class AssociationOverridesImpl extends AbstractResourceAnnotation<Member>
 	}
 
 	public String getElementName() {
-		return "value";
+		return JPA.ASSOCIATION_OVERRIDES__VALUE;
 	}
 
 	public void update(CompilationUnit astRoot) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java
index e34de7acdd..a878fff6f8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdap
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
 import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
 import org.eclipse.jpt.core.resource.java.AttributeOverridesAnnotation;
+import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.resource.java.NestableAttributeOverride;
@@ -107,7 +108,7 @@ public class AttributeOverridesImpl extends AbstractResourceAnnotation<Member> i
 	}
 
 	public String getElementName() {
-		return "value";
+		return JPA.ATTRIBUTE_OVERRIDES__VALUE;
 	}
 
 	public void update(CompilationUnit astRoot) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java
index c10206642c..96e02e1fd3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
+import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
@@ -108,7 +109,7 @@ public class JoinColumnsImpl extends AbstractResourceAnnotation<Member> implemen
 	}
 
 	public String getElementName() {
-		return "value";
+		return JPA.JOIN_COLUMNS__VALUE;
 	}
 	
 	public void update(CompilationUnit astRoot) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java
index 0d4834f69f..3e326005d2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java
@@ -89,6 +89,11 @@ public class JoinTableImpl extends AbstractResourceTable implements JoinTableAnn
 	}
 	
 	@Override
+	protected String getUniqueConstraintsElementName() {
+		return JPA.JOIN_TABLE__UNIQUE_CONSTRAINTS;
+	}
+	
+	@Override
 	protected NestableUniqueConstraint createUniqueConstraint(int index) {
 		return UniqueConstraintImpl.createJoinTableUniqueConstraint(this, this.getMember(), index);
 	}
@@ -252,7 +257,7 @@ public class JoinTableImpl extends AbstractResourceTable implements JoinTableAnn
 			JoinTableImpl.this.removeJoinColumn(nestedAnnotation);	
 		}
 		public String getElementName() {
-			return "joinColumns";
+			return JPA.JOIN_TABLE__JOIN_COLUMNS;
 		}
 	}
 	
@@ -299,7 +304,7 @@ public class JoinTableImpl extends AbstractResourceTable implements JoinTableAnn
 		}
 		
 		public String getElementName() {
-			return "inverseJoinColumns";
+			return JPA.JOIN_TABLE__INVERSE_JOIN_COLUMNS;
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java
index 86adc83e30..07b1880231 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
+import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.resource.java.NamedNativeQueriesAnnotation;
@@ -52,7 +53,7 @@ public class NamedNativeQueriesImpl extends AbstractResourceAnnotation<Type> imp
 	}
 
 	public String getElementName() {
-		return "value";
+		return JPA.NAMED_NATIVE_QUERIES__VALUE;
 	}
 		
 	public ListIterator<NestableNamedNativeQuery> nestedAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java
index 98a055003e..11b91188e2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java
@@ -92,16 +92,21 @@ public class NamedNativeQueryImpl extends AbstractNamedQuery
 	//************* AbstractNamedQuery implementation *************
 
 	@Override
-	protected String nameElementName() {
+	protected String getNameElementName() {
 		return JPA.NAMED_NATIVE_QUERY__NAME;
 	}
 
 	@Override
-	protected String queryElementName() {
+	protected String getQueryElementName() {
 		return JPA.NAMED_NATIVE_QUERY__QUERY;
 	}
 	
 	@Override
+	protected String getHintsElementName() {
+		return JPA.NAMED_NATIVE_QUERY__HINTS;
+	}
+	
+	@Override
 	public void initializeFrom(NestableAnnotation oldAnnotation) {
 		super.initializeFrom(oldAnnotation);
 		NamedNativeQueryAnnotation oldNamedQuery = (NamedNativeQueryAnnotation) oldAnnotation;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java
index 24220a0f35..60e7dab677 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
+import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.resource.java.NamedQueriesAnnotation;
@@ -52,7 +53,7 @@ public class NamedQueriesImpl extends AbstractResourceAnnotation<Type> implement
 	}
 
 	public String getElementName() {
-		return "value";
+		return JPA.NAMED_QUERIES__VALUE;
 	}
 		
 	public ListIterator<NestableNamedQuery> nestedAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java
index ae1c4f09f4..47bfd5b897 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java
@@ -43,16 +43,21 @@ public class NamedQueryImpl extends AbstractNamedQuery
 	
 	//************* AbstractNamedQuery implementation *************
 	@Override
-	protected String nameElementName() {
+	protected String getNameElementName() {
 		return JPA.NAMED_QUERY__NAME;
 	}
 	
 	@Override
-	protected String queryElementName() {
+	protected String getQueryElementName() {
 		return JPA.NAMED_QUERY__QUERY;
 	}
 	
 	@Override
+	protected String getHintsElementName() {
+		return JPA.NAMED_QUERY__HINTS;
+	}
+	
+	@Override
 	protected NestableQueryHint createQueryHint(int index) {
 		return QueryHintImpl.createNamedQueryQueryHint(this, getMember(), this.getDeclarationAnnotationAdapter(), index);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java
index 2fbcee6a4b..c777127c5e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
+import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.resource.java.NestablePrimaryKeyJoinColumn;
@@ -51,7 +52,7 @@ public class PrimaryKeyJoinColumnsImpl extends AbstractResourceAnnotation<Member
 	}
 
 	public String getElementName() {
-		return "value";
+		return JPA.PRIMARY_KEY_JOIN_COLUMNS__VALUE;
 	}
 		
 	public ListIterator<NestablePrimaryKeyJoinColumn> nestedAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java
index dc7da417d7..7ad53b29c2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java
@@ -105,6 +105,11 @@ public class SecondaryTableImpl extends AbstractResourceTable implements Nestabl
 	}
 	
 	@Override
+	protected String getUniqueConstraintsElementName() {
+		return JPA.SECONDARY_TABLE__UNIQUE_CONSTRAINTS;
+	}
+
+	@Override
 	protected NestableUniqueConstraint createUniqueConstraint(int index) {
 		return UniqueConstraintImpl.createSecondaryTableUniqueConstraint(this, this.getMember(), this.getDeclarationAnnotationAdapter(), index);
 	}
@@ -283,7 +288,7 @@ public class SecondaryTableImpl extends AbstractResourceTable implements Nestabl
 		}
 		
 		public String getElementName() {
-			return "pkJoinColumns";
+			return JPA.SECONDARY_TABLE__PK_JOIN_COLUMNS;
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java
index 4fb30c832d..1df7ca438d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
+import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.NestableSecondaryTable;
@@ -50,7 +51,7 @@ public class SecondaryTablesImpl extends AbstractResourceAnnotation<Member> impl
 	}
 
 	public String getElementName() {
-		return "value";
+		return JPA.SECONDARY_TABLES__VALUE;
 	}
 	
 	public ListIterator<NestableSecondaryTable> nestedAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java
index f6aa40e628..dfcc23596f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java
@@ -444,7 +444,7 @@ public class TableGeneratorImpl extends GeneratorImpl implements TableGeneratorA
 		}
 		
 		public String getElementName() {
-			return "uniqueConstraints";
+			return JPA.TABLE_GENERATOR__UNIQUE_CONSTRAINTS;
 		}
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java
index b7a7d57a5e..f5d4dcc666 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java
@@ -60,6 +60,11 @@ public class TableImpl extends AbstractResourceTable
 	}
 	
 	@Override
+	protected String getUniqueConstraintsElementName() {
+		return JPA.TABLE__UNIQUE_CONSTRAINTS;
+	}
+
+	@Override
 	protected NestableUniqueConstraint createUniqueConstraint(int index) {
 		return UniqueConstraintImpl.createTableUniqueConstraint(this, this.getMember(), index);
 	}