diff options
author | bvosburgh | 2008-03-26 03:12:20 +0000 |
---|---|---|
committer | bvosburgh | 2008-03-26 03:12:20 +0000 |
commit | 284e6bb770ca9573db8670ed1a09c2afde6a76e3 (patch) | |
tree | 42d369867a9d7dbf682e42b83d7643af5e6f6d14 /jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core | |
parent | 496ded0890472d932194a9b82c29a28808f5e08e (diff) | |
download | webtools.dali-284e6bb770ca9573db8670ed1a09c2afde6a76e3.tar.gz webtools.dali-284e6bb770ca9573db8670ed1a09c2afde6a76e3.tar.xz webtools.dali-284e6bb770ca9573db8670ed1a09c2afde6a76e3.zip |
renamed AbstractColumnAnnotation to BaseColumnAnnotation and related changes
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core')
15 files changed, 38 insertions, 38 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; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BaseColumnImpl.java index be095c40bb..98b0aa6135 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BaseColumnImpl.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter; -import org.eclipse.jpt.core.resource.java.AbstractColumnAnnotation; +import org.eclipse.jpt.core.resource.java.BaseColumnAnnotation; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.NestableAnnotation; import org.eclipse.jpt.core.utility.TextRange; @@ -21,7 +21,7 @@ import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.utility.jdt.Member; -public abstract class AbstractColumnImpl extends AbstractNamedColumn implements AbstractColumnAnnotation +public abstract class BaseColumnImpl extends AbstractNamedColumn implements BaseColumnAnnotation { // hold this so we can get the 'table' text range private final DeclarationAnnotationElementAdapter<String> tableDeclarationAdapter; @@ -55,11 +55,11 @@ public abstract class AbstractColumnImpl extends AbstractNamedColumn implements private Boolean updatable; - public AbstractColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) { + public BaseColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) { this(parent, member, daa, new MemberAnnotationAdapter(member, daa)); } - public AbstractColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + public BaseColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.tableDeclarationAdapter = this.buildStringElementAdapter(this.tableElementName()); this.tableAdapter = this.buildShortCircuitElementAdapter(this.tableDeclarationAdapter); @@ -96,7 +96,7 @@ public abstract class AbstractColumnImpl extends AbstractNamedColumn implements @Override public void initializeFrom(NestableAnnotation oldAnnotation) { super.initializeFrom(oldAnnotation); - AbstractColumnAnnotation oldColumn = (AbstractColumnAnnotation) oldAnnotation; + BaseColumnAnnotation oldColumn = (BaseColumnAnnotation) oldAnnotation; setTable(oldColumn.getTable()); setUnique(oldColumn.getUnique()); setNullable(oldColumn.getNullable()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java index e07c48a81c..df0d17c7bb 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.utility.jdt.Member; -public class ColumnImpl extends AbstractColumnImpl implements ColumnAnnotation, NestableAnnotation +public class ColumnImpl extends BaseColumnImpl implements ColumnAnnotation, NestableAnnotation { // this adapter is only used by a Column annotation associated with a mapping annotation (e.g. Basic) public static final DeclarationAnnotationAdapter MAPPING_DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java index 0199c6e372..a244dadf3e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java @@ -31,7 +31,7 @@ import org.eclipse.jpt.core.utility.jdt.IndexedAnnotationAdapter; import org.eclipse.jpt.core.utility.jdt.IndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.utility.jdt.Member; -public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinColumn +public class JoinColumnImpl extends BaseColumnImpl implements NestableJoinColumn { private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java index 5d7a79c329..aef98dea3c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Oracle. All rights reserved. + * Copyright (c) 2007, 2008 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -16,7 +16,7 @@ import org.eclipse.jpt.core.resource.java.ColumnAnnotation; import org.eclipse.jpt.core.utility.TextRange; -public class NullAttributeOverrideColumn extends NullAbstractColumn implements ColumnAnnotation, Annotation +public class NullAttributeOverrideColumn extends NullBaseColumn implements ColumnAnnotation, Annotation { public NullAttributeOverrideColumn(AttributeOverrideAnnotation parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseColumn.java index 446552a8f3..59f7435a00 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Oracle. All rights reserved. + * Copyright (c) 2007, 2008 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,20 +10,20 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.resource.java.AbstractColumnAnnotation; +import org.eclipse.jpt.core.resource.java.BaseColumnAnnotation; import org.eclipse.jpt.core.resource.java.Annotation; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.utility.TextRange; -public abstract class NullAbstractColumn extends NullNamedColumn implements AbstractColumnAnnotation, Annotation +public abstract class NullBaseColumn extends NullNamedColumn implements BaseColumnAnnotation, Annotation { - protected NullAbstractColumn(JavaResourceNode parent) { + protected NullBaseColumn(JavaResourceNode parent) { super(parent); } @Override - protected abstract AbstractColumnAnnotation createColumnResource(); + protected abstract BaseColumnAnnotation createColumnResource(); public String getTable() { return null; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java index add7a37b75..85bc7403d4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java @@ -18,9 +18,9 @@ import org.eclipse.jpt.core.resource.java.UniqueConstraint; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; -public abstract class NullAbstractTable extends AbstractJavaResourceNode implements TableAnnotation, Annotation +public abstract class NullBaseTable extends AbstractJavaResourceNode implements Annotation { - protected NullAbstractTable(JavaResourcePersistentMember parent) { + protected NullBaseTable(JavaResourcePersistentMember parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java index ef716a468d..01ce755c4a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Oracle. All rights reserved. + * Copyright (c) 2007, 2008 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -16,7 +16,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; import org.eclipse.jpt.core.utility.TextRange; -public class NullColumn extends NullAbstractColumn implements ColumnAnnotation, Annotation +public class NullColumn extends NullBaseColumn implements ColumnAnnotation, Annotation { public NullColumn(JavaResourcePersistentMember parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java index 7471ccc888..0c8e3e0ea4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Oracle. All rights reserved. + * Copyright (c) 2007, 2008 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -17,7 +17,7 @@ import org.eclipse.jpt.core.utility.TextRange; -public class NullJoinColumn extends NullAbstractColumn implements JoinColumnAnnotation, Annotation +public class NullJoinColumn extends NullBaseColumn implements JoinColumnAnnotation, Annotation { public NullJoinColumn(JavaResourceNode parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java index a70b34fa70..cd6098a296 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Oracle. All rights reserved. + * Copyright (c) 2007, 2008 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -16,14 +16,14 @@ import org.eclipse.jpt.core.resource.java.JoinTableAnnotation; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; -public class NullJoinTable extends NullAbstractTable implements JoinTableAnnotation +public class NullJoinTable extends NullBaseTable implements JoinTableAnnotation { protected NullJoinTable(JavaResourcePersistentMember parent) { super(parent); } public String getAnnotationName() { - return JoinTableAnnotation.ANNOTATION_NAME; + return ANNOTATION_NAME; } public JoinColumnAnnotation addInverseJoinColumn(int index) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java index a0832f080b..1d5f9f6185 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Oracle. All rights reserved. + * Copyright (c) 2007, 2008 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -13,14 +13,14 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; import org.eclipse.jpt.core.resource.java.TableAnnotation; -public class NullTable extends NullAbstractTable implements TableAnnotation +public class NullTable extends NullBaseTable implements TableAnnotation { protected NullTable(JavaResourcePersistentMember parent) { super(parent); } public String getAnnotationName() { - return TableAnnotation.ANNOTATION_NAME; + return ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AbstractColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BaseColumnAnnotation.java index 89718d0402..d23135e853 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AbstractColumnAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BaseColumnAnnotation.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.core.utility.TextRange; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. */ -public interface AbstractColumnAnnotation extends NamedColumnAnnotation +public interface BaseColumnAnnotation extends NamedColumnAnnotation { /** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ColumnAnnotation.java index 8e1b92fc13..95ab292b4a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ColumnAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ColumnAnnotation.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.core.utility.TextRange; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. */ -public interface ColumnAnnotation extends AbstractColumnAnnotation +public interface ColumnAnnotation extends BaseColumnAnnotation { String ANNOTATION_NAME = JPA.COLUMN; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnAnnotation.java index c48d841457..88d8a4a4d1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnAnnotation.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.core.utility.TextRange; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. */ -public interface JoinColumnAnnotation extends AbstractColumnAnnotation +public interface JoinColumnAnnotation extends BaseColumnAnnotation { String ANNOTATION_NAME = JPA.JOIN_COLUMN; |