Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToManyMappingDefinition2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToManyMappingDefinition2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/NullOrderColumn2_0Annotation.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/OrderColumn2_0AnnotationDefinition.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryOrderColumn2_0Annotation.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceOrderColumn2_0Annotation.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaSpecifiedOrderColumn2_0.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/OrderColumnAnnotation2_0.java (renamed from jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/OrderColumn2_0Annotation.java)2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OrderColumn2_0AnnotationTests.java36
12 files changed, 58 insertions, 58 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java
index 68d661ba88..25687d215d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java
@@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.OrderColumn2_0Annota
import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrderable2_0;
import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSpecifiedOrderColumn2_0;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.resource.java.OrderByAnnotation;
import org.eclipse.jpt.jpa.core.validation.JptJpaCoreValidationMessages;
import org.eclipse.jpt.jpa.db.Table;
@@ -52,7 +52,7 @@ public class GenericJavaOrderable
protected boolean customOrdering = false;
// JPA 1.0
- protected OrderColumn2_0Annotation nullOrderColumnAnnotation;
+ protected OrderColumnAnnotation2_0 nullOrderColumnAnnotation;
// JPA 2.0
protected final JavaOrderable2_0.ParentAdapter parentAdapter;
@@ -344,8 +344,8 @@ public class GenericJavaOrderable
// ********** order column annotation **********
- protected OrderColumn2_0Annotation getOrderColumnAnnotation() {
- return (OrderColumn2_0Annotation) this.getResourceAttribute().getAnnotation(OrderColumn2_0Annotation.ANNOTATION_NAME);
+ protected OrderColumnAnnotation2_0 getOrderColumnAnnotation() {
+ return (OrderColumnAnnotation2_0) this.getResourceAttribute().getAnnotation(OrderColumnAnnotation2_0.ANNOTATION_NAME);
}
/**
@@ -355,8 +355,8 @@ public class GenericJavaOrderable
return this.isJpa2_0Compatible() && (this.getOrderColumnAnnotation() != null);
}
- protected OrderColumn2_0Annotation addOrderColumnAnnotation() {
- return (OrderColumn2_0Annotation) this.getResourceAttribute().addAnnotation(OrderColumn2_0Annotation.ANNOTATION_NAME);
+ protected OrderColumnAnnotation2_0 addOrderColumnAnnotation() {
+ return (OrderColumnAnnotation2_0) this.getResourceAttribute().addAnnotation(OrderColumnAnnotation2_0.ANNOTATION_NAME);
}
protected void removeOrderColumnAnnotation() {
@@ -366,29 +366,29 @@ public class GenericJavaOrderable
}
protected void removeOrderColumnAnnotation_() {
- this.getResourceAttribute().removeAnnotation(OrderColumn2_0Annotation.ANNOTATION_NAME);
+ this.getResourceAttribute().removeAnnotation(OrderColumnAnnotation2_0.ANNOTATION_NAME);
}
/**
* If we are in a JPA 1.0 project, return a <em>null</em> annotation.
*/
- public OrderColumn2_0Annotation getNonNullOrderColumnAnnotation() {
+ public OrderColumnAnnotation2_0 getNonNullOrderColumnAnnotation() {
// hmmmm...
return this.isJpa2_0Compatible() ?
- (OrderColumn2_0Annotation) this.getResourceAttribute().getNonNullAnnotation(OrderColumn2_0Annotation.ANNOTATION_NAME) :
+ (OrderColumnAnnotation2_0) this.getResourceAttribute().getNonNullAnnotation(OrderColumnAnnotation2_0.ANNOTATION_NAME) :
this.getNullOrderColumnAnnotation();
}
- protected OrderColumn2_0Annotation getNullOrderColumnAnnotation() {
+ protected OrderColumnAnnotation2_0 getNullOrderColumnAnnotation() {
if (this.nullOrderColumnAnnotation == null) {
this.nullOrderColumnAnnotation = this.buildNullOrderColumnAnnotation();
}
return this.nullOrderColumnAnnotation;
}
- protected OrderColumn2_0Annotation buildNullOrderColumnAnnotation() {
+ protected OrderColumnAnnotation2_0 buildNullOrderColumnAnnotation() {
// hmmmm...
- return (OrderColumn2_0Annotation) OrderColumn2_0AnnotationDefinition.instance().buildNullAnnotation(this.getResourceAttribute());
+ return (OrderColumnAnnotation2_0) OrderColumn2_0AnnotationDefinition.instance().buildNullAnnotation(this.getResourceAttribute());
}
@@ -503,7 +503,7 @@ public class GenericJavaOrderable
return new OrderColumnValidator(this.getPersistentAttribute(), (SpecifiedOrderColumn2_0) column);
}
- public OrderColumn2_0Annotation getColumnAnnotation() {
+ public OrderColumnAnnotation2_0 getColumnAnnotation() {
return GenericJavaOrderable.this.getNonNullOrderColumnAnnotation();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java
index e0a58e8c9d..0c4de77605 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java
@@ -11,13 +11,13 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java;
import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaNamedColumn;
import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSpecifiedOrderColumn2_0;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
/**
* Java order column
*/
public class GenericJavaOrderColumn2_0
- extends AbstractJavaNamedColumn<JavaSpecifiedOrderColumn2_0.ParentAdapter, OrderColumn2_0Annotation>
+ extends AbstractJavaNamedColumn<JavaSpecifiedOrderColumn2_0.ParentAdapter, OrderColumnAnnotation2_0>
implements JavaSpecifiedOrderColumn2_0
{
protected Boolean specifiedNullable;
@@ -39,7 +39,7 @@ public class GenericJavaOrderColumn2_0
}
@Override
- protected void initialize(OrderColumn2_0Annotation columnAnnotation) {
+ protected void initialize(OrderColumnAnnotation2_0 columnAnnotation) {
super.initialize(columnAnnotation);
this.specifiedNullable = this.buildSpecifiedNullable(columnAnnotation);
this.specifiedInsertable = this.buildSpecifiedInsertable(columnAnnotation);
@@ -49,7 +49,7 @@ public class GenericJavaOrderColumn2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel(OrderColumn2_0Annotation columnAnnotation) {
+ public void synchronizeWithResourceModel(OrderColumnAnnotation2_0 columnAnnotation) {
super.synchronizeWithResourceModel(columnAnnotation);
this.setSpecifiedNullable_(this.buildSpecifiedNullable(columnAnnotation));
this.setSpecifiedInsertable_(this.buildSpecifiedInsertable(columnAnnotation));
@@ -71,7 +71,7 @@ public class GenericJavaOrderColumn2_0
* If we are in a JPA 1.0 project, return a <em>null</em> annotation.
*/
@Override
- public OrderColumn2_0Annotation getColumnAnnotation() {
+ public OrderColumnAnnotation2_0 getColumnAnnotation() {
return this.parentAdapter.getColumnAnnotation();
}
@@ -105,7 +105,7 @@ public class GenericJavaOrderColumn2_0
this.firePropertyChanged(SPECIFIED_NULLABLE_PROPERTY, old, nullable);
}
- protected Boolean buildSpecifiedNullable(OrderColumn2_0Annotation columnAnnotation) {
+ protected Boolean buildSpecifiedNullable(OrderColumnAnnotation2_0 columnAnnotation) {
return columnAnnotation.getNullable();
}
@@ -148,7 +148,7 @@ public class GenericJavaOrderColumn2_0
this.firePropertyChanged(SPECIFIED_INSERTABLE_PROPERTY, old, insertable);
}
- protected Boolean buildSpecifiedInsertable(OrderColumn2_0Annotation columnAnnotation) {
+ protected Boolean buildSpecifiedInsertable(OrderColumnAnnotation2_0 columnAnnotation) {
return columnAnnotation.getInsertable();
}
@@ -191,7 +191,7 @@ public class GenericJavaOrderColumn2_0
this.firePropertyChanged(SPECIFIED_UPDATABLE_PROPERTY, old, updatable);
}
- protected Boolean buildSpecifiedUpdatable(OrderColumn2_0Annotation columnAnnotation) {
+ protected Boolean buildSpecifiedUpdatable(OrderColumnAnnotation2_0 columnAnnotation) {
return columnAnnotation.getUpdatable();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java
index 7571115899..b6a0eb4600 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyEnumeratedAnnotation2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyJoinColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyTemporalAnnotation2_0;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation;
@@ -91,7 +91,7 @@ public class JavaElementCollectionMappingDefinition2_0
JPA2_0.MAP_KEY_JOIN_COLUMNS,
MapKeyTemporalAnnotation2_0.ANNOTATION_NAME,
OrderByAnnotation.ANNOTATION_NAME,
- OrderColumn2_0Annotation.ANNOTATION_NAME,
+ OrderColumnAnnotation2_0.ANNOTATION_NAME,
TemporalAnnotation.ANNOTATION_NAME
};
private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToManyMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToManyMappingDefinition2_0.java
index 9daf96d3ac..cddfa9ecaf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToManyMappingDefinition2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToManyMappingDefinition2_0.java
@@ -20,7 +20,7 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyEnumeratedAnnotation2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyJoinColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyTemporalAnnotation2_0;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.JPA;
@@ -67,7 +67,7 @@ public class JavaManyToManyMappingDefinition2_0
MapKeyJoinColumnAnnotation2_0.ANNOTATION_NAME,
JPA2_0.MAP_KEY_JOIN_COLUMNS,
MapKeyTemporalAnnotation2_0.ANNOTATION_NAME,
- OrderColumn2_0Annotation.ANNOTATION_NAME
+ OrderColumnAnnotation2_0.ANNOTATION_NAME
};
private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToManyMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToManyMappingDefinition2_0.java
index cbd3bdc893..062158e38e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToManyMappingDefinition2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToManyMappingDefinition2_0.java
@@ -20,7 +20,7 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyEnumeratedAnnotation2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyJoinColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyTemporalAnnotation2_0;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.JPA;
@@ -67,7 +67,7 @@ public class JavaOneToManyMappingDefinition2_0
MapKeyJoinColumnAnnotation2_0.ANNOTATION_NAME,
JPA2_0.MAP_KEY_JOIN_COLUMNS,
MapKeyTemporalAnnotation2_0.ANNOTATION_NAME,
- OrderColumn2_0Annotation.ANNOTATION_NAME
+ OrderColumnAnnotation2_0.ANNOTATION_NAME
};
private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/NullOrderColumn2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/NullOrderColumn2_0Annotation.java
index 3ccac42369..b3b6c76076 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/NullOrderColumn2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/NullOrderColumn2_0Annotation.java
@@ -12,14 +12,14 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.resource.java;
import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.internal.resource.java.NullNamedColumnAnnotation;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
/**
* <code>javax.persistence.OrderColumn</code>
*/
public final class NullOrderColumn2_0Annotation
- extends NullNamedColumnAnnotation<OrderColumn2_0Annotation>
- implements OrderColumn2_0Annotation
+ extends NullNamedColumnAnnotation<OrderColumnAnnotation2_0>
+ implements OrderColumnAnnotation2_0
{
public NullOrderColumn2_0Annotation(JavaResourceAnnotatedElement parent) {
super(parent);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/OrderColumn2_0AnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/OrderColumn2_0AnnotationDefinition.java
index d43bcb3c79..dfa1803a94 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/OrderColumn2_0AnnotationDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/OrderColumn2_0AnnotationDefinition.java
@@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
import org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.binary.BinaryOrderColumn2_0Annotation;
import org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.source.SourceOrderColumn2_0Annotation;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
/**
* javax.persistence.OrderColumn
@@ -54,6 +54,6 @@ public final class OrderColumn2_0AnnotationDefinition
}
public String getAnnotationName() {
- return OrderColumn2_0Annotation.ANNOTATION_NAME;
+ return OrderColumnAnnotation2_0.ANNOTATION_NAME;
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryOrderColumn2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryOrderColumn2_0Annotation.java
index 6219e5f4e8..6dfb65538c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryOrderColumn2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryOrderColumn2_0Annotation.java
@@ -13,7 +13,7 @@ import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.internal.resource.java.binary.BinaryNamedColumnAnnotation;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
import org.eclipse.jpt.jpa.core.resource.java.JPA;
/**
@@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.resource.java.JPA;
*/
public class BinaryOrderColumn2_0Annotation
extends BinaryNamedColumnAnnotation
- implements OrderColumn2_0Annotation
+ implements OrderColumnAnnotation2_0
{
private Boolean nullable;
private Boolean insertable;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceOrderColumn2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceOrderColumn2_0Annotation.java
index a79559c376..16285684c6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceOrderColumn2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceOrderColumn2_0Annotation.java
@@ -19,14 +19,14 @@ import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceNamedColumnAnnotation;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
/**
* <code>javax.persistence.OrderColumn</code>
*/
public final class SourceOrderColumn2_0Annotation
extends SourceNamedColumnAnnotation
- implements OrderColumn2_0Annotation
+ implements OrderColumnAnnotation2_0
{
private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaSpecifiedOrderColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaSpecifiedOrderColumn2_0.java
index 2a35277d06..9a25a41343 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaSpecifiedOrderColumn2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaSpecifiedOrderColumn2_0.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.jpa2.context.java;
import org.eclipse.jpt.jpa.core.context.NamedColumn;
import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedNamedColumn;
import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
/**
* Java specified order column
@@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
public interface JavaSpecifiedOrderColumn2_0
extends SpecifiedOrderColumn2_0, JavaSpecifiedNamedColumn
{
- OrderColumn2_0Annotation getColumnAnnotation();
+ OrderColumnAnnotation2_0 getColumnAnnotation();
// ********** parent adapter **********
@@ -40,7 +40,7 @@ public interface JavaSpecifiedOrderColumn2_0
interface ParentAdapter
extends NamedColumn.ParentAdapter
{
- OrderColumn2_0Annotation getColumnAnnotation();
+ OrderColumnAnnotation2_0 getColumnAnnotation();
void removeColumnAnnotation();
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/OrderColumn2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/OrderColumnAnnotation2_0.java
index d0f7c7b70e..984cd9f40a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/OrderColumn2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/OrderColumnAnnotation2_0.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.resource.java.NamedColumnAnnotation;
* @version 2.3
* @since 2.3
*/
-public interface OrderColumn2_0Annotation
+public interface OrderColumnAnnotation2_0
extends NamedColumnAnnotation
{
String ANNOTATION_NAME = JPA2_0.ORDER_COLUMN;
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OrderColumn2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OrderColumn2_0AnnotationTests.java
index b345585aab..1d9eecef23 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OrderColumn2_0AnnotationTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OrderColumn2_0AnnotationTests.java
@@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumnAnnotation2_0;
@SuppressWarnings("nls")
public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase {
@@ -84,7 +84,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumnWithName();
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertEquals(COLUMN_NAME, column.getName());
}
@@ -93,7 +93,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumn();
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertNull(column.getName());
assertNull(column.getNullable());
@@ -106,7 +106,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumn();
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertNull(column.getName());
@@ -121,14 +121,14 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumnWithName();
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertEquals(COLUMN_NAME, column.getName());
column.setName(null);
assertNull(column.getName());
- column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertSourceContains("@OrderColumn", cu);
}
@@ -137,7 +137,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumnWithColumnDefinition();
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition());
}
@@ -145,7 +145,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumn();
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertNull(column.getColumnDefinition());
@@ -157,7 +157,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
column.setColumnDefinition(null);
- column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertSourceContains("@OrderColumn", cu);
}
@@ -166,7 +166,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumnWithBooleanElement("nullable");
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertEquals(Boolean.TRUE, column.getNullable());
}
@@ -175,7 +175,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumn();
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertNull(column.getNullable());
@@ -186,7 +186,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
assertSourceContains("@OrderColumn(nullable = false)", cu);
column.setNullable(null);
- column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertSourceContains("@OrderColumn", cu);
}
@@ -195,7 +195,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumnWithBooleanElement("insertable");
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertEquals(Boolean.TRUE, column.getInsertable());
}
@@ -204,7 +204,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumn();
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertNull(column.getInsertable());
@@ -215,7 +215,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
assertSourceContains("@OrderColumn(insertable = false)", cu);
column.setInsertable(null);
- column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertSourceContains("@OrderColumn", cu);
}
@@ -224,7 +224,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumnWithBooleanElement("updatable");
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertEquals(Boolean.TRUE, column.getUpdatable());
}
@@ -233,7 +233,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
ICompilationUnit cu = this.createTestOrderColumn();
JavaResourceType resourceType = buildJavaResourceType(cu);
JavaResourceField resourceField = IterableTools.get(resourceType.getFields(), 0);
- OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ OrderColumnAnnotation2_0 column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertNull(column.getUpdatable());
@@ -245,7 +245,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase
column.setUpdatable(null);
- column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
+ column = (OrderColumnAnnotation2_0) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN);
assertNotNull(column);
assertSourceContains("@OrderColumn", cu);
}

Back to the top