fixed eclipselink JAXBElement usage

1 files changed, 11 insertions, 6 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java
index 5e69ee5e9a..61e1c75034 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java
@@ -11,7 +11,6 @@ package org.eclipse.jpt.jaxb.core.internal.context.java;
 
 import java.util.List;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.utility.JDTTools;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.common.utility.Filter;
@@ -211,20 +210,26 @@ public class GenericJavaElementFactoryMethod
 		this.substitutionHeadQName.validate(messages, reporter, astRoot);
 		
 		JavaResourceMethod resourceMethod = getResourceMethod();
-		if (! JAXB.JAXB_ELEMENT.equals(resourceMethod.getTypeName())) {
+		validateMethodReturnType(resourceMethod, messages, astRoot);
+		
+		if (resourceMethod.getParametersSize() != 1) {
 			messages.add(
 					DefaultValidationMessages.buildMessage(
 							IMessage.HIGH_SEVERITY,
-							JaxbValidationMessages.XML_ELEMENT_DECL__INVALID_METHOD_SIGNATURE_RETURN_TYPE,
+							JaxbValidationMessages.XML_ELEMENT_DECL__INVALID_METHOD_SIGNATURE_PARAM,
 							this,
 							getValidationTextRange(astRoot)));
 		}
-		if (resourceMethod.getParametersSize() != 1 || 
-				! JDTTools.typeIsSubType(getJaxbProject().getJavaProject(), resourceMethod.getParameterTypeName(0), Object.class.getName())) {
+	}
+	
+	protected void validateMethodReturnType(
+			JavaResourceMethod resourceMethod, List<IMessage> messages, CompilationUnit astRoot) {
+		
+		if (! JAXB.JAXB_ELEMENT.equals(resourceMethod.getTypeName())) {
 			messages.add(
 					DefaultValidationMessages.buildMessage(
 							IMessage.HIGH_SEVERITY,
-							JaxbValidationMessages.XML_ELEMENT_DECL__INVALID_METHOD_SIGNATURE_PARAM,
+							JaxbValidationMessages.XML_ELEMENT_DECL__INVALID_METHOD_SIGNATURE_RETURN_TYPE,
 							this,
 							getValidationTextRange(astRoot)));
 		}