renamed AbstractColumnAnnotation to BaseColumnAnnotation and related changes

2 files changed, 9 insertions, 9 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java
index f3c12d091f..f93dccd804 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java
@@ -14,14 +14,14 @@ import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.context.BaseColumn;
 import org.eclipse.jpt.core.context.java.JavaBaseColumn;
 import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.AbstractColumnAnnotation;
+import org.eclipse.jpt.core.resource.java.BaseColumnAnnotation;
 import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.utility.Filter;
 import org.eclipse.jpt.utility.internal.StringTools;
 import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
 import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
 
-public abstract class AbstractJavaBaseColumn<T extends AbstractColumnAnnotation> extends AbstractJavaNamedColumn<T>
+public abstract class AbstractJavaBaseColumn<T extends BaseColumnAnnotation> extends AbstractJavaNamedColumn<T>
 	implements JavaBaseColumn
 {
 
@@ -280,23 +280,23 @@ public abstract class AbstractJavaBaseColumn<T extends AbstractColumnAnnotation>
 		return this.owner().defaultTableName();
 	}
 	
-	protected String specifiedTable(AbstractColumnAnnotation column) {
+	protected String specifiedTable(BaseColumnAnnotation column) {
 		return column.getTable();
 	}
 	
-	protected Boolean specifiedUnique(AbstractColumnAnnotation column) {
+	protected Boolean specifiedUnique(BaseColumnAnnotation column) {
 		return column.getUnique();
 	}
 	
-	protected Boolean specifiedNullable(AbstractColumnAnnotation column) {
+	protected Boolean specifiedNullable(BaseColumnAnnotation column) {
 		return column.getNullable();
 	}
 	
-	protected Boolean specifiedInsertable(AbstractColumnAnnotation column) {
+	protected Boolean specifiedInsertable(BaseColumnAnnotation column) {
 		return column.getInsertable();
 	}
 	
-	protected Boolean specifiedUpdatable(AbstractColumnAnnotation column) {
+	protected Boolean specifiedUpdatable(BaseColumnAnnotation column) {
 		return column.getUpdatable();
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java
index 8a19ea7e84..9775332c16 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java
@@ -11,14 +11,14 @@ package org.eclipse.jpt.core.internal.context.java;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.context.Column;
-import org.eclipse.jpt.core.internal.resource.java.NullAbstractColumn;
+import org.eclipse.jpt.core.internal.resource.java.NullBaseColumn;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
 import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
 import org.eclipse.jpt.core.utility.TextRange;
 
 
-public class VirtualAttributeOverrideColumn extends NullAbstractColumn implements ColumnAnnotation, Annotation
+public class VirtualAttributeOverrideColumn extends NullBaseColumn implements ColumnAnnotation, Annotation
 {	
 	private Column column;