Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Fullbright2013-03-13 13:43:47 +0000
committerPaul Fullbright2013-03-13 14:00:50 +0000
commitc666db737df771c88f3ebad6e9195cd10f5742f8 (patch)
treede3ff8735743ae84fdde9eca1faea5d0c2a6fdc3 /jaxb/plugins
parent2e04cad3f7ee61ef0bed4395577783508a292152 (diff)
downloadwebtools.dali-c666db737df771c88f3ebad6e9195cd10f5742f8.tar.gz
webtools.dali-c666db737df771c88f3ebad6e9195cd10f5742f8.tar.xz
webtools.dali-c666db737df771c88f3ebad6e9195cd10f5742f8.zip
oxm java attributes support - initial contribution
Diffstat (limited to 'jaxb/plugins')
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.ecore7
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.genmodel1
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlType.java16
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmFactory.java39
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java97
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java791
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbMappingKeys.java5
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELClassMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELClassMapping.java)8
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAnyAttributeMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlAnyAttributeMapping.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAnyElementMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlAnyElementMapping.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAttributeMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlAttributeMapping.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlCDATA.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlCDATA.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlCDATAMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlCDATAMapping.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlDiscriminatorNode.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlDiscriminatorNode.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlDiscriminatorValue.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlDiscriminatorValue.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlElementMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlElementMapping.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlElementsMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlElementsMapping.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlInverseReferenceMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlInverseReferenceMapping.java)11
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlJoinNode.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlJoinNode.java)11
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlJoinNodesMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlJoinNodesMapping.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlKey.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlKey.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlNamedNodeMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlNamedNodeMapping.java)2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlPath.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlPath.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlPathMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlPathMapping.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlValueMapping.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlValueMapping.java)4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmAttributeMapping.java33
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmAttributeMappingDefinition.java35
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmFile.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmFileDefinition.java17
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaAttribute.java30
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaType.java8
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAnyAttribute.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAnyElement.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAttribute.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElement.java14
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElementRef.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElementRefs.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElements.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlInverseReference.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlJavaTypeAdapterXmlElement.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlJoinNodes.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlTransformation.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlTransient.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlValue.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/ELJaxbContextRootImpl.java3
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaClassMapping.java8
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyAttributeMapping.java10
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMapping.java10
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMappingDefinition.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMapping.java12
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMappingDefinition.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlCDATA.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorNode.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorValue.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementMapping.java14
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefMapping.java6
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefsMapping.java6
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementWrapper.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementsMapping.java8
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMapping.java5
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMappingDefinition.java15
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNode.java8
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMapping.java12
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMappingDefinition.java8
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlKey.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlPath.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMapping.java6
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMappingDefinition.java8
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlValueMapping.java10
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmAttributeMapping.java106
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmJavaAttribute.java66
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmAttributesContainer.java37
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmFileDefinitionImpl.java52
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmFileImpl.java12
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaAttributeImpl.java244
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaTypeImpl.java148
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyAttributeDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyAttributeImpl.java29
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyElementDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyElementImpl.java29
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAttributeDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAttributeImpl.java29
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java17
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefImpl.java34
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefsDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefsImpl.java34
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementsDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementsImpl.java34
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlInverseReferenceDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlInverseReferenceImpl.java29
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJavaTypeAdapterXmlElementDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJavaTypeAdapterXmlElementImpl.java35
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJoinNodesDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJoinNodesImpl.java29
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransformationDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransformationImpl.java29
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransientDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransientImpl.java29
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlValueDefinition.java44
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlValueImpl.java29
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java28
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_Factory.java36
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbJavaPersistentAttributeLabelProvider.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbPersistentAttributeLabelProvider.java)12
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java6
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaAttributeLabelProvider.java14
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ClassesGeneratorUi.java1
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/EmptyInnerPackageFilter.java5
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/NonJavaElementFilter.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java6
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JavaClassItemContentProvider.java7
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JavaPersistentAttributeItemLabelProvider.java (renamed from jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentAttributeItemLabelProvider.java)20
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/CheckboxTreeAndListGroup.java1
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/NewSchemaFileWizardPage.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java1
130 files changed, 2260 insertions, 1228 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
index 8738b2eef8..98786039db 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.300,4.0.0)",
org.eclipse.xsd;bundle-version="[2.8.0,3.0.0)"
Export-Package: org.eclipse.jpt.jaxb.eclipselink.core,
org.eclipse.jpt.jaxb.eclipselink.core.context,
- org.eclipse.jpt.jaxb.eclipselink.core.context.java,
org.eclipse.jpt.jaxb.eclipselink.core.context.oxm,
org.eclipse.jpt.jaxb.eclipselink.core.internal;x-internal:=true,
org.eclipse.jpt.jaxb.eclipselink.core.internal.context;x-internal:=true,
@@ -46,5 +45,4 @@ Export-Package: org.eclipse.jpt.jaxb.eclipselink.core,
org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_4;x-internal:=true,
org.eclipse.jpt.jaxb.eclipselink.core.resource.java,
org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm,
- org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.util,
org.eclipse.jpt.jaxb.eclipselink.core.validation
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.ecore b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.ecore
index 13b7eb72e9..22fa9c556c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.ecore
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.ecore
@@ -64,11 +64,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="xmlProperties" upperBound="-1"
eType="#//EXmlProperty" containment="true" resolveProxies="false"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="EPropOrder" instanceClassName="java.util.List">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="itemType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
- </eAnnotations>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EReadWriteJavaAttribute" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
@@ -314,7 +309,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="factoryClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="factoryMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="propOrder" eType="#//EPropOrder"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="propOrder" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EXmlValue" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EAdaptableJavaAttribute #//EContainerJavaAttribute #//EReadWriteJavaAttribute #//ETypedJavaAttribute #//EPropertyHolder">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="cdata" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.genmodel b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.genmodel
index f2786ad9d0..f9ab579ba8 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.genmodel
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.genmodel
@@ -36,7 +36,6 @@
<genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlVirtualAccessMethodsSchema/NODES"/>
<genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlVirtualAccessMethodsSchema/ANY"/>
</genEnums>
- <genDataTypes ecoreDataType="oxm.ecore#//EPropOrder"/>
<genClasses image="false" ecoreClass="oxm.ecore#//EAbstractTypeMapping">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EAbstractTypeMapping/xmlTransient"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EAbstractTypeMapping/xmlType"/>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java
index a0a84a90d2..369d6131e7 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java
@@ -644,6 +644,8 @@ public class EXmlAnyAttribute extends EJavaAttribute implements EAccessibleJavaA
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java
index 948e6d19be..0000383b62 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java
@@ -1021,6 +1021,8 @@ public class EXmlAnyElement extends EJavaAttribute implements EAccessibleJavaAtt
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java
index 5fe7d5897e..616a94c88b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java
@@ -1647,6 +1647,8 @@ public class EXmlAttribute extends EJavaAttribute implements EAccessibleJavaAttr
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator(),
new EAbstractXmlNullPolicy.AbstractXmlNullPolicyTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java
index 02d1a98a9d..ae8270a976 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java
@@ -1993,6 +1993,8 @@ public class EXmlElement extends EJavaAttribute implements EAccessibleJavaAttrib
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java
index 869dc6ce3c..1a7e92cb8e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java
@@ -1037,6 +1037,8 @@ public class EXmlElementRef extends EJavaAttribute implements EAccessibleJavaAtt
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java
index 6a7f14d16e..520300cf77 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java
@@ -788,6 +788,8 @@ public class EXmlElementRefs extends EJavaAttribute implements EAccessibleJavaAt
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java
index 6f593e1b30..c8cb7c4938 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java
@@ -884,6 +884,8 @@ public class EXmlElements extends EJavaAttribute implements EAccessibleJavaAttri
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java
index abd14e01ab..2350420311 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java
@@ -577,6 +577,8 @@ public class EXmlInverseReference extends EJavaAttribute implements EAccessibleJ
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java
index e575d79970..6d58e30083 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java
@@ -346,6 +346,8 @@ public class EXmlJavaTypeAdapter extends EJavaAttribute
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java
index 8045d29ddd..11789670be 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java
@@ -399,6 +399,8 @@ public class EXmlJoinNodes extends EJavaAttribute implements EContainerJavaAttri
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java
index 9c7f361c09..ac87494c0d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java
@@ -543,6 +543,8 @@ public class EXmlTransformation extends EJavaAttribute implements EAccessibleJav
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java
index 327b295098..6cbb714f39 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java
@@ -214,6 +214,8 @@ public class EXmlTransient extends EJavaAttribute
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlType.java
index 25090eb029..199c29233b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlType.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlType.java
@@ -123,7 +123,7 @@ public class EXmlType extends EBaseObjectImpl implements EBaseObject
* @generated
* @ordered
*/
- protected static final List<String> PROP_ORDER_EDEFAULT = null;
+ protected static final String PROP_ORDER_EDEFAULT = null;
/**
* The cached value of the '{@link #getPropOrder() <em>Prop Order</em>}' attribute.
@@ -133,7 +133,7 @@ public class EXmlType extends EBaseObjectImpl implements EBaseObject
* @generated
* @ordered
*/
- protected List<String> propOrder = PROP_ORDER_EDEFAULT;
+ protected String propOrder = PROP_ORDER_EDEFAULT;
/**
* <!-- begin-user-doc -->
@@ -305,12 +305,12 @@ public class EXmlType extends EBaseObjectImpl implements EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Prop Order</em>' attribute.
- * @see #setPropOrder(List)
+ * @see #setPropOrder(String)
* @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlType_PropOrder()
- * @model dataType="org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropOrder" many="false"
+ * @model
* @generated
*/
- public List<String> getPropOrder()
+ public String getPropOrder()
{
return propOrder;
}
@@ -323,9 +323,9 @@ public class EXmlType extends EBaseObjectImpl implements EBaseObject
* @see #getPropOrder()
* @generated
*/
- public void setPropOrder(List<String> newPropOrder)
+ public void setPropOrder(String newPropOrder)
{
- List<String> oldPropOrder = propOrder;
+ String oldPropOrder = propOrder;
propOrder = newPropOrder;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TYPE__PROP_ORDER, oldPropOrder, propOrder));
@@ -379,7 +379,7 @@ public class EXmlType extends EBaseObjectImpl implements EBaseObject
setFactoryMethod((String)newValue);
return;
case OxmPackage.EXML_TYPE__PROP_ORDER:
- setPropOrder((List<String>)newValue);
+ setPropOrder((String)newValue);
return;
}
super.eSet(featureID, newValue);
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java
index 440f547051..cde54a31c0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java
@@ -904,6 +904,8 @@ public class EXmlValue extends EJavaAttribute implements EAccessibleJavaAttribut
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
+ buildJavaAttributeTranslator(),
+ buildXmlAccessorTypeTranslator()
};
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmFactory.java
index 5dfac3d9bb..447ee7ec19 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmFactory.java
@@ -144,8 +144,6 @@ public class OxmFactory extends EFactoryImpl
return createEXmlNsFormFromString(eDataType, initialValue);
case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS_SCHEMA:
return createEXmlVirtualAccessMethodsSchemaFromString(eDataType, initialValue);
- case OxmPackage.EPROP_ORDER:
- return createEPropOrderFromString(eDataType, initialValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
@@ -171,8 +169,6 @@ public class OxmFactory extends EFactoryImpl
return convertEXmlNsFormToString(eDataType, instanceValue);
case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS_SCHEMA:
return convertEXmlVirtualAccessMethodsSchemaToString(eDataType, instanceValue);
- case OxmPackage.EPROP_ORDER:
- return convertEPropOrderToString(eDataType, instanceValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
@@ -700,41 +696,6 @@ public class OxmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
- public List<String> createEPropOrderFromString(EDataType eDataType, String initialValue)
- {
- if (initialValue == null) return null;
- List<String> result = new ArrayList<String>();
- for (String item : split(initialValue))
- {
- result.add((String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, item));
- }
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertEPropOrderToString(EDataType eDataType, Object instanceValue)
- {
- if (instanceValue == null) return null;
- List<?> list = (List<?>)instanceValue;
- if (list.isEmpty()) return "";
- StringBuffer result = new StringBuffer();
- for (Object item : list)
- {
- result.append(XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.STRING, item));
- result.append(' ');
- }
- return result.substring(0, result.length() - 1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public OxmPackage getOxmPackage()
{
return (OxmPackage)getEPackage();
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java
index cd797586ef..5369db5326 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java
@@ -9,18 +9,14 @@
*******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;
-import java.util.List;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
import org.eclipse.jpt.common.core.resource.xml.CommonPackage;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.util.OxmValidator;
/**
* <!-- begin-user-doc -->
@@ -1105,6 +1101,15 @@ public class OxmPackage extends EPackageImpl
public static final int EXML_BINDINGS__VERSION = CommonPackage.EROOT_OBJECT_IMPL__VERSION;
/**
+ * The feature id for the '<em><b>Namespace</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int EXML_BINDINGS__NAMESPACE = CommonPackage.EROOT_OBJECT_IMPL__NAMESPACE;
+
+ /**
* The feature id for the '<em><b>Schema Location</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3012,16 +3017,6 @@ public class OxmPackage extends EPackageImpl
public static final int EXML_VIRTUAL_ACCESS_METHODS_SCHEMA = 51;
/**
- * The meta object id for the '<em>EProp Order</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.util.List
- * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropOrder()
- * @generated
- */
- public static final int EPROP_ORDER = 52;
-
- /**
* The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSeeAlso <em>EXml See Also</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3756,13 +3751,6 @@ public class OxmPackage extends EPackageImpl
private EEnum eXmlVirtualAccessMethodsSchemaEEnum = null;
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType ePropOrderEDataType = null;
-
- /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -3820,17 +3808,6 @@ public class OxmPackage extends EPackageImpl
// Initialize created meta-data
theOxmPackage.initializePackageContents();
- // Register package validator
- EValidator.Registry.INSTANCE.put
- (theOxmPackage,
- new EValidator.Descriptor()
- {
- public EValidator getEValidator()
- {
- return OxmValidator.INSTANCE;
- }
- });
-
// Mark meta-data to indicate it can't be changed
theOxmPackage.freeze();
@@ -6905,22 +6882,6 @@ public class OxmPackage extends EPackageImpl
/**
- * Returns the meta object for data type '{@link java.util.List <em>EProp Order</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>EProp Order</em>'.
- * @see java.util.List
- * @model instanceClass="java.util.List"
- * extendedMetaData="itemType='http://www.eclipse.org/emf/2003/XMLType#string'"
- * @generated
- */
- public EDataType getEPropOrder()
- {
- return ePropOrderEDataType;
- }
-
-
- /**
* Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSeeAlso <em>EXml See Also</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -7240,9 +7201,6 @@ public class OxmPackage extends EPackageImpl
eXmlMarshalNullRepresentationEEnum = createEEnum(EXML_MARSHAL_NULL_REPRESENTATION);
eXmlNsFormEEnum = createEEnum(EXML_NS_FORM);
eXmlVirtualAccessMethodsSchemaEEnum = createEEnum(EXML_VIRTUAL_ACCESS_METHODS_SCHEMA);
-
- // Create data types
- ePropOrderEDataType = createEDataType(EPROP_ORDER);
}
/**
@@ -7588,7 +7546,7 @@ public class OxmPackage extends EPackageImpl
initEAttribute(getEXmlType_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getEXmlType_FactoryClass(), ecorePackage.getEString(), "factoryClass", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getEXmlType_FactoryMethod(), ecorePackage.getEString(), "factoryMethod", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getEXmlType_PropOrder(), this.getEPropOrder(), "propOrder", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getEXmlType_PropOrder(), ecorePackage.getEString(), "propOrder", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(eXmlValueEClass, EXmlValue.class, "EXmlValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getEXmlValue_Cdata(), ecorePackage.getEBoolean(), "cdata", null, 0, 1, EXmlValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -7627,33 +7585,8 @@ public class OxmPackage extends EPackageImpl
addEEnumLiteral(eXmlVirtualAccessMethodsSchemaEEnum, EXmlVirtualAccessMethodsSchema.NODES);
addEEnumLiteral(eXmlVirtualAccessMethodsSchemaEEnum, EXmlVirtualAccessMethodsSchema.ANY);
- // Initialize data types
- initEDataType(ePropOrderEDataType, List.class, "EPropOrder", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
// Create resource
createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createExtendedMetaDataAnnotations()
- {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
- addAnnotation
- (ePropOrderEDataType,
- source,
- new String[]
- {
- "itemType", "http://www.eclipse.org/emf/2003/XMLType#string"
- });
}
/**
@@ -9445,16 +9378,6 @@ public class OxmPackage extends EPackageImpl
public static final EEnum EXML_VIRTUAL_ACCESS_METHODS_SCHEMA = eINSTANCE.getEXmlVirtualAccessMethodsSchema();
/**
- * The meta object literal for the '<em>EProp Order</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.util.List
- * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropOrder()
- * @generated
- */
- public static final EDataType EPROP_ORDER = eINSTANCE.getEPropOrder();
-
- /**
* The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSeeAlso <em>EXml See Also</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java
deleted file mode 100644
index 2f2b96ff69..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java
+++ /dev/null
@@ -1,791 +0,0 @@
-/**
- */
-package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.util;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.EObjectValidator;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator;
-
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Validator</b> for the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage
- * @generated
- */
-public class OxmValidator extends EObjectValidator
-{
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final OxmValidator INSTANCE = new OxmValidator();
-
- /**
- * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.common.util.Diagnostic#getSource()
- * @see org.eclipse.emf.common.util.Diagnostic#getCode()
- * @generated
- */
- public static final String DIAGNOSTIC_SOURCE = "org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm";
-
- /**
- * A constant with a fixed name that can be used as the base value for additional hand written constants.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
-
- /**
- * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
-
- /**
- * The cached base package validator.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected XMLTypeValidator xmlTypeValidator;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public OxmValidator()
- {
- super();
- xmlTypeValidator = XMLTypeValidator.INSTANCE;
- }
-
- /**
- * Returns the package of this validator switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EPackage getEPackage()
- {
- return OxmPackage.eINSTANCE;
- }
-
- /**
- * Calls <code>validateXXX</code> for the corresponding classifier of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- switch (classifierID)
- {
- case OxmPackage.EABSTRACT_TYPE_MAPPING:
- return validateEAbstractTypeMapping((EAbstractTypeMapping)value, diagnostics, context);
- case OxmPackage.EABSTRACT_XML_NULL_POLICY:
- return validateEAbstractXmlNullPolicy((EAbstractXmlNullPolicy)value, diagnostics, context);
- case OxmPackage.EABSTRACT_XML_TRANSFORMER:
- return validateEAbstractXmlTransformer((EAbstractXmlTransformer)value, diagnostics, context);
- case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE:
- return validateEAccessibleJavaAttribute((EAccessibleJavaAttribute)value, diagnostics, context);
- case OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE:
- return validateEAdaptableJavaAttribute((EAdaptableJavaAttribute)value, diagnostics, context);
- case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE:
- return validateEContainerJavaAttribute((EContainerJavaAttribute)value, diagnostics, context);
- case OxmPackage.EJAVA_ATTRIBUTE:
- return validateEJavaAttribute((EJavaAttribute)value, diagnostics, context);
- case OxmPackage.EJAVA_TYPE:
- return validateEJavaType((EJavaType)value, diagnostics, context);
- case OxmPackage.EPROPERTY_HOLDER:
- return validateEPropertyHolder((EPropertyHolder)value, diagnostics, context);
- case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE:
- return validateEReadWriteJavaAttribute((EReadWriteJavaAttribute)value, diagnostics, context);
- case OxmPackage.ETYPED_JAVA_ATTRIBUTE:
- return validateETypedJavaAttribute((ETypedJavaAttribute)value, diagnostics, context);
- case OxmPackage.EXML_ACCESS_METHODS:
- return validateEXmlAccessMethods((EXmlAccessMethods)value, diagnostics, context);
- case OxmPackage.EXML_ANY_ATTRIBUTE:
- return validateEXmlAnyAttribute((EXmlAnyAttribute)value, diagnostics, context);
- case OxmPackage.EXML_ANY_ELEMENT:
- return validateEXmlAnyElement((EXmlAnyElement)value, diagnostics, context);
- case OxmPackage.EXML_ATTRIBUTE:
- return validateEXmlAttribute((EXmlAttribute)value, diagnostics, context);
- case OxmPackage.EXML_BINDINGS:
- return validateEXmlBindings((EXmlBindings)value, diagnostics, context);
- case OxmPackage.EXML_CLASS_EXTRACTOR:
- return validateEXmlClassExtractor((EXmlClassExtractor)value, diagnostics, context);
- case OxmPackage.EXML_ELEMENT:
- return validateEXmlElement((EXmlElement)value, diagnostics, context);
- case OxmPackage.EXML_ELEMENT_DECL:
- return validateEXmlElementDecl((EXmlElementDecl)value, diagnostics, context);
- case OxmPackage.EXML_ELEMENT_REF:
- return validateEXmlElementRef((EXmlElementRef)value, diagnostics, context);
- case OxmPackage.EXML_ELEMENT_REFS:
- return validateEXmlElementRefs((EXmlElementRefs)value, diagnostics, context);
- case OxmPackage.EXML_ELEMENTS:
- return validateEXmlElements((EXmlElements)value, diagnostics, context);
- case OxmPackage.EXML_ELEMENT_WRAPPER:
- return validateEXmlElementWrapper((EXmlElementWrapper)value, diagnostics, context);
- case OxmPackage.EXML_ENUM:
- return validateEXmlEnum((EXmlEnum)value, diagnostics, context);
- case OxmPackage.EXML_ENUM_VALUE:
- return validateEXmlEnumValue((EXmlEnumValue)value, diagnostics, context);
- case OxmPackage.EXML_INVERSE_REFERENCE:
- return validateEXmlInverseReference((EXmlInverseReference)value, diagnostics, context);
- case OxmPackage.EXML_IS_SET_NULL_POLICY:
- return validateEXmlIsSetNullPolicy((EXmlIsSetNullPolicy)value, diagnostics, context);
- case OxmPackage.EXML_IS_SET_PARAMETER:
- return validateEXmlIsSetParameter((EXmlIsSetParameter)value, diagnostics, context);
- case OxmPackage.EXML_JAVA_TYPE_ADAPTER:
- return validateEXmlJavaTypeAdapter((EXmlJavaTypeAdapter)value, diagnostics, context);
- case OxmPackage.EXML_JOIN_NODE:
- return validateEXmlJoinNode((EXmlJoinNode)value, diagnostics, context);
- case OxmPackage.EXML_JOIN_NODES:
- return validateEXmlJoinNodes((EXmlJoinNodes)value, diagnostics, context);
- case OxmPackage.EXML_MAP:
- return validateEXmlMap((EXmlMap)value, diagnostics, context);
- case OxmPackage.EXML_NULL_POLICY:
- return validateEXmlNullPolicy((EXmlNullPolicy)value, diagnostics, context);
- case OxmPackage.EXML_NS:
- return validateEXmlNs((EXmlNs)value, diagnostics, context);
- case OxmPackage.EXML_PROPERTY:
- return validateEXmlProperty((EXmlProperty)value, diagnostics, context);
- case OxmPackage.EXML_READ_TRANSFORMER:
- return validateEXmlReadTransformer((EXmlReadTransformer)value, diagnostics, context);
- case OxmPackage.EXML_REGISTRY:
- return validateEXmlRegistry((EXmlRegistry)value, diagnostics, context);
- case OxmPackage.EXML_ROOT_ELEMENT:
- return validateEXmlRootElement((EXmlRootElement)value, diagnostics, context);
- case OxmPackage.EXML_SCHEMA:
- return validateEXmlSchema((EXmlSchema)value, diagnostics, context);
- case OxmPackage.EXML_SCHEMA_TYPE:
- return validateEXmlSchemaType((EXmlSchemaType)value, diagnostics, context);
- case OxmPackage.EXML_SEE_ALSO:
- return validateEXmlSeeAlso((EXmlSeeAlso)value, diagnostics, context);
- case OxmPackage.EXML_TRANSFORMATION:
- return validateEXmlTransformation((EXmlTransformation)value, diagnostics, context);
- case OxmPackage.EXML_TRANSIENT:
- return validateEXmlTransient((EXmlTransient)value, diagnostics, context);
- case OxmPackage.EXML_TYPE:
- return validateEXmlType((EXmlType)value, diagnostics, context);
- case OxmPackage.EXML_VALUE:
- return validateEXmlValue((EXmlValue)value, diagnostics, context);
- case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS:
- return validateEXmlVirtualAccessMethods((EXmlVirtualAccessMethods)value, diagnostics, context);
- case OxmPackage.EXML_WRITE_TRANSFORMER:
- return validateEXmlWriteTransformer((EXmlWriteTransformer)value, diagnostics, context);
- case OxmPackage.EXML_ACCESS_ORDER:
- return validateEXmlAccessOrder((EXmlAccessOrder)value, diagnostics, context);
- case OxmPackage.EXML_ACCESS_TYPE:
- return validateEXmlAccessType((EXmlAccessType)value, diagnostics, context);
- case OxmPackage.EXML_MARSHAL_NULL_REPRESENTATION:
- return validateEXmlMarshalNullRepresentation((EXmlMarshalNullRepresentation)value, diagnostics, context);
- case OxmPackage.EXML_NS_FORM:
- return validateEXmlNsForm((EXmlNsForm)value, diagnostics, context);
- case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS_SCHEMA:
- return validateEXmlVirtualAccessMethodsSchema((EXmlVirtualAccessMethodsSchema)value, diagnostics, context);
- case OxmPackage.EPROP_ORDER:
- return validateEPropOrder((List<?>)value, diagnostics, context);
- default:
- return true;
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEAbstractTypeMapping(EAbstractTypeMapping eAbstractTypeMapping, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eAbstractTypeMapping, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEAbstractXmlNullPolicy(EAbstractXmlNullPolicy eAbstractXmlNullPolicy, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eAbstractXmlNullPolicy, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEAbstractXmlTransformer(EAbstractXmlTransformer eAbstractXmlTransformer, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eAbstractXmlTransformer, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEAccessibleJavaAttribute(EAccessibleJavaAttribute eAccessibleJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eAccessibleJavaAttribute, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEAdaptableJavaAttribute(EAdaptableJavaAttribute eAdaptableJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eAdaptableJavaAttribute, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEContainerJavaAttribute(EContainerJavaAttribute eContainerJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eContainerJavaAttribute, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEJavaAttribute(EJavaAttribute eJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eJavaAttribute, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEJavaType(EJavaType eJavaType, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eJavaType, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEPropertyHolder(EPropertyHolder ePropertyHolder, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)ePropertyHolder, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEReadWriteJavaAttribute(EReadWriteJavaAttribute eReadWriteJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eReadWriteJavaAttribute, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateETypedJavaAttribute(ETypedJavaAttribute eTypedJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eTypedJavaAttribute, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlAccessMethods(EXmlAccessMethods eXmlAccessMethods, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlAccessMethods, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlAnyAttribute(EXmlAnyAttribute eXmlAnyAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlAnyAttribute, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlAnyElement(EXmlAnyElement eXmlAnyElement, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlAnyElement, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlAttribute(EXmlAttribute eXmlAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlAttribute, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlBindings(EXmlBindings eXmlBindings, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlBindings, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlClassExtractor(EXmlClassExtractor eXmlClassExtractor, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlClassExtractor, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlElement(EXmlElement eXmlElement, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlElement, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlElementDecl(EXmlElementDecl eXmlElementDecl, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlElementDecl, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlElementRef(EXmlElementRef eXmlElementRef, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlElementRef, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlElementRefs(EXmlElementRefs eXmlElementRefs, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlElementRefs, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlElements(EXmlElements eXmlElements, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlElements, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlElementWrapper(EXmlElementWrapper eXmlElementWrapper, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlElementWrapper, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlEnum(EXmlEnum eXmlEnum, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlEnum, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlEnumValue(EXmlEnumValue eXmlEnumValue, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlEnumValue, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlInverseReference(EXmlInverseReference eXmlInverseReference, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlInverseReference, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlIsSetNullPolicy(EXmlIsSetNullPolicy eXmlIsSetNullPolicy, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlIsSetNullPolicy, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlIsSetParameter(EXmlIsSetParameter eXmlIsSetParameter, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlIsSetParameter, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlJavaTypeAdapter(EXmlJavaTypeAdapter eXmlJavaTypeAdapter, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlJavaTypeAdapter, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlJoinNode(EXmlJoinNode eXmlJoinNode, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlJoinNode, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlJoinNodes(EXmlJoinNodes eXmlJoinNodes, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlJoinNodes, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlMap(EXmlMap eXmlMap, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlMap, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlNullPolicy(EXmlNullPolicy eXmlNullPolicy, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlNullPolicy, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlNs(EXmlNs eXmlNs, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlNs, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlProperty(EXmlProperty eXmlProperty, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlProperty, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlReadTransformer(EXmlReadTransformer eXmlReadTransformer, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlReadTransformer, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlRegistry(EXmlRegistry eXmlRegistry, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlRegistry, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlRootElement(EXmlRootElement eXmlRootElement, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlRootElement, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlSchema(EXmlSchema eXmlSchema, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlSchema, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlSchemaType(EXmlSchemaType eXmlSchemaType, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlSchemaType, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlSeeAlso(EXmlSeeAlso eXmlSeeAlso, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlSeeAlso, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlTransformation(EXmlTransformation eXmlTransformation, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlTransformation, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlTransient(EXmlTransient eXmlTransient, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlTransient, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlType(EXmlType eXmlType, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlType, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlValue(EXmlValue eXmlValue, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlValue, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlVirtualAccessMethods(EXmlVirtualAccessMethods eXmlVirtualAccessMethods, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlVirtualAccessMethods, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlWriteTransformer(EXmlWriteTransformer eXmlWriteTransformer, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint((EObject)eXmlWriteTransformer, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlAccessOrder(EXmlAccessOrder eXmlAccessOrder, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlAccessType(EXmlAccessType eXmlAccessType, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlMarshalNullRepresentation(EXmlMarshalNullRepresentation eXmlMarshalNullRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlNsForm(EXmlNsForm eXmlNsForm, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlVirtualAccessMethodsSchema(EXmlVirtualAccessMethodsSchema eXmlVirtualAccessMethodsSchema, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEPropOrder(List<?> ePropOrder, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- boolean result = validateEPropOrder_ItemType(ePropOrder, diagnostics, context);
- return result;
- }
-
- /**
- * Validates the ItemType constraint of '<em>EProp Order</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEPropOrder_ItemType(List<?> ePropOrder, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- boolean result = true;
- for (Iterator<?> i = ePropOrder.iterator(); i.hasNext() && (result || diagnostics != null); )
- {
- Object item = i.next();
- if (XMLTypePackage.Literals.STRING.isInstance(item))
- {
- result &= xmlTypeValidator.validateString((String)item, diagnostics, context);
- }
- else
- {
- result = false;
- reportDataValueTypeViolation(XMLTypePackage.Literals.STRING, item, diagnostics, context);
- }
- }
- return result;
- }
-
- /**
- * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator()
- {
- // TODO
- // Specialize this to return a resource locator for messages specific to this validator.
- // Ensure that you remove @generated or mark it @generated NOT
- return super.getResourceLocator();
- }
-
-} //OxmValidator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbMappingKeys.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbMappingKeys.java
index 4622278de2..ca18fce4af 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbMappingKeys.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbMappingKeys.java
@@ -9,6 +9,8 @@
*******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core;
+import org.eclipse.jpt.jaxb.core.MappingKeys;
+
/**
* Provisional API: This interface is part of an interim API that is still
* under development and expected to change significantly before reaching
@@ -19,7 +21,8 @@ package org.eclipse.jpt.jaxb.eclipselink.core;
* @version 3.0
* @since 3.0
*/
-public interface ELJaxbMappingKeys {
+public interface ELJaxbMappingKeys
+ extends MappingKeys {
String XML_INVERSE_REFERENCE_ATTRIBUTE_MAPPING_KEY = "xml-inverse-reference";
String XML_JOIN_NODES_ATTRIBUTE_MAPPING_KEY = "xml-join-nodes";
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELClassMapping.java
index 822eac0415..8d59765de5 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELClassMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELClassMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,9 +7,9 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
-import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping;
+import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
/**
* Oxm extensions to JaxbClassMapping
@@ -24,7 +24,7 @@ import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping;
* @since 3.2
*/
public interface ELClassMapping
- extends JavaClassMapping {
+ extends JaxbClassMapping {
// ***** XmlDiscriminatorNode *****
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlAnyAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAnyAttributeMapping.java
index df1c9ce8a8..82f1ce7bb0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlAnyAttributeMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAnyAttributeMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.XmlAnyAttributeMapping;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlAnyElementMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAnyElementMapping.java
index 3045fc7faf..e656397121 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlAnyElementMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAnyElementMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.XmlAnyElementMapping;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAttributeMapping.java
index df93d78c67..f159bdc551 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlAttributeMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAttributeMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlCDATA.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlCDATA.java
index ed3bff2e59..9e3b65654b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlCDATA.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlCDATA.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlCDATAMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlCDATAMapping.java
index 2a119ac893..131b4016b9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlCDATAMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlCDATAMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
/**
* Oxm mappings that have an XmlCDATA
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlDiscriminatorNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlDiscriminatorNode.java
index f4d211d48d..a7720c7aa3 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlDiscriminatorNode.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlDiscriminatorNode.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlDiscriminatorValue.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlDiscriminatorValue.java
index 3074d0ab89..339e01c1aa 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlDiscriminatorValue.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlDiscriminatorValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
/**
* Corresponds to XmlDiscriminatorValue annotation
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlElementMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlElementMapping.java
index 958b28488f..de0cd3b414 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlElementMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlElementMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.XmlElementMapping;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlElementsMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlElementsMapping.java
index 12f59b5357..14bcf6c6ae 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlElementsMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlElementsMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.common.utility.iterable.ListIterable;
import org.eclipse.jpt.jaxb.core.context.XmlElementsMapping;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlInverseReferenceMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlInverseReferenceMapping.java
index 8a6c81d15a..24bba4a42c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlInverseReferenceMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlInverseReferenceMapping.java
@@ -1,4 +1,13 @@
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlJoinNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlJoinNode.java
index 33c69202be..b1024ebedf 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlJoinNode.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlJoinNode.java
@@ -1,4 +1,13 @@
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlJoinNodesMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlJoinNodesMapping.java
index c6ff1295eb..8e072a50b9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlJoinNodesMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlJoinNodesMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.common.utility.iterable.ListIterable;
import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlKey.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlKey.java
index 1f3c7993df..21dd56223d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlKey.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlKey.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlNamedNodeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlNamedNodeMapping.java
index f8be35305e..8adc1f4c0c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlNamedNodeMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlNamedNodeMapping.java
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
import org.eclipse.jpt.common.utility.transformer.Transformer;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlPath.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlPath.java
index 809905c416..dee0d9033c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlPath.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlPath.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlPathMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlPathMapping.java
index 8f7b807980..77b7672453 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlPathMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlPathMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
/**
* Oxm mappings that have an XmlPath
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlValueMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlValueMapping.java
index a9a6f71237..739eaac8ca 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/java/ELXmlValueMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlValueMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context.java;
+package org.eclipse.jpt.jaxb.eclipselink.core.context;
import org.eclipse.jpt.jaxb.core.context.XmlValueMapping;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmAttributeMapping.java
new file mode 100644
index 0000000000..0b668310c2
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmAttributeMapping.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmAttributeMapping<A extends EJavaAttribute>
+ extends JaxbAttributeMapping {
+
+ /**
+ * Resource model element
+ */
+ A getEJavaAttribute();
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmAttributeMappingDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmAttributeMappingDefinition.java
new file mode 100644
index 0000000000..44e411110d
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmAttributeMappingDefinition.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+
+public interface OxmAttributeMappingDefinition {
+
+ /**
+ * Return the mapping key {@see ELJaxbMappingKeys} for this mapping definition.
+ */
+ String getKey();
+
+ /**
+ * Return the XML element used for this mapping definition
+ */
+ String getElement();
+
+ /**
+ * Build the corresponding EMF EJavaAttribute.
+ */
+ EJavaAttribute buildEJavaAttribute();
+
+ /**
+ * Build a context mapping for the given parent and resource mapping.
+ */
+ OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping);
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmFile.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmFile.java
index 11acfd2dda..a27f23a121 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmFile.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmFile.java
@@ -26,6 +26,8 @@ import org.eclipse.jpt.jaxb.eclipselink.core.context.ELJaxbPackage;
public interface OxmFile
extends JaxbContextNode {
+ OxmFileDefinition getDefinition();
+
JptXmlResource getOxmResource();
String getPackageName();
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmFileDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmFileDefinition.java
new file mode 100644
index 0000000000..74cfa082ee
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmFileDefinition.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+public interface OxmFileDefinition {
+
+ OxmAttributeMappingDefinition getAttributeMappingDefinitionForElement(String element);
+
+ OxmAttributeMappingDefinition getAttributeMappingDefinitionForKey(String key);
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaAttribute.java
index f9cc6f3acf..5477d1df9d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaAttribute.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaAttribute.java
@@ -10,15 +10,29 @@
package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
+import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessTypeHolder;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
-
-public interface OxmJavaAttribute<A extends EJavaAttribute>
- extends JaxbContextNode {
-
- /**
- * Resource model element
- */
- A getEJavaAttribute();
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmJavaAttribute
+ extends JaxbContextNode, JaxbPersistentAttribute, XmlAccessTypeHolder {
+
+ EJavaAttribute getEJavaAttribute();
+
+
+ // ***** overrides *****
+
+ OxmJavaType getClassMapping();
// ***** java attribute name *****
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaType.java
index 0a865af43f..73fb55a6c0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaType.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaType.java
@@ -95,4 +95,12 @@ public interface OxmJavaType
ListIterable<OxmJavaAttribute> getSpecifiedAttributes();
int getSpecifiedAttributesSize();
+
+
+ // ***** misc *****
+
+ void attributeMappingChanged(
+ OxmJavaAttribute attribute,
+ OxmAttributeMapping oldMapping,
+ OxmAttributeMapping newMapping);
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAnyAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAnyAttribute.java
new file mode 100644
index 0000000000..0e2a6a61f5
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAnyAttribute.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlAnyAttribute
+ extends OxmAttributeMapping<EXmlAnyAttribute> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAnyElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAnyElement.java
new file mode 100644
index 0000000000..3add20325c
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAnyElement.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlAnyElement
+ extends OxmAttributeMapping<EXmlAnyElement> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAttribute.java
new file mode 100644
index 0000000000..6452756fdc
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlAttribute.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlAttribute
+ extends OxmAttributeMapping<EXmlAttribute> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElement.java
index 894e5398f8..0a7a47d79c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElement.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElement.java
@@ -10,8 +10,18 @@
package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement;
-
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
public interface OxmXmlElement
- extends OxmJavaAttribute<EXmlElement> {
+ extends OxmAttributeMapping<EXmlElement> {
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElementRef.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElementRef.java
new file mode 100644
index 0000000000..c9bc53c091
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElementRef.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlElementRef
+ extends OxmAttributeMapping<EXmlElementRef> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElementRefs.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElementRefs.java
new file mode 100644
index 0000000000..d266fc27da
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElementRefs.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlElementRefs
+ extends OxmAttributeMapping<EXmlElementRefs> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElements.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElements.java
new file mode 100644
index 0000000000..703b1698fd
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElements.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlElements
+ extends OxmAttributeMapping<EXmlElements> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlInverseReference.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlInverseReference.java
new file mode 100644
index 0000000000..a9ac44d899
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlInverseReference.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlInverseReference
+ extends OxmAttributeMapping<EXmlInverseReference> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlJavaTypeAdapterXmlElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlJavaTypeAdapterXmlElement.java
new file mode 100644
index 0000000000..6e44ed3dd8
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlJavaTypeAdapterXmlElement.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlJavaTypeAdapterXmlElement
+ extends OxmAttributeMapping<EXmlJavaTypeAdapter> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlJoinNodes.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlJoinNodes.java
new file mode 100644
index 0000000000..ddf6addce0
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlJoinNodes.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlJoinNodes
+ extends OxmAttributeMapping<EXmlJoinNodes> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlTransformation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlTransformation.java
new file mode 100644
index 0000000000..64663a8b07
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlTransformation.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlTransformation
+ extends OxmAttributeMapping<EXmlTransformation> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlTransient.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlTransient.java
new file mode 100644
index 0000000000..cc31edc95a
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlTransient.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlTransient
+ extends OxmAttributeMapping<EXmlTransient> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlValue.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlValue.java
new file mode 100644
index 0000000000..1523529761
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlValue.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue;
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ *
+ * @version 3.3
+ * @since 3.3
+ */
+public interface OxmXmlValue
+ extends OxmAttributeMapping<EXmlValue> {
+
+
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/ELJaxbContextRootImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/ELJaxbContextRootImpl.java
index 80ac19dd55..43d59bab4e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/ELJaxbContextRootImpl.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/ELJaxbContextRootImpl.java
@@ -225,6 +225,9 @@ public class ELJaxbContextRootImpl
@Override
public JaxbTypeMapping getTypeMapping(String typeName) {
+ if (typeName == null) {
+ return null;
+ }
OxmTypeMapping oxmTypeMapping = getOxmTypeMapping(typeName);
return (oxmTypeMapping != null) ? oxmTypeMapping : super.getTypeMapping(typeName);
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaClassMapping.java
index f6bf6530ca..a78d6a5586 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaClassMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaClassMapping.java
@@ -18,10 +18,10 @@ import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.XmlNamedNodeMapping;
import org.eclipse.jpt.jaxb.core.context.java.JavaClass;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaClassMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELClassMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlDiscriminatorNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlDiscriminatorValue;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlNamedNodeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELClassMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlDiscriminatorNode;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlDiscriminatorValue;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlNamedNodeMapping;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorNodeAnnotation;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorValueAnnotation;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyAttributeMapping.java
index 2150577ac8..e7b1185011 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyAttributeMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyAttributeMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -13,10 +13,10 @@ import java.util.List;
import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlAnyAttributeMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlAnyAttributeMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlAnyAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlPath;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
@@ -30,7 +30,7 @@ public class ELJavaXmlAnyAttributeMapping
protected ELJavaXmlPath xmlPath;
- public ELJavaXmlAnyAttributeMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlAnyAttributeMapping(JavaPersistentAttribute parent) {
super(parent);
initXmlPath();
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMapping.java
index af004f61ae..2d30549a5a 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -14,16 +14,16 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.XmlElementRef;
import org.eclipse.jpt.jaxb.core.context.XmlElementRefs;
import org.eclipse.jpt.jaxb.core.context.XmlElementWrapper;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlAnyElementMapping;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlElementRefs;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlAnyElementMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlAnyElementMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlPath;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
@@ -37,7 +37,7 @@ public class ELJavaXmlAnyElementMapping
protected ELJavaXmlPath xmlPath;
- public ELJavaXmlAnyElementMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlAnyElementMapping(JavaPersistentAttribute parent) {
super(parent);
initXmlPath();
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMappingDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMappingDefinition.java
index 8f88ca067d..9073f0e6a5 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMappingDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMappingDefinition.java
@@ -9,8 +9,6 @@
******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
-import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlAnyElementMappingDefinition;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMapping.java
index a8043e3902..ed93386e88 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -14,13 +14,13 @@ import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.XmlID;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlAttributeMapping;
import org.eclipse.jpt.jaxb.core.resource.java.XmlIDAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlAttributeMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlKey;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlKey;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlPath;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.xpath.java.XPath;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlKeyAnnotation;
@@ -38,7 +38,7 @@ public class ELJavaXmlAttributeMapping
protected ELJavaXmlKey xmlKey;
- public ELJavaXmlAttributeMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlAttributeMapping(JavaPersistentAttribute parent) {
super(parent);
initXmlPath();
initXmlKey();
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMappingDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMappingDefinition.java
index 629c613778..e0a979b98d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMappingDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMappingDefinition.java
@@ -11,8 +11,8 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
import java.util.StringTokenizer;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.java.DefaultJavaAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlAttributeMappingDefinition;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
@@ -54,7 +54,7 @@ public class ELJavaXmlAttributeMappingDefinition
IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES));
}
- public boolean isDefault(JaxbPersistentAttribute persistentAttribute) {
+ public boolean isDefault(JavaPersistentAttribute persistentAttribute) {
// test whether annotated with @XmlPath, and if so, if last segment starts with "@"
// (presence of "@" elsewhere may be a node select clause)
XmlPathAnnotation xmlPathAnnotation = null;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlCDATA.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlCDATA.java
index 8727f9e6a2..e3cbdfb849 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlCDATA.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlCDATA.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaContextNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlCDATA;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlCDATA;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlCDATAAnnotation;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorNode.java
index 47bb19869d..5ec97a99bc 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorNode.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorNode.java
@@ -17,7 +17,7 @@ import org.eclipse.jpt.jaxb.core.JaxbNode;
import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaContextNode;
import org.eclipse.jpt.jaxb.core.xsd.XsdTypeDefinition;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlDiscriminatorNode;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlDiscriminatorNode;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.xpath.java.XPath;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.xpath.java.XPathFactory;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorNodeAnnotation;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorValue.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorValue.java
index 422b4571d4..e36615aa2a 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorValue.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorValue.java
@@ -13,7 +13,7 @@ import java.util.List;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaContextNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlDiscriminatorValue;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlDiscriminatorValue;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorValueAnnotation;
import org.eclipse.jpt.jaxb.eclipselink.core.validation.JptJaxbEclipseLinkCoreValidationMessages;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementMapping.java
index 832a39834a..557efd12cd 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -14,17 +14,17 @@ import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.XmlElement;
import org.eclipse.jpt.jaxb.core.context.XmlElementWrapper;
import org.eclipse.jpt.jaxb.core.context.XmlID;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlElementMapping;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation;
import org.eclipse.jpt.jaxb.core.resource.java.XmlIDAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlCDATA;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlElementMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlKey;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlCDATA;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlElementMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlKey;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlPath;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.xpath.java.XPath;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlCDATAAnnotation;
@@ -45,7 +45,7 @@ public class ELJavaXmlElementMapping
protected ELJavaXmlCDATA xmlCDATA;
- public ELJavaXmlElementMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlElementMapping(JavaPersistentAttribute parent) {
super(parent);
initXmlPath();
initXmlKey();
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefMapping.java
index f4fca14dc1..297b867fa9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -9,15 +9,15 @@
*******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.XmlElementRef;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlElementRefMapping;
public class ELJavaXmlElementRefMapping
extends GenericJavaXmlElementRefMapping {
- public ELJavaXmlElementRefMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlElementRefMapping(JavaPersistentAttribute parent) {
super(parent);
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefsMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefsMapping.java
index bbb7628474..313f5b5aa2 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefsMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementRefsMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -10,9 +10,9 @@
package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.XmlElementRef;
import org.eclipse.jpt.jaxb.core.context.XmlElementRefs;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlElementRefs;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlElementRefsMapping;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
@@ -21,7 +21,7 @@ import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
public class ELJavaXmlElementRefsMapping
extends GenericJavaXmlElementRefsMapping {
- public ELJavaXmlElementRefsMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlElementRefsMapping(JavaPersistentAttribute parent) {
super(parent);
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementWrapper.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementWrapper.java
index d2ca1eaad6..129dbaa75e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementWrapper.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementWrapper.java
@@ -10,7 +10,7 @@
package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
import java.util.List;
-import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMapping;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlElementWrapper;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
@@ -19,7 +19,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter;
public class ELJavaXmlElementWrapper
extends GenericJavaXmlElementWrapper {
- public ELJavaXmlElementWrapper(JaxbAttributeMapping parent, Context context) {
+ public ELJavaXmlElementWrapper(JavaAttributeMapping parent, Context context) {
super(parent, context);
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementsMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementsMapping.java
index 346337a8ff..e2c5d11fc8 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementsMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementsMapping.java
@@ -22,14 +22,14 @@ import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper;
import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper;
import org.eclipse.jpt.common.utility.iterable.ListIterable;
import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.XmlElement;
import org.eclipse.jpt.jaxb.core.context.XmlElementWrapper;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlElementsMapping;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlElementsMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlElementsMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlPath;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
import org.eclipse.jpt.jaxb.eclipselink.core.validation.JptJaxbEclipseLinkCoreValidationMessages;
@@ -44,7 +44,7 @@ public class ELJavaXmlElementsMapping
protected final ContextListContainer<ELJavaXmlPath, XmlPathAnnotation> xmlPathContainer;
- public ELJavaXmlElementsMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlElementsMapping(JavaPersistentAttribute parent) {
super(parent);
this.xmlPathContainer = buildXmlPathContainer();
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMapping.java
index 6c8bdfd798..d2ea8a8d76 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMapping.java
@@ -18,9 +18,10 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.jaxb.core.MappingKeys;
import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaAttributeMapping;
import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlInverseReferenceMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlInverseReferenceMapping;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlInverseReferenceAnnotation;
import org.eclipse.jpt.jaxb.eclipselink.core.validation.JptJaxbEclipseLinkCoreValidationMessages;
@@ -35,7 +36,7 @@ public class ELJavaXmlInverseReferenceMapping
protected String mappedBy;
- public ELJavaXmlInverseReferenceMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlInverseReferenceMapping(JavaPersistentAttribute parent) {
super(parent);
this.mappedBy = getResourceMappedBy();
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMappingDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMappingDefinition.java
index d02bfc2aea..0dd2c242ea 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMappingDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMappingDefinition.java
@@ -1,10 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
import org.eclipse.jpt.jaxb.core.JaxbFactory;
-import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMapping;
import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaAttributeMappingDefinition;
import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
@@ -45,7 +54,7 @@ public class ELJavaXmlInverseReferenceMappingDefinition
return EmptyIterable.instance();
}
- public JaxbAttributeMapping buildMapping(JaxbPersistentAttribute parent, JaxbFactory factory) {
+ public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JaxbFactory factory) {
// TODO: move to factory once API opens up again
return new ELJavaXmlInverseReferenceMapping(parent);
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNode.java
index 8dede2f3db..05600c6533 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNode.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNode.java
@@ -22,9 +22,9 @@ import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaContextNode;
import org.eclipse.jpt.jaxb.core.xsd.XsdTypeDefinition;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELClassMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlJoinNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlJoinNodesMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELClassMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlJoinNode;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlJoinNodesMapping;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.xpath.java.XPath;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.xpath.java.XPathFactory;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlJoinNodeAnnotation;
@@ -236,7 +236,7 @@ public class ELJavaXmlJoinNode
ELJavaXmlJoinNode.this,
getReferencedXmlPathTextRange(),
JptJaxbEclipseLinkCoreValidationMessages.XML_JOIN_NODE__REFERENCED_XML_PATH_NOT_IN_REFERENCED_CLASS_KEYS,
- referencedClassMapping.getJavaType().getTypeName().getFullyQualifiedName(),
+ referencedClassMapping.getTypeName().getFullyQualifiedName(),
this.referencedXmlPath));
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMapping.java
index 4e63e37f41..83c4305378 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMapping.java
@@ -22,14 +22,14 @@ import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper;
import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper;
import org.eclipse.jpt.common.utility.iterable.ListIterable;
import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaAttributeMapping;
import org.eclipse.jpt.jaxb.core.xsd.XsdTypeDefinition;
import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELClassMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlElementsMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlJoinNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlJoinNodesMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELClassMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlElementsMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlJoinNode;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlJoinNodesMapping;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlJoinNodeAnnotation;
import org.eclipse.jpt.jaxb.eclipselink.core.validation.JptJaxbEclipseLinkCoreValidationMessages;
@@ -44,7 +44,7 @@ public class ELJavaXmlJoinNodesMapping
protected final ContextListContainer<ELJavaXmlJoinNode, XmlJoinNodeAnnotation> xmlJoinNodeContainer;
- public ELJavaXmlJoinNodesMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlJoinNodesMapping(JavaPersistentAttribute parent) {
super(parent);
this.xmlJoinNodeContainer = buildXmlJoinNodeContainer();
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMappingDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMappingDefinition.java
index 6e831e843e..f3dc5e42fe 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMappingDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMappingDefinition.java
@@ -11,9 +11,9 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.jaxb.core.JaxbFactory;
-import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMapping;
import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaAttributeMappingDefinition;
import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
@@ -54,7 +54,7 @@ public class ELJavaXmlJoinNodesMappingDefinition
}
@Override
- public boolean isSpecified(JaxbPersistentAttribute persistentAttribute) {
+ public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
return persistentAttribute.getJavaResourceAttribute().getContainerAnnotation(getAnnotationName()) != null
|| ! IterableTools.isEmpty(persistentAttribute.getJavaResourceAttribute().getAnnotations(ELJaxb.XML_JOIN_NODE));
}
@@ -63,7 +63,7 @@ public class ELJavaXmlJoinNodesMappingDefinition
return IterableTools.listIterable(SUPPORTING_ANNOTATION_NAMES);
}
- public JaxbAttributeMapping buildMapping(JaxbPersistentAttribute parent, JaxbFactory factory) {
+ public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JaxbFactory factory) {
return new ELJavaXmlJoinNodesMapping(parent);
}
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlKey.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlKey.java
index b3d5d0f3d3..f8062d2c98 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlKey.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlKey.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaContextNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlKey;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlKey;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlKeyAnnotation;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlPath.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlPath.java
index b0dfa52646..5a5106e765 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlPath.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlPath.java
@@ -20,7 +20,7 @@ import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaContextNode;
import org.eclipse.jpt.jaxb.core.xsd.XsdTypeDefinition;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlPath;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.xpath.java.XPath;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.xpath.java.XPathFactory;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMapping.java
index 036908cb6c..67db637113 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -9,7 +9,7 @@
*******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaAttributeMapping;
import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
@@ -19,7 +19,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlTransformationAnno
public class ELJavaXmlTransformationMapping
extends AbstractJavaAttributeMapping<XmlTransformationAnnotation> {
- public ELJavaXmlTransformationMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlTransformationMapping(JavaPersistentAttribute parent) {
super(parent);
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMappingDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMappingDefinition.java
index 443dc783ba..323b5a84fd 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMappingDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlTransformationMappingDefinition.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,9 +11,9 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
import org.eclipse.jpt.jaxb.core.JaxbFactory;
-import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMapping;
import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.AbstractJavaAttributeMappingDefinition;
import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
@@ -54,7 +54,7 @@ public class ELJavaXmlTransformationMappingDefinition
return EmptyIterable.instance();
}
- public JaxbAttributeMapping buildMapping(JaxbPersistentAttribute parent, JaxbFactory factory) {
+ public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JaxbFactory factory) {
// TODO: move to factory once API opens up again
return new ELJavaXmlTransformationMapping(parent);
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlValueMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlValueMapping.java
index e3521bfbbf..a782d7ad25 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlValueMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlValueMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -9,10 +9,10 @@
*******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlValueMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlCDATA;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlValueMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlCDATA;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlValueMapping;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlCDATAAnnotation;
@@ -24,7 +24,7 @@ public class ELJavaXmlValueMapping
protected ELJavaXmlCDATA xmlCDATA;
- public ELJavaXmlValueMapping(JaxbPersistentAttribute parent) {
+ public ELJavaXmlValueMapping(JavaPersistentAttribute parent) {
super(parent);
initXmlCDATA();
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmAttributeMapping.java
new file mode 100644
index 0000000000..0cc02e8575
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmAttributeMapping.java
@@ -0,0 +1,106 @@
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.common.utility.internal.StringTools;
+import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable;
+import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
+import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
+import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping;
+import org.eclipse.jpt.jaxb.core.context.XmlSchemaType;
+import org.eclipse.jpt.jaxb.core.internal.context.AbstractJaxbContextNode;
+import org.eclipse.jpt.jaxb.core.xsd.XsdTypeDefinition;
+import org.eclipse.jpt.jaxb.core.xsd.XsdUtil;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+
+public abstract class AbstractOxmAttributeMapping<A extends EJavaAttribute>
+ extends AbstractJaxbContextNode
+ implements OxmAttributeMapping<A> {
+
+ protected A eJavaAttribute;
+
+
+ protected AbstractOxmAttributeMapping(OxmJavaAttribute parent, A eJavaAttribute) {
+ super(parent);
+ this.eJavaAttribute = eJavaAttribute;
+ }
+
+
+ public OxmJavaAttribute getPersistentAttribute() {
+ return (OxmJavaAttribute) getParent();
+ }
+
+ public OxmJavaType getClassMapping() {
+ return getPersistentAttribute().getClassMapping();
+ }
+
+ public JaxbPackage getJaxbPackage() {
+ return getClassMapping().getJaxbPackage();
+ }
+
+ public A getEJavaAttribute() {
+ return this.eJavaAttribute;
+ }
+
+
+ // ***** misc *****
+
+ public String getBoundTypeName() {
+ return getPersistentAttribute().getJavaResourceAttributeBaseTypeName();
+ }
+
+ public String getValueTypeName() {
+ return getBoundTypeName();
+ }
+
+ public String getDataTypeName() {
+ return getValueTypeName();
+ }
+
+ /**
+ * Return the expected schema type associated with the data type
+ */
+ public XsdTypeDefinition getDataTypeXsdTypeDefinition() {
+ String dataType = getDataTypeName();
+ if (StringTools.isBlank(dataType)) {
+ return null;
+ }
+
+ JaxbPackage pkg = getJaxbPackage();
+ JaxbPackageInfo pkgInfo = (pkg == null) ? null : pkg.getPackageInfo();
+ if (pkgInfo != null) {
+ for (XmlSchemaType schemaType : pkgInfo.getXmlSchemaTypes()) {
+ if (dataType.equals(schemaType.getFullyQualifiedType())) {
+ return schemaType.getXsdTypeDefinition();
+ }
+ }
+ }
+
+ JaxbTypeMapping jaxbTypeMapping = getContextRoot().getTypeMapping(dataType);
+ if (jaxbTypeMapping != null) {
+ return jaxbTypeMapping.getXsdTypeDefinition();
+ }
+
+ String builtInType = getJaxbProject().getPlatform().getDefinition().getSchemaTypeMapping(dataType);
+ if (builtInType != null) {
+ return XsdUtil.getSchemaForSchema().getTypeDefinition(builtInType);
+ }
+
+ return null;
+ }
+
+ public Iterable<String> getReferencedXmlTypeNames() {
+ return new SingleElementIterable<String>(getValueTypeName());
+ }
+
+ /* default impl */
+ public boolean isParticleMapping() {
+ return false;
+ }
+
+ /* default impl */
+ public boolean isTransient() {
+ return false;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmJavaAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmJavaAttribute.java
deleted file mode 100644
index ca0516553b..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmJavaAttribute.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
-
-import org.eclipse.jpt.jaxb.core.internal.context.AbstractJaxbContextNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
-
-public abstract class AbstractOxmJavaAttribute<A extends EJavaAttribute>
- extends AbstractJaxbContextNode
- implements OxmJavaAttribute<A> {
-
- protected A eJavaAttribute;
-
- protected String javaAttributeName;
-
-
- protected AbstractOxmJavaAttribute(OxmJavaType parent, A eJavaAttribute) {
- super(parent);
- this.eJavaAttribute = eJavaAttribute;
- this.javaAttributeName = buildJavaAttributeName();
- }
-
-
- public A getEJavaAttribute() {
- return this.eJavaAttribute;
- }
-
- // ***** sync/update *****
-
- @Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- setJavaAttributeName_(buildJavaAttributeName());
- }
-
-
- // ***** java attribute name *****
-
- public String getJavaAttributeName() {
- return this.javaAttributeName;
- }
-
- public void setJavaAttributeName(String newName) {
- this.eJavaAttribute.setJavaAttribute(newName);
- setJavaAttributeName_(newName);
- }
-
- protected void setJavaAttributeName_(String newName) {
- String oldName = this.javaAttributeName;
- this.javaAttributeName = newName;
- firePropertyChanged(JAVA_ATTRIBUTE_NAME_PROPERTY, oldName, newName);
- }
-
- protected String buildJavaAttributeName() {
- return this.eJavaAttribute.getJavaAttribute();
- }
-}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmAttributesContainer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmAttributesContainer.java
new file mode 100644
index 0000000000..c35542f30f
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmAttributesContainer.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
+import org.eclipse.jpt.jaxb.core.context.JaxbAttributesContainer;
+import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
+import org.eclipse.jpt.jaxb.core.internal.context.AbstractJaxbContextNode;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+
+// TODO - this is a null implementation at this point, but needs to include the
+// OxmJavaType's attributes as well as any default attributes from java
+// (while taking into consideration the access type imposed from the owning class mapping)
+public class OxmAttributesContainer
+ extends AbstractJaxbContextNode
+ implements JaxbAttributesContainer {
+
+ public OxmAttributesContainer(JaxbClassMapping parent) {
+ super(parent);
+ }
+
+
+ public Iterable<OxmJavaAttribute> getAttributes() {
+ return EmptyIterable.instance();
+ }
+
+ public int getAttributesSize() {
+ return 0;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmFileDefinitionImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmFileDefinitionImpl.java
new file mode 100644
index 0000000000..db25b63035
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmFileDefinitionImpl.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmFileDefinition;
+
+public class OxmFileDefinitionImpl
+ implements OxmFileDefinition {
+
+ final OxmAttributeMappingDefinition[] attributeMappingDefinitions = {
+ new OxmXmlAnyAttributeDefinition(),
+ new OxmXmlAnyElementDefinition(),
+ new OxmXmlAttributeDefinition(),
+ new OxmXmlElementDefinition(),
+ new OxmXmlElementRefDefinition(),
+ new OxmXmlElementRefsDefinition(),
+ new OxmXmlElementsDefinition(),
+ new OxmXmlInverseReferenceDefinition(),
+ new OxmXmlJoinNodesDefinition(),
+ new OxmXmlTransformationDefinition(),
+ new OxmXmlTransientDefinition(),
+ new OxmXmlValueDefinition(),
+ new OxmXmlJavaTypeAdapterXmlElementDefinition() }; // this one goes LAST
+
+
+ public OxmAttributeMappingDefinition getAttributeMappingDefinitionForKey(String key) {
+ for (OxmAttributeMappingDefinition amd : this.attributeMappingDefinitions) {
+ if (ObjectTools.equals(amd.getKey(), key)) {
+ return amd;
+ }
+ }
+ throw new IllegalArgumentException("No attribute mapping definition for key: " + key);
+ }
+
+ public OxmAttributeMappingDefinition getAttributeMappingDefinitionForElement(String element) {
+ for (OxmAttributeMappingDefinition amd : this.attributeMappingDefinitions) {
+ if (ObjectTools.equals(amd.getElement(), element)) {
+ return amd;
+ }
+ }
+ throw new IllegalArgumentException("No attribute mapping definition supports element: " + element);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmFileImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmFileImpl.java
index ad21aa98ec..8ad9314324 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmFileImpl.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmFileImpl.java
@@ -19,6 +19,7 @@ import org.eclipse.jpt.jaxb.core.internal.context.AbstractJaxbContextNode;
import org.eclipse.jpt.jaxb.eclipselink.core.context.ELJaxbContextRoot;
import org.eclipse.jpt.jaxb.eclipselink.core.context.ELJaxbPackage;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmFile;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmFileDefinition;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlBindings;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings;
import org.eclipse.jpt.jaxb.eclipselink.core.validation.JptJaxbEclipseLinkCoreValidationMessages;
@@ -28,6 +29,8 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter;
public class OxmFileImpl
extends AbstractJaxbContextNode
implements OxmFile {
+
+ protected OxmFileDefinition definition;
// never null
protected JptXmlResource oxmResource;
@@ -49,7 +52,8 @@ public class OxmFileImpl
public OxmFileImpl(ELJaxbContextRoot parent, JptXmlResource oxmResource) {
- super(parent);
+ super(parent);
+ this.definition = new OxmFileDefinitionImpl();
this.oxmResource = oxmResource;
this.resourceType = oxmResource.getResourceType();
this.xmlBindings = buildXmlBindings();
@@ -64,6 +68,10 @@ public class OxmFileImpl
@Override
public IResource getResource() {
return this.oxmResource.getFile();
+ }
+
+ public OxmFileDefinition getDefinition() {
+ return this.definition;
}
public JptXmlResource getOxmResource() {
@@ -180,4 +188,4 @@ public class OxmFileImpl
this.xmlBindings.validate(messages, reporter);
}
}
-} \ No newline at end of file
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaAttributeImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaAttributeImpl.java
new file mode 100644
index 0000000000..9078ef76c8
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaAttributeImpl.java
@@ -0,0 +1,244 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
+import org.eclipse.jpt.jaxb.core.context.TypeName;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
+import org.eclipse.jpt.jaxb.core.internal.context.AbstractJaxbContextNode;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmFileDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+
+public class OxmJavaAttributeImpl
+ extends AbstractJaxbContextNode
+ implements OxmJavaAttribute {
+
+ protected String javaAttributeName;
+
+ protected XmlAccessType accessType;
+ protected XmlAccessType defaultAccessType;
+ protected XmlAccessType specifiedAccessType;
+
+ protected static final String JAVA_RESOURCE_ATTRIBUTE_PROPERTY = "javaResourceAttribute"; //$NON-NLS-1$
+ protected JavaResourceAttribute javaResourceAttribute;
+
+ protected OxmAttributeMapping mapping; // never null
+
+
+ protected OxmJavaAttributeImpl(OxmJavaType parent, EJavaAttribute eJavaAttribute) {
+ super(parent);
+ initMapping(eJavaAttribute);
+ initJavaAttributeName();
+ initAccessType();
+ }
+
+
+ public OxmJavaType getClassMapping() {
+ return (OxmJavaType) getParent();
+ }
+
+ protected OxmFileDefinition getOxmFileDefinition() {
+ return getClassMapping().getXmlBindings().getOxmFile().getDefinition();
+ }
+
+ public EJavaAttribute getEJavaAttribute() {
+ return this.mapping.getEJavaAttribute();
+ }
+
+ public String getName() {
+ return getJavaAttributeName();
+ }
+
+
+ // ***** sync/update *****
+
+ @Override
+ public void synchronizeWithResourceModel() {
+ super.synchronizeWithResourceModel();
+ syncJavaAttributeName();
+ syncAccessType();
+ syncMapping();
+ }
+
+ @Override
+ public void update() {
+ super.update();
+ updateAccessType();
+ updateMapping();
+ }
+
+
+ // ***** java attribute name *****
+
+ public String getJavaAttributeName() {
+ return this.javaAttributeName;
+ }
+
+ public void setJavaAttributeName(String newName) {
+ getEJavaAttribute().setJavaAttribute(newName);
+ setJavaAttributeName_(newName);
+ }
+
+ protected void setJavaAttributeName_(String newName) {
+ String oldName = this.javaAttributeName;
+ this.javaAttributeName = newName;
+ firePropertyChanged(JAVA_ATTRIBUTE_NAME_PROPERTY, oldName, newName);
+ }
+
+ protected String getResourceJavaAttributeName() {
+ return getEJavaAttribute().getJavaAttribute();
+ }
+
+ protected void initJavaAttributeName() {
+ this.javaAttributeName = getResourceJavaAttributeName();
+ }
+
+ protected void syncJavaAttributeName() {
+ setJavaAttributeName_(getResourceJavaAttributeName());
+ }
+
+
+ // ***** access type *****
+
+ public XmlAccessType getAccessType() {
+ return this.accessType;
+ }
+
+ protected void setAccessType_(XmlAccessType accessType) {
+ XmlAccessType old = this.accessType;
+ this.accessType = accessType;
+ firePropertyChanged(ACCESS_TYPE_PROPERTY, old, accessType);
+ }
+
+ public XmlAccessType getDefaultAccessType() {
+ return this.defaultAccessType;
+ }
+
+ protected void setDefaultAccessType_(XmlAccessType accessType) {
+ XmlAccessType old = this.defaultAccessType;
+ this.defaultAccessType = accessType;
+ firePropertyChanged(DEFAULT_ACCESS_TYPE_PROPERTY, old, accessType);
+ }
+
+ public XmlAccessType getSpecifiedAccessType() {
+ return this.specifiedAccessType;
+ }
+
+ public void setSpecifiedAccessType(XmlAccessType accessType) {
+ setSpecifiedAccessType_(accessType);
+ getEJavaAttribute().setXmlAccessorType(ELXmlAccessType.toOxmResourceModel(accessType));
+ }
+
+ protected void setSpecifiedAccessType_(XmlAccessType accessType) {
+ XmlAccessType old = this.specifiedAccessType;
+ this.specifiedAccessType = accessType;
+ firePropertyChanged(SPECIFIED_ACCESS_TYPE_PROPERTY, old, accessType);
+ }
+
+ protected void initAccessType() {
+ this.specifiedAccessType = getResourceAccessType();
+ }
+
+ protected void syncAccessType() {
+ setSpecifiedAccessType_(getResourceAccessType());
+ }
+
+ protected void updateAccessType() {
+ XmlAccessType defaultAccessType = getClassMapping().getAccessType();
+ setDefaultAccessType_(defaultAccessType);
+ XmlAccessType accessType = (this.specifiedAccessType != null) ?
+ this.specifiedAccessType : this.defaultAccessType;
+ setAccessType_(accessType);
+ }
+
+ protected XmlAccessType getResourceAccessType() {
+ return ELXmlAccessType.fromOxmResourceModel(getEJavaAttribute().getXmlAccessorType());
+ }
+
+
+ // ***** mapping *****
+
+ public OxmAttributeMapping getMapping() {
+ return this.mapping;
+ }
+
+ protected void setMapping_(OxmAttributeMapping mapping) {
+ OxmAttributeMapping old = this.mapping;
+ this.mapping = mapping;
+ firePropertyChanged(MAPPING_PROPERTY, old, mapping);
+ getClassMapping().attributeMappingChanged(this, old, mapping);
+ }
+
+ public String getMappingKey() {
+ return this.mapping.getKey();
+ }
+
+ public JaxbAttributeMapping setMappingKey(String key) {
+ if (valuesAreDifferent(getMappingKey(), key)) {
+ OxmAttributeMappingDefinition mappingDefinition =
+ getOxmFileDefinition().getAttributeMappingDefinitionForKey(key);
+ EJavaAttribute eJavaAttribute =
+ mappingDefinition.buildEJavaAttribute();
+ setMapping_(mappingDefinition.buildContextMapping(this, eJavaAttribute));
+ }
+ return this.mapping;
+ }
+
+ protected void initMapping(EJavaAttribute eJavaAttribute) {
+ OxmAttributeMappingDefinition mappingDef =
+ getOxmFileDefinition().getAttributeMappingDefinitionForElement(eJavaAttribute.getElementName());
+ this.mapping = mappingDef.buildContextMapping(this, eJavaAttribute);
+ }
+
+ protected void syncMapping() {
+ // if resource element has changed, the entire attribute will be rebuilt
+ this.mapping.synchronizeWithResourceModel();
+ }
+
+ protected void updateMapping() {
+ this.mapping.update();
+ }
+
+
+ // ***** declaring class / inheritance *****
+
+ public boolean isInherited() {
+ return ObjectTools.notEquals(getDeclaringTypeName(), getClassMapping().getTypeName());
+ }
+
+ public TypeName getDeclaringTypeName() {
+ // TODO - should this be altered for inherited attributes?
+ return getClassMapping().getTypeName();
+ }
+
+
+ // ***** java type information *****
+
+ public String getJavaResourceAttributeBaseTypeName() {
+ // TODO
+ return Object.class.getName();
+ }
+
+ public boolean isJavaResourceAttributeCollectionType() {
+ // TODO
+ return false;
+ }
+
+ public boolean isJavaResourceAttributeTypeSubTypeOf(String typeName) {
+ // TODO
+ return false;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaTypeImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaTypeImpl.java
index c9d2273263..7d9cf529ac 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaTypeImpl.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaTypeImpl.java
@@ -13,16 +13,19 @@ import java.util.List;
import java.util.Vector;
import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
+import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
+import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.common.utility.internal.TypeDeclarationTools;
+import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
+import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.common.utility.iterable.ListIterable;
import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping;
import org.eclipse.jpt.jaxb.core.context.JaxbAttributesContainer;
-import org.eclipse.jpt.jaxb.core.context.JaxbAttributesContainer.Context;
import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.TypeKind;
@@ -32,14 +35,14 @@ import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
import org.eclipse.jpt.jaxb.core.context.java.JavaClass;
import org.eclipse.jpt.jaxb.core.context.java.JavaType;
import org.eclipse.jpt.jaxb.core.internal.context.ContextContainerTools;
+import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaAttributesContainer;
import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaJaxbClass;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlBindings;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
import org.eclipse.jpt.jaxb.eclipselink.core.validation.JptJaxbEclipseLinkCoreValidationMessages;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
@@ -71,19 +74,24 @@ public class OxmJavaTypeImpl
protected final Vector<OxmJavaAttribute> specifiedAttributes;
protected final SpecifiedAttributeContainerAdapter specifiedAttributeContainerAdapter;
+ protected final static String DEFAULT_ATTRIBUTES_COLLECTION = "defaultAttributes"; //$NON-NLS-1$
+ protected final JaxbAttributesContainer defaultAttributesContainer;
+
public OxmJavaTypeImpl(OxmXmlBindings parent, EJavaType eJavaType) {
super(parent, eJavaType);
this.specifiedAttributes = new Vector<OxmJavaAttribute>();
this.specifiedAttributeContainerAdapter = new SpecifiedAttributeContainerAdapter();
+ this.defaultAttributesContainer =
+ new DefaultAttributesContainer(this, new DefaultAttributesContainerContext());
initSpecifiedName();
initSuperTypeName();
initSpecifiedAccessOrder();
initDefaultAccessOrder();
initAccessType();
- initSpecifiedAttributes();
+ initAttributes();
}
@@ -124,7 +132,7 @@ public class OxmJavaTypeImpl
syncSuperTypeName();
syncSpecifiedAccessOrder();
syncAccessType();
- ContextContainerTools.synchronizeWithResourceModel(this.specifiedAttributeContainerAdapter);
+ syncAttributes();
}
@Override
@@ -134,7 +142,7 @@ public class OxmJavaTypeImpl
updateSuperclass();
updateDefaultAccessOrder();
updateAccessType();
- ContextContainerTools.update(this.specifiedAttributeContainerAdapter);
+ updateAttributes();
}
@@ -483,11 +491,12 @@ public class OxmJavaTypeImpl
// ***** prop order *****
public ListIterable<String> getPropOrder() {
- // TODO Auto-generated method stub
- return null;
+ // TODO
+ return EmptyListIterable.instance();
}
+
public int getPropOrderSize() {
- // TODO Auto-generated method stub
+ // TODO
return 0;
}
@@ -498,64 +507,65 @@ public class OxmJavaTypeImpl
public void addProp(int index, String prop) {
// TODO Auto-generated method stub
-
}
public void removeProp(int index) {
// TODO Auto-generated method stub
-
}
public void removeProp(String prop) {
// TODO Auto-generated method stub
-
}
public void moveProp(int targetIndex, int sourceIndex) {
// TODO Auto-generated method stub
-
}
// ***** attributes *****
public Iterable<JaxbPersistentAttribute> getAttributes() {
- // TODO Auto-generated method stub
- return null;
+ // TODO
+ return EmptyIterable.instance();
}
public int getAttributesSize() {
- // TODO Auto-generated method stub
+ // TODO
return 0;
}
public Iterable<JaxbPersistentAttribute> getIncludedAttributes() {
- // TODO Auto-generated method stub
- return null;
+ // TODO
+ return EmptyIterable.instance();
}
public int getIncludedAttributesSize() {
- // TODO Auto-generated method stub
+ // TODO
return 0;
}
public Iterable<JaxbPersistentAttribute> getAllLocallyDefinedAttributes() {
- // TODO Auto-generated method stub
- return null;
+ // TODO
+ return EmptyIterable.instance();
}
public Iterable<JaxbPersistentAttribute> getInheritedAttributes() {
- // TODO Auto-generated method stub
- return null;
+ // TODO
+ return EmptyIterable.instance();
}
- public JaxbAttributesContainer buildIncludedAttributesContainer(JaxbClassMapping parent, Context context) {
- // TODO Auto-generated method stub
- return null;
+ public JaxbAttributesContainer buildIncludedAttributesContainer(
+ JaxbClassMapping parent, JaxbAttributesContainer.Context context) {
+ return new OxmAttributesContainer(parent);
}
- // ***** specified java attributes *****
+ // ***** attributes *****
+
+ protected Iterable<JaxbAttributeMapping> getDefaultAttributes() {
+ return this.defaultAttributesContainer.getAttributes();
+ }
+
public ListIterable<OxmJavaAttribute> getSpecifiedAttributes() {
return IterableTools.cloneLive(this.specifiedAttributes);
@@ -578,26 +588,37 @@ public class OxmJavaTypeImpl
moveItemInList(index, attribute, this.specifiedAttributes, SPECIFIED_ATTRIBUTES_LIST);
}
- protected void initSpecifiedAttributes() {
+ protected void initAttributes() {
for (EJavaAttribute eJavaAttribute : getETypeMapping().getJavaAttributes()) {
this.specifiedAttributes.add(buildSpecifiedAttribute(eJavaAttribute));
}
}
+ protected void syncAttributes() {
+ ContextContainerTools.synchronizeWithResourceModel(this.specifiedAttributeContainerAdapter);
+ }
+
+ protected void updateAttributes() {
+ ContextContainerTools.update(this.specifiedAttributeContainerAdapter);
+ }
+
protected OxmJavaAttribute buildSpecifiedAttribute(EJavaAttribute resourceAttribute) {
- // If this gets weighty or duplicated, we can move it
- String elementName = resourceAttribute.getElementName();
- if (ObjectTools.equals(Oxm.XML_ELEMENT, elementName)) {
- return new OxmXmlElementImpl(this, (EXmlElement) resourceAttribute);
- }
-
- // ?
- return null;
+ return new OxmJavaAttributeImpl(this, resourceAttribute);
}
+ // ***** default attributes *****
+
+
+
+
// ***** misc *****
+ public void attributeMappingChanged(OxmJavaAttribute attribute, OxmAttributeMapping oldMapping, OxmAttributeMapping newMapping) {
+ // TODO Auto-generated method stub
+
+ }
+
public JaxbAttributeMapping getXmlIdMapping() {
// TODO Auto-generated method stub
return null;
@@ -677,4 +698,59 @@ public class OxmJavaTypeImpl
OxmJavaTypeImpl.this.moveSpecifiedAttribute_(index, element);
}
}
+
+
+ protected class DefaultAttributesContainer
+ extends GenericJavaAttributesContainer {
+
+ protected DefaultAttributesContainer(OxmJavaTypeImpl parent, Context context) {
+ super(parent, context, null);
+ }
+
+
+ @Override
+ public boolean isFor(JavaResourceType javaResourceType) {
+ if (this.javaResourceType == null) {
+ return false;
+ }
+ return super.isFor(javaResourceType);
+ }
+
+ @Override
+ protected Iterable<JavaResourceField> getResourceFields() {
+ if (this.javaResourceType == null) {
+ return EmptyIterable.instance();
+ }
+ return super.getResourceFields();
+ }
+
+ @Override
+ protected Iterable<JavaResourceMethod> getResourceMethods() {
+ if (this.javaResourceType == null) {
+ return EmptyIterable.instance();
+ }
+ return super.getResourceMethods();
+ }
+
+ protected void setJavaResourceType(JavaResourceType javaResourceType) {
+ this.javaResourceType = javaResourceType;
+ }
+ }
+
+
+ protected class DefaultAttributesContainerContext
+ implements JaxbAttributesContainer.Context {
+
+ public XmlAccessType getAccessType() {
+ return OxmJavaTypeImpl.this.getAccessType();
+ }
+
+ public void attributeAdded(JaxbPersistentAttribute attribute) {
+ OxmJavaTypeImpl.this.fireItemAdded(DEFAULT_ATTRIBUTES_COLLECTION, attribute);
+ }
+
+ public void attributeRemoved(JaxbPersistentAttribute attribute) {
+ OxmJavaTypeImpl.this.fireItemRemoved(DEFAULT_ATTRIBUTES_COLLECTION, attribute);
+ }
+ }
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyAttributeDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyAttributeDefinition.java
new file mode 100644
index 0000000000..67bd9100ef
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyAttributeDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlAnyAttributeDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlAnyAttributeDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ANY_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_ANY_ATTRIBUTE;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlAnyAttribute();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlAnyAttributeImpl(parent, (EXmlAnyAttribute) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyAttributeImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyAttributeImpl.java
new file mode 100644
index 0000000000..bb2db1f6d6
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyAttributeImpl.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlAnyAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute;
+
+public class OxmXmlAnyAttributeImpl
+ extends AbstractOxmAttributeMapping<EXmlAnyAttribute>
+ implements OxmXmlAnyAttribute {
+
+ public OxmXmlAnyAttributeImpl(OxmJavaAttribute parent, EXmlAnyAttribute eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ANY_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyElementDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyElementDefinition.java
new file mode 100644
index 0000000000..7018c82821
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyElementDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlAnyElementDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlAnyElementDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ANY_ELEMENT_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_ANY_ELEMENT;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlAnyElement();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlAnyElementImpl(parent, (EXmlAnyElement) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyElementImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyElementImpl.java
new file mode 100644
index 0000000000..84a46f1add
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAnyElementImpl.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlAnyElement;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement;
+
+public class OxmXmlAnyElementImpl
+ extends AbstractOxmAttributeMapping<EXmlAnyElement>
+ implements OxmXmlAnyElement {
+
+ public OxmXmlAnyElementImpl(OxmJavaAttribute parent, EXmlAnyElement eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ANY_ELEMENT_ATTRIBUTE_MAPPING_KEY;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAttributeDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAttributeDefinition.java
new file mode 100644
index 0000000000..86530787b3
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAttributeDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlAttributeDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlAttributeDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_ATTRIBUTE;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlAttribute();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlAttributeImpl(parent, (EXmlAttribute) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAttributeImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAttributeImpl.java
new file mode 100644
index 0000000000..da091b8326
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlAttributeImpl.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute;
+
+public class OxmXmlAttributeImpl
+ extends AbstractOxmAttributeMapping<EXmlAttribute>
+ implements OxmXmlAttribute {
+
+ public OxmXmlAttributeImpl(OxmJavaAttribute parent, EXmlAttribute eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementDefinition.java
new file mode 100644
index 0000000000..45199bf8e7
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlElementDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlElementDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_ELEMENT;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlElement();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlElementImpl(parent, (EXmlElement) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java
index 1e3be37862..2c30b99f48 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java
@@ -9,15 +9,26 @@
*******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlElement;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement;
public class OxmXmlElementImpl
- extends AbstractOxmJavaAttribute<EXmlElement>
+ extends AbstractOxmAttributeMapping<EXmlElement>
implements OxmXmlElement {
- public OxmXmlElementImpl(OxmJavaType parent, EXmlElement eJavaAttribute) {
+ public OxmXmlElementImpl(OxmJavaAttribute parent, EXmlElement eJavaAttribute) {
super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ @Override
+ public boolean isParticleMapping() {
+ return true;
}
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefDefinition.java
new file mode 100644
index 0000000000..c4f4a6cc39
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlElementRefDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlElementRefDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ELEMENT_REF_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_ELEMENT_REF;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlElementRef();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlElementRefImpl(parent, (EXmlElementRef) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefImpl.java
new file mode 100644
index 0000000000..3c03f6789e
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefImpl.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlElementRef;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef;
+
+public class OxmXmlElementRefImpl
+ extends AbstractOxmAttributeMapping<EXmlElementRef>
+ implements OxmXmlElementRef {
+
+ public OxmXmlElementRefImpl(OxmJavaAttribute parent, EXmlElementRef eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ELEMENT_REF_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ @Override
+ public boolean isParticleMapping() {
+ return true;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefsDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefsDefinition.java
new file mode 100644
index 0000000000..1c38799455
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefsDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlElementRefsDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlElementRefsDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ELEMENT_REFS_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_ELEMENT_REFS;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlElementRefs();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlElementRefsImpl(parent, (EXmlElementRefs) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefsImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefsImpl.java
new file mode 100644
index 0000000000..ffa833ac71
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementRefsImpl.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlElementRefs;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs;
+
+public class OxmXmlElementRefsImpl
+ extends AbstractOxmAttributeMapping<EXmlElementRefs>
+ implements OxmXmlElementRefs {
+
+ public OxmXmlElementRefsImpl(OxmJavaAttribute parent, EXmlElementRefs eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ELEMENT_REFS_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ @Override
+ public boolean isParticleMapping() {
+ return true;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementsDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementsDefinition.java
new file mode 100644
index 0000000000..40f89ed5af
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementsDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlElementsDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlElementsDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ELEMENTS_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_ELEMENTS;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlElements();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlElementsImpl(parent, (EXmlElements) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementsImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementsImpl.java
new file mode 100644
index 0000000000..396197a831
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementsImpl.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlElements;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements;
+
+public class OxmXmlElementsImpl
+ extends AbstractOxmAttributeMapping<EXmlElements>
+ implements OxmXmlElements {
+
+ public OxmXmlElementsImpl(OxmJavaAttribute parent, EXmlElements eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_ELEMENTS_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ @Override
+ public boolean isParticleMapping() {
+ return true;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlInverseReferenceDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlInverseReferenceDefinition.java
new file mode 100644
index 0000000000..980c500c0b
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlInverseReferenceDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlInverseReferenceDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlInverseReferenceDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_INVERSE_REFERENCE_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_INVERSE_REFERENCE;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlInverseReference();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlInverseReferenceImpl(parent, (EXmlInverseReference) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlInverseReferenceImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlInverseReferenceImpl.java
new file mode 100644
index 0000000000..cc4d6470ec
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlInverseReferenceImpl.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlInverseReference;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference;
+
+public class OxmXmlInverseReferenceImpl
+ extends AbstractOxmAttributeMapping<EXmlInverseReference>
+ implements OxmXmlInverseReference {
+
+ public OxmXmlInverseReferenceImpl(OxmJavaAttribute parent, EXmlInverseReference eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_INVERSE_REFERENCE_ATTRIBUTE_MAPPING_KEY;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJavaTypeAdapterXmlElementDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJavaTypeAdapterXmlElementDefinition.java
new file mode 100644
index 0000000000..34fee846fe
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJavaTypeAdapterXmlElementDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+
+public class OxmXmlJavaTypeAdapterXmlElementDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlJavaTypeAdapterXmlElementDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ // Hmmmmmmm ....
+ return null;
+ }
+
+ public String getElement() {
+ return Oxm.XML_JAVA_TYPE_ADAPTER;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ // Hmmmmmm ....
+ return null;
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlJavaTypeAdapterXmlElementImpl(parent, (EXmlJavaTypeAdapter) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJavaTypeAdapterXmlElementImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJavaTypeAdapterXmlElementImpl.java
new file mode 100644
index 0000000000..02e682d39d
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJavaTypeAdapterXmlElementImpl.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlJavaTypeAdapterXmlElement;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter;
+
+public class OxmXmlJavaTypeAdapterXmlElementImpl
+ extends AbstractOxmAttributeMapping<EXmlJavaTypeAdapter>
+ implements OxmXmlJavaTypeAdapterXmlElement {
+
+ public OxmXmlJavaTypeAdapterXmlElementImpl(OxmJavaAttribute parent, EXmlJavaTypeAdapter eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ // Hmmmmmmmmmm ...
+ return ELJaxbMappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ @Override
+ public boolean isParticleMapping() {
+ return true;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJoinNodesDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJoinNodesDefinition.java
new file mode 100644
index 0000000000..81ff3cb0db
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJoinNodesDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlJoinNodesDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlJoinNodesDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_JOIN_NODES_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_JOIN_NODES;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlJoinNodes();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlJoinNodesImpl(parent, (EXmlJoinNodes) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJoinNodesImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJoinNodesImpl.java
new file mode 100644
index 0000000000..09842b3e04
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlJoinNodesImpl.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlJoinNodes;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes;
+
+public class OxmXmlJoinNodesImpl
+ extends AbstractOxmAttributeMapping<EXmlJoinNodes>
+ implements OxmXmlJoinNodes {
+
+ public OxmXmlJoinNodesImpl(OxmJavaAttribute parent, EXmlJoinNodes eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_JOIN_NODES_ATTRIBUTE_MAPPING_KEY;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransformationDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransformationDefinition.java
new file mode 100644
index 0000000000..77db6d07a2
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransformationDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlTransformationDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlTransformationDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_TRANSFORMATION;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlTransformation();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlTransformationImpl(parent, (EXmlTransformation) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransformationImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransformationImpl.java
new file mode 100644
index 0000000000..207a691a05
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransformationImpl.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlTransformation;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation;
+
+public class OxmXmlTransformationImpl
+ extends AbstractOxmAttributeMapping<EXmlTransformation>
+ implements OxmXmlTransformation {
+
+ public OxmXmlTransformationImpl(OxmJavaAttribute parent, EXmlTransformation eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransientDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransientDefinition.java
new file mode 100644
index 0000000000..eac6dafb07
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransientDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlTransientDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlTransientDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_TRANSIENT_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_TRANSIENT;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlTransient();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlTransientImpl(parent, (EXmlTransient) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransientImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransientImpl.java
new file mode 100644
index 0000000000..2a61bb5245
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlTransientImpl.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlTransient;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient;
+
+public class OxmXmlTransientImpl
+ extends AbstractOxmAttributeMapping<EXmlTransient>
+ implements OxmXmlTransient {
+
+ public OxmXmlTransientImpl(OxmJavaAttribute parent, EXmlTransient eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_TRANSIENT_ATTRIBUTE_MAPPING_KEY;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlValueDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlValueDefinition.java
new file mode 100644
index 0000000000..ba7c33d430
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlValueDefinition.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMapping;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;
+
+public class OxmXmlValueDefinition
+ implements OxmAttributeMappingDefinition {
+
+ public OxmXmlValueDefinition() {
+ super();
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_VALUE_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getElement() {
+ return Oxm.XML_VALUE;
+ }
+
+ public EJavaAttribute buildEJavaAttribute() {
+ return OxmFactory.eINSTANCE.createEXmlValue();
+ }
+
+ public OxmAttributeMapping buildContextMapping(OxmJavaAttribute parent, EJavaAttribute resourceMapping) {
+ return new OxmXmlValueImpl(parent, (EXmlValue) resourceMapping);
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlValueImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlValueImpl.java
new file mode 100644
index 0000000000..dba7a8d729
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlValueImpl.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
+
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlValue;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue;
+
+public class OxmXmlValueImpl
+ extends AbstractOxmAttributeMapping<EXmlValue>
+ implements OxmXmlValue {
+
+ public OxmXmlValueImpl(OxmJavaAttribute parent, EXmlValue eJavaAttribute) {
+ super(parent, eJavaAttribute);
+ }
+
+
+ public String getKey() {
+ return ELJaxbMappingKeys.XML_VALUE_ATTRIBUTE_MAPPING_KEY;
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java
index 604f069ed2..9c543ac902 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java
@@ -38,6 +38,8 @@ public class XPath {
public static String DELIM = "/";
+ public static char DELIM_CHAR = '/';
+
public static String ATT_PREFIX = "@";
public static String TEXT = "text()";
@@ -95,9 +97,31 @@ public class XPath {
}
protected void parse(String xpath) {
- for (String segment : xpath.split(DELIM, -1)) {
- this.steps.add(createStep(segment));
+ int nextDelim = findNextDelim(xpath);
+ while (nextDelim >= 0) {
+ this.steps.add(createStep(xpath.substring(0, nextDelim)));
+ xpath = xpath.substring(nextDelim + 1);
+ nextDelim = findNextDelim(xpath);
+ }
+ // add a final step for the remainder
+ this.steps.add(createStep(xpath));
+ }
+
+ protected int findNextDelim(String xpath) {
+ boolean foundOpenBracket = false;
+ for (int i = 0; i < xpath.length(); i ++ ) {
+ char currentChar = xpath.charAt(i);
+ if (currentChar == DELIM_CHAR && ! foundOpenBracket) {
+ return i;
+ }
+ else if (currentChar == OPEN_BRACKET) {
+ foundOpenBracket = true;
+ }
+ else if (currentChar == CLOSE_BRACKET) {
+ foundOpenBracket = false;
+ }
}
+ return -1;
}
protected Step createStep(String stepValue) {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_Factory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_Factory.java
index da88f8a8c5..b9c010f6f6 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_Factory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_Factory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,18 +16,18 @@ import org.eclipse.jpt.jaxb.core.JaxbProject.Config;
import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod;
import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAnyAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlAnyElementMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementRefMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementRefsMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementsMapping;
import org.eclipse.jpt.jaxb.core.context.XmlRegistry;
-import org.eclipse.jpt.jaxb.core.context.XmlValueMapping;
import org.eclipse.jpt.jaxb.core.context.java.JavaClass;
import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaXmlAnyAttributeMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaXmlAnyElementMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaXmlAttributeMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaXmlElementMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaXmlElementRefMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaXmlElementRefsMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaXmlElementsMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaXmlValueMapping;
import org.eclipse.jpt.jaxb.core.internal.AbstractJaxbFactory;
import org.eclipse.jpt.jaxb.eclipselink.core.context.ELJaxbContextRoot;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.ELJaxbProjectImpl;
@@ -103,42 +103,42 @@ public class ELJaxb_2_1_Factory
}
@Override
- public XmlAnyAttributeMapping buildJavaXmlAnyAttributeMapping(JaxbPersistentAttribute parent) {
+ public JavaXmlAnyAttributeMapping buildJavaXmlAnyAttributeMapping(JavaPersistentAttribute parent) {
return new ELJavaXmlAnyAttributeMapping(parent);
}
@Override
- public XmlAnyElementMapping buildJavaXmlAnyElementMapping(JaxbPersistentAttribute parent) {
+ public JavaXmlAnyElementMapping buildJavaXmlAnyElementMapping(JavaPersistentAttribute parent) {
return new ELJavaXmlAnyElementMapping(parent);
}
@Override
- public XmlAttributeMapping buildJavaXmlAttributeMapping(JaxbPersistentAttribute parent) {
+ public JavaXmlAttributeMapping buildJavaXmlAttributeMapping(JavaPersistentAttribute parent) {
return new ELJavaXmlAttributeMapping(parent);
}
@Override
- public XmlElementMapping buildJavaXmlElementMapping(JaxbPersistentAttribute parent) {
+ public JavaXmlElementMapping buildJavaXmlElementMapping(JavaPersistentAttribute parent) {
return new ELJavaXmlElementMapping(parent);
}
@Override
- public XmlElementRefMapping buildJavaXmlElementRefMapping(JaxbPersistentAttribute parent) {
+ public JavaXmlElementRefMapping buildJavaXmlElementRefMapping(JavaPersistentAttribute parent) {
return new ELJavaXmlElementRefMapping(parent);
}
@Override
- public XmlElementRefsMapping buildJavaXmlElementRefsMapping(JaxbPersistentAttribute parent) {
+ public JavaXmlElementRefsMapping buildJavaXmlElementRefsMapping(JavaPersistentAttribute parent) {
return new ELJavaXmlElementRefsMapping(parent);
}
@Override
- public XmlElementsMapping buildJavaXmlElementsMapping(JaxbPersistentAttribute parent) {
+ public JavaXmlElementsMapping buildJavaXmlElementsMapping(JavaPersistentAttribute parent) {
return new ELJavaXmlElementsMapping(parent);
}
@Override
- public XmlValueMapping buildJavaXmlValueMapping(JaxbPersistentAttribute parent) {
+ public JavaXmlValueMapping buildJavaXmlValueMapping(JavaPersistentAttribute parent) {
return new ELJavaXmlValueMapping(parent);
}
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbPersistentAttributeLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbJavaPersistentAttributeLabelProvider.java
index be8a594c6d..8497ea6688 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbPersistentAttributeLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbJavaPersistentAttributeLabelProvider.java
@@ -11,15 +11,15 @@ package org.eclipse.jpt.jaxb.eclipselink.ui.internal.navigator;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.eclipselink.ui.internal.ELJaxbMappingImageHelper;
-import org.eclipse.jpt.jaxb.ui.internal.jaxb21.JaxbPersistentAttributeItemLabelProvider;
+import org.eclipse.jpt.jaxb.ui.internal.jaxb21.JavaPersistentAttributeItemLabelProvider;
-public class ELJaxbPersistentAttributeLabelProvider
- extends JaxbPersistentAttributeItemLabelProvider
-{
- public ELJaxbPersistentAttributeLabelProvider(JaxbPersistentAttribute attribute, ItemExtendedLabelProvider.Manager manager) {
+public class ELJaxbJavaPersistentAttributeLabelProvider
+ extends JavaPersistentAttributeItemLabelProvider {
+
+ public ELJaxbJavaPersistentAttributeLabelProvider(JavaPersistentAttribute attribute, ItemExtendedLabelProvider.Manager manager) {
super(attribute, manager);
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java
index b3e2feeccd..7717e471bf 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.eclipselink.ui.internal.navigator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jpt.common.ui.internal.jface.StaticItemExtendedLabelProvider;
import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmFile;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
@@ -40,8 +40,8 @@ public class ELJaxbNavigatorItemLabelProviderFactory
@Override
public ItemExtendedLabelProvider buildProvider(Object item, ItemExtendedLabelProvider.Manager manager) {
- if (item instanceof JaxbPersistentAttribute) {
- return new ELJaxbPersistentAttributeLabelProvider((JaxbPersistentAttribute) item, manager);
+ if (item instanceof JavaPersistentAttribute) {
+ return new ELJaxbJavaPersistentAttributeLabelProvider((JavaPersistentAttribute) item, manager);
}
else if (item instanceof OxmFile) {
return buildOxmFileLabelProvider((OxmFile) item, manager);
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaAttributeLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaAttributeLabelProvider.java
index 96cfafa35d..7b06040c85 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaAttributeLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaAttributeLabelProvider.java
@@ -13,9 +13,9 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.StaticPropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.ui.internal.ELJaxbMappingImageHelper;
public class OxmJavaAttributeLabelProvider
extends AbstractItemExtendedLabelProvider<OxmJavaAttribute> {
@@ -27,8 +27,16 @@ public class OxmJavaAttributeLabelProvider
@Override
protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
- // null for now
- return new StaticPropertyValueModel(null);
+ return new PropertyAspectAdapter<OxmJavaAttribute, ImageDescriptor>(OxmJavaAttribute.MAPPING_PROPERTY, this.item) {
+ @Override
+ protected ImageDescriptor buildValue_() {
+ return OxmJavaAttributeLabelProvider.this.buildImageDescriptor(this.subject.getMappingKey());
+ }
+ };
+ }
+
+ protected ImageDescriptor buildImageDescriptor(String mappingKey) {
+ return ELJaxbMappingImageHelper.imageDescriptorForAttributeMapping(mappingKey);
}
@Override
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ClassesGeneratorUi.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ClassesGeneratorUi.java
index 9729d35113..cfff2a3c9e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ClassesGeneratorUi.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ClassesGeneratorUi.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jaxb.ui.internal;
import java.util.List;
import java.util.Vector;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.emf.common.util.URI;
import org.eclipse.jdt.core.IJavaProject;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/EmptyInnerPackageFilter.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/EmptyInnerPackageFilter.java
index e89609ec7a..1bbac5158d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/EmptyInnerPackageFilter.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/EmptyInnerPackageFilter.java
@@ -12,11 +12,10 @@
package org.eclipse.jpt.jaxb.ui.internal.filters;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
/**
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/NonJavaElementFilter.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/NonJavaElementFilter.java
index 0c1a6949bd..81193e415d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/NonJavaElementFilter.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/filters/NonJavaElementFilter.java
@@ -14,12 +14,10 @@ package org.eclipse.jpt.jaxb.ui.internal.filters;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IStorage;
-
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jdt.core.IJavaElement;
-
/**
* Filters out all non-Java elements, and elements named package-info
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
index 0fc989591d..c77523fd5e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
@@ -15,9 +15,9 @@ import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant;
import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.java.JavaClass;
import org.eclipse.jpt.jaxb.core.context.java.JavaEnum;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
import org.eclipse.jpt.jaxb.ui.JptJaxbUiMessages;
@@ -55,8 +55,8 @@ public class GenericJaxb_2_1_NavigatorItemLabelProviderFactory
else if (item instanceof JavaEnum) {
return new JavaEnumItemLabelProvider((JavaEnum) item, manager);
}
- else if (item instanceof JaxbPersistentAttribute) {
- return new JaxbPersistentAttributeItemLabelProvider((JaxbPersistentAttribute) item, manager);
+ else if (item instanceof JavaPersistentAttribute) {
+ return new JavaPersistentAttributeItemLabelProvider((JavaPersistentAttribute) item, manager);
}
else if (item instanceof JaxbEnumConstant) {
return this.buildJaxbEnumConstantProvider((JaxbEnumConstant) item, manager);
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JavaClassItemContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JavaClassItemContentProvider.java
index d04d10c34b..6d53de6cfb 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JavaClassItemContentProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JavaClassItemContentProvider.java
@@ -19,6 +19,7 @@ import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
import org.eclipse.jpt.jaxb.core.context.java.JavaClass;
import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
public class JavaClassItemContentProvider
@@ -50,12 +51,12 @@ public class JavaClassItemContentProvider
};
}
- protected CollectionValueModel<JaxbPersistentAttribute> buildAttributesModel(
+ protected CollectionValueModel<JavaPersistentAttribute> buildAttributesModel(
PropertyValueModel<JavaClassMapping> mappingModel) {
- return new CollectionAspectAdapter<JavaClassMapping, JaxbPersistentAttribute>(
+ return new CollectionAspectAdapter<JavaClassMapping, JavaPersistentAttribute>(
mappingModel, JavaClassMapping.ATTRIBUTES_COLLECTION) {
@Override
- protected Iterable<JaxbPersistentAttribute> getIterable() {
+ protected Iterable<JavaPersistentAttribute> getIterable() {
return this.subject.getAttributes();
}
};
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentAttributeItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JavaPersistentAttributeItemLabelProvider.java
index 9064b8febd..4df31cefdc 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentAttributeItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JavaPersistentAttributeItemLabelProvider.java
@@ -14,17 +14,17 @@ import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvide
import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
+import org.eclipse.jpt.jaxb.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jaxb.ui.internal.JaxbMappingImageHelper;
-public class JaxbPersistentAttributeItemLabelProvider
- extends AbstractItemExtendedLabelProvider<JaxbPersistentAttribute>
-{
+public class JavaPersistentAttributeItemLabelProvider
+ extends AbstractItemExtendedLabelProvider<JavaPersistentAttribute> {
+
protected final String text;
protected final String description;
- public JaxbPersistentAttributeItemLabelProvider(JaxbPersistentAttribute attribute, ItemExtendedLabelProvider.Manager manager) {
+ public JavaPersistentAttributeItemLabelProvider(JavaPersistentAttribute attribute, ItemExtendedLabelProvider.Manager manager) {
super(attribute, manager);
this.text = this.buildText();
this.description = this.buildDescription();
@@ -32,10 +32,10 @@ public class JaxbPersistentAttributeItemLabelProvider
@Override
protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
- return new PropertyAspectAdapter<JaxbPersistentAttribute, ImageDescriptor>(IMAGE_ASPECT_NAMES, this.item) {
+ return new PropertyAspectAdapter<JavaPersistentAttribute, ImageDescriptor>(IMAGE_ASPECT_NAMES, this.item) {
@Override
protected ImageDescriptor buildValue_() {
- return JaxbPersistentAttributeItemLabelProvider.this.buildImageDescriptor(this.subject.getMappingKey());
+ return JavaPersistentAttributeItemLabelProvider.this.buildImageDescriptor(this.subject.getMappingKey());
}
};
}
@@ -45,8 +45,8 @@ public class JaxbPersistentAttributeItemLabelProvider
}
protected static final String[] IMAGE_ASPECT_NAMES = new String[] {
- JaxbPersistentAttribute.DEFAULT_MAPPING_KEY_PROPERTY,
- JaxbPersistentAttribute.MAPPING_PROPERTY
+ JavaPersistentAttribute.DEFAULT_MAPPING_KEY_PROPERTY,
+ JavaPersistentAttribute.MAPPING_PROPERTY
};
@Override
@@ -57,7 +57,7 @@ public class JaxbPersistentAttributeItemLabelProvider
protected String buildText() {
StringBuffer sb = new StringBuffer();
if (this.item.isInherited()) {
- sb.append(this.item.getDeclaringJavaResourceType().getName());
+ sb.append(this.item.getDeclaringTypeName().getTypeQualifiedName());
sb.append('.');
}
sb.append(this.item.getName());
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/CheckboxTreeAndListGroup.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/CheckboxTreeAndListGroup.java
index 24e56f7bfc..daafc0b7af 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/CheckboxTreeAndListGroup.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/CheckboxTreeAndListGroup.java
@@ -18,7 +18,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.CheckboxTreeViewer;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/NewSchemaFileWizardPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/NewSchemaFileWizardPage.java
index 7b24583d66..92275935dc 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/NewSchemaFileWizardPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/NewSchemaFileWizardPage.java
@@ -9,9 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jaxb.ui.internal.wizards.schemagen;
-import static org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties.CONTAINER_PATH;
-import static org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties.FILE_NAME;
-import static org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties.PROJECT;
+import static org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties.*;
import static org.eclipse.jpt.jaxb.ui.internal.wizards.schemagen.SchemaGeneratorWizard.XSD_EXTENSION;
import java.io.File;
import org.eclipse.core.resources.IProject;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java
index f8600cd67a..58f70dc3bd 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java
@@ -10,7 +10,6 @@
package org.eclipse.jpt.jaxb.ui.internal.wizards.schemagen;
import java.util.Iterator;
-
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.IJavaProject;

Back to the top