diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context')
17 files changed, 61 insertions, 57 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java index 5027a842a3..a7e8f1402e 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java @@ -66,7 +66,7 @@ public class JavaEclipseLinkBasicMapping @Override protected String getResourceConverterType() { //check @Convert first, this is the order that EclipseLink searches - if (this.resourcePersistentAttribute.getSupportingAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME) != null) { + if (this.resourcePersistentAttribute.getAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME) != null) { return EclipseLinkConvert.ECLIPSE_LINK_CONVERTER; } return super.getResourceConverterType(); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java index 13a0eb1d06..226352d220 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java @@ -66,11 +66,13 @@ public class JavaEclipseLinkCachingImpl extends AbstractJavaJpaContextNode imple //You could call more than one setter before this object has received any notification //from the java resource model protected EclipseLinkCacheAnnotation getCacheAnnotation() { - return (EclipseLinkCacheAnnotation) this.resourcePersistentType.getNonNullSupportingAnnotation(getCacheAnnotationName()); + return (EclipseLinkCacheAnnotation) this.resourcePersistentType. + getNonNullAnnotation(getCacheAnnotationName()); } protected EclipseLinkExistenceCheckingAnnotation getExistenceCheckingAnnotation() { - return (EclipseLinkExistenceCheckingAnnotation) this.resourcePersistentType.getSupportingAnnotation(getExistenceCheckingAnnotationName()); + return (EclipseLinkExistenceCheckingAnnotation) this.resourcePersistentType. + getAnnotation(getExistenceCheckingAnnotationName()); } protected String getCacheAnnotationName() { @@ -290,10 +292,10 @@ public class JavaEclipseLinkCachingImpl extends AbstractJavaJpaContextNode imple boolean oldExistenceChecking = this.existenceChecking; this.existenceChecking = newExistenceChecking; if (newExistenceChecking) { - this.resourcePersistentType.addSupportingAnnotation(getExistenceCheckingAnnotationName()); + this.resourcePersistentType.addAnnotation(getExistenceCheckingAnnotationName()); } else { - this.resourcePersistentType.removeSupportingAnnotation(getExistenceCheckingAnnotationName()); + this.resourcePersistentType.removeAnnotation(getExistenceCheckingAnnotationName()); } firePropertyChanged(EXISTENCE_CHECKING_PROPERTY, oldExistenceChecking, newExistenceChecking); setDefaultExistenceType(caclulateDefaultExistenceType()); @@ -385,8 +387,8 @@ public class JavaEclipseLinkCachingImpl extends AbstractJavaJpaContextNode imple if (this.expiryTimeOfDay != null) { throw new IllegalStateException("expiryTimeOfDay already exists, use getExpiryTimeOfDay()"); //$NON-NLS-1$ } - if (this.resourcePersistentType.getSupportingAnnotation(getCacheAnnotationName()) == null) { - this.resourcePersistentType.addSupportingAnnotation(getCacheAnnotationName()); + if (this.resourcePersistentType.getAnnotation(getCacheAnnotationName()) == null) { + this.resourcePersistentType.addAnnotation(getCacheAnnotationName()); } JavaEclipseLinkExpiryTimeOfDay newExpiryTimeOfDay = new JavaEclipseLinkExpiryTimeOfDay(this); this.expiryTimeOfDay = newExpiryTimeOfDay; diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java index fb32ed8f76..1a8428fa99 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java @@ -45,15 +45,15 @@ public class JavaEclipseLinkChangeTracking extends AbstractJavaJpaContextNode im } protected EclipseLinkChangeTrackingAnnotation getChangeTrackingAnnotation() { - return (EclipseLinkChangeTrackingAnnotation) this.resourcePersistentType.getSupportingAnnotation(getChangeTrackingAnnotationName()); + return (EclipseLinkChangeTrackingAnnotation) this.resourcePersistentType.getAnnotation(getChangeTrackingAnnotationName()); } protected void addChangeTrackingAnnotation() { - this.resourcePersistentType.addSupportingAnnotation(getChangeTrackingAnnotationName()); + this.resourcePersistentType.addAnnotation(getChangeTrackingAnnotationName()); } protected void removeChangeTrackingAnnotation() { - this.resourcePersistentType.removeSupportingAnnotation(getChangeTrackingAnnotationName()); + this.resourcePersistentType.removeAnnotation(getChangeTrackingAnnotationName()); } public EclipseLinkChangeTrackingType getType() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java index b5e75d7b8f..cad2f639f2 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java @@ -60,13 +60,13 @@ public class JavaEclipseLinkConvert extends AbstractJavaJpaContextNode implement } public void addToResourceModel() { - this.resourcePersistentAttribute.addSupportingAnnotation(getAnnotationName()); + this.resourcePersistentAttribute.addAnnotation(getAnnotationName()); } public void removeFromResourceModel() { - this.resourcePersistentAttribute.removeSupportingAnnotation(getAnnotationName()); + this.resourcePersistentAttribute.removeAnnotation(getAnnotationName()); if (getConverter() != null) { - this.resourcePersistentAttribute.removeSupportingAnnotation(getConverter().getAnnotationName()); + this.resourcePersistentAttribute.removeAnnotation(getConverter().getAnnotationName()); } } @@ -75,7 +75,7 @@ public class JavaEclipseLinkConvert extends AbstractJavaJpaContextNode implement } protected EclipseLinkConvertAnnotation getResourceConvert() { - return (EclipseLinkConvertAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getAnnotationName()); + return (EclipseLinkConvertAnnotation) this.resourcePersistentAttribute.getAnnotation(getAnnotationName()); } public String getConverterName() { @@ -122,11 +122,11 @@ public class JavaEclipseLinkConvert extends AbstractJavaJpaContextNode implement JavaEclipseLinkConverter newConverter = buildConverter(converterType); this.converter = null; if (oldConverter != null) { - this.resourcePersistentAttribute.removeSupportingAnnotation(oldConverter.getAnnotationName()); + this.resourcePersistentAttribute.removeAnnotation(oldConverter.getAnnotationName()); } this.converter = newConverter; if (newConverter != null) { - this.resourcePersistentAttribute.addSupportingAnnotation(newConverter.getAnnotationName()); + this.resourcePersistentAttribute.addAnnotation(newConverter.getAnnotationName()); } firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter); } @@ -205,16 +205,16 @@ public class JavaEclipseLinkConvert extends AbstractJavaJpaContextNode implement } protected String getResourceConverterType() { - if (this.resourcePersistentAttribute.getSupportingAnnotation(EclipseLinkConverterAnnotation.ANNOTATION_NAME) != null) { + if (this.resourcePersistentAttribute.getAnnotation(EclipseLinkConverterAnnotation.ANNOTATION_NAME) != null) { return EclipseLinkConverter.CUSTOM_CONVERTER; } - else if (this.resourcePersistentAttribute.getSupportingAnnotation(EclipseLinkTypeConverterAnnotation.ANNOTATION_NAME) != null) { + else if (this.resourcePersistentAttribute.getAnnotation(EclipseLinkTypeConverterAnnotation.ANNOTATION_NAME) != null) { return EclipseLinkConverter.TYPE_CONVERTER; } - else if (this.resourcePersistentAttribute.getSupportingAnnotation(EclipseLinkObjectTypeConverterAnnotation.ANNOTATION_NAME) != null) { + else if (this.resourcePersistentAttribute.getAnnotation(EclipseLinkObjectTypeConverterAnnotation.ANNOTATION_NAME) != null) { return EclipseLinkConverter.OBJECT_TYPE_CONVERTER; } - else if (this.resourcePersistentAttribute.getSupportingAnnotation(EclipseLinkStructConverterAnnotation.ANNOTATION_NAME) != null) { + else if (this.resourcePersistentAttribute.getAnnotation(EclipseLinkStructConverterAnnotation.ANNOTATION_NAME) != null) { return EclipseLinkConverter.STRUCT_CONVERTER; } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java index 87eda32cfc..85da0c2a56 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java @@ -34,7 +34,7 @@ public abstract class JavaEclipseLinkConverter extends AbstractJavaJpaContextNod protected EclipseLinkNamedConverterAnnotation getAnnotation() { - return (EclipseLinkNamedConverterAnnotation) this.resourcePersistentMember.getSupportingAnnotation(getAnnotationName()); + return (EclipseLinkNamedConverterAnnotation) this.resourcePersistentMember.getAnnotation(getAnnotationName()); } protected abstract String getAnnotationName(); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConverterHolderImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConverterHolderImpl.java index 985aeb2e13..e26c0d7f6d 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConverterHolderImpl.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkConverterHolderImpl.java @@ -50,7 +50,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo throw new IllegalStateException("custom converter already exists"); //$NON-NLS-1$ } this.customConverter = buildCustomConverter(); - this.resourcePersistentType.addSupportingAnnotation(this.customConverter.getAnnotationName()); + this.resourcePersistentType.addAnnotation(this.customConverter.getAnnotationName()); firePropertyChanged(CUSTOM_CONVERTER_PROPERTY, null, this.customConverter); return this.customConverter; } @@ -66,7 +66,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo } JavaEclipseLinkCustomConverter oldConverter = this.customConverter; this.customConverter = null; - this.resourcePersistentType.removeSupportingAnnotation(oldConverter.getAnnotationName()); + this.resourcePersistentType.removeAnnotation(oldConverter.getAnnotationName()); firePropertyChanged(CUSTOM_CONVERTER_PROPERTY, oldConverter, null); } @@ -80,7 +80,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo } protected EclipseLinkConverterAnnotation getResourceConverter() { - return (EclipseLinkConverterAnnotation) this.resourcePersistentType.getSupportingAnnotation(getConverterAnnotationName()); + return (EclipseLinkConverterAnnotation) this.resourcePersistentType.getAnnotation(getConverterAnnotationName()); } @@ -94,7 +94,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo throw new IllegalStateException("object type converter already exists"); //$NON-NLS-1$ } this.objectTypeConverter = buildObjectTypeConverter(); - this.resourcePersistentType.addSupportingAnnotation(this.objectTypeConverter.getAnnotationName()); + this.resourcePersistentType.addAnnotation(this.objectTypeConverter.getAnnotationName()); firePropertyChanged(OBJECT_TYPE_CONVERTER_PROPERTY, null, this.objectTypeConverter); return this.objectTypeConverter; } @@ -110,7 +110,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo } JavaEclipseLinkObjectTypeConverter oldConverter = this.objectTypeConverter; this.objectTypeConverter = null; - this.resourcePersistentType.removeSupportingAnnotation(oldConverter.getAnnotationName()); + this.resourcePersistentType.removeAnnotation(oldConverter.getAnnotationName()); firePropertyChanged(OBJECT_TYPE_CONVERTER_PROPERTY, oldConverter, null); } @@ -125,7 +125,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo } protected EclipseLinkObjectTypeConverterAnnotation getResourceObjectTypeConverter() { - return (EclipseLinkObjectTypeConverterAnnotation) this.resourcePersistentType.getSupportingAnnotation(getObjectTypeConverterAnnotationName()); + return (EclipseLinkObjectTypeConverterAnnotation) this.resourcePersistentType.getAnnotation(getObjectTypeConverterAnnotationName()); } @@ -139,7 +139,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo throw new IllegalStateException("type converter already exists"); //$NON-NLS-1$ } this.typeConverter = buildTypeConverter(); - this.resourcePersistentType.addSupportingAnnotation(this.typeConverter.getAnnotationName()); + this.resourcePersistentType.addAnnotation(this.typeConverter.getAnnotationName()); firePropertyChanged(TYPE_CONVERTER_PROPERTY, null, this.typeConverter); return this.typeConverter; } @@ -155,7 +155,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo } JavaEclipseLinkTypeConverter oldConverter = this.typeConverter; this.typeConverter = null; - this.resourcePersistentType.removeSupportingAnnotation(oldConverter.getAnnotationName()); + this.resourcePersistentType.removeAnnotation(oldConverter.getAnnotationName()); firePropertyChanged(TYPE_CONVERTER_PROPERTY, oldConverter, null); } @@ -170,7 +170,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo } protected EclipseLinkTypeConverterAnnotation getResourceTypeConverter() { - return (EclipseLinkTypeConverterAnnotation) this.resourcePersistentType.getSupportingAnnotation(getTypeConverterAnnotationName()); + return (EclipseLinkTypeConverterAnnotation) this.resourcePersistentType.getAnnotation(getTypeConverterAnnotationName()); } @@ -184,7 +184,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo throw new IllegalStateException("struct converter already exists"); //$NON-NLS-1$ } this.structConverter = buildStructConverter(); - this.resourcePersistentType.addSupportingAnnotation(this.structConverter.getAnnotationName()); + this.resourcePersistentType.addAnnotation(this.structConverter.getAnnotationName()); firePropertyChanged(STRUCT_CONVERTER_PROPERTY, null, this.structConverter); return this.structConverter; } @@ -200,7 +200,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo } JavaEclipseLinkStructConverter oldConverter = this.structConverter; this.structConverter = null; - this.resourcePersistentType.removeSupportingAnnotation(oldConverter.getAnnotationName()); + this.resourcePersistentType.removeAnnotation(oldConverter.getAnnotationName()); firePropertyChanged(STRUCT_CONVERTER_PROPERTY, oldConverter, null); } @@ -215,7 +215,7 @@ public class JavaEclipseLinkConverterHolderImpl extends AbstractJavaJpaContextNo } protected EclipseLinkStructConverterAnnotation getResourceStructConverter() { - return (EclipseLinkStructConverterAnnotation) this.resourcePersistentType.getSupportingAnnotation(getStructConverterAnnotationName()); + return (EclipseLinkStructConverterAnnotation) this.resourcePersistentType.getAnnotation(getStructConverterAnnotationName()); } public void update(JavaResourcePersistentType jrpt) { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java index ee51e446e0..5bf19b59dd 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java @@ -47,11 +47,11 @@ public class JavaEclipseLinkCustomizer extends AbstractJavaJpaContextNode implem } protected void addResourceCustomizer() { - this.resourcePersistentType.addSupportingAnnotation(getAnnotationName()); + this.resourcePersistentType.addAnnotation(getAnnotationName()); } protected void removeResourceCustomizer() { - this.resourcePersistentType.removeSupportingAnnotation(getAnnotationName()); + this.resourcePersistentType.removeAnnotation(getAnnotationName()); } public TextRange getValidationTextRange(CompilationUnit astRoot) { @@ -59,7 +59,7 @@ public class JavaEclipseLinkCustomizer extends AbstractJavaJpaContextNode implem } protected EclipseLinkCustomizerAnnotation getResourceCustomizer() { - return (EclipseLinkCustomizerAnnotation) this.resourcePersistentType.getSupportingAnnotation(getAnnotationName()); + return (EclipseLinkCustomizerAnnotation) this.resourcePersistentType.getAnnotation(getAnnotationName()); } public String getCustomizerClass() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java index f394a24a3c..6b66dee285 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java @@ -66,7 +66,7 @@ public class JavaEclipseLinkIdMapping @Override protected String getResourceConverterType() { //check @Convert first, this is the order that EclipseLink searches - if (this.resourcePersistentAttribute.getSupportingAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME) != null) { + if (this.resourcePersistentAttribute.getAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME) != null) { return EclipseLinkConvert.ECLIPSE_LINK_CONVERTER; } return super.getResourceConverterType(); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java index 989478e5dd..45aac07dae 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java @@ -37,15 +37,15 @@ public class JavaEclipseLinkJoinFetch } protected EclipseLinkJoinFetchAnnotation getResourceJoinFetch() { - return (EclipseLinkJoinFetchAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getJoinFetchAnnotationName()); + return (EclipseLinkJoinFetchAnnotation) this.resourcePersistentAttribute.getAnnotation(getJoinFetchAnnotationName()); } protected void addResourceJoinFetch() { - this.resourcePersistentAttribute.addSupportingAnnotation(getJoinFetchAnnotationName()); + this.resourcePersistentAttribute.addAnnotation(getJoinFetchAnnotationName()); } protected void removeResourceJoinFetch() { - this.resourcePersistentAttribute.removeSupportingAnnotation(getJoinFetchAnnotationName()); + this.resourcePersistentAttribute.removeAnnotation(getJoinFetchAnnotationName()); } public EclipseLinkJoinFetchType getValue() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java index a1c958abd9..07983c6654 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java @@ -43,15 +43,15 @@ public class JavaEclipseLinkMutable extends AbstractJavaJpaContextNode implement } protected EclipseLinkMutableAnnotation getResourceMutable() { - return (EclipseLinkMutableAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getMutableAnnotationName()); + return (EclipseLinkMutableAnnotation) this.resourcePersistentAttribute.getAnnotation(getMutableAnnotationName()); } protected void addResourceMutable() { - this.resourcePersistentAttribute.addSupportingAnnotation(getMutableAnnotationName()); + this.resourcePersistentAttribute.addAnnotation(getMutableAnnotationName()); } protected void removeResourceMutable() { - this.resourcePersistentAttribute.removeSupportingAnnotation(getMutableAnnotationName()); + this.resourcePersistentAttribute.removeAnnotation(getMutableAnnotationName()); } protected boolean calculateDefaultMutable() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java index 2fe553d365..3baa4c8105 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java @@ -71,15 +71,15 @@ public class JavaEclipseLinkOneToManyMapping } protected EclipseLinkPrivateOwnedAnnotation getResourcePrivateOwned() { - return (EclipseLinkPrivateOwnedAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getPrivateOwnedAnnotationName()); + return (EclipseLinkPrivateOwnedAnnotation) this.resourcePersistentAttribute.getAnnotation(getPrivateOwnedAnnotationName()); } protected void addResourcePrivateOwned() { - this.resourcePersistentAttribute.addSupportingAnnotation(getPrivateOwnedAnnotationName()); + this.resourcePersistentAttribute.addAnnotation(getPrivateOwnedAnnotationName()); } protected void removeResourcePrivateOwned() { - this.resourcePersistentAttribute.removeSupportingAnnotation(getPrivateOwnedAnnotationName()); + this.resourcePersistentAttribute.removeAnnotation(getPrivateOwnedAnnotationName()); } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMappingProvider.java index af08f01cab..f503619774 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMappingProvider.java @@ -53,7 +53,7 @@ public class JavaEclipseLinkOneToManyMappingProvider } @Override - public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) { + public boolean testDefault(JavaPersistentAttribute persistentAttribute) { String targetEntity = persistentAttribute.getMultiReferenceEntityTypeName(); return (targetEntity != null) && (persistentAttribute.getPersistenceUnit().getEntity(targetEntity) != null); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMappingProvider.java index 9ab909556f..dcaa388e92 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMappingProvider.java @@ -53,7 +53,7 @@ public class JavaEclipseLinkOneToOneMappingProvider } @Override - public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) { + public boolean testDefault(JavaPersistentAttribute persistentAttribute) { String targetEntity = persistentAttribute.getSingleReferenceEntityTypeName(); return (targetEntity != null) && (persistentAttribute.getPersistenceUnit().getEntity(targetEntity) != null); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java index 281cdfd505..b78910b26b 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java @@ -17,7 +17,9 @@ import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkPrivateOwned; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkPrivateOwnedAnnotation; -public class JavaEclipseLinkPrivateOwned extends AbstractJavaJpaContextNode implements EclipseLinkPrivateOwned +public class JavaEclipseLinkPrivateOwned + extends AbstractJavaJpaContextNode + implements EclipseLinkPrivateOwned { protected boolean privateOwned; @@ -32,15 +34,15 @@ public class JavaEclipseLinkPrivateOwned extends AbstractJavaJpaContextNode impl } protected EclipseLinkPrivateOwnedAnnotation getResourcePrivateOwned() { - return (EclipseLinkPrivateOwnedAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getPrivateOwnedAnnotationName()); + return (EclipseLinkPrivateOwnedAnnotation) this.resourcePersistentAttribute.getAnnotation(getPrivateOwnedAnnotationName()); } protected void addResourcePrivateOwned() { - this.resourcePersistentAttribute.addSupportingAnnotation(getPrivateOwnedAnnotationName()); + this.resourcePersistentAttribute.addAnnotation(getPrivateOwnedAnnotationName()); } protected void removeResourcePrivateOwned() { - this.resourcePersistentAttribute.removeSupportingAnnotation(getPrivateOwnedAnnotationName()); + this.resourcePersistentAttribute.removeAnnotation(getPrivateOwnedAnnotationName()); } public boolean isPrivateOwned() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java index 87acff8b97..6c68a9c0a0 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java @@ -34,15 +34,15 @@ public class JavaEclipseLinkReadOnly extends AbstractJavaJpaContextNode implemen } protected EclipseLinkReadOnlyAnnotation getResourceReadOnly() { - return (EclipseLinkReadOnlyAnnotation) this.resourcePersistentType.getSupportingAnnotation(getReadOnlyAnnotationName()); + return (EclipseLinkReadOnlyAnnotation) this.resourcePersistentType.getAnnotation(getReadOnlyAnnotationName()); } protected void addResourceReadOnly() { - this.resourcePersistentType.addSupportingAnnotation(getReadOnlyAnnotationName()); + this.resourcePersistentType.addAnnotation(getReadOnlyAnnotationName()); } protected void removeResourceReadOnly() { - this.resourcePersistentType.removeSupportingAnnotation(getReadOnlyAnnotationName()); + this.resourcePersistentType.removeAnnotation(getReadOnlyAnnotationName()); } public boolean isReadOnly() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMappingProvider.java index efeb4a0d12..0670f1a268 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMappingProvider.java @@ -55,7 +55,7 @@ public class JavaEclipseLinkVariableOneToOneMappingProvider } @Override - public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) { + public boolean testDefault(JavaPersistentAttribute persistentAttribute) { return ((JavaEclipseLinkPersistentAttribute) persistentAttribute).typeIsValidForVariableOneToOne(); } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java index dbfe1e38d4..5a439f9272 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java @@ -66,7 +66,7 @@ public class JavaEclipseLinkVersionMapping @Override protected String getResourceConverterType() { //check @Convert first, this is the order that EclipseLink searches - if (this.resourcePersistentAttribute.getSupportingAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME) != null) { + if (this.resourcePersistentAttribute.getAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME) != null) { return EclipseLinkConvert.ECLIPSE_LINK_CONVERTER; } return super.getResourceConverterType(); |