Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2008-10-29 21:39:24 +0000
committerkmoore2008-10-29 21:39:24 +0000
commit6e8ef6055d6e71ddaf62d6f4fa328f5d9ee949ff (patch)
treed5db6e821dcd890f795027ef619772fc1fa8630d
parent6ead318d10d71d1fca1038c90802985747d425b7 (diff)
downloadwebtools.dali-6e8ef6055d6e71ddaf62d6f4fa328f5d9ee949ff.tar.gz
webtools.dali-6e8ef6055d6e71ddaf62d6f4fa328f5d9ee949ff.tar.xz
webtools.dali-6e8ef6055d6e71ddaf62d6f4fa328f5d9ee949ff.zip
check for @Convert first since that's the way Eclipselink proceses the converters
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingImpl.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingImpl.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingImpl.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java7
6 files changed, 12 insertions, 30 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingImpl.java
index f853e23ac3..3859a0abd4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingImpl.java
@@ -45,14 +45,11 @@ public class EclipseLinkJavaBasicMappingImpl extends GenericJavaBasicMapping imp
@Override
protected String specifiedConverterType(JavaResourcePersistentAttribute jrpa) {
- String specifiedConverterType = super.specifiedConverterType(jrpa);
- if (specifiedConverterType != null) {
- return specifiedConverterType;
- }
+ //check @Convert first, this is the order that EclipseLink searches
if (jrpa.getSupportingAnnotation(ConvertAnnotation.ANNOTATION_NAME) != null) {
return Convert.ECLIPSE_LINK_CONVERTER;
}
- return null;
+ return super.specifiedConverterType(jrpa);
}
//************ EclipselinkJavaBasicMapping implementation ****************
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingImpl.java
index 25f1f43488..5ec2f068ab 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingImpl.java
@@ -44,14 +44,11 @@ public class EclipseLinkJavaIdMappingImpl extends GenericJavaIdMapping implement
@Override
protected String specifiedConverterType(JavaResourcePersistentAttribute jrpa) {
- String specifiedConverterType = super.specifiedConverterType(jrpa);
- if (specifiedConverterType != null) {
- return specifiedConverterType;
- }
+ //check @Convert first, this is the order that EclipseLink searches
if (jrpa.getSupportingAnnotation(ConvertAnnotation.ANNOTATION_NAME) != null) {
return Convert.ECLIPSE_LINK_CONVERTER;
}
- return null;
+ return super.specifiedConverterType(jrpa);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingImpl.java
index f4bf030c2d..0f5490e4f8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingImpl.java
@@ -44,14 +44,11 @@ public class EclipseLinkJavaVersionMappingImpl extends GenericJavaVersionMapping
@Override
protected String specifiedConverterType(JavaResourcePersistentAttribute jrpa) {
- String specifiedConverterType = super.specifiedConverterType(jrpa);
- if (specifiedConverterType != null) {
- return specifiedConverterType;
- }
+ //check @Convert first, this is the order that EclipseLink searches
if (jrpa.getSupportingAnnotation(ConvertAnnotation.ANNOTATION_NAME) != null) {
return Convert.ECLIPSE_LINK_CONVERTER;
}
- return null;
+ return super.specifiedConverterType(jrpa);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java
index 33f606c3a7..82bf185cbe 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java
@@ -54,14 +54,11 @@ public class EclipseLinkOrmBasicMapping extends GenericOrmBasicMapping
@Override
protected String specifiedConverterType() {
- String specifiedConverterType = super.specifiedConverterType();
- if (specifiedConverterType != null) {
- return specifiedConverterType;
- }
+ //check @Convert first, this is the order that EclipseLink searches
if (((XmlBasic) this.resourceAttributeMapping).getConvert() != null) {
return Convert.ECLIPSE_LINK_CONVERTER;
}
- return null;
+ return super.specifiedConverterType();
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java
index 00aeaeaf9c..54d4aae114 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java
@@ -54,14 +54,11 @@ public class EclipseLinkOrmIdMapping extends GenericOrmIdMapping
@Override
protected String specifiedConverterType() {
- String specifiedConverterType = super.specifiedConverterType();
- if (specifiedConverterType != null) {
- return specifiedConverterType;
- }
+ //check @Convert first, this is the order that EclipseLink searches
if (((XmlId) this.resourceAttributeMapping).getConvert() != null) {
return Convert.ECLIPSE_LINK_CONVERTER;
}
- return null;
+ return super.specifiedConverterType();
}
// **************** resource-context interaction ***************************
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java
index d5c6713ecc..103ad77c76 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java
@@ -54,14 +54,11 @@ public class EclipseLinkOrmVersionMapping extends GenericOrmVersionMapping
@Override
protected String specifiedConverterType() {
- String specifiedConverterType = super.specifiedConverterType();
- if (specifiedConverterType != null) {
- return specifiedConverterType;
- }
+ //check @Convert first, this is the order that EclipseLink searches
if (((XmlVersion) this.resourceAttributeMapping).getConvert() != null) {
return Convert.ECLIPSE_LINK_CONVERTER;
}
- return null;
+ return super.specifiedConverterType();
}
// **************** resource-context interaction ***************************

Back to the top