Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Fullbright2013-03-19 21:36:55 +0000
committerPaul Fullbright2013-03-19 21:38:04 +0000
commite6f9831eaa1a3905edfe6015a4dcf47bed32993c (patch)
tree2ed4b5985189f521e5682f3c85262ac102f78d18 /jaxb/plugins
parent076f7c34108afa93330031b04d7fa49c86abf466 (diff)
downloadwebtools.dali-e6f9831eaa1a3905edfe6015a4dcf47bed32993c.tar.gz
webtools.dali-e6f9831eaa1a3905edfe6015a4dcf47bed32993c.tar.xz
webtools.dali-e6f9831eaa1a3905edfe6015a4dcf47bed32993c.zip
Only return built in xsd type if the model has an associated schema
Diffstat (limited to 'jaxb/plugins')
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAttributeMapping.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAttributeMapping.java
index 62766d435e..7e3521a2d0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAttributeMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAttributeMapping.java
@@ -157,7 +157,8 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation>
}
String builtInType = getJaxbProject().getPlatform().getDefinition().getSchemaTypeMapping(dataType);
- if (builtInType != null) {
+ // only return built in schema type if this mapping is actually connected to a schema
+ if (builtInType != null && getJaxbPackage().getXsdSchema() != null) {
return XsdUtil.getSchemaForSchema().getTypeDefinition(builtInType);
}

Back to the top