added isSpecified to BaseTableAnnotation and NamedColumnAnnotation, this is probably useful on NullAnnotation itself

10 files changed, 37 insertions, 11 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java
index 3207cfcebb..8ac0a35c18 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java
@@ -69,12 +69,8 @@ public class GenericJavaDiscriminatorColumn extends AbstractJavaNamedColumn<Disc
 		return (DiscriminatorColumnAnnotation) this.persistenceResource.getNonNullSupportingAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME);
 	}
 	
-	public DiscriminatorColumnAnnotation getResourceColumnOrNull() {
-		return (DiscriminatorColumnAnnotation) this.persistenceResource.getSupportingAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME);
-	}
-	
 	public boolean isResourceSpecified() {
-		return getResourceColumnOrNull() != null;
+		return getResourceColumn().isSpecified();
 	}
 	
 	public DiscriminatorType getDiscriminatorType() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java
index e6369ff23c..9cc2f9b377 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java
@@ -47,13 +47,9 @@ public class GenericJavaTable
 		//TODO get the NullTable from the resource model or build it here in the context model??
 		return (TableAnnotation) this.resourcePersistentMember.getNonNullSupportingAnnotation(getAnnotationName());
 	}
-	
-	protected TableAnnotation getResourceTableOrNull() {
-		return (TableAnnotation) this.resourcePersistentMember.getSupportingAnnotation(getAnnotationName());
-	}
 
 	public boolean isResourceSpecified() {
-		return getResourceTableOrNull() != null;
+		return getTableAnnotation().isSpecified();
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTableAnnotation.java
index a00950ee0c..83c13211d0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTableAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTableAnnotation.java
@@ -32,7 +32,10 @@ public abstract class NullBaseTableAnnotation
 	
 	protected abstract BaseTableAnnotation addAnnotation();
 
-
+	public boolean isSpecified() {
+		return false;
+	}
+	
 	// ***** name
 	public String getName() {
 		return null;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumnAnnotation.java
index 8e3076918b..ae673da038 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumnAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumnAnnotation.java
@@ -28,6 +28,10 @@ public abstract class NullNamedColumnAnnotation
 		super(parent);
 	}
 
+	public boolean isSpecified() {
+		return false;
+	}
+
 	protected abstract NamedColumnAnnotation addAnnotation();
 
 	// ***** name
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java
index c5a0b435cd..ca8c3d4ed4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java
@@ -60,6 +60,10 @@ abstract class BinaryBaseTableAnnotation
 
 	// ********** BaseTableAnnotation implementation **********
 
+	public boolean isSpecified() {
+		return true;
+	}
+	
 	// ***** name
 	public String getName() {
 		return this.name;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryNamedColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryNamedColumnAnnotation.java
index 85f273bfa0..fb9168e6e5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryNamedColumnAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryNamedColumnAnnotation.java
@@ -50,6 +50,10 @@ abstract class BinaryNamedColumnAnnotation
 
 	// ********** NamedColumn implementation **********
 
+	public boolean isSpecified() {
+		return true;
+	}
+
 	// ***** name
 	public String getName() {
 		return this.name;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourceBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourceBaseTableAnnotation.java
index 5ff3c9d736..608f9c5cdb 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourceBaseTableAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourceBaseTableAnnotation.java
@@ -105,6 +105,10 @@ abstract class SourceBaseTableAnnotation
 
 	// ********** BaseTableAnnotation implementation **********
 
+	public boolean isSpecified() {
+		return true;
+	}
+	
 	// ***** name
 	public String getName() {
 		return this.name;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourceNamedColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourceNamedColumnAnnotation.java
index 83d1bc6715..3f6048f7e3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourceNamedColumnAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourceNamedColumnAnnotation.java
@@ -102,6 +102,10 @@ abstract class SourceNamedColumnAnnotation
 
 	// ********** NamedColumn implementation **********
 
+	public boolean isSpecified() {
+		return true;
+	}
+
 	// ***** name
 	public String getName() {
 		return this.name;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BaseTableAnnotation.java
index 1e8740607e..ced7baae17 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BaseTableAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BaseTableAnnotation.java
@@ -29,6 +29,12 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface BaseTableAnnotation
 	extends Annotation
 {
+	
+	/**
+	 * Return true if the table annotation exists in Java, false if it does not.
+	 */
+	boolean isSpecified();
+	
 	/**
 	 * Corresponds to the 'name' element of the *Table annotation.
 	 * Return null if the element does not exist in Java.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedColumnAnnotation.java
index 932325c2c1..978ba1de9a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedColumnAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedColumnAnnotation.java
@@ -29,6 +29,11 @@ public interface NamedColumnAnnotation
 	extends Annotation
 {
 	/**
+	 * Return true if the annotation exists in Java, false if it does not.
+	 */
+	boolean isSpecified();
+
+	/**
 	 * Corresponds to the 'name' element of the *Column annotation.
 	 * Return null if the element does not exist in Java.
 	 */