diff options
author | Paul Fullbright | 2012-12-07 21:30:37 +0000 |
---|---|---|
committer | Paul Fullbright | 2012-12-07 22:01:07 +0000 |
commit | 8938081bb4d9e724c80fa880f8f54d6c655e99d5 (patch) | |
tree | ec9e2f66ccaeae1da4665dc6963a3b553d7abe38 | |
parent | 01082bf0fd6fd80b9718eaab23d3e81d70858b61 (diff) | |
download | webtools.dali-8938081bb4d9e724c80fa880f8f54d6c655e99d5.tar.gz webtools.dali-8938081bb4d9e724c80fa880f8f54d6c655e99d5.tar.xz webtools.dali-8938081bb4d9e724c80fa880f8f54d6c655e99d5.zip |
refactoring for oxm - checkpoint
140 files changed, 2335 insertions, 2177 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java index 9ac162d6ab..ac5532d285 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java @@ -20,11 +20,9 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.jaxb.core.context.Accessor; import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant; import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; @@ -43,6 +41,10 @@ import org.eclipse.jpt.jaxb.core.context.XmlRegistry; import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.context.XmlSchema; 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.JavaEnum; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnumMapping; import org.eclipse.jpt.jaxb.core.resource.java.XmlNsAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation; @@ -109,15 +111,15 @@ public interface JaxbFactory { XmlNs buildJavaXmlNs(XmlSchema parent, XmlNsAnnotation xmlNsAnnotation); - JaxbClass buildJaxbClass(JaxbContextRoot parent, JavaResourceType resourceType); + JavaClass buildJaxbClass(JaxbContextRoot parent, JavaResourceType resourceType); - JaxbEnum buildJaxbEnum(JaxbContextRoot parent, JavaResourceEnum resourceEnum); + JavaEnum buildJaxbEnum(JaxbContextRoot parent, JavaResourceEnum resourceEnum); - JaxbClassMapping buildJaxbClassMapping(JaxbClass parent); + JavaClassMapping buildJavaClassMapping(JavaClass parent); - JaxbEnumMapping buildJaxbEnumMapping(JaxbEnum parent); + JavaEnumMapping buildJavaEnumMapping(JavaEnum parent); - XmlRegistry buildXmlRegistry(JaxbClass parent); + XmlRegistry buildXmlRegistry(JavaClass parent); JaxbElementFactoryMethod buildJavaElementFactoryMethod(XmlRegistry parent, JavaResourceMethod resourceMethod); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbAttributesContainer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbAttributesContainer.java index 651b5b1587..ae5d3abb8f 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbAttributesContainer.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbAttributesContainer.java @@ -9,8 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jaxb.core.context; -import org.eclipse.jpt.common.core.resource.java.JavaResourceType; - /** * Holds the attributes represented by a particular JavaResourceType and XmlAccessType. * <p> @@ -20,21 +18,34 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.0 + * @version 3.3 * @since 3.0 */ public interface JaxbAttributesContainer extends JaxbContextNode { - - /** - * Return true if this JaxbAtributesContainer contains attributes for the given JavaResourceType. - */ - boolean isFor(JavaResourceType javaResourceType); - - - /********** attributes **********/ - + + // ***** attributes ***** + Iterable<JaxbPersistentAttribute> getAttributes(); int getAttributesSize(); + + + interface Context { + + /** + * Return the access type of the owner, to be used in determining which attributes to build + */ + XmlAccessType getAccessType(); + + /** + * called after an attribute was added to the container + */ + void attributeAdded(JaxbPersistentAttribute attribute); + + /** + * called after an attribute was removed from the container + */ + void attributeRemoved(JaxbPersistentAttribute attribute); + } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClassMapping.java index 0c5a82956e..f047fb25c6 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClassMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClassMapping.java @@ -15,11 +15,6 @@ import org.eclipse.jpt.common.utility.iterable.ListIterable; public interface JaxbClassMapping extends JaxbTypeMapping, XmlAccessTypeHolder, XmlAccessOrderHolder { - // ***** overrides ***** - - JaxbClass getJaxbType(); - - // ***** XmlType.factoryClass ***** String getFactoryClass(); @@ -77,17 +72,13 @@ public interface JaxbClassMapping // ***** attributes ***** - String ATTRIBUTES_COLLECTION = "attributes"; //$NON-NLS-1$ - + /** + * Return the attributes defined on this class (not its superclass) + */ Iterable<JaxbPersistentAttribute> getAttributes(); int getAttributesSize(); - - // ***** included attributes ***** - - String INCLUDED_ATTRIBUTES_COLLECTION = "includedAttributes"; //$NON-NLS-1$ - /** * <i>Included</i> attributes come from any direct superclasses that are mapped as @XmlTransient. * (As opposed to <i>inherited</i> attributes, which a class has by way of <i>any</i> mapped superclasses.) @@ -117,6 +108,12 @@ public interface JaxbClassMapping // ***** misc ***** + /** + * Build an included attributes container that process attribute metadata of this class + * with the context of the owning class + */ + JaxbAttributesContainer buildIncludedAttributesContainer( + JaxbClassMapping parent, JaxbAttributesContainer.Context context); /** * Return the id attribute mapping for this class mapping, if it has one. diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextRoot.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextRoot.java index fdb9aa6ecb..e7840a8e3d 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextRoot.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextRoot.java @@ -9,6 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.jaxb.core.context; +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.JavaType; + /** * Root of the JAXB context model. * <p> @@ -41,46 +45,46 @@ public interface JaxbContextRoot int getPackagesSize(); - // ***** jaxb types ***** + // ***** java types ***** - public final static String TYPES_COLLECTION = "types"; //$NON-NLS-1$ + public final static String JAVA_TYPES_COLLECTION = "javaTypes"; //$NON-NLS-1$ /** - * Return the set of all JAXB types within this context root. + * Return the set of all java types within this context root. */ - Iterable<JaxbType> getTypes(); + Iterable<JavaType> getJavaTypes(); /** - * Return the type with the given (fully qualified) type name + * Return the java type with the given (fully qualified) name */ - JaxbType getType(String typeName); + JavaType getJavaType(String typeName); - int getTypesSize(); + int getJavaTypesSize(); /** - * Return the set of types that are in the given package + * Return the set of java types that are in the given package */ - Iterable<JaxbType> getTypes(JaxbPackage jaxbPackage); + Iterable<JavaType> getJavaTypes(JaxbPackage jaxbPackage); /** - * The set of jaxb classes. These may be explicitly or implicitly included. + * The set of java classes. These may be explicitly or implicitly included. */ - Iterable<JaxbClass> getClasses(); + Iterable<JavaClass> getJavaClasses(); /** - * Return the set of jaxb classes that are in the given package + * Return the set of java classes that are in the given package */ - Iterable<JaxbClass> getClasses(JaxbPackage jaxbPackage); + Iterable<JavaClass> getJavaClasses(JaxbPackage jaxbPackage); /** - * The set of jaxb enums. These may be explicitly or implicitly included. + * The set of java enums. These may be explicitly or implicitly included. */ - Iterable<JaxbEnum> getEnums(); + Iterable<JavaEnum> getJavaEnums(); /** * Return the set of jaxb enums that are in the given package */ - Iterable<JaxbEnum> getEnums(JaxbPackage jaxbPackage); + Iterable<JavaEnum> getJavaEnums(JaxbPackage jaxbPackage); /** * Return the set of {@link XmlRegistry}(ie)s that are in the given package @@ -96,8 +100,4 @@ public interface JaxbContextRoot * Return the {@link JaxbClassMapping} for the given (fully qualified) type name */ JaxbClassMapping getClassMapping(String typeName); - - - // ***** misc ***** - } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbTypeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbTypeMapping.java index fbfbae1ceb..bb53a0c9b8 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbTypeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbTypeMapping.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.core.context; import org.eclipse.jpt.jaxb.core.xsd.XsdTypeDefinition; /** - * Represents mapping metadata on a JaxbType (specified or implied). + * Represents mapping metadata on a JavaType (specified or implied). * <p> * Provisional API: This interface is part of an interim API that is still * under development and expected to change significantly before reaching @@ -26,9 +26,19 @@ import org.eclipse.jpt.jaxb.core.xsd.XsdTypeDefinition; public interface JaxbTypeMapping extends JaxbContextNode { - // ***** JaxbType ***** + /** + * Return the kind of type represented. + * {@link JaxbTypeMapping}s of {@link TypeKind} CLASS may safely be cast to {@link JaxbClassMapping} + * {@link JaxbTypeMapping}s of {@link TypeKind} ENUM may safely be cast to {@link JaxbEnumMapping} + */ + TypeKind getTypeKind(); + + /** + * Return the type's name object + */ + TypeName getTypeName(); - JaxbType getJaxbType(); + JaxbPackage getJaxbPackage(); // ***** XmlTransient ***** diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessOrderHolder.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/TypeKind.java index 5f7cd6950a..854af16032 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessOrderHolder.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/TypeKind.java @@ -7,21 +7,24 @@ * Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context; - -import org.eclipse.jpt.jaxb.core.context.XmlAccessOrderHolder; - -/** - * 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 +package org.eclipse.jpt.jaxb.core.context; +
+
+/**
+ * Represents the kind of type: CLASS or ENUM (others are as of yet unsupported)
+ * <p>
+ * 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.1
*/ -public interface ELXmlAccessOrderHolder - extends XmlAccessOrderHolder<ELXmlAccessOrder> { +public enum TypeKind { -} + CLASS, + + ENUM; +}
\ No newline at end of file diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/TypeName.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/TypeName.java new file mode 100644 index 0000000000..1015445d0c --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/TypeName.java @@ -0,0 +1,47 @@ +/*******************************************************************************
+ * 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.core.context; +
+/**
+ * Represents the name of a java type
+ * <p>
+ * 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 TypeName {
+
+ /**
+ * Return the name of the type without any package or type qualifiers
+ */
+ String getSimpleName();
+
+ /**
+ * Returns the fully qualified name of this type, including qualification for any
+ * enclosing types and packages.
+ */
+ String getFullyQualifiedName();
+
+ /**
+ * Return the name of the type's package. Empty string if none.
+ */
+ String getPackageName();
+
+ /**
+ * Returns the type-qualified name of this type, including qualification for any
+ * enclosing types, but not including package qualification.
+ */
+ String getTypeQualifiedName();
+} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlAccessOrderHolder.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlAccessOrderHolder.java index 3d64ceeeb4..8f9402c8f6 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlAccessOrderHolder.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlAccessOrderHolder.java @@ -20,14 +20,14 @@ package org.eclipse.jpt.jaxb.core.context; * @version 3.3 * @since 3.0 */ -public interface XmlAccessOrderHolder<A extends XmlAccessOrder> +public interface XmlAccessOrderHolder extends JaxbContextNode { /** * Return the access order, whether specified or defaulted. * This should never return null since at least the default will be set */ - A getAccessOrder(); + XmlAccessOrder getAccessOrder(); /** * String constant associated with changes to the default access order @@ -37,7 +37,7 @@ public interface XmlAccessOrderHolder<A extends XmlAccessOrder> /** * Return the default access order, never null */ - A getDefaultAccessOrder(); + XmlAccessOrder getDefaultAccessOrder(); /** * String constant associated with changes to the specified access order @@ -47,10 +47,10 @@ public interface XmlAccessOrderHolder<A extends XmlAccessOrder> /** * Return the specified access order; */ - A getSpecifiedAccessOrder(); + XmlAccessOrder getSpecifiedAccessOrder(); /** * Set the specified access order. */ - void setSpecifiedAccessOrder(A newSpecifiedAccessOrder); + void setSpecifiedAccessOrder(XmlAccessOrder newSpecifiedAccessOrder); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlAccessTypeHolder.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlAccessTypeHolder.java index 784a38974f..1ba91a5757 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlAccessTypeHolder.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlAccessTypeHolder.java @@ -20,14 +20,14 @@ package org.eclipse.jpt.jaxb.core.context; * @version 3.3 * @since 3.0 */ -public interface XmlAccessTypeHolder<A extends XmlAccessType> +public interface XmlAccessTypeHolder extends JaxbContextNode { /** * Return the access type, whether specified or defaulted. * This should never return null since at least the default will be set */ - A getAccessType(); + XmlAccessType getAccessType(); /** * String constant associated with changes to the default access type @@ -37,7 +37,7 @@ public interface XmlAccessTypeHolder<A extends XmlAccessType> /** * Return the default access type, never null */ - A getDefaultAccessType(); + XmlAccessType getDefaultAccessType(); /** * String constant associated with changes to the specified access type @@ -47,10 +47,10 @@ public interface XmlAccessTypeHolder<A extends XmlAccessType> /** * Return the specified access type; */ - A getSpecifiedAccessType(); + XmlAccessType getSpecifiedAccessType(); /** * Set the specified access type. */ - void setSpecifiedAccessType(A newSpecifiedAccessType); + void setSpecifiedAccessType(XmlAccessType newSpecifiedAccessType); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlRegistry.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlRegistry.java index a8e8dc3ec7..610af914be 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlRegistry.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlRegistry.java @@ -9,6 +9,8 @@ *******************************************************************************/ package org.eclipse.jpt.jaxb.core.context; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; + /** @@ -38,5 +40,5 @@ public interface XmlRegistry // ***** misc ***** - JaxbClass getJaxbClass(); + JavaClass getJaxbClass(); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlRootElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlRootElement.java index 1097d39e09..0ccdb41b78 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlRootElement.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/XmlRootElement.java @@ -9,6 +9,8 @@ *******************************************************************************/ package org.eclipse.jpt.jaxb.core.context; +import org.eclipse.jpt.jaxb.core.context.java.JavaTypeMapping; + /** * Represents a JAXB xml root element. @@ -26,7 +28,7 @@ package org.eclipse.jpt.jaxb.core.context; public interface XmlRootElement extends JaxbContextNode { - JaxbTypeMapping getTypeMapping(); + JavaTypeMapping getTypeMapping(); JaxbQName getQName(); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClass.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaClass.java index 6a85bf3de7..08e60052d3 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClass.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaClass.java @@ -7,12 +7,13 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.jaxb.core.context; +package org.eclipse.jpt.jaxb.core.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.jaxb.core.context.XmlRegistry; /** - * Represents a <i>class</i> in a JAXB context. + * Represents a java class with JAXB metadata (specified or implied). * <p> * Provisional API: This interface is part of an interim API that is still * under development and expected to change significantly before reaching @@ -20,17 +21,17 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.0 + * @version 3.3 * @since 3.0 */ -public interface JaxbClass - extends JaxbType { +public interface JavaClass + extends JavaType { // ***** overrides ***** JavaResourceType getJavaResourceType(); - public JaxbClassMapping getMapping(); + public JavaClassMapping getMapping(); // ***** XmlRegistry ***** diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaClassMapping.java new file mode 100644 index 0000000000..bb51a9ad7a --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaClassMapping.java @@ -0,0 +1,20 @@ +package org.eclipse.jpt.jaxb.core.context.java; + +import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; + +public interface JavaClassMapping + extends JavaTypeMapping, JaxbClassMapping { + + // ***** overrides ***** + + JavaClass getJavaType(); + + + // ***** attributes ***** + + /** string associated with changes to the collection of attributes on this class mapping */ + String ATTRIBUTES_COLLECTION = "attributes"; //$NON-NLS-1$ + + /** string associated with changes to the collection of included attributes on this class mapping */ + String INCLUDED_ATTRIBUTES_COLLECTION = "includedAttributes"; //$NON-NLS-1$ +} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbEnum.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaEnum.java index 5a98a688b8..b9b61bd3d4 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbEnum.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaEnum.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.jaxb.core.context; +package org.eclipse.jpt.jaxb.core.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum; /** - * Represents an <i>enum</i> in a JAXB context. + * Represents a java enum with JAXB metadata (specified or implied). * <p> * Provisional API: This interface is part of an interim API that is still * under development and expected to change significantly before reaching @@ -20,15 +20,15 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 3.1 */ -public interface JaxbEnum - extends JaxbType { +public interface JavaEnum + extends JavaType { // ***** covariant overrides ***** JavaResourceEnum getJavaResourceType(); - public JaxbEnumMapping getMapping(); + public JavaEnumMapping getMapping(); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaEnumMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaEnumMapping.java new file mode 100644 index 0000000000..07de75ea9e --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaEnumMapping.java @@ -0,0 +1,18 @@ +/*******************************************************************************
+ * 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.core.context.java; + +import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping;
+ +public interface JavaEnumMapping + extends JavaTypeMapping, JaxbEnumMapping { + + +} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaType.java index de62801a94..e7bbc78887 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbType.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaType.java @@ -7,10 +7,17 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.jaxb.core.context; +package org.eclipse.jpt.jaxb.core.context.java; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; +import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; +import org.eclipse.jpt.jaxb.core.context.JaxbPackage; +import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; +import org.eclipse.jpt.jaxb.core.context.TypeKind; +import org.eclipse.jpt.jaxb.core.context.TypeName; +import org.eclipse.jpt.jaxb.core.context.XmlAdaptable; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -23,15 +30,20 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 3.1 */ -public interface JaxbType +public interface JavaType extends JaxbContextNode, XmlAdaptable { // ***** kind ***** - Kind getKind(); + /** + * Return the kind of type represented. + * {@link JavaType}s of {@link TypeKind} CLASS may safely be cast to {@link JavaClass} + * {@link JavaType}s of {@link TypeKind} ENUM may safely be cast to {@link JavaEnum} + */ + TypeKind getKind(); // ***** type mapping ***** @@ -44,7 +56,7 @@ public interface JaxbType * Will <b>not</b> be null if this type has an XmlType annotation (or other mapping annotation) * or if this type is default mapped. */ - JaxbTypeMapping getMapping(); + JavaTypeMapping getMapping(); // ***** default mapped ***** @@ -70,26 +82,9 @@ public interface JaxbType JavaResourceAbstractType getJavaResourceType(); /** - * Return the name of the type without any package or type qualifiers + * Return the type's name object */ - String getSimpleName(); - - /** - * Returns the type-qualified name of this type, including qualification for any - * enclosing types, but not including package qualification. - */ - String getTypeQualifiedName(); - - /** - * Returns the fully qualified name of this type, including qualification for any - * enclosing types and packages. - */ - String getFullyQualifiedName(); - - /** - * Return the name of the type's package. Empty string if none. - */ - String getPackageName(); + TypeName getTypeName(); /** * Return the {@link JaxbPackage} associated with this type @@ -115,18 +110,4 @@ public interface JaxbType * Add to the list of current validation messages */ void validate(List<IMessage> messages, IReporter reporter); - - - public enum Kind { - - /** - * {@link JaxbType}s of {@link Kind} CLASS may safely be cast as {@link JaxbClass} - */ - CLASS, - - /** - * {@link JaxbType}s of {@link Kind} ENUM may safely be cast as {@link JaxbEnum} - */ - ENUM; - } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessTypeHolder.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaTypeMapping.java index 60e3eeb37a..bd143b47b7 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessTypeHolder.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaTypeMapping.java @@ -7,11 +7,13 @@ * Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.context; +package org.eclipse.jpt.jaxb.core.context.java; -import org.eclipse.jpt.jaxb.core.context.XmlAccessTypeHolder;
+import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping;
/**
+ * Represents mapping metadata on a JavaType (specified or implied).
+ * <p>
* 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
@@ -19,9 +21,10 @@ import org.eclipse.jpt.jaxb.core.context.XmlAccessTypeHolder; * will almost certainly be broken (repeatedly) as the API evolves.
*
* @version 3.3
- * @since 3.3
+ * @since 3.1
*/ -public interface ELXmlAccessTypeHolder
- extends XmlAccessTypeHolder<ELXmlAccessType> {
+public interface JavaTypeMapping
+ extends JaxbTypeMapping {
+ JavaType getJavaType();
} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java index 2bfd9edc6e..1b77c40af3 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java @@ -24,11 +24,9 @@ import org.eclipse.jpt.jaxb.core.JaxbProject; import org.eclipse.jpt.jaxb.core.JaxbProject.Config; import org.eclipse.jpt.jaxb.core.context.Accessor; import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant; import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; @@ -47,6 +45,10 @@ import org.eclipse.jpt.jaxb.core.context.XmlRegistry; import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.context.XmlSchema; 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.JavaEnum; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnumMapping; import org.eclipse.jpt.jaxb.core.internal.context.GenericContextRoot; import org.eclipse.jpt.jaxb.core.internal.context.GenericPackage; import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaClassMapping; @@ -122,23 +124,23 @@ public abstract class AbstractJaxbFactory return new GenericJavaXmlNs(parent, xmlNsAnnotation); } - public JaxbClass buildJaxbClass(JaxbContextRoot parent, JavaResourceType resourceType) { + public JavaClass buildJaxbClass(JaxbContextRoot parent, JavaResourceType resourceType) { return new GenericJavaJaxbClass(parent, resourceType); } - public JaxbEnum buildJaxbEnum(JaxbContextRoot parent, JavaResourceEnum resourceEnum) { + public JavaEnum buildJaxbEnum(JaxbContextRoot parent, JavaResourceEnum resourceEnum) { return new GenericJavaJaxbEnum(parent, resourceEnum); } - public JaxbClassMapping buildJaxbClassMapping(JaxbClass parent) { + public JavaClassMapping buildJavaClassMapping(JavaClass parent) { return new GenericJavaClassMapping(parent); } - public JaxbEnumMapping buildJaxbEnumMapping(JaxbEnum parent) { + public JavaEnumMapping buildJavaEnumMapping(JavaEnum parent) { return new GenericJavaEnumMapping(parent); } - public XmlRegistry buildXmlRegistry(JaxbClass parent) { + public XmlRegistry buildXmlRegistry(JavaClass parent) { return new GenericJavaXmlRegistry(parent); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java index 361a91bd09..776b9d0b74 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java @@ -64,7 +64,7 @@ import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; -import org.eclipse.jpt.jaxb.core.context.JaxbType; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; import org.eclipse.jpt.jaxb.core.internal.platform.JaxbPlatformImpl; import org.eclipse.jpt.jaxb.core.internal.plugin.JptJaxbCorePlugin; import org.eclipse.jpt.jaxb.core.internal.utility.CallbackSynchronousSynchronizer; @@ -604,16 +604,16 @@ public abstract class AbstractJaxbProject } else if (contentType.isKindOf(JavaResourceCompilationUnit.CONTENT_TYPE)) { try { - return new FilteringIterable<JaxbType>( - new TransformationIterable<IType, JaxbType>( + return new FilteringIterable<JavaType>( + new TransformationIterable<IType, JavaType>( new ArrayIterable<IType>(cu.getAllTypes())) { @Override - protected JaxbType transform(IType o) { - JaxbType jaxbType = getContextRoot().getType(o.getFullyQualifiedName('.')); + protected JavaType transform(IType o) { + JavaType jaxbType = getContextRoot().getJavaType(o.getFullyQualifiedName('.')); return jaxbType; } }, - NotNullFilter.<JaxbType>instance()); + NotNullFilter.<JavaType>instance()); } catch (JavaModelException jme) { return EmptyIterable.instance(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java index 9e21c8612d..cf51426f6d 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java @@ -31,14 +31,15 @@ import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jaxb.core.JaxbProject; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; -import org.eclipse.jpt.jaxb.core.context.JaxbType; -import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping; +import org.eclipse.jpt.jaxb.core.context.TypeKind; import org.eclipse.jpt.jaxb.core.context.XmlRegistry; +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.JavaEnum; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; +import org.eclipse.jpt.jaxb.core.context.java.JavaTypeMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.jaxbindex.JaxbIndexResource; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -57,8 +58,8 @@ public abstract class AbstractJaxbContextRoot /* The map of package name to JaxbPackage objects */ protected final Map<String, JaxbPackage> packages; - /* The map of class name to JaxbType objects */ - protected final Map<String, JaxbType> types; + /* The map of class name to JavaType objects */ + protected final Map<String, JavaType> types; public AbstractJaxbContextRoot(JaxbProject jaxbProject) { @@ -68,7 +69,7 @@ public abstract class AbstractJaxbContextRoot } this.jaxbProject = jaxbProject; this.packages = new Hashtable<String, JaxbPackage>(); - this.types = new Hashtable<String, JaxbType>(); + this.types = new Hashtable<String, JavaType>(); initialize(); } @@ -113,7 +114,7 @@ public abstract class AbstractJaxbContextRoot for (JaxbPackage each : getPackages()) { each.synchronizeWithResourceModel(); } - for (JaxbType each : getTypes()) { + for (JavaType each : getJavaTypes()) { each.synchronizeWithResourceModel(); } } @@ -165,7 +166,7 @@ public abstract class AbstractJaxbContextRoot } for (String typeToScan : new SnapshotCloneIterable<String>(typesToScan)) { - JaxbType jaxbType = getType(typeToScan); + JavaType jaxbType = getJavaType(typeToScan); if (jaxbType != null) { for (String referencedTypeName : jaxbType.getReferencedXmlTypeNames()) { if (! StringTools.isBlank(referencedTypeName) && ! totalTypes.contains(referencedTypeName)) { @@ -229,9 +230,9 @@ public abstract class AbstractJaxbContextRoot protected Set<String> calculatePackageNames(Set<String> typeNames) { Set<String> packageNames = CollectionTools.<String>set(); for (String typeName : typeNames) { - JaxbType jaxbType = this.types.get(typeName); + JavaType jaxbType = this.types.get(typeName); if (jaxbType != null) { - packageNames.add(jaxbType.getPackageName()); + packageNames.add(jaxbType.getTypeName().getPackageName()); } } return packageNames; @@ -287,11 +288,11 @@ public abstract class AbstractJaxbContextRoot } protected void processType(JavaResourceAbstractType resourceType, Set<String> typesToUpdate, boolean defaultMapped) { - JaxbType.Kind jaxbTypeKind = calculateJaxbTypeKind(resourceType); + TypeKind jaxbTypeKind = calculateJaxbTypeKind(resourceType); String className = resourceType.getTypeBinding().getQualifiedName(); if (this.types.containsKey(className)) { - JaxbType type = this.types.get(className); + JavaType type = this.types.get(className); if (type.getKind() == jaxbTypeKind) { typesToUpdate.add(className); type.setDefaultMapped(defaultMapped); @@ -302,24 +303,24 @@ public abstract class AbstractJaxbContextRoot } } - JaxbType type = buildType(resourceType); + JavaType type = buildType(resourceType); type.setDefaultMapped(defaultMapped); this.addType(type); } - protected JaxbType.Kind calculateJaxbTypeKind(JavaResourceAbstractType resourceType) { + protected TypeKind calculateJaxbTypeKind(JavaResourceAbstractType resourceType) { if (resourceType.getKind() == JavaResourceAbstractType.Kind.ENUM) { - return JaxbType.Kind.ENUM; + return TypeKind.ENUM; } // else is of kind TYPE else { - return JaxbType.Kind.CLASS; + return TypeKind.CLASS; } } - protected JaxbType buildType(JavaResourceAbstractType resourceType) { - JaxbType.Kind kind = calculateJaxbTypeKind(resourceType); - if (kind == JaxbType.Kind.ENUM) { + protected JavaType buildType(JavaResourceAbstractType resourceType) { + TypeKind kind = calculateJaxbTypeKind(resourceType); + if (kind == TypeKind.ENUM) { return buildJaxbEnum((JavaResourceEnum) resourceType); } else { @@ -396,120 +397,120 @@ public abstract class AbstractJaxbContextRoot // ***** types ***** - public Iterable<JaxbType> getTypes() { - return new LiveCloneIterable<JaxbType>(this.types.values()); + public Iterable<JavaType> getJavaTypes() { + return new LiveCloneIterable<JavaType>(this.types.values()); } - public int getTypesSize() { + public int getJavaTypesSize() { return this.types.size(); } - public JaxbType getType(String typeName) { + public JavaType getJavaType(String typeName) { return typeName == null ? null : this.types.get(typeName); } - protected void addType_(JaxbType type) { - this.types.put(type.getFullyQualifiedName(), type); + protected void addType_(JavaType type) { + this.types.put(type.getTypeName().getFullyQualifiedName(), type); } - protected void addType(JaxbType type) { - if (this.types.containsKey(type.getFullyQualifiedName())) { + protected void addType(JavaType type) { + if (this.types.containsKey(type.getTypeName().getFullyQualifiedName())) { throw new IllegalArgumentException("Type with that name already exists."); //$NON-NLS-1$ } addType_(type); - fireItemAdded(TYPES_COLLECTION, type); + fireItemAdded(JAVA_TYPES_COLLECTION, type); } - protected void removeType(JaxbType type) { - removeType(type.getFullyQualifiedName()); + protected void removeType(JavaType type) { + removeType(type.getTypeName().getFullyQualifiedName()); } protected void removeType(String typeName) { if (! this.types.containsKey(typeName)) { throw new IllegalArgumentException("No type with that name exists."); //$NON-NLS-1$ } - JaxbType removedType = this.types.remove(typeName); - fireItemRemoved(TYPES_COLLECTION, removedType); + JavaType removedType = this.types.remove(typeName); + fireItemRemoved(JAVA_TYPES_COLLECTION, removedType); } - public Iterable<JaxbType> getTypes(final JaxbPackage jaxbPackage) { - return new FilteringIterable<JaxbType>(getTypes()) { + public Iterable<JavaType> getJavaTypes(final JaxbPackage jaxbPackage) { + return new FilteringIterable<JavaType>(getJavaTypes()) { @Override - protected boolean accept(JaxbType o) { - return o.getPackageName().equals(jaxbPackage.getName()); + protected boolean accept(JavaType o) { + return o.getTypeName().getPackageName().equals(jaxbPackage.getName()); } }; } - public Iterable<JaxbClass> getClasses() { - return new SubIterableWrapper<JaxbType, JaxbClass>( - new FilteringIterable<JaxbType>(getTypes()) { + public Iterable<JavaClass> getJavaClasses() { + return new SubIterableWrapper<JavaType, JavaClass>( + new FilteringIterable<JavaType>(getJavaTypes()) { @Override - protected boolean accept(JaxbType o) { - return o.getKind() == JaxbType.Kind.CLASS; + protected boolean accept(JavaType o) { + return o.getKind() == TypeKind.CLASS; } }); } - public Iterable<JaxbClass> getClasses(JaxbPackage jaxbPackage) { - return new SubIterableWrapper<JaxbType, JaxbClass>( - new FilteringIterable<JaxbType>(getTypes(jaxbPackage)) { + public Iterable<JavaClass> getJavaClasses(JaxbPackage jaxbPackage) { + return new SubIterableWrapper<JavaType, JavaClass>( + new FilteringIterable<JavaType>(getJavaTypes(jaxbPackage)) { @Override - protected boolean accept(JaxbType o) { - return o.getKind() == JaxbType.Kind.CLASS; + protected boolean accept(JavaType o) { + return o.getKind() == TypeKind.CLASS; } }); } - public Iterable<JaxbEnum> getEnums() { - return new SubIterableWrapper<JaxbType, JaxbEnum>( - new FilteringIterable<JaxbType>(getTypes()) { + public Iterable<JavaEnum> getJavaEnums() { + return new SubIterableWrapper<JavaType, JavaEnum>( + new FilteringIterable<JavaType>(getJavaTypes()) { @Override - protected boolean accept(JaxbType o) { - return o.getKind() == JaxbType.Kind.ENUM; + protected boolean accept(JavaType o) { + return o.getKind() == TypeKind.ENUM; } }); } - public Iterable<JaxbEnum> getEnums(JaxbPackage jaxbPackage) { - return new SubIterableWrapper<JaxbType, JaxbEnum>( - new FilteringIterable<JaxbType>(getTypes(jaxbPackage)) { + public Iterable<JavaEnum> getJavaEnums(JaxbPackage jaxbPackage) { + return new SubIterableWrapper<JavaType, JavaEnum>( + new FilteringIterable<JavaType>(getJavaTypes(jaxbPackage)) { @Override - protected boolean accept(JaxbType o) { - return o.getKind() == JaxbType.Kind.ENUM; + protected boolean accept(JavaType o) { + return o.getKind() == TypeKind.ENUM; } }); } - protected JaxbClass buildJaxbClass(JavaResourceType resourceType) { + protected JavaClass buildJaxbClass(JavaResourceType resourceType) { return this.getFactory().buildJaxbClass(this, resourceType); } - protected JaxbEnum buildJaxbEnum(JavaResourceEnum resourceEnum) { + protected JavaEnum buildJaxbEnum(JavaResourceEnum resourceEnum) { return this.getFactory().buildJaxbEnum(this, resourceEnum); } public Iterable<XmlRegistry> getXmlRegistries(JaxbPackage jaxbPackage) { return new FilteringIterable<XmlRegistry>( - new TransformationIterable<JaxbClass, XmlRegistry>(getClasses(jaxbPackage)) { + new TransformationIterable<JavaClass, XmlRegistry>(getJavaClasses(jaxbPackage)) { @Override - protected XmlRegistry transform(JaxbClass o) { + protected XmlRegistry transform(JavaClass o) { return o.getXmlRegistry(); } }, NotNullFilter.INSTANCE); } - public JaxbTypeMapping getTypeMapping(String typeName) { - JaxbType type = getType(typeName); + public JavaTypeMapping getTypeMapping(String typeName) { + JavaType type = getJavaType(typeName); return (type == null) ? null : type.getMapping(); } - public JaxbClassMapping getClassMapping(String typeName) { - JaxbType type = getType(typeName); - return (type == null || (type.getKind() != JaxbType.Kind.CLASS)) ? - null : ((JaxbClass) type).getMapping(); + public JavaClassMapping getClassMapping(String typeName) { + JavaType type = getJavaType(typeName); + return (type == null || (type.getKind() != TypeKind.CLASS)) ? + null : ((JavaClass) type).getMapping(); } @@ -529,7 +530,7 @@ public abstract class AbstractJaxbContextRoot for (JaxbPackage pkg : this.packages.values()) { pkg.validate(messages, reporter); } - for (JaxbType type : this.types.values()) { + for (JavaType type : this.types.values()) { type.validate(messages, reporter); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/ContextContainerTools.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/ContextContainerTools.java new file mode 100644 index 0000000000..1cfff80b7b --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/ContextContainerTools.java @@ -0,0 +1,140 @@ +package org.eclipse.jpt.jaxb.core.internal.context;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
+
+/**
+ * Utility methods for manipulating context containers.
+ * (Copied originally from *.jpa.core on 11/6/12 - pwf)
+ */
+public class ContextContainerTools {
+
+ /**
+ * Adapter used to synchronize a context container with its corresponding
+ * resource container.
+ *
+ * @param <C> the type of context elements
+ * @param <R> the type of resource elements
+ */
+ public interface Adapter<C extends JaxbContextNode, R> {
+
+ /**
+ * Return the container's context elements.
+ */
+ Iterable<C> getContextElements();
+
+ /**
+ * Return the container's current set of resource elements.
+ * These are what the context elements will be synchronized to.
+ */
+ Iterable<R> getResourceElements();
+
+ /**
+ * Return the resource element corresponding to the specified context
+ * element.
+ */
+ R getResourceElement(C contextElement);
+
+ /**
+ * Move the specified context element to the specified index.
+ */
+ void moveContextElement(int index, C element);
+
+ /**
+ * Add a context element for the specified resource element at the
+ * specified index.
+ */
+ void addContextElement(int index, R resourceElement);
+
+ /**
+ * Remove the specified context element from the container.
+ */
+ void removeContextElement(C element);
+ }
+
+
+ /**
+ * Using the specified adapter, synchronize a context container with its
+ * corresponding resource container: moving, removing, and adding elements
+ * as necessary.
+ * <p>
+ * We can do this because:<ul>
+ * <li>the XML translators will <em>move</em> the EMF elements when
+ * appropriate (as opposed to simply rebuilding them in place).
+ * <li>the Java resource model will re-use existing annotations when
+ * appropriate (as opposed to simply rebuilding them in place).
+ * </ul>
+ */
+ public static <C extends JaxbContextNode, R> void synchronizeWithResourceModel(Adapter<C, R> adapter) {
+ sync(adapter, true); // true = sync
+ }
+
+ /**
+ * @see #synchronizeWithResourceModel(Adapter)
+ */
+ public static <C extends JaxbContextNode, R> void update(Adapter<C, R> adapter) {
+ sync(adapter, false); // false = update
+ }
+
+ /**
+ * The specified <code>sync</code> flag controls whether any surviving
+ * context nodes are either <em>synchronized</em> (<code>true</code>) or
+ * <em>updated</em> (<code>false</code>).
+ */
+ protected static <C extends JaxbContextNode, R> void sync(Adapter<C, R> adapter, boolean sync) {
+ HashSet<C> contextElements = CollectionTools.set(adapter.getContextElements());
+ ArrayList<C> contextElementsToSync = new ArrayList<C>(contextElements.size());
+ int resourceIndex = 0;
+
+ for (R resourceElement : adapter.getResourceElements()) {
+ boolean match = false;
+ for (Iterator<C> stream = contextElements.iterator(); stream.hasNext(); ) {
+ C contextElement = stream.next();
+ if (ObjectTools.equals(adapter.getResourceElement(contextElement), resourceElement)) {
+ // we don't know the source index because the element has been moved by previously moved elements
+ adapter.moveContextElement(resourceIndex, contextElement);
+ stream.remove();
+ // TODO perform update here someday...
+ contextElementsToSync.add(contextElement);
+ match = true;
+ break;
+ }
+ }
+ if ( ! match) {
+ // added elements are sync'ed during construction or will be
+ // updated during the next "update" (which is triggered by
+ // their addition to the model)
+ adapter.addContextElement(resourceIndex, resourceElement);
+ }
+ resourceIndex++;
+ }
+ // remove any leftover context elements
+ for (C contextElement : contextElements) {
+ adapter.removeContextElement(contextElement);
+ }
+ // TODO bjv
+ // take care of the structural changes before sync'ing the remaining elements;
+ // we might be able to do this inline once we get rid of the "list change" events
+ // and go with only add, remove, etc. list events
+ // (these syncs will trigger "list change" events with list aspect adapters, which
+ // trigger refreshes of UI adapters (e.g. TableModelAdapter) which will prematurely
+ // discover any structural changes... :( )
+ // see ItemAspectListValueModelAdapter.itemAspectChanged(EventObject)
+ for (C contextElement : contextElementsToSync) {
+ if (sync) {
+ contextElement.synchronizeWithResourceModel();
+ } else {
+ contextElement.update();
+ }
+ }
+ }
+
+ private ContextContainerTools() {
+ super();
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java index 395aaa94bc..1c8c62e8c7 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java @@ -13,7 +13,8 @@ package org.eclipse.jpt.jaxb.core.internal.context; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;import org.eclipse.jpt.jaxb.core.context.JaxbPackage; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; +import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; import org.eclipse.jpt.jaxb.core.context.XmlNsForm; import org.eclipse.jpt.jaxb.core.context.XmlRegistry; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAdaptableAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAdaptableAttributeMapping.java index 6789f06f05..79e2e016d2 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAdaptableAttributeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAdaptableAttributeMapping.java @@ -15,10 +15,10 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; -import org.eclipse.jpt.jaxb.core.context.JaxbType; import org.eclipse.jpt.jaxb.core.context.XmlAdaptableMapping; import org.eclipse.jpt.jaxb.core.context.XmlAdapter; import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -135,7 +135,7 @@ public abstract class AbstractJavaAdaptableAttributeMapping<A extends Annotation String boundTypeName = getBoundTypeName(); // see if there is an xml adapter specified on the type - JaxbType boundType = getContextRoot().getType(boundTypeName); + JavaType boundType = getContextRoot().getJavaType(boundTypeName); if (boundType != null) { XmlJavaTypeAdapter xmlJavaTypeAdapter = boundType.getXmlJavaTypeAdapter(); if (xmlJavaTypeAdapter != null) { @@ -144,7 +144,7 @@ public abstract class AbstractJavaAdaptableAttributeMapping<A extends Annotation } // see if there is an xml adapter on the package - JaxbPackage pkg = getJaxbClassMapping().getJaxbType().getJaxbPackage(); + JaxbPackage pkg = getClassMapping().getJaxbPackage(); JaxbPackageInfo pkgInfo = (pkg == null) ? null : pkg.getPackageInfo(); if (pkgInfo != null) { XmlJavaTypeAdapter xmlJavaTypeAdapter = pkgInfo.getXmlJavaTypeAdapter(boundTypeName); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAttributeMapping.java index ed8a217e62..aa9be9a7f0 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAttributeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaAttributeMapping.java @@ -112,12 +112,8 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation> return (JaxbPersistentAttribute) super.getParent(); } - protected JaxbClassMapping getJaxbClassMapping() { - return getPersistentAttribute().getClassMapping(); - } - protected JaxbPackage getJaxbPackage() { - return getJaxbClassMapping().getJaxbType().getJaxbPackage(); + return getClassMapping().getJaxbPackage(); } public JavaResourceAttribute getJavaResourceAttribute() { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaElementQName.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaElementQName.java index fc47d3268c..38d78b2aac 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaElementQName.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaElementQName.java @@ -40,13 +40,13 @@ public abstract class AbstractJavaElementQName protected abstract JaxbPersistentAttribute getPersistentAttribute(); - protected JaxbClassMapping getJaxbClassMapping() { + protected JaxbClassMapping getClassMapping() { return getPersistentAttribute().getClassMapping(); } @Override protected JaxbPackage getJaxbPackage() { - return getJaxbClassMapping().getJaxbType().getJaxbPackage(); + return getClassMapping().getJaxbPackage(); } protected abstract XmlElementWrapper getElementWrapper(); @@ -58,7 +58,7 @@ public abstract class AbstractJavaElementQName @Override public Iterable<String> getNameProposals() { - XsdTypeDefinition xsdType = getJaxbClassMapping().getXsdTypeDefinition(); + XsdTypeDefinition xsdType = getClassMapping().getXsdTypeDefinition(); if (xsdType == null) { return EmptyIterable.instance(); } @@ -82,7 +82,7 @@ public abstract class AbstractJavaElementQName public String getDefaultNamespace() { JaxbPackage jaxbPackage = this.getJaxbPackage(); return (jaxbPackage != null && jaxbPackage.getElementFormDefault() == XmlNsForm.QUALIFIED) ? - getJaxbClassMapping().getQName().getNamespace() : ""; + getClassMapping().getQName().getNamespace() : ""; } @Override @@ -93,7 +93,7 @@ public abstract class AbstractJavaElementQName @Override protected void validateReference(List<IMessage> messages, IReporter reporter) { - XsdTypeDefinition xsdType = getJaxbClassMapping().getXsdTypeDefinition(); + XsdTypeDefinition xsdType = getClassMapping().getXsdTypeDefinition(); if (xsdType == null) { return; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaType.java index 3b5e6e52b2..a136cbc011 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaType.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaType.java @@ -20,9 +20,10 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; -import org.eclipse.jpt.jaxb.core.context.JaxbType; -import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping; +import org.eclipse.jpt.jaxb.core.context.TypeName; import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; +import org.eclipse.jpt.jaxb.core.context.java.JavaTypeMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation; @@ -34,11 +35,11 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public abstract class AbstractJavaType extends AbstractJavaContextNode - implements JaxbType { + implements JavaType { protected final JavaResourceAbstractType resourceType; - protected JaxbTypeMapping mapping; + protected JavaTypeMapping mapping; protected boolean defaultMapped = false; @@ -80,17 +81,17 @@ public abstract class AbstractJavaType // ***** mapping ***** - public JaxbTypeMapping getMapping() { + public JavaTypeMapping getMapping() { return this.mapping; } - protected void setMapping_(JaxbTypeMapping newMapping) { - JaxbTypeMapping old = this.mapping; + protected void setMapping_(JavaTypeMapping newMapping) { + JavaTypeMapping old = this.mapping; this.mapping = newMapping; firePropertyChanged(MAPPING_PROPERTY, old, newMapping); } - protected abstract JaxbTypeMapping buildMapping(); + protected abstract JavaTypeMapping buildMapping(); protected void initMapping() { if (isDefaultMapped() || isSpecifiedMapped()) { @@ -225,31 +226,36 @@ public abstract class AbstractJavaType } - // ***** JaxbType misc ***** + // ***** JavaType misc ***** public JavaResourceAbstractType getJavaResourceType() { return this.resourceType; } - public String getSimpleName() { - return this.resourceType.getName(); - } - - public String getTypeQualifiedName() { - String packageName = getPackageName(); - return (packageName.length() == 0) ? getFullyQualifiedName() : getFullyQualifiedName().substring(packageName.length() + 1); - } - - public String getFullyQualifiedName() { - return this.resourceType.getTypeBinding().getQualifiedName(); - } - - public String getPackageName() { - return this.resourceType.getTypeBinding().getPackageName(); + public TypeName getTypeName() { + return new TypeName() { + + public String getSimpleName() { + return AbstractJavaType.this.resourceType.getName(); + } + + public String getTypeQualifiedName() { + String packageName = getPackageName(); + return (packageName.length() == 0) ? getFullyQualifiedName() : getFullyQualifiedName().substring(packageName.length() + 1); + } + + public String getFullyQualifiedName() { + return AbstractJavaType.this.resourceType.getTypeBinding().getQualifiedName(); + } + + public String getPackageName() { + return AbstractJavaType.this.resourceType.getTypeBinding().getPackageName(); + } + }; } public JaxbPackage getJaxbPackage() { - return getContextRoot().getPackage(getPackageName()); + return getContextRoot().getPackage(getTypeName().getPackageName()); } public JaxbPackageInfo getJaxbPackageInfo() { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaTypeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaTypeMapping.java index 0b9c51888f..7a3bfb7578 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaTypeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaTypeMapping.java @@ -20,10 +20,12 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbQName; -import org.eclipse.jpt.jaxb.core.context.JaxbType; import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping; +import org.eclipse.jpt.jaxb.core.context.TypeKind; +import org.eclipse.jpt.jaxb.core.context.TypeName; import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.context.XmlSeeAlso; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; import org.eclipse.jpt.jaxb.core.internal.JptJaxbCoreMessages; import org.eclipse.jpt.jaxb.core.internal.validation.DefaultValidationMessages; import org.eclipse.jpt.jaxb.core.internal.validation.JaxbValidationMessages; @@ -53,7 +55,7 @@ public abstract class AbstractJavaTypeMapping protected XmlSeeAlso xmlSeeAlso; - protected AbstractJavaTypeMapping(JaxbType parent) { + protected AbstractJavaTypeMapping(JavaType parent) { super(parent); initXmlTransient(); this.qName = buildQName(); @@ -62,16 +64,24 @@ public abstract class AbstractJavaTypeMapping } - public JaxbType getJaxbType() { - return (JaxbType) getParent(); + public JavaType getJavaType() { + return (JavaType) getParent(); } protected JavaResourceAbstractType getJavaResourceType() { - return getJaxbType().getJavaResourceType(); + return getJavaType().getJavaResourceType(); } - protected JaxbPackage getJaxbPackage() { - return getJaxbType().getJaxbPackage(); + public TypeKind getTypeKind() { + return getJavaType().getKind(); + } + + public TypeName getTypeName() { + return getJavaType().getTypeName(); + } + + public JaxbPackage getJaxbPackage() { + return getJavaType().getJaxbPackage(); } @@ -338,7 +348,7 @@ public abstract class AbstractJavaTypeMapping @Override public TextRange getValidationTextRange() { TextRange textRange = getXmlTypeAnnotation().getTextRange(); - return (textRange != null) ? textRange : getJaxbType().getValidationTextRange(); + return (textRange != null) ? textRange : getJavaType().getValidationTextRange(); } @Override @@ -396,18 +406,18 @@ public abstract class AbstractJavaTypeMapping @Override protected JaxbPackage getJaxbPackage() { - return AbstractJavaTypeMapping.this.getJaxbType().getJaxbPackage(); + return AbstractJavaTypeMapping.this.getJavaType().getJaxbPackage(); } @Override public String getDefaultNamespace() { - JaxbPackage jaxbPackage = AbstractJavaTypeMapping.this.getJaxbType().getJaxbPackage(); + JaxbPackage jaxbPackage = AbstractJavaTypeMapping.this.getJavaType().getJaxbPackage(); return (jaxbPackage == null) ? null : jaxbPackage.getNamespace(); } @Override public String getDefaultName() { - return Introspector.decapitalize(AbstractJavaTypeMapping.this.getJaxbType().getSimpleName()); + return Introspector.decapitalize(AbstractJavaTypeMapping.this.getJavaType().getTypeName().getSimpleName()); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlNodeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlNodeMapping.java index 89fa74d128..85c768b1e1 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlNodeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlNodeMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributeMappingXmlSchemaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributeMappingXmlSchemaType.java index 3db4fca576..279eea17f5 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributeMappingXmlSchemaType.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributeMappingXmlSchemaType.java @@ -40,13 +40,13 @@ public class GenericJavaAttributeMappingXmlSchemaType return getAttributeMapping().getPersistentAttribute(); } - protected JaxbClassMapping getJaxbClassMapping() { + protected JaxbClassMapping getClassMapping() { return getPersistentAttribute().getClassMapping(); } @Override protected JaxbPackage getJaxbPackage() { - return this.getJaxbClassMapping().getJaxbType().getJaxbPackage(); + return this.getClassMapping().getJaxbPackage(); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributesContainer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributesContainer.java index 48b964098e..783d745f28 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributesContainer.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributesContainer.java @@ -38,11 +38,12 @@ public class GenericJavaAttributesContainer protected JavaResourceType javaResourceType; - protected Owner owner; + protected JaxbAttributesContainer.Context owner; protected final Vector<JaxbPersistentAttribute> attributes = new Vector<JaxbPersistentAttribute>(); - public GenericJavaAttributesContainer(JaxbClassMapping parent, Owner owner, JavaResourceType resourceType) { + public GenericJavaAttributesContainer( + JaxbClassMapping parent, JaxbAttributesContainer.Context owner, JavaResourceType resourceType) { super(parent); this.javaResourceType = resourceType; this.owner = owner; @@ -50,7 +51,7 @@ public class GenericJavaAttributesContainer } - public JaxbClassMapping getJaxbClassMapping() { + public JaxbClassMapping getClassMapping() { return (JaxbClassMapping) getParent(); } @@ -92,26 +93,26 @@ public class GenericJavaAttributesContainer protected void addAttribute(JaxbPersistentAttribute attribute) { if (this.attributes.add(attribute)) { - this.owner.fireAttributeAdded(attribute); + this.owner.attributeAdded(attribute); } } protected void removeAttribute(JaxbPersistentAttribute attribute) { if (this.attributes.remove(attribute)) { - this.owner.fireAttributeRemoved(attribute); + this.owner.attributeRemoved(attribute); } } protected JaxbPersistentAttribute buildField(JavaResourceField resourceField) { - return getFactory().buildJavaPersistentField(getJaxbClassMapping(), resourceField); + return getFactory().buildJavaPersistentField(getClassMapping(), resourceField); } protected JaxbPersistentAttribute buildProperty(JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) { - return getFactory().buildJavaPersistentProperty(getJaxbClassMapping(), resourceGetter, resourceSetter); + return getFactory().buildJavaPersistentProperty(getClassMapping(), resourceGetter, resourceSetter); } protected void initializeAttributes() { - if (getJaxbClassMapping().isXmlTransient()) { + if (getClassMapping().isXmlTransient()) { return; } if (getAccessType() == XmlAccessType.PUBLIC_MEMBER) { @@ -319,7 +320,7 @@ public class GenericJavaAttributesContainer * which can be controlled in a number of different places.... */ protected void updateAttributes() { - if (getJaxbClassMapping().isXmlTransient()) { + if (getClassMapping().isXmlTransient()) { for (JaxbPersistentAttribute contextAttribute : getAttributes()) { this.removeAttribute(contextAttribute); } @@ -651,25 +652,6 @@ public class GenericJavaAttributesContainer @Override public TextRange getValidationTextRange() { - return getJaxbClassMapping().getValidationTextRange(); - } - - - interface Owner { - - /** - * Return the access type of the owner, to be used in determining which attributes to build - */ - XmlAccessType getAccessType(); - - /** - * fire property change event for the added attribute - */ - void fireAttributeAdded(JaxbPersistentAttribute attribute); - - /** - * fire property change event for the removed attribute - */ - void fireAttributeRemoved(JaxbPersistentAttribute attribute); + return getClassMapping().getValidationTextRange(); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java index 0b5a3e2114..7df0a2cb43 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java @@ -35,15 +35,17 @@ import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping; import org.eclipse.jpt.jaxb.core.context.JaxbAttributesContainer; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; +import org.eclipse.jpt.jaxb.core.context.JaxbAttributesContainer.Context; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; -import org.eclipse.jpt.jaxb.core.context.JaxbType; import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder; import org.eclipse.jpt.jaxb.core.context.XmlAccessType; import org.eclipse.jpt.jaxb.core.context.XmlNamedNodeMapping; +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.JavaType; import org.eclipse.jpt.jaxb.core.internal.validation.DefaultValidationMessages; import org.eclipse.jpt.jaxb.core.internal.validation.JaxbValidationMessages; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; @@ -56,7 +58,7 @@ import org.omg.CORBA.PUBLIC_MEMBER; public class GenericJavaClassMapping extends AbstractJavaTypeMapping - implements JaxbClassMapping { + implements JavaClassMapping { protected String specifiedFactoryClass; @@ -79,7 +81,7 @@ public class GenericJavaClassMapping protected final Map<JaxbClassMapping, JaxbAttributesContainer> includedAttributesContainers; - public GenericJavaClassMapping(JaxbClass parent) { + public GenericJavaClassMapping(JavaClass parent) { super(parent); this.includedAttributesContainers = new Hashtable<JaxbClassMapping, JaxbAttributesContainer>(); this.propOrderContainer = new PropOrderContainer(); @@ -102,8 +104,8 @@ public class GenericJavaClassMapping } @Override - public JaxbClass getJaxbType() { - return (JaxbClass) super.getJaxbType(); + public JavaClass getJavaType() { + return (JavaClass) super.getJavaType(); } public JaxbPackageInfo getPackageInfo() { @@ -446,17 +448,11 @@ public class GenericJavaClassMapping protected JaxbClassMapping findSuperclass() { JavaResourceType resourceType = getSuperclass(getJavaResourceType()); while (resourceType != null && resourceType != this) { - JaxbType jaxbType = getJaxbProject().getContextRoot().getType(resourceType.getTypeBinding().getQualifiedName()); + JaxbClassMapping classMapping = getJaxbProject().getContextRoot().getClassMapping(resourceType.getTypeBinding().getQualifiedName()); - // if the superclass is not a class, return null - if (jaxbType == null || jaxbType.getKind() != JaxbType.Kind.CLASS) { - return null; - } - - JaxbClassMapping jaxbClassMapping = ((JaxbClass) jaxbType).getMapping(); // rare for a non-null superclass to not be mapped, but potentially possible mid-update - if (jaxbClassMapping != null) { - return jaxbClassMapping; + if (classMapping != null) { + return classMapping; } else { resourceType = getSuperclass(resourceType); @@ -486,17 +482,17 @@ public class GenericJavaClassMapping return this.attributesContainer.getAttributesSize(); } - protected GenericJavaAttributesContainer.Owner buildAttributesContainerOwner() { - return new GenericJavaAttributesContainer.Owner() { + protected GenericJavaAttributesContainer.Context buildAttributesContainerOwner() { + return new GenericJavaAttributesContainer.Context() { public XmlAccessType getAccessType() { return GenericJavaClassMapping.this.getAccessType(); } - public void fireAttributeAdded(JaxbPersistentAttribute attribute) { + public void attributeAdded(JaxbPersistentAttribute attribute) { GenericJavaClassMapping.this.fireItemAdded(ATTRIBUTES_COLLECTION, attribute); } - public void fireAttributeRemoved(JaxbPersistentAttribute attribute) { + public void attributeRemoved(JaxbPersistentAttribute attribute) { GenericJavaClassMapping.this.fireItemRemoved(ATTRIBUTES_COLLECTION, attribute); } }; @@ -580,26 +576,30 @@ public class GenericJavaClassMapping } } - protected JaxbAttributesContainer buildIncludedAttributesContainer(JaxbClassMapping jaxbClassMapping) { - return new GenericJavaAttributesContainer(this, buildIncludedAttributesContainerOwner(), jaxbClassMapping.getJaxbType().getJavaResourceType()); + protected JaxbAttributesContainer buildIncludedAttributesContainer(JaxbClassMapping classMapping) { + return classMapping.buildIncludedAttributesContainer(this, buildIncludedAttributesContainerOwner()); } - protected GenericJavaAttributesContainer.Owner buildIncludedAttributesContainerOwner() { - return new GenericJavaAttributesContainer.Owner() { + protected JaxbAttributesContainer.Context buildIncludedAttributesContainerOwner() { + return new GenericJavaAttributesContainer.Context() { public XmlAccessType getAccessType() { return GenericJavaClassMapping.this.getAccessType(); } - public void fireAttributeAdded(JaxbPersistentAttribute attribute) { + public void attributeAdded(JaxbPersistentAttribute attribute) { GenericJavaClassMapping.this.fireItemAdded(INCLUDED_ATTRIBUTES_COLLECTION, attribute); } - public void fireAttributeRemoved(JaxbPersistentAttribute attribute) { + public void attributeRemoved(JaxbPersistentAttribute attribute) { GenericJavaClassMapping.this.fireItemRemoved(INCLUDED_ATTRIBUTES_COLLECTION, attribute); } }; } + public JaxbAttributesContainer buildIncludedAttributesContainer(JaxbClassMapping parent, Context context) { + return new GenericJavaAttributesContainer(parent, context, getJavaResourceType()); + } + // ***** misc attributes ***** @@ -658,13 +658,13 @@ public class GenericJavaClassMapping return true; } - for (JaxbType jaxbType : getJaxbProject().getContextRoot().getTypes()) { + for (JavaType jaxbType : getJaxbProject().getContextRoot().getJavaTypes()) { if (jaxbType.getMapping() != null && ! jaxbType.getMapping().isXmlTransient() && jaxbType.getMapping().getXmlRootElement() != null && JDTTools.typeIsSubType( getJaxbProject().getJavaProject(), - jaxbType.getFullyQualifiedName(), getJaxbType().getFullyQualifiedName())) { + jaxbType.getTypeName().getFullyQualifiedName(), getJavaType().getTypeName().getFullyQualifiedName())) { return true; } } @@ -802,7 +802,7 @@ public class GenericJavaClassMapping } else { if (getFactoryMethod() == null - && getJaxbType().getXmlJavaTypeAdapter() == null + && getJavaType().getXmlJavaTypeAdapter() == null && ! getJavaResourceType().hasPublicOrProtectedNoArgConstructor()) { messages.add( DefaultValidationMessages.buildMessage( diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java index f0c7440806..8507355b28 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.ObjectTools; +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.JaxbContextNode; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumMapping.java index c2d4dd0840..ac3c4e1393 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumMapping.java @@ -17,11 +17,11 @@ import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant; -import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping; -import org.eclipse.jpt.jaxb.core.context.JaxbType; import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnum; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnumMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; import org.eclipse.jpt.jaxb.core.internal.validation.DefaultValidationMessages; import org.eclipse.jpt.jaxb.core.internal.validation.JaxbValidationMessages; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; @@ -37,14 +37,14 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericJavaEnumMapping extends AbstractJavaTypeMapping - implements JaxbEnumMapping { + implements JavaEnumMapping { protected String specifiedXmlEnumValue; protected final EnumConstantContainer enumConstantContainer; - public GenericJavaEnumMapping(JaxbEnum parent) { + public GenericJavaEnumMapping(JavaEnum parent) { super(parent); this.enumConstantContainer = new EnumConstantContainer(); @@ -173,7 +173,7 @@ public class GenericJavaEnumMapping protected XsdTypeDefinition getValueXsdTypeDefinition_() { String fqXmlEnumValue = getFullyQualifiedXmlEnumValue(); - JaxbType jaxbType = getContextRoot().getType(fqXmlEnumValue); + JavaType jaxbType = getContextRoot().getJavaType(fqXmlEnumValue); if (jaxbType != null) { JaxbTypeMapping typeMapping = jaxbType.getMapping(); if (typeMapping != null) { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaJaxbClass.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaJaxbClass.java index 8bbd63f3b1..a47117b7bd 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaJaxbClass.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaJaxbClass.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; -import org.eclipse.jpt.jaxb.core.context.JaxbType; +import org.eclipse.jpt.jaxb.core.context.TypeKind; import org.eclipse.jpt.jaxb.core.context.XmlRegistry; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlRegistryAnnotation; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -23,7 +23,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericJavaJaxbClass extends AbstractJavaType - implements JaxbClass { + implements JavaClass { protected XmlRegistry xmlRegistry; @@ -39,8 +39,8 @@ public class GenericJavaJaxbClass return (JavaResourceType) super.getJavaResourceType(); } - public Kind getKind() { - return JaxbType.Kind.CLASS; + public TypeKind getKind() { + return TypeKind.CLASS; } @@ -62,13 +62,13 @@ public class GenericJavaJaxbClass // ***** mapping ***** @Override - public JaxbClassMapping getMapping() { - return (JaxbClassMapping) super.getMapping(); + public JavaClassMapping getMapping() { + return (JavaClassMapping) super.getMapping(); } @Override - protected JaxbClassMapping buildMapping() { - return getFactory().buildJaxbClassMapping(this); + protected JavaClassMapping buildMapping() { + return getFactory().buildJavaClassMapping(this); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaJaxbEnum.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaJaxbEnum.java index 3cf53874dc..88947d5fa0 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaJaxbEnum.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaJaxbEnum.java @@ -11,16 +11,16 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; -import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping; -import org.eclipse.jpt.jaxb.core.context.JaxbType; +import org.eclipse.jpt.jaxb.core.context.TypeKind; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnum; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnumMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlEnumAnnotation; public class GenericJavaJaxbEnum extends AbstractJavaType - implements JaxbEnum { + implements JavaEnum { public GenericJavaJaxbEnum(JaxbContextNode parent, JavaResourceEnum resourceType) { super(parent, resourceType); @@ -32,21 +32,21 @@ public class GenericJavaJaxbEnum return (JavaResourceEnum) super.getJavaResourceType(); } - public Kind getKind() { - return JaxbType.Kind.ENUM; + public TypeKind getKind() { + return TypeKind.ENUM; } // ***** mapping ***** @Override - public JaxbEnumMapping getMapping() { - return (JaxbEnumMapping) super.getMapping(); + public JavaEnumMapping getMapping() { + return (JavaEnumMapping) super.getMapping(); } @Override - protected JaxbEnumMapping buildMapping() { - return getFactory().buildJaxbEnumMapping(this); + protected JavaEnumMapping buildMapping() { + return getFactory().buildJavaEnumMapping(this); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentAttribute.java index 70bb48d780..2683bbe523 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentAttribute.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentAttribute.java @@ -92,7 +92,7 @@ public class GenericJavaPersistentAttribute } public boolean isInherited() { - return getDeclaringJavaResourceType() != getClassMapping().getJaxbType().getJavaResourceType(); + return ObjectTools.notEquals(getDeclaringJavaResourceType().getTypeBinding().getQualifiedName(), getClassMapping().getTypeName().getFullyQualifiedName()); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaTypeXmlJavaTypeAdapter.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaTypeXmlJavaTypeAdapter.java index aae5467d94..099dd902f3 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaTypeXmlJavaTypeAdapter.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaTypeXmlJavaTypeAdapter.java @@ -9,20 +9,20 @@ ******************************************************************************/ package org.eclipse.jpt.jaxb.core.internal.context.java; -import org.eclipse.jpt.jaxb.core.context.JaxbType; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation; public class GenericJavaTypeXmlJavaTypeAdapter extends AbstractJavaXmlJavaTypeAdapter { - public GenericJavaTypeXmlJavaTypeAdapter(JaxbType parent, XmlJavaTypeAdapterAnnotation resource) { + public GenericJavaTypeXmlJavaTypeAdapter(JavaType parent, XmlJavaTypeAdapterAnnotation resource) { super(parent, resource); } @Override - public JaxbType getParent() { - return (JaxbType) super.getParent(); + public JavaType getParent() { + return (JavaType) super.getParent(); } // ********** type ********** diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAttributeMapping.java index 73b15fd68d..fa079cf519 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAttributeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAttributeMapping.java @@ -136,7 +136,7 @@ public class GenericJavaXmlAttributeMapping // ***** misc ***** public XsdFeature getXsdFeature() { - XsdTypeDefinition type = getJaxbClassMapping().getXsdTypeDefinition(); + XsdTypeDefinition type = getClassMapping().getXsdTypeDefinition(); if (type != null) { XsdAttributeUse attributeUse = type.getAttribute(this.qName.getNamespace(), this.qName.getName()); return (attributeUse == null) ? null : attributeUse.getAttributeDeclaration(); @@ -248,7 +248,7 @@ public class GenericJavaXmlAttributeMapping @Override public Iterable<String> getNameProposals() { - XsdTypeDefinition xsdType = GenericJavaXmlAttributeMapping.this.getJaxbClassMapping().getXsdTypeDefinition(); + XsdTypeDefinition xsdType = GenericJavaXmlAttributeMapping.this.getClassMapping().getXsdTypeDefinition(); return (xsdType == null) ? EmptyIterable.<String>instance() : xsdType.getAttributeNameProposals(getNamespace()); } @@ -256,7 +256,7 @@ public class GenericJavaXmlAttributeMapping public String getDefaultNamespace() { JaxbPackage jaxbPackage = this.getJaxbPackage(); return (jaxbPackage != null && jaxbPackage.getAttributeFormDefault() == XmlNsForm.QUALIFIED) ? - GenericJavaXmlAttributeMapping.this.getJaxbClassMapping().getQName().getNamespace() : ""; + GenericJavaXmlAttributeMapping.this.getClassMapping().getQName().getNamespace() : ""; } @Override @@ -267,7 +267,7 @@ public class GenericJavaXmlAttributeMapping @Override protected void validateReference(List<IMessage> messages, IReporter reporter) { - XsdTypeDefinition type = getJaxbClassMapping().getXsdTypeDefinition(); + XsdTypeDefinition type = getClassMapping().getXsdTypeDefinition(); if (type != null) { if (type.getAttribute(getNamespace(), getName()) == null) { messages.add(getUnresolveSchemaComponentMessage()); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElement.java index e96e60db4d..671c68a1e4 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElement.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElement.java @@ -102,12 +102,12 @@ public class GenericJavaXmlElement return getContext().getAttributeMapping().getPersistentAttribute(); } - protected JaxbClassMapping getJaxbClassMapping() { + protected JaxbClassMapping getClassMapping() { return getPersistentAttribute().getClassMapping(); } protected JaxbPackage getJaxbPackage() { - return getJaxbClassMapping().getJaxbType().getJaxbPackage(); + return getClassMapping().getJaxbPackage(); } public XmlElementAnnotation getAnnotation(boolean createIfNull) { @@ -277,7 +277,7 @@ public class GenericJavaXmlElement } public XsdElementDeclaration getXsdElement() { - XsdTypeDefinition xsdType = getJaxbClassMapping().getXsdTypeDefinition(); + XsdTypeDefinition xsdType = getClassMapping().getXsdTypeDefinition(); return (xsdType == null) ? null : xsdType.getElement(this.qName.getNamespace(), this.qName.getName()); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementMapping.java index 8493d52099..ba2ffde419 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementMapping.java @@ -180,7 +180,7 @@ public class GenericJavaXmlElementMapping } public XsdFeature getXsdFeature() { - XsdTypeDefinition xsdType = getJaxbClassMapping().getXsdTypeDefinition(); + XsdTypeDefinition xsdType = getClassMapping().getXsdTypeDefinition(); if (xsdType != null) { XmlElementWrapper elementWrapper = this.xmlElementWrapper; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRef.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRef.java index b7f2e4fafc..af652ddbf6 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRef.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRef.java @@ -86,12 +86,12 @@ public class GenericJavaXmlElementRef return getContext().getAttributeMapping().getPersistentAttribute(); } - protected JaxbClassMapping getJaxbClassMapping() { + protected JaxbClassMapping getClassMapping() { return getPersistentAttribute().getClassMapping(); } protected JaxbPackage getJaxbPackage() { - return getJaxbClassMapping().getJaxbType().getJaxbPackage(); + return getClassMapping().getJaxbPackage(); } public XmlElementRefAnnotation getAnnotation() { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementWrapper.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementWrapper.java index d3e5d09cc9..cc15429835 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementWrapper.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementWrapper.java @@ -71,12 +71,12 @@ public class GenericJavaXmlElementWrapper return getAttributeMapping().getPersistentAttribute(); } - protected JaxbClassMapping getJaxbClassMapping() { + protected JaxbClassMapping getClassMapping() { return getPersistentAttribute().getClassMapping(); } protected JaxbPackage getJaxbPackage() { - return getJaxbClassMapping().getJaxbType().getJaxbPackage(); + return getClassMapping().getJaxbPackage(); } protected XmlElementWrapperAnnotation getAnnotation() { @@ -269,12 +269,12 @@ public class GenericJavaXmlElementWrapper public String getDefaultNamespace() { JaxbPackage jaxbPackage = this.getJaxbPackage(); return (jaxbPackage != null && jaxbPackage.getElementFormDefault() == XmlNsForm.QUALIFIED) ? - GenericJavaXmlElementWrapper.this.getJaxbClassMapping().getQName().getNamespace() : ""; + GenericJavaXmlElementWrapper.this.getClassMapping().getQName().getNamespace() : ""; } @Override public Iterable<String> getNameProposals() { - XsdTypeDefinition xsdType = GenericJavaXmlElementWrapper.this.getJaxbClassMapping().getXsdTypeDefinition(); + XsdTypeDefinition xsdType = GenericJavaXmlElementWrapper.this.getClassMapping().getXsdTypeDefinition(); return (xsdType == null) ? EmptyIterable.instance() : xsdType.getElementNameProposals(getNamespace()); } @@ -291,7 +291,7 @@ public class GenericJavaXmlElementWrapper @Override protected void validateReference(List<IMessage> messages, IReporter reporter) { - XsdTypeDefinition type = getJaxbClassMapping().getXsdTypeDefinition(); + XsdTypeDefinition type = getClassMapping().getXsdTypeDefinition(); if (type == null) { return; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRegistry.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRegistry.java index f930fa0dc2..f9104770ee 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRegistry.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRegistry.java @@ -22,10 +22,10 @@ import org.eclipse.jpt.common.utility.internal.collection.HashBag; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.XmlRegistry; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.internal.JptJaxbCoreMessages; import org.eclipse.jpt.jaxb.core.internal.validation.DefaultValidationMessages; import org.eclipse.jpt.jaxb.core.internal.validation.JaxbValidationMessages; @@ -43,7 +43,7 @@ public class GenericJavaXmlRegistry protected final ElementFactoryMethodContainer elementFactoryMethodContainer; - public GenericJavaXmlRegistry(JaxbClass parent) { + public GenericJavaXmlRegistry(JavaClass parent) { super(parent); this.elementFactoryMethodContainer = new ElementFactoryMethodContainer(); @@ -51,8 +51,8 @@ public class GenericJavaXmlRegistry } - public JaxbClass getJaxbClass() { - return (JaxbClass) getParent(); + public JavaClass getJaxbClass() { + return (JavaClass) getParent(); } public JavaResourceType getJavaResourceType() { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRootElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRootElement.java index dad066caf5..e48f4c3186 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRootElement.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRootElement.java @@ -17,9 +17,10 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbQName; -import org.eclipse.jpt.jaxb.core.context.JaxbType; import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping; import org.eclipse.jpt.jaxb.core.context.XmlRootElement; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; +import org.eclipse.jpt.jaxb.core.context.java.JavaTypeMapping; import org.eclipse.jpt.jaxb.core.internal.JptJaxbCoreMessages; import org.eclipse.jpt.jaxb.core.internal.validation.DefaultValidationMessages; import org.eclipse.jpt.jaxb.core.internal.validation.JaxbValidationMessages; @@ -51,12 +52,12 @@ public class GenericJavaXmlRootElement return new XmlRootElementQName(this); } - public JaxbTypeMapping getTypeMapping() { - return (JaxbTypeMapping) getParent(); + public JavaTypeMapping getTypeMapping() { + return (JavaTypeMapping) getParent(); } - protected JaxbType getJaxbType() { - return getTypeMapping().getJaxbType(); + protected JavaType getJaxbType() { + return getTypeMapping().getJavaType(); } protected JaxbPackage getJaxbPackage() { @@ -149,7 +150,7 @@ public class GenericJavaXmlRootElement @Override public String getDefaultName() { - return Introspector.decapitalize(GenericJavaXmlRootElement.this.getJaxbType().getSimpleName()); + return Introspector.decapitalize(GenericJavaXmlRootElement.this.getJaxbType().getTypeName().getSimpleName()); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/GenericJaxb_2_1_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/GenericJaxb_2_1_PlatformDefinition.java index 3fd564ea05..c332694d6e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/GenericJaxb_2_1_PlatformDefinition.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/GenericJaxb_2_1_PlatformDefinition.java @@ -68,8 +68,8 @@ import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlTypeAnnotationDefinit import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlValueAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.jaxbindex.JaxbIndexResourceModelProvider; import org.eclipse.jpt.jaxb.core.internal.resource.jaxbprops.JaxbPropertiesResourceModelProvider; -import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig; +import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition; public class GenericJaxb_2_1_PlatformDefinition extends AbstractJaxbPlatformDefinition { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/GenericJaxb_2_2_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/GenericJaxb_2_2_PlatformDefinition.java index 869366ed08..d8950fc68e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/GenericJaxb_2_2_PlatformDefinition.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/GenericJaxb_2_2_PlatformDefinition.java @@ -13,8 +13,8 @@ import org.eclipse.jpt.jaxb.core.GenericJaxbPlatform; import org.eclipse.jpt.jaxb.core.JaxbFactory; import org.eclipse.jpt.jaxb.core.internal.jaxb21.GenericJaxb_2_1_Factory; import org.eclipse.jpt.jaxb.core.internal.jaxb21.GenericJaxb_2_1_PlatformDefinition; -import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig; +import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition; public class GenericJaxb_2_2_PlatformDefinition diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/platform/JaxbPlatformImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/platform/JaxbPlatformImpl.java index 3690bdf7a1..ad21d32013 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/platform/JaxbPlatformImpl.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/platform/JaxbPlatformImpl.java @@ -27,8 +27,8 @@ 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.JavaAttributeMappingDefinition;
import org.eclipse.jpt.jaxb.core.platform.JaxbPlatform;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig;
+import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
public final class JaxbPlatformImpl
implements JaxbPlatform {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/utility/CallbackSynchronizer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/utility/CallbackSynchronizer.java index 8c0d3a046c..6f12a82b39 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/utility/CallbackSynchronizer.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/utility/CallbackSynchronizer.java @@ -11,7 +11,6 @@ package org.eclipse.jpt.jaxb.core.utility; import java.io.Serializable; import java.util.EventListener; - import org.eclipse.jpt.common.utility.internal.ObjectTools; /** diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/utility/Synchronizer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/utility/Synchronizer.java index e50f25f067..8bab1a2ffb 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/utility/Synchronizer.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/utility/Synchronizer.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.core.utility; import java.io.Serializable; - import org.eclipse.jpt.common.utility.internal.ObjectTools; /** diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdTypeDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdTypeDefinition.java index 176c893ed8..a57c6d87b0 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdTypeDefinition.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdTypeDefinition.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jaxb.core.xsd; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.jaxb.core.context.TypeKind; import org.eclipse.xsd.XSDTypeDefinition; /** @@ -94,12 +94,12 @@ public abstract class XsdTypeDefinition<A extends XSDTypeDefinition> public enum Kind { /** - * An {@link XsdTypeDefinition} of SIMPLE {@link Kind} may safely be cast to an {@link XsdSimpleTypeDefinition} + * An {@link XsdTypeDefinition} of SIMPLE {@link TypeKind} may safely be cast to an {@link XsdSimpleTypeDefinition} */ SIMPLE, /** - * An {@link XsdTypeDefinition} of COMPLEX {@link Kind} may safely be cast to an {@link XsdComplexTypeDefinition} + * An {@link XsdTypeDefinition} of COMPLEX {@link TypeKind} may safely be cast to an {@link XsdComplexTypeDefinition} */ COMPLEX; } 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 1e74f18a6e..07c23da2ae 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 @@ -46,5 +46,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.internal.validation;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.resource.oxm diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/property_files/el_jaxb_validation.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/property_files/el_jaxb_validation.properties index c5db9b2d8b..7cb8a5457d 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/property_files/el_jaxb_validation.properties +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/property_files/el_jaxb_validation.properties @@ -10,7 +10,8 @@ PROJECT_MISSING_ECLIPSELINK_JAXB_CONTEXT_FACTORY = Project is missing a jaxb.properties file specifying the EclipseLink JAXB context factory -OXM_FILE__NO_PACKAGE = No package could be associated with this OXM file. +OXM_FILE__NO_PACKAGE_SPECIFIED = No package name is associated with this OXM file. +OXM_FILE__NO_SUCH_PACKAGE = Could not associate with package ''{0}''. OXM_JAVA_TYPE__NAME_NOT_SPECIFIED = The java type name must be specified. OXM_JAVA_TYPE__PACKAGE_NAME_NOT_UNIFORM = The package name of java types must be uniform within an OXM file. diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessOrder.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessOrder.java deleted file mode 100644 index f1371ec01f..0000000000 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessOrder.java +++ /dev/null @@ -1,100 +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.context; - -import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder;
-
-/**
- * MOXy extension of Access Order
- *
- * 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 class ELXmlAccessOrder
- extends XmlAccessOrder {
-
- public static ELXmlAccessOrder ALPHABETICAL =
- new ELXmlAccessOrder(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder.ALPHABETICAL,
- EXmlAccessOrder.ALPHABETICAL);
-
- public static ELXmlAccessOrder UNDEFINED =
- new ELXmlAccessOrder(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder.UNDEFINED,
- EXmlAccessOrder.UNDEFINED);
-
- public static ELXmlAccessOrder[] VALUES =
- new ELXmlAccessOrder[] {
- ALPHABETICAL,
- UNDEFINED };
-
-
- public static org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder toJavaResourceModel(
- ELXmlAccessOrder accessOrder) {
- return (accessOrder == null) ? null : accessOrder.getJavaAccessOrder();
- }
-
- public static ELXmlAccessOrder fromJavaResourceModel(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder javaAccessOrder) {
-
- if (javaAccessOrder == null) {
- return null;
- }
-
- for (ELXmlAccessOrder accessOrder : ELXmlAccessOrder.VALUES) {
- if (accessOrder.getJavaAccessOrder() == javaAccessOrder) {
- return accessOrder;
- }
- }
- return null;
- }
-
- public static EXmlAccessOrder toOxmResourceModel(ELXmlAccessOrder accessOrder) {
- return (accessOrder != null) ? accessOrder.getOxmAccessOrder() : null;
- }
-
- public static ELXmlAccessOrder fromOxmResourceModel(EXmlAccessOrder oxmAccessOrder) {
-
- if (oxmAccessOrder == null) {
- return null;
- }
-
- for (ELXmlAccessOrder accessOrder : ELXmlAccessOrder.VALUES) {
- if (accessOrder.getOxmAccessOrder() == oxmAccessOrder) {
- return accessOrder;
- }
- }
-
- return null;
- }
-
-
- private EXmlAccessOrder oxmAccessOrder;
-
-
- protected ELXmlAccessOrder(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder javaAccessOrder,
- EXmlAccessOrder oxmAccessOrder) {
- super(javaAccessOrder);
- this.oxmAccessOrder = oxmAccessOrder;
- }
-
-
- public EXmlAccessOrder getOxmAccessOrder() {
- return this.oxmAccessOrder;
- }
-} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessType.java deleted file mode 100644 index 8d06561b45..0000000000 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/ELXmlAccessType.java +++ /dev/null @@ -1,113 +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.context; - -import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType;
-
-/**
- * MOXy extension of Access Type
- *
- * 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 class ELXmlAccessType
- extends XmlAccessType {
-
- public static final ELXmlAccessType FIELD =
- new ELXmlAccessType(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.FIELD,
- EXmlAccessType.FIELD);
-
- public static final ELXmlAccessType NONE =
- new ELXmlAccessType(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.NONE,
- EXmlAccessType.NONE);
-
- public static final ELXmlAccessType PROPERTY =
- new ELXmlAccessType(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.PROPERTY,
- EXmlAccessType.PROPERTY);
-
- public static final ELXmlAccessType PUBLIC_MEMBER =
- new ELXmlAccessType(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.PUBLIC_MEMBER,
- EXmlAccessType.PUBLIC_MEMBER);
-
- public static ELXmlAccessType[] VALUES =
- new ELXmlAccessType[] {
- ELXmlAccessType.FIELD,
- ELXmlAccessType.NONE,
- ELXmlAccessType.PROPERTY,
- ELXmlAccessType.PUBLIC_MEMBER };
-
-
- public static org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType toJavaResourceModel(
- ELXmlAccessType accessType) {
- return (accessType != null) ? accessType.getJavaAccessType() : null;
- }
-
- public static XmlAccessType fromJavaResourceModel(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType javaAccessType) {
-
- if (javaAccessType == null) {
- return null;
- }
-
- for (ELXmlAccessType accessType : ELXmlAccessType.VALUES) {
- if (accessType.getJavaAccessType() == javaAccessType) {
- return accessType;
- }
- }
-
- return null;
- }
-
- public static EXmlAccessType toOxmResourceModel(ELXmlAccessType accessType) {
- return (accessType != null) ? accessType.getOxmAccessType() : null;
- }
-
- public static ELXmlAccessType fromOxmResourceModel(EXmlAccessType oxmAccessType) {
-
- if (oxmAccessType == null) {
- return null;
- }
-
- for (ELXmlAccessType accessType : ELXmlAccessType.VALUES) {
- if (accessType.getOxmAccessType() == oxmAccessType) {
- return accessType;
- }
- }
-
- return null;
- }
-
-
- protected EXmlAccessType oxmAccessType;
-
-
- protected ELXmlAccessType(
- org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType javaAccessType,
- EXmlAccessType oxmAccessType) {
- super(javaAccessType);
- this.oxmAccessType = oxmAccessType;
- }
-
-
- public EXmlAccessType getOxmAccessType() {
- return this.oxmAccessType;
- }
-} 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/java/ELClassMapping.java index 3efd6f9ddf..822eac0415 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/java/ELClassMapping.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.context.java; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; /** * Oxm extensions to JaxbClassMapping @@ -24,7 +24,7 @@ import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; * @since 3.2 */ public interface ELClassMapping - extends JaxbClassMapping { + extends JavaClassMapping { // ***** XmlDiscriminatorNode ***** 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 new file mode 100644 index 0000000000..f9cc6f3acf --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJavaAttribute.java @@ -0,0 +1,31 @@ +/*******************************************************************************
+ * 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.context.oxm; +
+import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute;
+ +public interface OxmJavaAttribute<A extends EJavaAttribute>
+ extends JaxbContextNode {
+
+ /**
+ * Resource model element
+ */
+ A getEJavaAttribute();
+
+
+ // ***** java attribute name *****
+
+ static final String JAVA_ATTRIBUTE_NAME_PROPERTY = "javaAttributeName"; //$NON-NLS-1$
+
+ String getJavaAttributeName();
+
+ void setJavaAttributeName(String newName);
+} 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 7f49fdb24b..89c6aa9662 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 @@ -9,7 +9,10 @@ *******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm; +import org.eclipse.jpt.common.utility.iterable.ListIterable;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessOrderHolder;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessTypeHolder;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType;
/**
@@ -23,7 +26,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType; * @since 3.3
*/
public interface OxmJavaType
- extends JaxbContextNode {
+ extends JaxbContextNode, XmlAccessOrderHolder, XmlAccessTypeHolder {
/**
* Resource model element
@@ -36,7 +39,7 @@ public interface OxmJavaType /**
* String associated with changes to the "specifiedName" property
*/
- static final String SPECIFIED_NAME_PROPERTY = "specifiedName"; //$NON-NLS-1$
+ String SPECIFIED_NAME_PROPERTY = "specifiedName"; //$NON-NLS-1$
/**
* Return the name specified in source
@@ -51,7 +54,7 @@ public interface OxmJavaType /**
* String associated with changes to the "specifiedName" property
*/
- static final String QUALIFIED_NAME_PROPERTY = "qualifiedName"; //$NON-NLS-1$
+ String QUALIFIED_NAME_PROPERTY = "qualifiedName"; //$NON-NLS-1$
/**
* Return
@@ -64,4 +67,13 @@ public interface OxmJavaType * Return the name with no package qualification
*/
String getSimpleName();
+
+
+ // ***** specified attributes *****
+
+ String SPECIFIED_ATTRIBUTES_LIST = "specifiedAttributes"; //$NON-NLS-1$
+
+ ListIterable<OxmJavaAttribute> getSpecifiedAttributes();
+
+ int getSpecifiedAttributesSize();
} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJaxbType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJaxbType.java new file mode 100644 index 0000000000..60f6644419 --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmJaxbType.java @@ -0,0 +1,53 @@ +/*******************************************************************************
+ * 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.context.oxm; + +import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
+import org.eclipse.jpt.jaxb.core.context.java.JavaType;
+
+/**
+ * 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 OxmJaxbType<T extends JavaType>
+ extends JaxbContextNode {
+
+ // ***** qualified name *****
+
+ /**
+ * String associated with changes to the "qualifiedName" property
+ */
+ static final String QUALIFIED_NAME_PROPERTY = "qualifiedName"; //$NON-NLS-1$
+
+ /**
+ * Return
+ * - the name specified in source, if it is qualified or primitive
+ * - the name specified in source with the xml-bindings package name prepended
+ */
+ String getQualifiedName();
+
+ /**
+ * Return the name with no package qualification
+ */
+ String getSimpleName();
+
+
+ // ***** java type *****
+
+ final static String JAVA_TYPE_PROPERTY = "javaType"; //$NON-NLS-1$
+
+ T getJavaType();
+} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlBindings.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlBindings.java index 96943ae4df..8b31363131 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlBindings.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlBindings.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jaxb.eclipselink.core.context.oxm; import org.eclipse.jpt.common.utility.iterable.ListIterable;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlAccessOrderHolder;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlAccessTypeHolder;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessOrderHolder;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessTypeHolder;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings;
/**
@@ -26,7 +26,7 @@ import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings; * @since 3.3
*/ public interface OxmXmlBindings
- extends JaxbContextNode, ELXmlAccessTypeHolder, ELXmlAccessOrderHolder {
+ extends JaxbContextNode, XmlAccessTypeHolder, XmlAccessOrderHolder {
EXmlBindings getEXmlBindings();
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 new file mode 100644 index 0000000000..894e5398f8 --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/context/oxm/OxmXmlElement.java @@ -0,0 +1,17 @@ +/*******************************************************************************
+ * 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.context.oxm; +
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement;
+ +public interface OxmXmlElement
+ extends OxmJavaAttribute<EXmlElement> {
+
+} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/ELJaxbPackageImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/ELJaxbPackageImpl.java index 0b5ca4cf34..d32f1a9416 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/ELJaxbPackageImpl.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/ELJaxbPackageImpl.java @@ -50,7 +50,9 @@ public class ELJaxbPackageImpl protected void setOxmFile(OxmFile oxmFile) {
if (valuesAreDifferent(this.oxmFile, oxmFile)) {
- this.oxmFile.setPackage(null);
+ if (this.oxmFile != null) {
+ this.oxmFile.setPackage(null);
+ }
setOxmFile_(oxmFile);
oxmFile.setPackage(this);
}
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 4005645e47..e9296d5783 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,8 +18,8 @@ import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; +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; @@ -41,7 +41,7 @@ public class ELJavaClassMapping protected ELJavaXmlDiscriminatorValue xmlDiscriminatorValue; - public ELJavaClassMapping(JaxbClass parent) { + public ELJavaClassMapping(JavaClass parent) { super(parent); initXmlDiscriminatorNode(); initXmlDiscriminatorValue(); 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 82a01d9ce9..0246671251 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 @@ -45,7 +45,7 @@ public class ELJavaXmlDiscriminatorNode } protected JaxbPackage getJaxbPackage() { - return getClassMapping().getJaxbType().getJaxbPackage(); + return getClassMapping().getJavaType().getJaxbPackage(); } 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 d9197f5506..6a44323ca4 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 @@ -189,7 +189,7 @@ public class ELJavaXmlInverseReferenceMapping ELJaxbValidationMessageBuilder.buildMessage( IMessage.HIGH_SEVERITY, ELJaxbValidationMessages.XML_INVERSE_REFERENCE__MAPPED_BY_NOT_RESOLVED, - new String[] { mappedBy, referencedClassMapping.getJaxbType().getFullyQualifiedName() }, + new String[] { mappedBy, referencedClassMapping.getTypeName().getFullyQualifiedName() }, this, getMappedByTextRange())); } @@ -201,7 +201,7 @@ public class ELJavaXmlInverseReferenceMapping ELJaxbValidationMessageBuilder.buildMessage( IMessage.HIGH_SEVERITY, ELJaxbValidationMessages.XML_INVERSE_REFERENCE__MAPPED_BY_ILLEGAL_MAPPING_TYPE, - new String[] { mappedBy, referencedClassMapping.getJaxbType().getFullyQualifiedName() }, + new String[] { mappedBy, referencedClassMapping.getTypeName().getFullyQualifiedName() }, this, getMappedByTextRange())); } 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 49080b7220..4c0da26e72 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 @@ -55,7 +55,7 @@ public class ELJavaXmlJoinNode protected JaxbPackage getJaxbPackage() { - return getClassMapping().getJaxbType().getJaxbPackage(); + return getClassMapping().getJaxbPackage(); } @@ -237,7 +237,7 @@ public class ELJavaXmlJoinNode ELJaxbValidationMessageBuilder.buildMessage( IMessage.HIGH_SEVERITY, ELJaxbValidationMessages.XML_JOIN_NODE__REFERENCED_XML_PATH_NOT_IN_REFERENCED_CLASS_KEYS, - new String[] { referencedClassMapping.getJaxbType().getFullyQualifiedName(), this.referencedXmlPath }, + new String[] { referencedClassMapping.getJavaType().getTypeName().getFullyQualifiedName(), this.referencedXmlPath }, ELJavaXmlJoinNode.this, getReferencedXmlPathTextRange())); } 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 d6c6ce1509..ef181ac1fa 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 @@ -47,7 +47,7 @@ public class ELJavaXmlPath protected JaxbPackage getJaxbPackage() { - return getClassMapping().getJaxbType().getJaxbPackage(); + return getClassMapping().getJaxbPackage(); } 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 new file mode 100644 index 0000000000..ca0516553b --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmJavaAttribute.java @@ -0,0 +1,66 @@ +/*******************************************************************************
+ * 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/AbstractOxmJaxbType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmJaxbType.java new file mode 100644 index 0000000000..c106815e63 --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/AbstractOxmJaxbType.java @@ -0,0 +1,127 @@ +/*******************************************************************************
+ * 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.JavaResourceType;
+import org.eclipse.jpt.common.utility.internal.StringTools;
+import org.eclipse.jpt.common.utility.internal.TypeDeclarationTools;
+import org.eclipse.jpt.jaxb.core.context.java.JavaType;
+import org.eclipse.jpt.jaxb.core.internal.context.AbstractJaxbContextNode;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJaxbType;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlBindings;
+ +public abstract class AbstractOxmJaxbType<T extends JavaType> + extends AbstractJaxbContextNode
+ implements OxmJaxbType<T> { +
+ protected String qualifiedName;
+
+ // hold on to java resource type for validation purposes
+ protected JavaResourceType javaResourceType;
+ protected T javaType;
+
+ + public AbstractOxmJaxbType(OxmXmlBindings parent) { + super(parent);
+ // 'javaType' is resolved in the update + }
+
+
+ // ***** sync/update *****
+
+ @Override
+ public void synchronizeWithResourceModel() {
+ super.synchronizeWithResourceModel();
+ syncJavaType();
+ }
+
+ @Override
+ public void update() {
+ super.update();
+ updateJavaType();
+ }
+
+
+ // ***** qualified name *****
+
+ public String getQualifiedName() {
+ return this.qualifiedName;
+ }
+
+ protected void setQualifiedName_(String newName) {
+ String oldName = this.qualifiedName;
+ this.qualifiedName = newName;
+ if (firePropertyChanged(QUALIFIED_NAME_PROPERTY, oldName, newName)) {
+ // If the qualified name changes, null out the java type to avoid syncing *it*.
+ // That's just wasted cycles.
+ // It'll get reset in update.
+ setJavaType(null);
+ }
+ }
+
+ protected abstract String buildQualifiedName();
+
+ public String getSimpleName() {
+ return TypeDeclarationTools.simpleName(this.qualifiedName);
+ }
+
+
+ // ***** java type *****
+
+ public T getJavaType() {
+ return this.javaType;
+ }
+
+ protected void setJavaType(T javaType) {
+ T oldJavaType = this.javaType;
+ this.javaType = javaType;
+ firePropertyChanged(JAVA_TYPE_PROPERTY, oldJavaType, javaType);
+ }
+
+ protected void syncJavaType() {
+ if (this.javaType != null) {
+ this.javaType.synchronizeWithResourceModel();
+ }
+ }
+
+ protected void updateJavaType() {
+ if (StringTools.isBlank(getQualifiedName())) {
+ setJavaType(null);
+ }
+ else {
+ JavaResourceType resourceType = this.resolveJavaResourceType();
+ if (resourceType != null) {
+ if (this.javaType == null
+ // using == here because it is possible that the names are the same, but the location has changed
+ // (e.g. the java resource type has moved from binary to source, or vice versa)
+ || this.javaType.getJavaResourceType() != resourceType) {
+ setJavaType(buildJavaType(resourceType));
+ }
+ else if (this.javaType != null) {
+ this.javaType.update();
+ }
+ }
+ else {
+ setJavaType(null);
+ }
+ }
+ }
+
+ protected abstract T buildJavaType(JavaResourceType resourceType);
+
+ protected JavaResourceType resolveJavaResourceType() {
+ if (StringTools.isBlank(getQualifiedName())) {
+ return null;
+ }
+ // return type whether it's a class, interface, or enum.
+ // building javaType will resolve problem if there is one.
+ return (JavaResourceType) getJaxbProject().getJavaResourceType(getQualifiedName());
+ } +} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/ELXmlAccessOrder.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/ELXmlAccessOrder.java new file mode 100644 index 0000000000..8fb6a9d1f5 --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/ELXmlAccessOrder.java @@ -0,0 +1,49 @@ +/*******************************************************************************
+ * 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.context.XmlAccessOrder;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder;
+ +public class ELXmlAccessOrder {
+
+ /* not to be constructed */
+ private ELXmlAccessOrder() {}
+
+ public static EXmlAccessOrder toOxmResourceModel(XmlAccessOrder accessOrder) {
+ if (accessOrder == XmlAccessOrder.ALPHABETICAL) {
+ return EXmlAccessOrder.ALPHABETICAL;
+ }
+ else if (accessOrder == XmlAccessOrder.UNDEFINED) {
+ return EXmlAccessOrder.UNDEFINED;
+ }
+ else if (accessOrder == null) {
+ return null;
+ }
+ else {
+ throw new IllegalArgumentException(accessOrder.toString());
+ }
+ }
+
+ public static XmlAccessOrder fromOxmResourceModel(EXmlAccessOrder accessOrder) {
+ if (accessOrder == EXmlAccessOrder.ALPHABETICAL) {
+ return XmlAccessOrder.ALPHABETICAL;
+ }
+ else if (accessOrder == EXmlAccessOrder.UNDEFINED) {
+ return XmlAccessOrder.UNDEFINED;
+ }
+ else if (accessOrder == null) {
+ return null;
+ }
+ else {
+ throw new IllegalArgumentException(accessOrder.toString());
+ }
+ }
+} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/ELXmlAccessType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/ELXmlAccessType.java new file mode 100644 index 0000000000..618477bbf5 --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/ELXmlAccessType.java @@ -0,0 +1,61 @@ +/*******************************************************************************
+ * 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.context.XmlAccessType;
+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType;
+ +public class ELXmlAccessType {
+
+ /* not to be constructed */
+ private ELXmlAccessType() {}
+
+ public static EXmlAccessType toOxmResourceModel(XmlAccessType accessType) {
+ if (accessType == XmlAccessType.FIELD) {
+ return EXmlAccessType.FIELD;
+ }
+ else if (accessType == XmlAccessType.NONE) {
+ return EXmlAccessType.NONE;
+ }
+ else if (accessType == XmlAccessType.PROPERTY) {
+ return EXmlAccessType.PROPERTY;
+ }
+ else if (accessType == XmlAccessType.PUBLIC_MEMBER) {
+ return EXmlAccessType.PUBLIC_MEMBER;
+ }
+ else if (accessType == null) {
+ return null;
+ }
+ else {
+ throw new IllegalArgumentException(accessType.toString());
+ }
+ }
+
+ public static XmlAccessType fromOxmResourceModel(EXmlAccessType accessType) {
+ if (accessType == EXmlAccessType.FIELD) {
+ return XmlAccessType.FIELD;
+ }
+ else if (accessType == EXmlAccessType.NONE) {
+ return XmlAccessType.NONE;
+ }
+ else if (accessType == EXmlAccessType.PROPERTY) {
+ return XmlAccessType.PROPERTY;
+ }
+ else if (accessType == EXmlAccessType.PUBLIC_MEMBER) {
+ return XmlAccessType.PUBLIC_MEMBER;
+ }
+ else if (accessType == null) {
+ return null;
+ }
+ else {
+ throw new IllegalArgumentException(accessType.toString());
+ }
+ }
+} 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 606858d239..da7007cedd 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 @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jpt.common.core.JptResourceType;
import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
import org.eclipse.jpt.common.core.utility.TextRange;
+import org.eclipse.jpt.common.utility.internal.StringTools;
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;
@@ -22,7 +23,6 @@ import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlBindings; import org.eclipse.jpt.jaxb.eclipselink.core.internal.validation.ELJaxbValidationMessageBuilder;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.validation.ELJaxbValidationMessages;
import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.Oxm;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
@@ -130,12 +130,9 @@ public class OxmFileImpl }
}
- protected OxmXmlBindings buildXmlBindings() { - // if less than 2.3, then there is no context model support - if (this.resourceType.isKindOf(Oxm.RESOURCE_TYPE_2_3)) { - return new OxmXmlBindingsImpl(this, (EXmlBindings) this.oxmResource.getRootObject()); - } - return null; + protected OxmXmlBindings buildXmlBindings() {
+ EXmlBindings eXmlBindings = (EXmlBindings) this.oxmResource.getRootObject();
+ return (eXmlBindings == null) ? null : new OxmXmlBindingsImpl(this, eXmlBindings); } @@ -164,12 +161,23 @@ public class OxmFileImpl super.validate(messages, reporter); if (getPackage() == null) {
- messages.add(
- ELJaxbValidationMessageBuilder.buildMessage(
- IMessage.HIGH_SEVERITY,
- ELJaxbValidationMessages.OXM_FILE__NO_PACKAGE,
- this,
- getPackageNameTextRange()));
+ if (StringTools.isBlank(getPackageName())) {
+ messages.add(
+ ELJaxbValidationMessageBuilder.buildMessage(
+ IMessage.HIGH_SEVERITY,
+ ELJaxbValidationMessages.OXM_FILE__NO_PACKAGE_SPECIFIED,
+ this,
+ getPackageNameTextRange()));
+ }
+ else {
+ messages.add(
+ ELJaxbValidationMessageBuilder.buildMessage(
+ IMessage.HIGH_SEVERITY,
+ ELJaxbValidationMessages.OXM_FILE__NO_SUCH_PACKAGE,
+ new String[] { getPackageName() },
+ this,
+ getPackageNameTextRange()));
+ }
}
if (this.xmlBindings != null) {
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 14504d7af0..ce9ae6cb12 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 @@ -10,34 +10,64 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm; import java.util.List;
+import java.util.Vector;
+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.jaxb.core.internal.context.AbstractJaxbContextNode;
+import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable;
+import org.eclipse.jpt.common.utility.iterable.ListIterable;
+import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
+import org.eclipse.jpt.jaxb.core.context.java.JavaClass;
+import org.eclipse.jpt.jaxb.core.internal.context.ContextContainerTools;
+import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaJaxbClass;
+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.internal.validation.ELJaxbValidationMessageBuilder;
import org.eclipse.jpt.jaxb.eclipselink.core.internal.validation.ELJaxbValidationMessages;
+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.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
public class OxmJavaTypeImpl
- extends AbstractJaxbContextNode
+ extends AbstractOxmJaxbType<JavaClass>
implements OxmJavaType {
protected EJavaType eJavaType;
protected String specifiedName;
- protected String qualifiedName;
+
+ protected XmlAccessOrder defaultAccessOrder;
+ protected XmlAccessOrder specifiedAccessOrder;
+
+ protected XmlAccessType defaultAccessType;
+ protected XmlAccessType specifiedAccessType;
+
+ protected final Vector<OxmJavaAttribute> specifiedAttributes;
+ protected final SpecifiedAttributeContainerAdapter specifiedAttributeContainerAdapter;
public OxmJavaTypeImpl(OxmXmlBindings parent, EJavaType eJavaType) {
super(parent);
this.eJavaType = eJavaType;
- this.specifiedName = buildSpecifiedName();
- this.qualifiedName = buildQualifiedName();
+
+ this.specifiedAttributes = new Vector<OxmJavaAttribute>();
+ this.specifiedAttributeContainerAdapter = new SpecifiedAttributeContainerAdapter();
+
+ initSpecifiedName();
+ initQualifiedName();
+ initSpecifiedAccessOrder();
+ initDefaultAccessOrder();
+ initSpecifiedAccessType();
+ initDefaultAccessType();
+ initSpecifiedAttributes();
}
@@ -49,6 +79,15 @@ public class OxmJavaTypeImpl return this.eJavaType;
}
+ @Override
+ protected JavaClass buildJavaType(JavaResourceType resourceType) {
+ return new GenericJavaJaxbClass(this, resourceType);
+ }
+
+ protected JaxbClassMapping getJavaClassMapping() {
+ return (this.javaType == null) ? null : this.javaType.getMapping();
+ }
+
// ***** sync/update *****
@@ -57,6 +96,17 @@ public class OxmJavaTypeImpl super.synchronizeWithResourceModel();
setSpecifiedName_(buildSpecifiedName());
setQualifiedName_(buildQualifiedName());
+ syncSpecifiedAccessOrder();
+ syncSpecifiedAccessType();
+ ContextContainerTools.synchronizeWithResourceModel(this.specifiedAttributeContainerAdapter);
+ }
+
+ @Override
+ public void update() {
+ super.update();
+ updateDefaultAccessOrder();
+ updateDefaultAccessType();
+ ContextContainerTools.update(this.specifiedAttributeContainerAdapter);
}
@@ -77,26 +127,231 @@ public class OxmJavaTypeImpl firePropertyChanged(SPECIFIED_NAME_PROPERTY, oldName, newName);
}
- protected String buildSpecifiedName() {
- return this.eJavaType.getName();
+ protected void initSpecifiedName() {
+ this.specifiedName = buildSpecifiedName();
}
- public String getQualifiedName() {
- return this.qualifiedName;
+ protected String buildSpecifiedName() {
+ return this.eJavaType.getName();
}
- protected void setQualifiedName_(String newName) {
- String oldName = this.qualifiedName;
- this.qualifiedName = newName;
- firePropertyChanged(QUALIFIED_NAME_PROPERTY, oldName, newName);
+ protected void initQualifiedName() {
+ this.qualifiedName = buildQualifiedName();
}
+ @Override
protected String buildQualifiedName() {
return getXmlBindings().getQualifiedName(this.specifiedName);
}
- public String getSimpleName() {
- return TypeDeclarationTools.simpleName(this.qualifiedName);
+
+ // ***** XmlAccessorOrder *****
+
+ public XmlAccessOrder getAccessOrder() {
+ return (this.specifiedAccessOrder != null) ? this.specifiedAccessOrder : this.defaultAccessOrder;
+ }
+
+ public XmlAccessOrder getDefaultAccessOrder() {
+ return this.defaultAccessOrder;
+ }
+
+ protected void setDefaultAccessOrder_(XmlAccessOrder accessOrder) {
+ XmlAccessOrder old = this.defaultAccessOrder;
+ this.defaultAccessOrder = accessOrder;
+ firePropertyChanged(DEFAULT_ACCESS_ORDER_PROPERTY, old, accessOrder);
+ }
+
+ public XmlAccessOrder getSpecifiedAccessOrder() {
+ return this.specifiedAccessOrder;
+ }
+
+ public void setSpecifiedAccessOrder(XmlAccessOrder accessOrder) {
+ this.eJavaType.setXmlAccessorOrder(ELXmlAccessOrder.toOxmResourceModel(accessOrder));
+ setSpecifiedAccessOrder_(accessOrder);
+ }
+
+ protected void setSpecifiedAccessOrder_(XmlAccessOrder accessOrder) {
+ XmlAccessOrder old = this.specifiedAccessOrder;
+ this.specifiedAccessOrder = accessOrder;
+ firePropertyChanged(SPECIFIED_ACCESS_ORDER_PROPERTY, old, accessOrder);
+ }
+
+ protected void initDefaultAccessOrder() {
+ this.defaultAccessOrder = buildDefaultAccessOrder();
+ }
+
+ protected void updateDefaultAccessOrder() {
+ setDefaultAccessOrder_(buildDefaultAccessOrder());
+ }
+
+ /**
+ * Default access order rules are TBD. For now we
+ * - check if specified on java class
+ * - if not, check if specified on xml bindings
+ * - if not, return UNDEFINED
+ */
+ protected XmlAccessOrder buildDefaultAccessOrder() {
+ XmlAccessOrder access;
+
+ // TODO
+// access = getSuperclassAccessOrder();
+// if (access != null) {
+// return access;
+// }
+
+ if (! getXmlBindings().isXmlMappingMetadataComplete()) {
+ JaxbClassMapping javaMapping = getJavaClassMapping();
+ if (javaMapping != null) {
+ access = javaMapping.getSpecifiedAccessOrder();
+ if (access != null) {
+ return access;
+ }
+ }
+ }
+ access = getXmlBindings().getSpecifiedAccessOrder();
+ if (access != null) {
+ return access;
+ }
+
+ return XmlAccessOrder.UNDEFINED;
+ }
+
+ protected void initSpecifiedAccessOrder() {
+ this.specifiedAccessOrder = buildSpecifiedAccessOrder();
+ }
+
+ protected void syncSpecifiedAccessOrder() {
+ setSpecifiedAccessOrder_(buildSpecifiedAccessOrder());
+ }
+
+ protected XmlAccessOrder buildSpecifiedAccessOrder() {
+ return ELXmlAccessOrder.fromOxmResourceModel(this.eJavaType.getXmlAccessorOrder());
+ }
+
+
+ // ***** XmlAccessorType *****
+
+ public XmlAccessType getAccessType() {
+ return (this.specifiedAccessType != null) ? this.specifiedAccessType : this.defaultAccessType;
+ }
+
+ public XmlAccessType getDefaultAccessType() {
+ return this.defaultAccessType;
+ }
+
+ protected void setDefaultAccessType_(XmlAccessType access) {
+ XmlAccessType old = this.defaultAccessType;
+ this.defaultAccessType = access;
+ firePropertyChanged(DEFAULT_ACCESS_TYPE_PROPERTY, old, access);
+ }
+
+ public XmlAccessType getSpecifiedAccessType() {
+ return this.specifiedAccessType;
+ }
+
+ public void setSpecifiedAccessType(XmlAccessType access) {
+ this.eJavaType.setXmlAccessorType(ELXmlAccessType.toOxmResourceModel(access));
+ setSpecifiedAccessType_(access);
+ }
+
+ protected void setSpecifiedAccessType_(XmlAccessType access) {
+ XmlAccessType old = this.specifiedAccessType;
+ this.specifiedAccessType = access;
+ firePropertyChanged(SPECIFIED_ACCESS_TYPE_PROPERTY, old, access);
+ }
+
+ protected void initDefaultAccessType() {
+ this.defaultAccessType = buildDefaultAccessType();
+ }
+
+ protected void updateDefaultAccessType() {
+ setDefaultAccessType_(buildDefaultAccessType());
+ }
+
+ /**
+ * Default access order rules are TBD. For now we
+ * - check if specified on java class
+ * - if not, check if specified on xml bindings
+ * - if not, return PUBLIC_MEMBER
+ */
+ protected XmlAccessType buildDefaultAccessType() {
+ XmlAccessType access;
+
+ // TODO
+// access = getSuperclassAccessType();
+// if (access != null) {
+// return access;
+// }
+
+ if (! getXmlBindings().isXmlMappingMetadataComplete()) {
+ JaxbClassMapping javaMapping = getJavaClassMapping();
+ if (javaMapping != null) {
+ access = javaMapping.getSpecifiedAccessType();
+ if (access != null) {
+ return access;
+ }
+ }
+ }
+
+ access = getXmlBindings().getSpecifiedAccessType();
+ if (access != null) {
+ return access;
+ }
+
+ return XmlAccessType.PUBLIC_MEMBER;
+ }
+
+ protected void initSpecifiedAccessType() {
+ this.specifiedAccessType = buildSpecifiedAccessType();
+ }
+
+ protected void syncSpecifiedAccessType() {
+ setSpecifiedAccessType_(buildSpecifiedAccessType());
+ }
+
+ protected XmlAccessType buildSpecifiedAccessType() {
+ return ELXmlAccessType.fromOxmResourceModel(this.eJavaType.getXmlAccessorType());
+ }
+
+
+ // ***** specified java attributes *****
+
+ public ListIterable<OxmJavaAttribute> getSpecifiedAttributes() {
+ return new LiveCloneListIterable<OxmJavaAttribute>(this.specifiedAttributes);
+ }
+
+ public int getSpecifiedAttributesSize() {
+ return this.specifiedAttributes.size();
+ }
+
+ protected void addSpecifiedAttribute_(int index, EJavaAttribute resourceAttribute) {
+ OxmJavaAttribute attribute = buildSpecifiedAttribute(resourceAttribute);
+ addItemToList(index, attribute, this.specifiedAttributes, SPECIFIED_ATTRIBUTES_LIST);
+ }
+
+ protected void removeSpecifiedAttribute_(OxmJavaAttribute attribute) {
+ this.removeItemFromList(attribute, this.specifiedAttributes, SPECIFIED_ATTRIBUTES_LIST);
+ }
+
+ protected void moveSpecifiedAttribute_(int index, OxmJavaAttribute attribute) {
+ moveItemInList(index, attribute, this.specifiedAttributes, SPECIFIED_ATTRIBUTES_LIST);
+ }
+
+ protected void initSpecifiedAttributes() {
+ for (EJavaAttribute eJavaAttribute : this.eJavaType.getJavaAttributes()) {
+ this.specifiedAttributes.add(buildSpecifiedAttribute(eJavaAttribute));
+ }
+ }
+
+ 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;
}
@@ -143,4 +398,36 @@ public class OxmJavaTypeImpl getNameTextRange()));
}
}
+
+
+ /**
+ * specified attribute container adapter
+ */
+ protected class SpecifiedAttributeContainerAdapter
+ implements ContextContainerTools.Adapter<OxmJavaAttribute, EJavaAttribute> {
+
+ public Iterable<OxmJavaAttribute> getContextElements() {
+ return OxmJavaTypeImpl.this.getSpecifiedAttributes();
+ }
+
+ public Iterable<EJavaAttribute> getResourceElements() {
+ return OxmJavaTypeImpl.this.eJavaType.getJavaAttributes();
+ }
+
+ public EJavaAttribute getResourceElement(OxmJavaAttribute contextElement) {
+ return contextElement.getEJavaAttribute();
+ }
+
+ public void addContextElement(int index, EJavaAttribute resourceElement) {
+ OxmJavaTypeImpl.this.addSpecifiedAttribute_(index, resourceElement);
+ }
+
+ public void removeContextElement(OxmJavaAttribute element) {
+ OxmJavaTypeImpl.this.removeSpecifiedAttribute_(element);
+ }
+
+ public void moveContextElement(int index, OxmJavaAttribute element) {
+ OxmJavaTypeImpl.this.moveSpecifiedAttribute_(index, element);
+ }
+ }
} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlBindingsImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlBindingsImpl.java index da2b3456cc..9cb08cc981 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlBindingsImpl.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlBindingsImpl.java @@ -17,9 +17,9 @@ import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.TypeDeclarationTools;
import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable;
import org.eclipse.jpt.common.utility.iterable.ListIterable;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder;
+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.ELXmlAccessOrder;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlAccessType;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmFile;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlBindings;
@@ -35,9 +35,9 @@ public class OxmXmlBindingsImpl protected EXmlBindings eXmlBindings; - protected ELXmlAccessType specifiedAccessType; + protected XmlAccessType specifiedAccessType; - protected ELXmlAccessOrder specifiedAccessOrder; + protected XmlAccessOrder specifiedAccessOrder; protected boolean xmlMappingMetadataComplete; @@ -85,60 +85,60 @@ public class OxmXmlBindingsImpl // ***** xml access type ***** - public ELXmlAccessType getAccessType() { + public XmlAccessType getAccessType() { return (this.specifiedAccessType != null) ? this.specifiedAccessType : getDefaultAccessType(); } - public ELXmlAccessType getDefaultAccessType() { - return ELXmlAccessType.PUBLIC_MEMBER; + public XmlAccessType getDefaultAccessType() { + return XmlAccessType.PUBLIC_MEMBER; } - public ELXmlAccessType getSpecifiedAccessType() { + public XmlAccessType getSpecifiedAccessType() { return this.specifiedAccessType; } - public void setSpecifiedAccessType(ELXmlAccessType newAccessType) { + public void setSpecifiedAccessType(XmlAccessType newAccessType) { this.eXmlBindings.setXmlAccessorType(ELXmlAccessType.toOxmResourceModel(newAccessType)); setSpecifiedAccessType_(newAccessType); } - protected void setSpecifiedAccessType_(ELXmlAccessType newAccessType) { - ELXmlAccessType oldAccessType = this.specifiedAccessType; + protected void setSpecifiedAccessType_(XmlAccessType newAccessType) { + XmlAccessType oldAccessType = this.specifiedAccessType; this.specifiedAccessType = newAccessType; firePropertyChanged(SPECIFIED_ACCESS_TYPE_PROPERTY, oldAccessType, newAccessType); } - protected ELXmlAccessType buildSpecifiedAccessType() { + protected XmlAccessType buildSpecifiedAccessType() {
return ELXmlAccessType.fromOxmResourceModel(this.eXmlBindings.getXmlAccessorType()); } // ***** xml access order ***** - public ELXmlAccessOrder getAccessOrder() { + public XmlAccessOrder getAccessOrder() { return (this.specifiedAccessOrder != null) ? this.specifiedAccessOrder : getDefaultAccessOrder(); } - public ELXmlAccessOrder getDefaultAccessOrder() { - return ELXmlAccessOrder.UNDEFINED; + public XmlAccessOrder getDefaultAccessOrder() { + return XmlAccessOrder.UNDEFINED; } - public ELXmlAccessOrder getSpecifiedAccessOrder() { + public XmlAccessOrder getSpecifiedAccessOrder() { return this.specifiedAccessOrder; } - public void setSpecifiedAccessOrder(ELXmlAccessOrder newAccessOrder) { + public void setSpecifiedAccessOrder(XmlAccessOrder newAccessOrder) { this.eXmlBindings.setXmlAccessorOrder(ELXmlAccessOrder.toOxmResourceModel(newAccessOrder)); setSpecifiedAccessOrder_(newAccessOrder); } - protected void setSpecifiedAccessOrder_(ELXmlAccessOrder newAccessOrder) { - ELXmlAccessOrder oldAccessOrder = this.specifiedAccessOrder; + protected void setSpecifiedAccessOrder_(XmlAccessOrder newAccessOrder) { + XmlAccessOrder oldAccessOrder = this.specifiedAccessOrder; this.specifiedAccessOrder = newAccessOrder; firePropertyChanged(SPECIFIED_ACCESS_ORDER_PROPERTY, oldAccessOrder, newAccessOrder); } - protected ELXmlAccessOrder buildSpecifiedAccessOrder() { + protected XmlAccessOrder buildSpecifiedAccessOrder() { return ELXmlAccessOrder.fromOxmResourceModel(this.eXmlBindings.getXmlAccessorOrder()); } 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 new file mode 100644 index 0000000000..88105ec401 --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java @@ -0,0 +1,14 @@ +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.context.oxm.OxmXmlElement; +import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement; + +public class OxmXmlElementImpl + extends AbstractOxmJavaAttribute<EXmlElement> + implements OxmXmlElement { + + public OxmXmlElementImpl(OxmJavaType parent, EXmlElement eJavaAttribute) { + super(parent, eJavaAttribute); + } +} 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 8a4b2d567a..da88f8a8c5 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 @@ -13,8 +13,6 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.jaxb.core.JaxbFactory; import org.eclipse.jpt.jaxb.core.JaxbProject; import org.eclipse.jpt.jaxb.core.JaxbProject.Config; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; @@ -28,6 +26,8 @@ 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.internal.AbstractJaxbFactory; import org.eclipse.jpt.jaxb.eclipselink.core.context.ELJaxbContextRoot; import org.eclipse.jpt.jaxb.eclipselink.core.internal.ELJaxbProjectImpl; @@ -98,7 +98,7 @@ public class ELJaxb_2_1_Factory } @Override - public JaxbClassMapping buildJaxbClassMapping(JaxbClass parent) { + public JavaClassMapping buildJavaClassMapping(JavaClass parent) { return new ELJavaClassMapping(parent); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/validation/ELJaxbValidationMessages.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/validation/ELJaxbValidationMessages.java index 18bd262d93..08eed434c8 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/validation/ELJaxbValidationMessages.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/validation/ELJaxbValidationMessages.java @@ -20,7 +20,8 @@ public interface ELJaxbValidationMessages { String PROJECT_MISSING_ECLIPSELINK_JAXB_CONTEXT_FACTORY = "PROJECT_MISSING_ECLIPSELINK_JAXB_CONTEXT_FACTORY"; // oxm file - String OXM_FILE__NO_PACKAGE = "OXM_FILE__NO_PACKAGE"; + String OXM_FILE__NO_PACKAGE_SPECIFIED = "OXM_FILE__NO_PACKAGE_SPECIFIED"; + String OXM_FILE__NO_SUCH_PACKAGE = "OXM_FILE__NO_SUCH_PACKAGE"; // oxm java type String OXM_JAVA_TYPE__NAME_NOT_SPECIFIED = "OXM_JAVA_TYPE__NAME_NOT_SPECIFIED"; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaAttribute.java index 2f203411ee..78b44cb3e9 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaAttribute.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaAttribute.java @@ -272,6 +272,12 @@ public abstract class EJavaAttribute extends EBaseObjectImpl implements EBaseObj }
+ // ***** misc *****
+
+ /** return the xml element name associated with this java attribute (e.g. "xml-transformation") */
+ public abstract String getElementName();
+
+
// ***** translators *****
static class JavaAttributesTranslator
@@ -414,5 +420,19 @@ public abstract class EJavaAttribute extends EBaseObjectImpl implements EBaseObj String domPathAndName, EStructuralFeature eStructuralFeature, Translator[] translatorChildren) {
super(Oxm.JAVA_ATTRIBUTES + "/" + domPathAndName, eStructuralFeature, translatorChildren);
}
+
+ protected static Translator buildJavaAttributeTranslator() {
+ return new Translator(
+ Oxm.JAVA_ATTRIBUTE,
+ OxmPackage.eINSTANCE.getEJavaAttribute_JavaAttribute(),
+ Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildXmlAccessorTypeTranslator() {
+ return new Translator(
+ Oxm.XML_ACCESSOR_TYPE,
+ OxmPackage.eINSTANCE.getEJavaAttribute_XmlAccessorType(),
+ Translator.DOM_ATTRIBUTE);
+ }
}
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java index bfde945c47..d4d170dc0d 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -625,6 +625,14 @@ public class EXmlAnyAttribute extends EJavaAttribute implements EAccessibleJavaA }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_ANY_ATTRIBUTE;
+ }
+
+
// ***** translators *****
static class XmlAnyAttributeTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java index e2a61c5938..916c18732e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -1002,6 +1002,14 @@ public class EXmlAnyElement extends EJavaAttribute implements EAccessibleJavaAtt }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_ANY_ELEMENT;
+ }
+
+
// ***** translators *****
static class XmlAnyElementTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java index c3b282095c..2466fc975c 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java @@ -1628,6 +1628,14 @@ public class EXmlAttribute extends EJavaAttribute implements EAccessibleJavaAttr }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_ATTRIBUTE;
+ }
+
+
// ***** translators *****
static class XmlAttributeTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java index c9156f3981..b99facf49a 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -1974,6 +1974,14 @@ public class EXmlElement extends EJavaAttribute implements EAccessibleJavaAttrib }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_ELEMENT;
+ }
+
+
// ***** translators *****
static class XmlElementTranslator
@@ -1985,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/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java index 87425ab555..56dfd393d5 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -1017,6 +1017,14 @@ public class EXmlElementRef extends EJavaAttribute implements EAccessibleJavaAtt }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_ELEMENT_REF;
+ }
+
+
// ***** translators *****
static class XmlElementRefTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java index af98164163..4b6f029350 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -769,6 +769,14 @@ public class EXmlElementRefs extends EJavaAttribute implements EAccessibleJavaAt }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_ELEMENT_REFS;
+ }
+
+
// ***** translators *****
static class XmlElementRefsTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java index dc61c43200..7141242c2b 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -865,6 +865,14 @@ public class EXmlElements extends EJavaAttribute implements EAccessibleJavaAttri }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_ELEMENTS;
+ }
+
+
// ***** translators *****
static class XmlElementsTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java index fdf90db7ac..c8ed2db4dd 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -558,6 +558,14 @@ public class EXmlInverseReference extends EJavaAttribute implements EAccessibleJ }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_INVERSE_REFERENCE;
+ }
+
+
// ***** translators *****
static class XmlInverseReferenceTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java index cc2c094037..e575d79970 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java @@ -327,6 +327,14 @@ public class EXmlJavaTypeAdapter extends EJavaAttribute }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_JAVA_TYPE_ADAPTER;
+ }
+
+
// ***** translators *****
static class XmlJavaTypeAdapterTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java index a72f279878..508d56d857 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -380,6 +380,14 @@ public class EXmlJoinNodes extends EJavaAttribute implements EContainerJavaAttri }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_JOIN_NODES;
+ }
+
+
// ***** translators *****
static class XmlJoinNodesTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java index 110a7278b9..53b3c2c2e7 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -524,6 +524,14 @@ public class EXmlTransformation extends EJavaAttribute implements EAccessibleJav }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_TRANSFORMATION;
+ }
+
+
// ***** translators *****
static class XmlTransformationTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java index f39adc6d70..7807557013 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java @@ -11,9 +11,9 @@ package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -195,6 +195,14 @@ public class EXmlTransient extends EJavaAttribute }
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_TRANSIENT;
+ }
+
+
// ***** translators *****
static class XmlTransientTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java index 66897da10f..3ca429ebd2 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java @@ -14,12 +14,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -883,8 +883,16 @@ public class EXmlValue extends EJavaAttribute implements EAccessibleJavaAttribut result.append(')');
return result.toString();
}
-
-
+
+
+ // ***** misc *****
+
+ @Override
+ public String getElementName() {
+ return Oxm.XML_VALUE;
+ }
+
+
// ***** translators *****
static class XmlValueTranslator
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/Oxm.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/Oxm.java index 8ac18a1153..40edffe396 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/Oxm.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/Oxm.java @@ -42,6 +42,7 @@ public interface Oxm { // Oxm specific nodes
+ String JAVA_ATTRIBUTE = "java-attribute"; //$NON-NLS-1$
String JAVA_ATTRIBUTES = "java-attributes"; //$NON-NLS-1$
String JAVA_TYPE = "java-type"; //$NON-NLS-1$
String JAVA_TYPES = "java-types"; //$NON-NLS-1$
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java index c3f90a0131..e7f9ffebc0 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java @@ -16,11 +16,9 @@ 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 -->
@@ -3704,17 +3702,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();
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java deleted file mode 100644 index c7ce432d68..0000000000 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java +++ /dev/null @@ -1,805 +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_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_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);
- case OxmPackage.EXML_SEE_ALSO:
- return validateEXmlSeeAlso((List<?>)value, diagnostics, context);
- default:
- return true;
- }
- }
-
- /**
- * <!-- 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 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;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlSeeAlso(List<?> eXmlSeeAlso, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- boolean result = validateEXmlSeeAlso_ItemType(eXmlSeeAlso, diagnostics, context);
- return result;
- }
-
- /**
- * Validates the ItemType constraint of '<em>EXml See Also</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateEXmlSeeAlso_ItemType(List<?> eXmlSeeAlso, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- boolean result = true;
- for (Iterator<?> i = eXmlSeeAlso.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.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 dd2f147da9..411d0351a6 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 @@ -14,9 +14,9 @@ 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.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; import org.eclipse.jpt.jaxb.eclipselink.ui.JptJaxbEclipseLinkUiImages; -import org.eclipse.jpt.jaxb.eclipselink.ui.internal.plugin.JptJaxbEclipseLinkUiPlugin; import org.eclipse.jpt.jaxb.ui.internal.jaxb21.GenericJaxb_2_1_NavigatorItemLabelProviderFactory; @@ -48,6 +48,9 @@ public class ELJaxbNavigatorItemLabelProviderFactory else if (item instanceof OxmJavaType) { return buildOxmJavaTypeLabelProvider((OxmJavaType) item, manager); } + else if (item instanceof OxmJavaAttribute) { + return buildOxmJavaAttributeLabelProvider((OxmJavaAttribute) item, manager); + } return super.buildProvider(item, manager); } @@ -76,7 +79,12 @@ public class ELJaxbNavigatorItemLabelProviderFactory } protected ItemExtendedLabelProvider buildOxmJavaTypeLabelProvider( - OxmJavaType oxmJavaType, ItemExtendedLabelProvider.Manager manager) { - return new OxmJavaTypeItemLabelProvider(oxmJavaType, manager); + OxmJavaType item, ItemExtendedLabelProvider.Manager manager) { + return new OxmJavaTypeItemLabelProvider(item, manager); + } + + protected ItemExtendedLabelProvider buildOxmJavaAttributeLabelProvider( + OxmJavaAttribute item, ItemExtendedLabelProvider.Manager manager) { + return new OxmJavaAttributeLabelProvider(item, manager); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorTreeItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorTreeItemContentProviderFactory.java index 95d349e0e9..1ab64083f1 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorTreeItemContentProviderFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorTreeItemContentProviderFactory.java @@ -14,6 +14,7 @@ import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider.Manager; import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
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.OxmJavaType;
import org.eclipse.jpt.jaxb.ui.internal.jaxb21.GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory;
public class ELJaxbNavigatorTreeItemContentProviderFactory
@@ -38,6 +39,9 @@ public class ELJaxbNavigatorTreeItemContentProviderFactory if (item instanceof OxmFile) {
return buildOxmFileContentProvider((OxmFile) item, manager);
}
+ else if (item instanceof OxmJavaType) {
+ return buildOxmJavaTypeContentProvider((OxmJavaType) item, manager);
+ }
return super.buildProvider(item, manager);
}
@@ -49,4 +53,8 @@ public class ELJaxbNavigatorTreeItemContentProviderFactory protected ItemTreeContentProvider buildOxmFileContentProvider(OxmFile item, Manager manager) {
return new OxmFileContentProvider(item, manager);
}
+
+ protected ItemTreeContentProvider buildOxmJavaTypeContentProvider(OxmJavaType item, Manager manager) {
+ return new OxmJavaTypeContentProvider(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 new file mode 100644 index 0000000000..96cfafa35d --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaAttributeLabelProvider.java @@ -0,0 +1,48 @@ +/*******************************************************************************
+ * 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.ui.internal.navigator; +
+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;
+ +public class OxmJavaAttributeLabelProvider
+ extends AbstractItemExtendedLabelProvider<OxmJavaAttribute> {
+
+ public OxmJavaAttributeLabelProvider(OxmJavaAttribute oxmJavaAttribute, ItemExtendedLabelProvider.Manager manager) {
+ super(oxmJavaAttribute, manager);
+ }
+
+
+ @Override
+ protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
+ // null for now
+ return new StaticPropertyValueModel(null);
+ }
+
+ @Override
+ protected PropertyValueModel<String> buildTextModel() {
+ return new PropertyAspectAdapter<OxmJavaAttribute, String>(OxmJavaAttribute.JAVA_ATTRIBUTE_NAME_PROPERTY, this.item) {
+ @Override
+ protected String buildValue_() {
+ return this.subject.getJavaAttributeName();
+ }
+ };
+ }
+
+ @Override
+ protected PropertyValueModel<String> buildDescriptionModel() {
+ return buildTextModel();
+ }
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaTypeContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaTypeContentProvider.java new file mode 100644 index 0000000000..d5c324e8f0 --- /dev/null +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaTypeContentProvider.java @@ -0,0 +1,48 @@ +/*******************************************************************************
+ * 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.ui.internal.navigator; +
+import org.eclipse.jpt.common.ui.internal.jface.AbstractItemTreeContentProvider;
+import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.ListCollectionValueModelAdapter;
+import org.eclipse.jpt.common.utility.iterable.ListIterable;
+import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaAttribute;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
+ +public class OxmJavaTypeContentProvider
+ extends AbstractItemTreeContentProvider<OxmJavaType, OxmJavaAttribute> {
+
+ public OxmJavaTypeContentProvider(OxmJavaType item, Manager manager) {
+ super(item, manager);
+ }
+
+
+ public Object getParent() {
+ return this.item.getParent();
+ }
+
+ @Override
+ protected CollectionValueModel<OxmJavaAttribute> buildChildrenModel() {
+ return new ListCollectionValueModelAdapter<OxmJavaAttribute>(
+ new ItemPropertyListValueModelAdapter<OxmJavaAttribute>(
+ new ListAspectAdapter<OxmJavaType, OxmJavaAttribute>(OxmJavaType.SPECIFIED_ATTRIBUTES_LIST, this.item) {
+ @Override
+ protected ListIterable<OxmJavaAttribute> getListIterable() {
+ return this.subject.getSpecifiedAttributes();
+ }
+ @Override
+ protected int size_() {
+ return this.subject.getSpecifiedAttributesSize();
+ }
+ }));
+ }
+} diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/commands/CreatePackageInfoCommandHandler.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/commands/CreatePackageInfoCommandHandler.java index b1958a6426..42bb24c3ab 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/commands/CreatePackageInfoCommandHandler.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/commands/CreatePackageInfoCommandHandler.java @@ -74,7 +74,7 @@ public class CreatePackageInfoCommandHandler private IPackageFragment getJdtPackage(JaxbPackage jaxbPackage) { return (IPackageFragment) IterableTools.get( - jaxbPackage.getContextRoot().getTypes(jaxbPackage), 0). + jaxbPackage.getContextRoot().getJavaTypes(jaxbPackage), 0). getJavaResourceType().getJavaResourceCompilationUnit().getCompilationUnit().getParent(); } } 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 82da87aa75..35401b8b1f 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 @@ -12,12 +12,12 @@ package org.eclipse.jpt.jaxb.ui.internal.jaxb21; import org.eclipse.jpt.common.ui.internal.jface.StaticItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; 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.ui.JptJaxbUiImages; import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages; @@ -49,11 +49,11 @@ public class GenericJaxb_2_1_NavigatorItemLabelProviderFactory else if (item instanceof JaxbPackage) { return this.buildJaxbPackageProvider((JaxbPackage) item, manager); } - else if (item instanceof JaxbClass) { - return new JaxbClassItemLabelProvider((JaxbClass) item, manager); + else if (item instanceof JavaClass) { + return new JaxbClassItemLabelProvider((JavaClass) item, manager); } - else if (item instanceof JaxbEnum) { - return new JaxbEnumItemLabelProvider((JaxbEnum) item, manager); + else if (item instanceof JavaEnum) { + return new JaxbEnumItemLabelProvider((JavaEnum) item, manager); } else if (item instanceof JaxbPersistentAttribute) { return new JaxbPersistentAttributeItemLabelProvider((JaxbPersistentAttribute) item, manager); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java index 52c3fa79e9..54d6bdd360 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java @@ -12,10 +12,10 @@ package org.eclipse.jpt.jaxb.ui.internal.jaxb21; import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider; import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider.Manager; import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnum; /** * @@ -45,11 +45,11 @@ public class GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory if (item instanceof JaxbPackage) { return this.buildJaxbPackageProvider((JaxbPackage) item, manager); } - if (item instanceof JaxbClass) { - return this.buildJaxbClassProvider((JaxbClass) item, manager); + if (item instanceof JavaClass) { + return this.buildJaxbClassProvider((JavaClass) item, manager); } - if (item instanceof JaxbEnum) { - return this.buildJaxbEnumProvider((JaxbEnum) item, manager); + if (item instanceof JavaEnum) { + return this.buildJaxbEnumProvider((JavaEnum) item, manager); } return null; } @@ -62,11 +62,11 @@ public class GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory return new JaxbPackageItemContentProvider(item, manager); } - protected ItemTreeContentProvider buildJaxbClassProvider(JaxbClass item, Manager manager) { + protected ItemTreeContentProvider buildJaxbClassProvider(JavaClass item, Manager manager) { return new JaxbClassItemContentProvider(item, manager); } - protected ItemTreeContentProvider buildJaxbEnumProvider(JaxbEnum item, Manager manager) { + protected ItemTreeContentProvider buildJaxbEnumProvider(JavaEnum item, Manager manager) { return new JaxbEnumItemContentProvider(item, manager); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemContentProvider.java index c0f7861863..e2eb7021ae 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemContentProvider.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemContentProvider.java @@ -15,17 +15,17 @@ import org.eclipse.jpt.common.utility.internal.model.value.CompositeCollectionVa import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.CollectionValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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; public class JaxbClassItemContentProvider - extends AbstractItemTreeContentProvider<JaxbClass, JaxbPersistentAttribute> + extends AbstractItemTreeContentProvider<JavaClass, JaxbPersistentAttribute> { - public JaxbClassItemContentProvider(JaxbClass jaxbClass, Manager manager) { + public JaxbClassItemContentProvider(JavaClass jaxbClass, Manager manager) { super(jaxbClass, manager); } @@ -36,25 +36,25 @@ public class JaxbClassItemContentProvider @Override protected CollectionValueModel<JaxbPersistentAttribute> buildChildrenModel() { - PropertyValueModel<JaxbClassMapping> mappingModel = buildMappingModel(); + PropertyValueModel<JavaClassMapping> mappingModel = buildMappingModel(); return CompositeCollectionValueModel.forModels( buildAttributesModel(mappingModel), buildIncludedAttributesModel(mappingModel)); } - protected PropertyValueModel<JaxbClassMapping> buildMappingModel() { - return new PropertyAspectAdapter<JaxbClass, JaxbClassMapping>(JaxbClass.MAPPING_PROPERTY, this.item) { + protected PropertyValueModel<JavaClassMapping> buildMappingModel() { + return new PropertyAspectAdapter<JavaClass, JavaClassMapping>(JavaClass.MAPPING_PROPERTY, this.item) { @Override - protected JaxbClassMapping buildValue_() { + protected JavaClassMapping buildValue_() { return this.subject.getMapping(); } }; } protected CollectionValueModel<JaxbPersistentAttribute> buildAttributesModel( - PropertyValueModel<JaxbClassMapping> mappingModel) { - return new CollectionAspectAdapter<JaxbClassMapping, JaxbPersistentAttribute>( - mappingModel, JaxbClassMapping.ATTRIBUTES_COLLECTION) { + PropertyValueModel<JavaClassMapping> mappingModel) { + return new CollectionAspectAdapter<JavaClassMapping, JaxbPersistentAttribute>( + mappingModel, JavaClassMapping.ATTRIBUTES_COLLECTION) { @Override protected Iterable<JaxbPersistentAttribute> getIterable() { return this.subject.getAttributes(); @@ -63,9 +63,9 @@ public class JaxbClassItemContentProvider } protected CollectionValueModel<JaxbPersistentAttribute> buildIncludedAttributesModel( - PropertyValueModel<JaxbClassMapping> mappingModel) { - return new CollectionAspectAdapter<JaxbClassMapping, JaxbPersistentAttribute>( - mappingModel, JaxbClassMapping.INCLUDED_ATTRIBUTES_COLLECTION) { + PropertyValueModel<JavaClassMapping> mappingModel) { + return new CollectionAspectAdapter<JavaClassMapping, JaxbPersistentAttribute>( + mappingModel, JavaClassMapping.INCLUDED_ATTRIBUTES_COLLECTION) { @Override protected Iterable<JaxbPersistentAttribute> getIterable() { return this.subject.getIncludedAttributes(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemLabelProvider.java index 6570d9a396..6e1d9f4a93 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemLabelProvider.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemLabelProvider.java @@ -17,19 +17,19 @@ import org.eclipse.jpt.common.utility.internal.model.value.StaticPropertyValueMo import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; -import org.eclipse.jpt.jaxb.core.context.JaxbType; import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages; public class JaxbClassItemLabelProvider - extends JaxbTypeItemLabelProvider<JaxbClass> + extends JaxbTypeItemLabelProvider<JavaClass> { - public JaxbClassItemLabelProvider(JaxbClass jaxbPersistentClass, ItemExtendedLabelProvider.Manager manager) { - super(jaxbPersistentClass, manager); + public JaxbClassItemLabelProvider(JavaClass jaxbClass, ItemExtendedLabelProvider.Manager manager) { + super(jaxbClass, manager); } @Override @@ -39,7 +39,7 @@ public class JaxbClassItemLabelProvider protected class JaxbClassImageDescriptorModel - extends AspectPropertyValueModelAdapter<JaxbClass, ImageDescriptor> { + extends AspectPropertyValueModelAdapter<JavaClass, ImageDescriptor> { protected final PropertyValueModel<Boolean> isXmlRegistryModel; @@ -50,8 +50,8 @@ public class JaxbClassItemLabelProvider protected final PropertyChangeListener propertyChangeListener; - public JaxbClassImageDescriptorModel(JaxbClass subject) { - super(new StaticPropertyValueModel<JaxbClass>(subject)); + public JaxbClassImageDescriptorModel(JavaClass subject) { + super(new StaticPropertyValueModel<JavaClass>(subject)); this.isXmlRegistryModel = buildIsXmlRegistryModel(); this.mappingModel = buildMappingModel(); this.isXmlTransientModel = buildIsXmlTransientModel(); @@ -60,7 +60,7 @@ public class JaxbClassItemLabelProvider protected PropertyValueModel<Boolean> buildIsXmlRegistryModel() { - return new PropertyAspectAdapter<JaxbClass, Boolean>(JaxbClass.XML_REGISTRY_PROPERTY, JaxbClassItemLabelProvider.this.item) { + return new PropertyAspectAdapter<JavaClass, Boolean>(JavaClass.XML_REGISTRY_PROPERTY, JaxbClassItemLabelProvider.this.item) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getXmlRegistry() != null); @@ -69,7 +69,7 @@ public class JaxbClassItemLabelProvider } protected PropertyValueModel<JaxbClassMapping> buildMappingModel() { - return new PropertyAspectAdapter<JaxbClass, JaxbClassMapping> (JaxbType.MAPPING_PROPERTY, JaxbClassItemLabelProvider.this.item) { + return new PropertyAspectAdapter<JavaClass, JaxbClassMapping> (JavaType.MAPPING_PROPERTY, JaxbClassItemLabelProvider.this.item) { @Override protected JaxbClassMapping buildValue_() { return this.subject.getMapping(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemContentProvider.java index 9c25e9a1da..670e3a8870 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemContentProvider.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemContentProvider.java @@ -15,16 +15,16 @@ import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter import org.eclipse.jpt.common.utility.model.value.CollectionValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant; import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping; -import org.eclipse.jpt.jaxb.core.context.JaxbType; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnum; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; public class JaxbEnumItemContentProvider - extends AbstractItemTreeContentProvider<JaxbEnum, JaxbEnumConstant> { + extends AbstractItemTreeContentProvider<JavaEnum, JaxbEnumConstant> { - public JaxbEnumItemContentProvider(JaxbEnum jaxbEnum, Manager manager) { + public JaxbEnumItemContentProvider(JavaEnum jaxbEnum, Manager manager) { super(jaxbEnum, manager); } @@ -34,7 +34,7 @@ public class JaxbEnumItemContentProvider } protected PropertyValueModel<JaxbEnumMapping> buildMappingModel() { - return new PropertyAspectAdapter<JaxbEnum, JaxbEnumMapping>(JaxbType.MAPPING_PROPERTY, this.item) { + return new PropertyAspectAdapter<JavaEnum, JaxbEnumMapping>(JavaType.MAPPING_PROPERTY, this.item) { @Override protected JaxbEnumMapping buildValue_() { return this.subject.getMapping(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemLabelProvider.java index 8eb8e7011b..0921ca4ddc 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemLabelProvider.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemLabelProvider.java @@ -17,17 +17,16 @@ import org.eclipse.jpt.common.utility.internal.model.value.StaticPropertyValueMo import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping; -import org.eclipse.jpt.jaxb.core.context.JaxbType; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnum; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages; public class JaxbEnumItemLabelProvider - extends JaxbTypeItemLabelProvider<JaxbEnum> -{ + extends JaxbTypeItemLabelProvider<JavaEnum> { - public JaxbEnumItemLabelProvider(JaxbEnum jaxbEnum, ItemExtendedLabelProvider.Manager manager) { + public JaxbEnumItemLabelProvider(JavaEnum jaxbEnum, ItemExtendedLabelProvider.Manager manager) { super(jaxbEnum, manager); } @@ -38,7 +37,7 @@ public class JaxbEnumItemLabelProvider protected class JaxbEnumImageDescriptorModel - extends AspectPropertyValueModelAdapter<JaxbEnum, ImageDescriptor> { + extends AspectPropertyValueModelAdapter<JavaEnum, ImageDescriptor> { protected final PropertyValueModel<JaxbEnumMapping> mappingModel; @@ -47,8 +46,8 @@ public class JaxbEnumItemLabelProvider protected final PropertyChangeListener propertyChangeListener; - public JaxbEnumImageDescriptorModel(JaxbEnum subject) { - super(new StaticPropertyValueModel<JaxbEnum>(subject)); + public JaxbEnumImageDescriptorModel(JavaEnum subject) { + super(new StaticPropertyValueModel<JavaEnum>(subject)); this.mappingModel = buildMappingModel(); this.isXmlTransientModel = buildIsXmlTransientModel(); this.propertyChangeListener = buildPropertyChangeListener(); @@ -56,7 +55,7 @@ public class JaxbEnumItemLabelProvider protected PropertyValueModel<JaxbEnumMapping> buildMappingModel() { - return new PropertyAspectAdapter<JaxbEnum, JaxbEnumMapping> (JaxbType.MAPPING_PROPERTY, JaxbEnumItemLabelProvider.this.item) { + return new PropertyAspectAdapter<JavaEnum, JaxbEnumMapping> (JavaType.MAPPING_PROPERTY, JaxbEnumItemLabelProvider.this.item) { @Override protected JaxbEnumMapping buildValue_() { return this.subject.getMapping(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java index c7197693d8..f4fe0bfa50 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java @@ -33,10 +33,10 @@ public class JaxbPackageItemContentProvider @Override protected CollectionValueModel<JaxbContextNode> buildChildrenModel() { return new CollectionAspectAdapter<JaxbContextRoot, JaxbContextNode>( - JaxbContextRoot.TYPES_COLLECTION, getParent()) { + JaxbContextRoot.JAVA_TYPES_COLLECTION, getParent()) { @Override protected Iterable<JaxbContextNode> getIterable() { - return new SuperIterableWrapper(this.subject.getTypes(JaxbPackageItemContentProvider.this.item)); + return new SuperIterableWrapper(this.subject.getJavaTypes(JaxbPackageItemContentProvider.this.item)); } }; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java index 254717e202..6bc81940d3 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java @@ -11,12 +11,12 @@ package org.eclipse.jpt.jaxb.ui.internal.jaxb21; import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider; -import org.eclipse.jpt.jaxb.core.context.JaxbType; +import org.eclipse.jpt.jaxb.core.context.java.JavaType; -public abstract class JaxbTypeItemLabelProvider<I extends JaxbType> - extends AbstractItemExtendedLabelProvider<I> -{ +public abstract class JaxbTypeItemLabelProvider<I extends JavaType> + extends AbstractItemExtendedLabelProvider<I> { + protected final String text; protected final String description; @@ -32,7 +32,7 @@ public abstract class JaxbTypeItemLabelProvider<I extends JaxbType> } protected String buildText() { - return this.item.getTypeQualifiedName(); + return this.item.getTypeName().getTypeQualifiedName(); } @Override @@ -42,7 +42,7 @@ public abstract class JaxbTypeItemLabelProvider<I extends JaxbType> protected String buildDescription() { StringBuilder sb = new StringBuilder(); - sb.append(this.item.getFullyQualifiedName()); + sb.append(this.item.getTypeName().getFullyQualifiedName()); sb.append(" - "); //$NON-NLS-1$ sb.append(this.item.getResource().getFullPath().makeRelative()); return sb.toString(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java index 401a2216b7..8a2845c93e 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java @@ -34,10 +34,10 @@ import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; -import org.eclipse.jpt.jaxb.core.context.JaxbType; +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.JavaType; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; @@ -193,15 +193,15 @@ public class GenericContextRootTests public void testGetRegistries() throws Exception { createClassWithXmlRegistry(); - Iterable<JaxbType> types = getContextRoot().getTypes(); + Iterable<JavaType> types = getContextRoot().getJavaTypes(); assertEquals(1, IterableTools.size(types)); - assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry()); + assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry()); //add an unannotated class and make sure it's not added to the context root createUnannotatedClassNamed("Foo"); - types = getContextRoot().getTypes(); + types = getContextRoot().getJavaTypes(); assertEquals(1, IterableTools.size(types)); - assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry()); + assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry()); //annotate the class with @XmlRegistry and test it's added to the root context node JavaResourceAbstractType fooResourceType = getJaxbProject().getJavaResourceType("test.Foo"); @@ -213,10 +213,10 @@ public class GenericContextRootTests } }); - types = getContextRoot().getTypes(); + types = getContextRoot().getJavaTypes(); assertEquals(2, IterableTools.size(types)); - assertNotNull(((JaxbClass) getContextRoot().getType("test.Foo")).getXmlRegistry()); - assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry()); + assertNotNull(((JavaClass) getContextRoot().getJavaType("test.Foo")).getXmlRegistry()); + assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry()); //remove the annotation from the class and test it's removed from the context root annotatedElement.edit( @@ -226,20 +226,20 @@ public class GenericContextRootTests } }); - types = getContextRoot().getTypes(); + types = getContextRoot().getJavaTypes(); assertEquals(1, IterableTools.size(types)); - assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry()); + assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry()); } public void testGetTypes() throws Exception { createClassWithXmlType(); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); //add an unannotated class and make sure it's not added to the context root createUnannotatedClassNamed("Foo"); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); //annotate the class with @XmlType and test it's added to the context root JavaResourceAbstractType fooResourceType = getJaxbProject().getJavaResourceType("test.Foo"); @@ -251,9 +251,9 @@ public class GenericContextRootTests } }); - assertEquals(2, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); - assertNotNull(((JaxbClass) getContextRoot().getType("test.Foo"))); + assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNotNull(((JavaClass) getContextRoot().getJavaType("test.Foo"))); //remove the annotation from the class and test it's removed from the root context node annotatedElement.edit( @@ -263,21 +263,21 @@ public class GenericContextRootTests } }); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); - assertNull(((JaxbClass) getContextRoot().getType("test.Foo"))); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNull(((JavaClass) getContextRoot().getJavaType("test.Foo"))); } public void testGetTypes2() throws Exception { createEnumWithXmlType(); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(((JaxbEnum) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(((JavaEnum) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); //add an unannotated class and make sure it's not added to the context root createUnannotatedEnumNamed("Foo"); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(((JaxbEnum) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); - assertNull(((JaxbEnum) getContextRoot().getType("test.Foo"))); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(((JavaEnum) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNull(((JavaEnum) getContextRoot().getJavaType("test.Foo"))); //annotate the class with @XmlEnum and test it's added to the context root JavaResourceEnum fooResourceType = (JavaResourceEnum) getJaxbProject().getJavaResourceType("test.Foo", JavaResourceAbstractType.Kind.ENUM); @@ -289,9 +289,9 @@ public class GenericContextRootTests } }); - assertEquals(2, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(((JaxbEnum) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); - assertNotNull(((JaxbEnum) getContextRoot().getType("test.Foo"))); + assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(((JavaEnum) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNotNull(((JavaEnum) getContextRoot().getJavaType("test.Foo"))); //remove the annotation from the class and test it's removed from the root context node annotatedElement.edit( @@ -301,9 +301,9 @@ public class GenericContextRootTests } }); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(((JaxbEnum) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); - assertNull(((JaxbEnum) getContextRoot().getType("test.Foo"))); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(((JavaEnum) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNull(((JavaEnum) getContextRoot().getJavaType("test.Foo"))); } public void testDirectReferencedSuperclass() throws Exception { @@ -312,21 +312,21 @@ public class GenericContextRootTests createUnannotatedClassNamed(superclassName); // make sure unannotated superclass is not in context - assertTrue(IterableTools.isEmpty(getContextRoot().getTypes())); + assertTrue(IterableTools.isEmpty(getContextRoot().getJavaTypes())); createClassWithXmlTypeAndSuperclassNamed(superclassName); - assertEquals(2, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); - assertNotNull(((JaxbClass) getContextRoot().getType(fqSuperclassName))); + assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNotNull(((JavaClass) getContextRoot().getJavaType(fqSuperclassName))); // remove annotated class - both classes removed from context - IFile file = (IFile) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME).getResource(); + IFile file = (IFile) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME).getResource(); file.delete(true, null); - assertTrue(IterableTools.isEmpty(getContextRoot().getTypes())); - assertNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME))); - assertNull(((JaxbClass) getContextRoot().getType(fqSuperclassName))); + assertTrue(IterableTools.isEmpty(getContextRoot().getJavaTypes())); + assertNull(((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME))); + assertNull(((JavaClass) getContextRoot().getJavaType(fqSuperclassName))); } public void testDirectReferencedAttribute() throws Exception { @@ -336,16 +336,16 @@ public class GenericContextRootTests createUnannotatedClassNamed(otherClassName); // make sure unannotated other class is not in context - assertTrue(IterableTools.isEmpty(getContextRoot().getTypes())); + assertTrue(IterableTools.isEmpty(getContextRoot().getJavaTypes())); createClassWithXmlTypeAndAttribute(attributeName, otherClassName); JavaResourceType thisType = (JavaResourceType) getJaxbProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME); JavaResourceAttribute attribute = getFieldNamed(thisType, attributeName); AnnotatedElement annotatedAttribute = annotatedElement(attribute); - assertEquals(2, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNotNull(getContextRoot().getType(fqOtherClassName)); + assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName)); // add an @XmlElement annotatedAttribute.edit( @@ -355,9 +355,9 @@ public class GenericContextRootTests } }); - assertEquals(2, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNotNull(getContextRoot().getType(fqOtherClassName)); + assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName)); // change to @XmlTransient annotatedAttribute.edit( @@ -368,9 +368,9 @@ public class GenericContextRootTests } }); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNull(getContextRoot().getType(fqOtherClassName)); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNull(getContextRoot().getJavaType(fqOtherClassName)); } public void testDirectReferencedListAttribute() throws Exception { @@ -380,16 +380,16 @@ public class GenericContextRootTests createUnannotatedClassNamed(otherClassName); // make sure unannotated other class is not in context - assertTrue(IterableTools.isEmpty(getContextRoot().getTypes())); + assertTrue(IterableTools.isEmpty(getContextRoot().getJavaTypes())); createClassWithXmlTypeAndListAttribute(attributeName, otherClassName); JavaResourceType thisType = (JavaResourceType) getJaxbProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME); JavaResourceAttribute attribute = getFieldNamed(thisType, attributeName); AnnotatedElement annotatedAttribute = annotatedElement(attribute); - assertEquals(2, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNotNull(getContextRoot().getType(fqOtherClassName)); + assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName)); // add an @XmlElement annotatedAttribute.edit( @@ -399,9 +399,9 @@ public class GenericContextRootTests } }); - assertEquals(2, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNotNull(getContextRoot().getType(fqOtherClassName)); + assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName)); // change to @XmlTransient annotatedAttribute.edit( @@ -412,9 +412,9 @@ public class GenericContextRootTests } }); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNull(getContextRoot().getType(fqOtherClassName)); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNull(getContextRoot().getJavaType(fqOtherClassName)); } public void testDirectReferencedSeeAlso() throws Exception { @@ -426,15 +426,15 @@ public class GenericContextRootTests createUnannotatedClassNamed(otherClassName2); // make sure unannotated other classes are not in context - assertTrue(IterableTools.isEmpty(getContextRoot().getTypes())); + assertTrue(IterableTools.isEmpty(getContextRoot().getJavaTypes())); createClassWithXmlType(); JavaResourceType thisType = (JavaResourceType) getJaxbProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME); AnnotatedElement annotatedType = annotatedElement(thisType); // make sure unannotated other classes are not in context - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); // add an @XmlSeeAlso with one class annotatedType.edit( @@ -444,9 +444,9 @@ public class GenericContextRootTests } }); - assertEquals(2, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNotNull(getContextRoot().getType(fqOtherClassName)); + assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName)); // change to @XmlSeeAlso with two classes annotatedType.edit( @@ -457,10 +457,10 @@ public class GenericContextRootTests } }); - assertEquals(3, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNotNull(getContextRoot().getType(fqOtherClassName)); - assertNotNull(getContextRoot().getType(fqOtherClassName2)); + assertEquals(3, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName2)); // remove the @XmlSeeAlso annotation annotatedType.edit( @@ -470,8 +470,8 @@ public class GenericContextRootTests } }); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); } public void testJaxbIndex() throws Exception { @@ -483,35 +483,35 @@ public class GenericContextRootTests createUnannotatedClassNamed(otherClassName2); // make sure unannotated other classes are not in context - assertTrue(IterableTools.isEmpty(getContextRoot().getTypes())); + assertTrue(IterableTools.isEmpty(getContextRoot().getJavaTypes())); createClassWithXmlType(); // make sure unannotated other classes are not in context - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); // add a jaxb.index with one class IFile jaxbIndex = getJavaProject().getProject().getFile(new Path("src/test/jaxb.index")); InputStream stream = new ByteArrayInputStream(otherClassName.getBytes()); jaxbIndex.create(stream, true, null); - assertEquals(2, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNotNull(getContextRoot().getType(fqOtherClassName)); + assertEquals(2, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName)); // change to jaxb.index with two classes jaxbIndex.setContents(new ByteArrayInputStream((otherClassName + CR + otherClassName2).getBytes()), true, false, null); - assertEquals(3, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); - assertNotNull(getContextRoot().getType(fqOtherClassName)); - assertNotNull(getContextRoot().getType(fqOtherClassName2)); + assertEquals(3, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName)); + assertNotNull(getContextRoot().getJavaType(fqOtherClassName2)); // clear the jaxb.index jaxbIndex.setContents(new ByteArrayInputStream(new byte[0]), true, false, null); - assertEquals(1, IterableTools.size(getContextRoot().getTypes())); - assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)); + assertEquals(1, IterableTools.size(getContextRoot().getJavaTypes())); + assertNotNull(getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME)); } } diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java index 1b39983480..47725c82c2 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java @@ -19,10 +19,10 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -57,8 +57,8 @@ public class GenericJavaAttributeXmlJavaTypeAdapterTests extends JaxbContextMode public void testModifyValue() throws Exception { createClassWithXmlTypeAndAttributeXmlJavaTypeAdapter(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlAttributeMapping attributeMapping = (XmlAttributeMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlJavaTypeAdapter contextXmlJavaTypeAdapter = attributeMapping.getXmlJavaTypeAdapter(); JavaResourceAttribute resourceAttribute = attributeMapping.getJavaResourceAttribute(); @@ -80,8 +80,8 @@ public class GenericJavaAttributeXmlJavaTypeAdapterTests extends JaxbContextMode public void testUpdateValue() throws Exception { createClassWithXmlTypeAndAttributeXmlJavaTypeAdapter(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlAttributeMapping attributeMapping = (XmlAttributeMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlJavaTypeAdapter contextXmlJavaTypeAdapter = attributeMapping.getXmlJavaTypeAdapter(); JavaResourceAttribute resourceAttribute = attributeMapping.getJavaResourceAttribute(); @@ -108,8 +108,8 @@ public class GenericJavaAttributeXmlJavaTypeAdapterTests extends JaxbContextMode public void testModifyType() throws Exception { createClassWithXmlTypeAndAttributeXmlJavaTypeAdapter(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlAttributeMapping attributeMapping = (XmlAttributeMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlJavaTypeAdapter contextXmlJavaTypeAdapter = attributeMapping.getXmlJavaTypeAdapter(); JavaResourceAttribute resourceAttribute = attributeMapping.getJavaResourceAttribute(); @@ -135,8 +135,8 @@ public class GenericJavaAttributeXmlJavaTypeAdapterTests extends JaxbContextMode public void testUpdateType() throws Exception { createClassWithXmlTypeAndAttributeXmlJavaTypeAdapter(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlAttributeMapping attributeMapping = (XmlAttributeMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlJavaTypeAdapter contextXmlJavaTypeAdapter = attributeMapping.getXmlJavaTypeAdapter(); JavaResourceAttribute resourceAttribute = attributeMapping.getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java index 14976a1bc8..935b6520a9 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java @@ -34,12 +34,12 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder; 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.JavaClassMapping; import org.eclipse.jpt.jaxb.core.internal.context.java.PropertyAccessor; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorOrderAnnotation; @@ -263,8 +263,8 @@ public class GenericJavaClassMappingTests public void testModifyFactoryClass() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertNull(classMapping.getSpecifiedFactoryClass()); @@ -295,8 +295,8 @@ public class GenericJavaClassMappingTests public void testUpdateFactoryClass() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertNull(classMapping.getSpecifiedFactoryClass()); @@ -325,8 +325,8 @@ public class GenericJavaClassMappingTests public void testModifyFactoryMethod() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertNull(classMapping.getFactoryMethod()); @@ -355,8 +355,8 @@ public class GenericJavaClassMappingTests public void testUpdateFactoryMethod() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertNull(classMapping.getFactoryMethod()); @@ -383,8 +383,8 @@ public class GenericJavaClassMappingTests public void testModifySchemaTypeName() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME); @@ -419,8 +419,8 @@ public class GenericJavaClassMappingTests public void testUpdateSchemaTypeName() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME); @@ -452,8 +452,8 @@ public class GenericJavaClassMappingTests public void testModifyNamespace() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertNull(classMapping.getQName().getSpecifiedNamespace()); @@ -487,8 +487,8 @@ public class GenericJavaClassMappingTests public void testUpdateNamespace() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertNull(classMapping.getQName().getSpecifiedNamespace()); @@ -519,8 +519,8 @@ public class GenericJavaClassMappingTests public void testModifyAccessType() throws Exception { createXmlTypeWithAccessorType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertEquals(XmlAccessType.PROPERTY, classMapping.getSpecifiedAccessType()); @@ -551,8 +551,8 @@ public class GenericJavaClassMappingTests public void testUpdateAccessType() throws Exception { createXmlTypeWithAccessorType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertEquals(XmlAccessType.PROPERTY, classMapping.getSpecifiedAccessType()); @@ -603,10 +603,10 @@ public class GenericJavaClassMappingTests createClassWithXmlType(); createTestSubType(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME); - JaxbClassMapping classMapping = jaxbClass.getMapping(); - JaxbClass childJaxbClass = (JaxbClass) getContextRoot().getType("test.AnnotationTestTypeChild"); - JaxbClassMapping childClassMapping = childJaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME); + JavaClassMapping classMapping = jaxbClass.getMapping(); + JavaClass childJaxbClass = (JavaClass) getContextRoot().getJavaType("test.AnnotationTestTypeChild"); + JavaClassMapping childClassMapping = childJaxbClass.getMapping(); assertEquals(XmlAccessType.PUBLIC_MEMBER, childClassMapping.getDefaultAccessType()); @@ -633,10 +633,10 @@ public class GenericJavaClassMappingTests createClassWithXmlType(); createTestSubType(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME); - JaxbClassMapping classMapping = jaxbClass.getMapping(); - JaxbClass childJaxbClass = (JaxbClass) getContextRoot().getType("test.AnnotationTestTypeChild"); - JaxbClassMapping childClassMapping = childJaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME); + JavaClassMapping classMapping = jaxbClass.getMapping(); + JavaClass childJaxbClass = (JavaClass) getContextRoot().getJavaType("test.AnnotationTestTypeChild"); + JavaClassMapping childClassMapping = childJaxbClass.getMapping(); assertEquals(classMapping, childClassMapping.getSuperclass()); @@ -653,8 +653,8 @@ public class GenericJavaClassMappingTests public void testModifyAccessOrder() throws Exception { createXmlTypeWithAccessorOrder(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertEquals(XmlAccessOrder.ALPHABETICAL, classMapping.getSpecifiedAccessOrder()); @@ -677,8 +677,8 @@ public class GenericJavaClassMappingTests public void testUpdateAccessOrder() throws Exception { createXmlTypeWithAccessorOrder(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertEquals(XmlAccessOrder.ALPHABETICAL, classMapping.getSpecifiedAccessOrder()); @@ -707,8 +707,8 @@ public class GenericJavaClassMappingTests public void testGetPropOrder() throws Exception { this.createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); ListIterator<String> props = classMapping.getPropOrder().iterator(); @@ -736,8 +736,8 @@ public class GenericJavaClassMappingTests public void testGetPropOrderSize() throws Exception { this.createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertEquals(0, classMapping.getPropOrderSize()); @@ -756,8 +756,8 @@ public class GenericJavaClassMappingTests public void testAddProp() throws Exception { this.createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); classMapping.addProp(0, "bar"); @@ -776,8 +776,8 @@ public class GenericJavaClassMappingTests public void testAddProp2() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); classMapping.addProp(0, "bar"); @@ -796,8 +796,8 @@ public class GenericJavaClassMappingTests public void testRemoveProp() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); classMapping.addProp(0, "bar"); @@ -826,8 +826,8 @@ public class GenericJavaClassMappingTests public void testMoveProp() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); classMapping.addProp(0, "bar"); @@ -866,8 +866,8 @@ public class GenericJavaClassMappingTests public void testSyncProps() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); ListIterator<String> props = classMapping.getPropOrder().iterator(); @@ -980,8 +980,8 @@ public class GenericJavaClassMappingTests public void testModifyXmlRootElement() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertNull(classMapping.getXmlRootElement()); @@ -1000,8 +1000,8 @@ public class GenericJavaClassMappingTests public void testUpdateXmlRootElement() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); assertNull(classMapping.getXmlRootElement()); @@ -1028,8 +1028,8 @@ public class GenericJavaClassMappingTests public void testUpdateFieldAttributes() throws Exception { this.createTestXmlTypeWithFieldAndPublicMemberAccess(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); //public int foo; publicFieldTest(classMapping); @@ -1061,7 +1061,7 @@ public class GenericJavaClassMappingTests privateStaticFinalFieldTest(classMapping); } - protected void publicFieldTest(JaxbClassMapping classMapping) { + protected void publicFieldTest(JavaClassMapping classMapping) { //public int foo; PUBLIC_MEMBER access - persistent assertEquals(1, classMapping.getAttributesSize()); Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); @@ -1137,7 +1137,7 @@ public class GenericJavaClassMappingTests }); } - protected void publicTransientFieldTest(JaxbClassMapping classMapping) { + protected void publicTransientFieldTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute(); @@ -1164,7 +1164,7 @@ public class GenericJavaClassMappingTests this.removeModifiers(resourceField, ModifierKeyword.TRANSIENT_KEYWORD); } - protected void publicStaticFieldTest(JaxbClassMapping classMapping) { + protected void publicStaticFieldTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute(); @@ -1191,7 +1191,7 @@ public class GenericJavaClassMappingTests this.removeModifiers(resourceField, ModifierKeyword.STATIC_KEYWORD); } - protected void publicFinalFieldTest(JaxbClassMapping classMapping) { + protected void publicFinalFieldTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute(); @@ -1227,7 +1227,7 @@ public class GenericJavaClassMappingTests this.removeModifiers(resourceField, ModifierKeyword.FINAL_KEYWORD); } - protected void publicStaticFinalFieldTest(JaxbClassMapping classMapping) { + protected void publicStaticFinalFieldTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute(); @@ -1254,7 +1254,7 @@ public class GenericJavaClassMappingTests this.removeModifiers(resourceField, ModifierKeyword.STATIC_KEYWORD, ModifierKeyword.FINAL_KEYWORD); } - protected void privateFieldTest(JaxbClassMapping classMapping) { + protected void privateFieldTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute(); removeModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD); @@ -1331,7 +1331,7 @@ public class GenericJavaClassMappingTests addModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD); } - protected void privateTransientFieldTest(JaxbClassMapping classMapping) { + protected void privateTransientFieldTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute(); removeModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD); @@ -1405,7 +1405,7 @@ public class GenericJavaClassMappingTests addModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD); } - protected void privateStaticFieldTest(JaxbClassMapping classMapping) { + protected void privateStaticFieldTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute(); removeModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD); @@ -1479,7 +1479,7 @@ public class GenericJavaClassMappingTests addModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD); } - protected void privateStaticFinalFieldTest(JaxbClassMapping classMapping) { + protected void privateStaticFinalFieldTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute(); removeModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD); @@ -1554,8 +1554,8 @@ public class GenericJavaClassMappingTests public void testUpdatePropertyAttributes() throws Exception { createTestXmlTypeWithPropertyAndPublicMemberAccess(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); //public int getFoo();, public void setFoo(int); publicGetterSetterTest(classMapping); @@ -1570,8 +1570,8 @@ public class GenericJavaClassMappingTests public void testUpdateGetterPropertyAttributes() throws Exception { createTestXmlTypeWithPropertyGetterAndPublicMemberAccess(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); //public int getFoo(); PUBLIC_MEMBER access - not persistent assertEquals(0, classMapping.getAttributesSize()); @@ -1593,7 +1593,7 @@ public class GenericJavaClassMappingTests assertEquals(0, classMapping.getAttributesSize()); //add @XmlAttribute annotation and test each access type - JavaResourceMethod resourceMethod = classMapping.getJaxbType().getJavaResourceType().getMethods().iterator().next(); + JavaResourceMethod resourceMethod = classMapping.getJavaType().getJavaResourceType().getMethods().iterator().next(); AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { @@ -1642,8 +1642,8 @@ public class GenericJavaClassMappingTests public void testUpdateSetterPropertyAttributes() throws Exception { createTestXmlTypeWithPropertySetterAndPublicMemberAccess(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); //public void setFoo(int foo); PUBLIC_MEMBER access - not persistent assertEquals(0, classMapping.getAttributesSize()); @@ -1665,7 +1665,7 @@ public class GenericJavaClassMappingTests assertEquals(0, classMapping.getAttributesSize()); //add @XmlAttribute annotation and test each access type - JavaResourceMethod resourceMethod = classMapping.getJaxbType().getJavaResourceType().getMethods().iterator().next(); + JavaResourceMethod resourceMethod = classMapping.getJavaType().getJavaResourceType().getMethods().iterator().next(); AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { @@ -1714,8 +1714,8 @@ public class GenericJavaClassMappingTests public void testUpdateGetterListPropertyAttributes() throws Exception { this.createTestXmlTypeWithPropertyGetterListAndPublicMemberAccess(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); //public List<?> getFoo(); PUBLIC_MEMBER access - persistent Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); @@ -1746,7 +1746,7 @@ public class GenericJavaClassMappingTests assertFalse(attributes.hasNext()); //add @XmlAttribute annotation and test each access type - JavaResourceMethod resourceMethod = classMapping.getJaxbType().getJavaResourceType().getMethods().iterator().next(); + JavaResourceMethod resourceMethod = classMapping.getJavaType().getJavaResourceType().getMethods().iterator().next(); AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { @@ -1792,7 +1792,7 @@ public class GenericJavaClassMappingTests }); } - protected void publicGetterSetterTest(JaxbClassMapping classMapping) { + protected void publicGetterSetterTest(JavaClassMapping classMapping) { //public int getFoo();, public void setFoo(int); PUBLIC_MEMBER access - persistent assertEquals(1, classMapping.getAttributesSize()); Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); @@ -1869,7 +1869,7 @@ public class GenericJavaClassMappingTests }); } - protected void publicStaticGetterSetterTest(JaxbClassMapping classMapping) { + protected void publicStaticGetterSetterTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); PropertyAccessor propertyAccessor = (PropertyAccessor) ObjectTools.get(attributes.next(), "accessor"); JavaResourceMethod resourceGetter = propertyAccessor.getResourceGetterMethod(); @@ -1946,7 +1946,7 @@ public class GenericJavaClassMappingTests this.removeModifiers(resourceSetter, ModifierKeyword.STATIC_KEYWORD); } - protected void privateGetterSetterTest(JaxbClassMapping classMapping) { + protected void privateGetterSetterTest(JavaClassMapping classMapping) { Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator(); PropertyAccessor propertyAccessor = (PropertyAccessor) ObjectTools.get(attributes.next(), "accessor"); JavaResourceMethod resourceGetter = propertyAccessor.getResourceGetterMethod(); @@ -2033,8 +2033,8 @@ public class GenericJavaClassMappingTests public void testModifyXmlSeeAlso() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); XmlSeeAlsoAnnotation annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO); @@ -2055,8 +2055,8 @@ public class GenericJavaClassMappingTests public void testUpdateXmlSeeAlso() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); XmlSeeAlsoAnnotation annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO); @@ -2129,8 +2129,8 @@ public class GenericJavaClassMappingTests return bodyDeclaration.modifiers(); } - protected void setAccessTypeInJavaSource(JaxbClassMapping classMapping, final String accessType) { - JavaResourceType resourceClass = classMapping.getJaxbType().getJavaResourceType(); + protected void setAccessTypeInJavaSource(JavaClassMapping classMapping, final String accessType) { + JavaResourceType resourceClass = classMapping.getJavaType().getJavaResourceType(); AnnotatedElement annotatedElement = this.annotatedElement(resourceClass); annotatedElement.edit(new Member.Editor() { public void edit(ModifiedDeclaration declaration) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java index 4fc62224f1..93b6557a79 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java @@ -18,9 +18,9 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod; import org.eclipse.jpt.jaxb.core.context.XmlRegistry; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementDeclAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -61,7 +61,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator(); @@ -85,7 +85,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); assertEquals(2, xmlRegistry.getElementFactoryMethodsSize()); @@ -115,7 +115,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator(); @@ -139,7 +139,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); assertEquals(2, xmlRegistry.getElementFactoryMethodsSize()); @@ -169,7 +169,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator(); @@ -201,7 +201,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); assertEquals(2, xmlRegistry.getElementFactoryMethodsSize()); @@ -233,7 +233,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator(); @@ -257,7 +257,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); assertEquals(2, xmlRegistry.getElementFactoryMethodsSize()); @@ -287,7 +287,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator(); @@ -311,7 +311,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); assertEquals(2, xmlRegistry.getElementFactoryMethodsSize()); @@ -341,7 +341,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator(); @@ -365,7 +365,7 @@ public class GenericJavaElementFactoryMethodTests createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry(); assertEquals(2, xmlRegistry.getElementFactoryMethodsSize()); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java index eda0aff24c..dc9cfeae6d 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java @@ -20,9 +20,9 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant; import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnum; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlEnumValueAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -52,7 +52,7 @@ public class GenericJavaEnumConstantTests extends JaxbContextModelTestCase public void testUpdateName() throws Exception { createEnumWithXmlEnum(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JaxbEnumConstant contextEnumConstant = IterableTools.get(enumMapping.getEnumConstants(), 1); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); @@ -75,7 +75,7 @@ public class GenericJavaEnumConstantTests extends JaxbContextModelTestCase public void testModifyValue() throws Exception { createEnumWithXmlEnum(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JaxbEnumConstant contextEnumConstant = IterableTools.get(enumMapping.getEnumConstants(), 1); JavaResourceEnumConstant resourceEnumConstant = contextEnumConstant.getResourceEnumConstant(); @@ -102,7 +102,7 @@ public class GenericJavaEnumConstantTests extends JaxbContextModelTestCase public void testUpdateValue() throws Exception { createEnumWithXmlEnum(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JaxbEnumConstant contextEnumConstant = IterableTools.get(enumMapping.getEnumConstants(), 1); JavaResourceEnumConstant resourceEnumConstant = contextEnumConstant.getResourceEnumConstant(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumMappingTests.java index 92699ce612..3f4646cc63 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumMappingTests.java @@ -20,9 +20,9 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jaxb.core.context.JaxbEnum; import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant; import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaEnum; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlEnumAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation; @@ -68,7 +68,7 @@ public class GenericJavaEnumMappingTests public void testModifySchemaTypeName() throws Exception { createEnumWithXmlType(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME); @@ -102,7 +102,7 @@ public class GenericJavaEnumMappingTests public void testUpdateSchemaTypeName() throws Exception { createEnumWithXmlType(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME); @@ -136,7 +136,7 @@ public class GenericJavaEnumMappingTests public void testModifyNamespace() throws Exception { createEnumWithXmlType(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); @@ -169,7 +169,7 @@ public class GenericJavaEnumMappingTests public void testUpdateNamespace() throws Exception { createEnumWithXmlType(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); @@ -202,7 +202,7 @@ public class GenericJavaEnumMappingTests public void testModifyXmlRootElement() throws Exception { createEnumWithXmlType(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); @@ -222,7 +222,7 @@ public class GenericJavaEnumMappingTests public void testUpdateXmlRootElement() throws Exception { createEnumWithXmlType(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); @@ -250,7 +250,7 @@ public class GenericJavaEnumMappingTests public void testModifyXmlEnumValue() throws Exception { createEnumWithXmlType(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); @@ -270,7 +270,7 @@ public class GenericJavaEnumMappingTests resourceEnum.addAnnotation(JAXB.XML_TYPE); resourceEnum.removeAnnotation(JAXB.XML_ENUM); - enumMapping = ((JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0)).getMapping(); + enumMapping = ((JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0)).getMapping(); assertNull(enumMapping.getSpecifiedXmlEnumValue()); assertEquals(JaxbEnumMapping.DEFAULT_XML_ENUM_VALUE, enumMapping.getXmlEnumValue()); } @@ -278,7 +278,7 @@ public class GenericJavaEnumMappingTests public void testUpdateXmlEnumValue() throws Exception { createEnumWithXmlType(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); @@ -310,7 +310,7 @@ public class GenericJavaEnumMappingTests public void testUpdateEnumConstants() throws Exception { createEnumWithXmlType(); - JaxbEnum jaxbEnum = (JaxbEnum) IterableTools.get(getContextRoot().getTypes(), 0); + JavaEnum jaxbEnum = (JavaEnum) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbEnumMapping enumMapping = jaxbEnum.getMapping(); JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java index 890aea3a36..6e7af648d9 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java @@ -12,9 +12,9 @@ package org.eclipse.jpt.jaxb.core.tests.internal.context.java; import org.eclipse.core.runtime.CoreException; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -57,7 +57,7 @@ public class GenericJavaPersistentAttributeTests public void testJavaResourceType() throws Exception { createXmlTypeWithVariousAttributes(); - JaxbClassMapping classMapping = ((JaxbClass) getContextRoot().getType(PACKAGE_NAME_ + TEST_CLASS_NAME)).getMapping(); + JavaClassMapping classMapping = ((JavaClass) getContextRoot().getJavaType(PACKAGE_NAME_ + TEST_CLASS_NAME)).getMapping(); // String string JaxbPersistentAttribute att = IterableTools.get(classMapping.getAttributes(), 0); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java index 8c7ef27afb..4025dc22a8 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java @@ -25,9 +25,9 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod; import org.eclipse.jpt.jaxb.core.context.XmlRegistry; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -116,7 +116,7 @@ public class GenericJavaRegistryTests extends JaxbContextModelTestCase createClassWithXmlType(); createClassWithXmlRegistryAndCreateMethods(); - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory"); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType("test.ObjectFactory"); XmlRegistry contextRegistry = jaxbClass.getXmlRegistry(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java index 3e81032d45..46b276e20b 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java @@ -19,8 +19,8 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -50,7 +50,7 @@ public class GenericJavaTypeXmlJavaTypeAdapterTests extends JaxbContextModelTest public void testModifyValue() throws Exception { createTypeWithXmlJavaTypeAdapter(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); XmlJavaTypeAdapter contextXmlJavaTypeAdapter = jaxbClass.getXmlJavaTypeAdapter(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); @@ -71,7 +71,7 @@ public class GenericJavaTypeXmlJavaTypeAdapterTests extends JaxbContextModelTest public void testUpdateValue() throws Exception { createTypeWithXmlJavaTypeAdapter(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); XmlJavaTypeAdapter contextXmlJavaTypeAdapter = jaxbClass.getXmlJavaTypeAdapter(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); @@ -97,7 +97,7 @@ public class GenericJavaTypeXmlJavaTypeAdapterTests extends JaxbContextModelTest public void testModifyType() throws Exception { createTypeWithXmlJavaTypeAdapter(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); XmlJavaTypeAdapter contextXmlJavaTypeAdapter = jaxbClass.getXmlJavaTypeAdapter(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); @@ -122,7 +122,7 @@ public class GenericJavaTypeXmlJavaTypeAdapterTests extends JaxbContextModelTest public void testUpdateType() throws Exception { createTypeWithXmlJavaTypeAdapter(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); XmlJavaTypeAdapter contextXmlJavaTypeAdapter = jaxbClass.getXmlJavaTypeAdapter(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java index 0d5295c0ac..80d2531bf1 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java @@ -15,12 +15,12 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAdapter; import org.eclipse.jpt.jaxb.core.context.XmlElementMapping; import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -84,8 +84,8 @@ public class GenericJavaXmlAdapterTests public void testBoundAndValueTypes() throws Exception { createXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping attributeMapping = (XmlElementMapping) persistentAttribute.getMapping(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java index 62fbafac0f..aa47bcb605 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java @@ -18,12 +18,12 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.MappingKeys; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAnyAttributeMapping; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; import org.eclipse.jpt.jaxb.core.context.XmlElementMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -56,8 +56,8 @@ public class GenericJavaXmlAnyAttributeMappingTests extends JaxbContextModelTest public void testChangeMappingType() throws Exception { createTypeWithXmlAnyAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyAttributeMapping attributeMapping = (XmlAnyAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -94,8 +94,8 @@ public class GenericJavaXmlAnyAttributeMappingTests extends JaxbContextModelTest public void testModifyXmlJavaTypeAdapter() throws Exception { createTypeWithXmlAnyAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyAttributeMapping attributeMapping = (XmlAnyAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -117,8 +117,8 @@ public class GenericJavaXmlAnyAttributeMappingTests extends JaxbContextModelTest public void testUpdateXmlJavaTypeAdapter() throws Exception { createTypeWithXmlAnyAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyAttributeMapping attributeMapping = (XmlAnyAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java index 7b23ad2c3a..ea4c508fbf 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java @@ -21,13 +21,13 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.MappingKeys; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; 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.XmlElementRef; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAnyElementAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation; @@ -64,8 +64,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testChangeMappingType() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -102,8 +102,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testModifyXmlJavaTypeAdapter() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -125,8 +125,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testUpdateXmlJavaTypeAdapter() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -159,8 +159,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testModifyLax() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -186,8 +186,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testUpdateLax() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -223,8 +223,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testModifyValue() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -245,8 +245,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testUpdateValue() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -294,8 +294,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testSyncXmlElementRefs() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -412,8 +412,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testModifyXmlElementRefs() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -473,8 +473,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testModifyXmlMixed() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -495,8 +495,8 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa public void testUpdateXmlMixed() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java index bf8ae0494c..80d6471abe 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.MarkerAnnotation; @@ -23,11 +22,11 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.MappingKeys; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; import org.eclipse.jpt.jaxb.core.context.XmlElementMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAttachmentRefAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlAttributeAnnotation; @@ -83,8 +82,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyName() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -109,8 +108,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateName() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -140,8 +139,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyNamespace() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -162,8 +161,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateNamespace() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -193,8 +192,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyRequired() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -221,8 +220,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateRequired() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -258,8 +257,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testChangeMappingType() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -284,8 +283,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyXmlJavaTypeAdapter() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping attributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -307,8 +306,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateXmlJavaTypeAdapter() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -341,8 +340,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyXmlSchemaType() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -364,8 +363,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateXmlSchemaType() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -417,8 +416,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyXmlList1() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -446,8 +445,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyXmlList2() throws Exception { createTypeWithCollectionXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -475,8 +474,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateXmlList1() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -515,8 +514,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateXmlList2() throws Exception { createTypeWithCollectionXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -555,8 +554,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyXmlID() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -577,8 +576,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateXmlID() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -613,8 +612,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyXmlIDREF() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -635,8 +634,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateXmlIDREF() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -671,8 +670,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testModifyXmlAttachmentRef() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -693,8 +692,8 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas public void testUpdateXmlAttachmentRef() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java index 0d46fe1e82..d76c1f513a 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.dom.Annotation; @@ -24,12 +23,12 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.MappingKeys; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; import org.eclipse.jpt.jaxb.core.context.XmlElement; import org.eclipse.jpt.jaxb.core.context.XmlElementMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAttachmentRefAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation; @@ -103,8 +102,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyName() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -130,8 +129,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateName() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -162,8 +161,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyNamespace() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -185,8 +184,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateNamespace() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -217,8 +216,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyRequired() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -246,8 +245,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateRequired() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -284,8 +283,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyNillable() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -313,8 +312,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateNillable() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -350,8 +349,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testDefaultNillable() throws Exception { createXmlTypeWithVariousAttributes(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); // string JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); @@ -408,8 +407,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyDefaultValue() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -431,8 +430,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateDefaultValue() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -462,8 +461,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyType() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -483,8 +482,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateType() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); XmlElement xmlElement = xmlElementMapping.getXmlElement(); @@ -518,8 +517,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testChangeMappingType() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -544,8 +543,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyXmlJavaTypeAdapter() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -567,8 +566,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateXmlJavaTypeAdapter() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -601,8 +600,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyXmlSchemaType() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -624,8 +623,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateXmlSchemaType() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -679,8 +678,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyXmlElementWrapper() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -701,8 +700,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateXmlElementWrapper() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -737,8 +736,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyXmlList1() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -766,8 +765,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyXmlList2() throws Exception { createTypeWithCollectionXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -795,8 +794,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateXmlList1() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -835,8 +834,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateXmlList2() throws Exception { createTypeWithCollectionXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -875,8 +874,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyXmlID() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -897,8 +896,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateXmlID() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -933,8 +932,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyXmlIDREF() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -957,8 +956,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateXmlIDREF() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -993,8 +992,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testModifyXmlAttachmentRef() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -1015,8 +1014,8 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase public void testUpdateXmlAttachmentRef() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java index 5c4a632f17..e87213259f 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java @@ -21,12 +21,12 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.MappingKeys; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; import org.eclipse.jpt.jaxb.core.context.XmlElementRef; import org.eclipse.jpt.jaxb.core.context.XmlElementRefMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation; @@ -111,8 +111,8 @@ public class GenericJavaXmlElementRefMappingTests createTypeWithJAXBElementXmlElementRef(); // FULLY_QUALIFIED_TYPE_NAME + "2" createTypeWithRootElementXmlElementRef(); // FULLY_QUALIFIED_TYPE_NAME + "3" - JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping(); XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef(); @@ -121,7 +121,7 @@ public class GenericJavaXmlElementRefMappingTests assertEquals("", xmlElementRef.getQName().getName()); assertEquals("", xmlElementRef.getQName().getNamespace()); - classMapping = ((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME + "2")).getMapping(); + classMapping = ((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME + "2")).getMapping(); xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); xmlElementRef = xmlElementRefMapping.getXmlElementRef(); @@ -129,7 +129,7 @@ public class GenericJavaXmlElementRefMappingTests assertEquals("foo", xmlElementRef.getQName().getName()); assertEquals("", xmlElementRef.getQName().getNamespace()); - classMapping = ((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME + "3")).getMapping(); + classMapping = ((JavaClass) getContextRoot().getJavaType(FULLY_QUALIFIED_TYPE_NAME + "3")).getMapping(); xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); xmlElementRef = xmlElementRefMapping.getXmlElementRef(); @@ -141,8 +141,8 @@ public class GenericJavaXmlElementRefMappingTests public void testModifyName() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -166,8 +166,8 @@ public class GenericJavaXmlElementRefMappingTests public void testUpdateName() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -197,8 +197,8 @@ public class GenericJavaXmlElementRefMappingTests public void testModifyNamespace() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -219,8 +219,8 @@ public class GenericJavaXmlElementRefMappingTests public void testUpdateNamespace() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -250,8 +250,8 @@ public class GenericJavaXmlElementRefMappingTests public void testModifyRequired() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -278,8 +278,8 @@ public class GenericJavaXmlElementRefMappingTests public void testUpdateRequired() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -315,8 +315,8 @@ public class GenericJavaXmlElementRefMappingTests public void testModifyType() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef(); @@ -336,8 +336,8 @@ public class GenericJavaXmlElementRefMappingTests public void testUpdateType() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -370,8 +370,8 @@ public class GenericJavaXmlElementRefMappingTests public void testChangeMappingType() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -396,8 +396,8 @@ public class GenericJavaXmlElementRefMappingTests public void testModifyXmlJavaTypeAdapter() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -419,8 +419,8 @@ public class GenericJavaXmlElementRefMappingTests public void testUpdateXmlJavaTypeAdapter() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -473,8 +473,8 @@ public class GenericJavaXmlElementRefMappingTests public void testModifyXmlElementWrapper() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -495,8 +495,8 @@ public class GenericJavaXmlElementRefMappingTests public void testUpdateXmlElementRefWrapper() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -530,8 +530,8 @@ public class GenericJavaXmlElementRefMappingTests public void testModifyXmlMixed() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefMapping attributeMapping = (XmlElementRefMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -554,8 +554,8 @@ public class GenericJavaXmlElementRefMappingTests public void testUpdateXmlMixed() throws Exception { createTypeWithXmlElementRef(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefMapping attributeMapping = (XmlElementRefMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java index 4ad9dec693..fdc59ae25a 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java @@ -22,12 +22,12 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.MappingKeys; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; import org.eclipse.jpt.jaxb.core.context.XmlElementRef; import org.eclipse.jpt.jaxb.core.context.XmlElementRefsMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefsAnnotation; @@ -107,8 +107,8 @@ public class GenericJavaXmlElementRefsMappingTests public void testSyncXmlElementRefs() throws Exception { createTypeWithXmlElementRefs(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefsMapping mapping = (XmlElementRefsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -168,8 +168,8 @@ public class GenericJavaXmlElementRefsMappingTests public void testModifyXmlElementRefs() throws Exception { createTypeWithXmlElementRefs(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementRefsMapping mapping = (XmlElementRefsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); XmlElementRefsAnnotation annotation = (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS); @@ -212,8 +212,8 @@ public class GenericJavaXmlElementRefsMappingTests public void testChangeMappingType() throws Exception { createTypeWithXmlElementRefs(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -237,8 +237,8 @@ public class GenericJavaXmlElementRefsMappingTests public void testModifyXmlJavaTypeAdapter() throws Exception { createTypeWithXmlElementRefs(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -260,8 +260,8 @@ public class GenericJavaXmlElementRefsMappingTests public void testUpdateXmlJavaTypeAdapter() throws Exception { createTypeWithXmlElementRefs(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -294,8 +294,8 @@ public class GenericJavaXmlElementRefsMappingTests public void testModifyXmlElementWrapper() throws Exception { createTypeWithXmlElementRefs(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -316,8 +316,8 @@ public class GenericJavaXmlElementRefsMappingTests public void testUpdateXmlElementWrapper() throws Exception { createTypeWithXmlElementRefs(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -351,8 +351,8 @@ public class GenericJavaXmlElementRefsMappingTests public void testModifyXmlMixed() throws Exception { createTypeWithXmlElementRefs(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -375,8 +375,8 @@ public class GenericJavaXmlElementRefsMappingTests public void testUpdateXmlMixed() throws Exception { createTypeWithXmlElementRefs(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java index 1796ac1892..0c86151499 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java @@ -19,10 +19,10 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.XmlElement; import org.eclipse.jpt.jaxb.core.context.XmlElementsMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation; @@ -84,8 +84,8 @@ public class GenericJavaXmlElementsMappingTests public void testSyncXmlElements() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementsMapping mapping = (XmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -145,8 +145,8 @@ public class GenericJavaXmlElementsMappingTests public void testModifyXmlElements() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementsMapping mapping = (XmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); XmlElementsAnnotation xmlElementsAnnotation = (XmlElementsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENTS); @@ -188,8 +188,8 @@ public class GenericJavaXmlElementsMappingTests public void testModifyXmlJavaTypeAdapter() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementsMapping mapping = (XmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -209,8 +209,8 @@ public class GenericJavaXmlElementsMappingTests public void testUpdateXmlJavaTypeAdapter() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementsMapping mapping = (XmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -241,8 +241,8 @@ public class GenericJavaXmlElementsMappingTests public void testModifyXmlElementWrapper() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementsMapping mapping = (XmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -266,8 +266,8 @@ public class GenericJavaXmlElementsMappingTests public void testUpdateXmlElementWrapper() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementsMapping mapping = (XmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -302,8 +302,8 @@ public class GenericJavaXmlElementsMappingTests public void testModifyXmlIDREF() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementsMapping mapping = (XmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -327,8 +327,8 @@ public class GenericJavaXmlElementsMappingTests public void testUpdateXmlIDREF() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); XmlElementsMapping mapping = (XmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java index 864375f812..5eb1e5cff6 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java @@ -20,9 +20,9 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.XmlRootElement; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -53,7 +53,7 @@ public class GenericJavaXmlRootElementTests public void testModifyNamespace() throws Exception { createTypeWithXmlTypeWithXmlRootElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbClassMapping classMapping = jaxbClass.getMapping(); XmlRootElement contextRootElement = classMapping.getXmlRootElement(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); @@ -77,7 +77,7 @@ public class GenericJavaXmlRootElementTests public void testUpdateNamespace() throws Exception { createTypeWithXmlTypeWithXmlRootElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbClassMapping classMapping = jaxbClass.getMapping(); XmlRootElement contextRootElement = classMapping.getXmlRootElement(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); @@ -106,7 +106,7 @@ public class GenericJavaXmlRootElementTests public void testModifyName() throws Exception { createTypeWithXmlTypeWithXmlRootElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbClassMapping classMapping = jaxbClass.getMapping(); XmlRootElement contextRootElement = classMapping.getXmlRootElement(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); @@ -131,7 +131,7 @@ public class GenericJavaXmlRootElementTests public void testUpdateName() throws Exception { createTypeWithXmlTypeWithXmlRootElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbClassMapping classMapping = jaxbClass.getMapping(); XmlRootElement contextRootElement = classMapping.getXmlRootElement(); JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java index 7ded8b31b7..76b5b25435 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java @@ -19,9 +19,9 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.XmlSeeAlso; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlSeeAlsoAnnotation; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -51,7 +51,7 @@ public class GenericJavaXmlSeeAlsoTests public void testModifyClasses() throws Exception { createAnnotatedPersistentClassWithXmlSeeAlso(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbClassMapping classMapping = jaxbClass.getMapping(); XmlSeeAlso contextXmlSeeAlso = classMapping.getXmlSeeAlso(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); @@ -89,7 +89,7 @@ public class GenericJavaXmlSeeAlsoTests public void testUpdateClasses() throws Exception { createAnnotatedPersistentClassWithXmlSeeAlso(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JaxbClassMapping classMapping = jaxbClass.getMapping(); XmlSeeAlso contextXmlSeeAlso = classMapping.getXmlSeeAlso(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java index aa86ba33a5..a37b2cff78 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; @@ -20,12 +19,12 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.MappingKeys; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; import org.eclipse.jpt.jaxb.core.context.XmlElementMapping; 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.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase; @@ -76,7 +75,7 @@ public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase public void testChangeMappingType() throws Exception { createTypeWithXmlValue(); - JaxbClassMapping classMapping = ((JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0)).getMapping(); + JavaClassMapping classMapping = ((JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0)).getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlValueMapping xmlValueMapping = (XmlValueMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlValueMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -113,7 +112,7 @@ public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase public void testModifyXmlJavaTypeAdapter() throws Exception { createTypeWithXmlValue(); - JaxbClassMapping classMapping = ((JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0)).getMapping(); + JavaClassMapping classMapping = ((JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0)).getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlValueMapping mapping = (XmlValueMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -135,7 +134,7 @@ public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase public void testUpdateXmlJavaTypeAdapter() throws Exception { createTypeWithXmlValue(); - JaxbClassMapping classMapping = ((JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0)).getMapping(); + JavaClassMapping classMapping = ((JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0)).getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlValueMapping xmlValueMapping = (XmlValueMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlValueMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -168,8 +167,8 @@ public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase public void testModifyXmlList1() throws Exception { createTypeWithXmlValue(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlValueMapping xmlMapping = (XmlValueMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -197,8 +196,8 @@ public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase public void testModifyXmlList2() throws Exception { createTypeWithCollectionXmlValue(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlValueMapping xmlMapping = (XmlValueMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -226,8 +225,8 @@ public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase public void testUpdateXmlList1() throws Exception { createTypeWithXmlValue(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlValueMapping xmlMapping = (XmlValueMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlMapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -266,8 +265,8 @@ public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase public void testUpdateXmlList2() throws Exception { createTypeWithCollectionXmlValue(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); XmlValueMapping xmlMapping = (XmlValueMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = xmlMapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaClassMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaClassMappingTests.java index 97d1ec04dc..bfdb975490 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaClassMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaClassMappingTests.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig; import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform; import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELClassMapping; @@ -40,7 +40,7 @@ public class ELJavaClassMappingTests public void testModifyXmlDiscriminatorNode() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); @@ -63,7 +63,7 @@ public class ELJavaClassMappingTests public void testUpdateXmlDiscriminatorNode() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); @@ -98,7 +98,7 @@ public class ELJavaClassMappingTests public void testModifyXmlDiscriminatorValue() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); @@ -121,7 +121,7 @@ public class ELJavaClassMappingTests public void testUpdateXmlDiscriminatorValue() throws Exception { createClassWithXmlType(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping(); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java index 91439b6337..411167ddb6 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; @@ -18,9 +17,9 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlAnyAttributeMapping; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; @@ -58,8 +57,8 @@ public class ELJavaXmlAnyAttributeMappingTests public void testModifyXmlPath() throws Exception { createTypeWithXmlAnyAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlAnyAttributeMapping mapping = (ELJavaXmlAnyAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -81,8 +80,8 @@ public class ELJavaXmlAnyAttributeMappingTests public void testUpdateXmlPath() throws Exception { createTypeWithXmlAnyAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlAnyAttributeMapping mapping = (ELJavaXmlAnyAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java index eee2be27d5..8887f87c3c 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; @@ -18,9 +17,9 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlAnyElementMapping; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; @@ -58,8 +57,8 @@ public class ELJavaXmlAnyElementMappingTests public void testModifyXmlPath() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlAnyElementMapping mapping = (ELJavaXmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -81,8 +80,8 @@ public class ELJavaXmlAnyElementMappingTests public void testUpdateXmlPath() throws Exception { createTypeWithXmlAnyElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlAnyElementMapping mapping = (ELJavaXmlAnyElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java index e9646055f9..f9233c8de5 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; @@ -19,9 +18,9 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.MappingKeys; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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.platform.JaxbPlatformConfig; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform; @@ -86,8 +85,8 @@ public class ELJavaXmlAttributeMappingTests public void testModifyXmlPath() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlAttributeMapping mapping = (ELJavaXmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -109,8 +108,8 @@ public class ELJavaXmlAttributeMappingTests public void testUpdateXmlPath() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlAttributeMapping mapping = (ELJavaXmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -142,8 +141,8 @@ public class ELJavaXmlAttributeMappingTests public void testDefault() throws Exception { createTypeWithXmlPath(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); JavaResourceAttribute resourceAttribute = persistentAttribute.getJavaResourceAttribute(); XmlPathAnnotation xmlPathAnnotation = (XmlPathAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_PATH); @@ -186,8 +185,8 @@ public class ELJavaXmlAttributeMappingTests public void testModifyXmlKey() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlAttributeMapping mapping = (ELJavaXmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -209,8 +208,8 @@ public class ELJavaXmlAttributeMappingTests public void testUpdateXmlKey() throws Exception { createTypeWithXmlAttribute(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlAttributeMapping mapping = (ELJavaXmlAttributeMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java index 1935b7966e..cc2227c938 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java @@ -17,7 +17,7 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform; @@ -61,7 +61,7 @@ public class ELJavaXmlDiscriminatorNodeTests public void testModifyValue() throws Exception { createTypeWithXmlDiscriminatorNode(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping(); ELXmlDiscriminatorNode discNode = classMapping.getXmlDiscriminatorNode(); @@ -90,7 +90,7 @@ public class ELJavaXmlDiscriminatorNodeTests public void testUpdateValue() throws Exception { createTypeWithXmlDiscriminatorNode(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping(); ELXmlDiscriminatorNode discNode = classMapping.getXmlDiscriminatorNode(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java index c39bc9626e..5622e8f7a3 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java @@ -8,7 +8,7 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform; @@ -52,7 +52,7 @@ public class ELJavaXmlDiscriminatorValueTests public void testModifyValue() throws Exception { createTypeWithXmlDiscriminatorValue(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping(); ELXmlDiscriminatorValue discValue = classMapping.getXmlDiscriminatorValue(); @@ -81,7 +81,7 @@ public class ELJavaXmlDiscriminatorValueTests public void testUpdateValue() throws Exception { createTypeWithXmlDiscriminatorValue(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); JavaResourceType resourceType = jaxbClass.getJavaResourceType(); ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping(); ELXmlDiscriminatorValue discValue = classMapping.getXmlDiscriminatorValue(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java index d7b3432499..3f84e1f4c8 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; @@ -19,9 +18,9 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.jaxb.core.MappingKeys; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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.platform.JaxbPlatformConfig; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform; @@ -86,8 +85,8 @@ public class ELJavaXmlElementMappingTests public void testModifyXmlPath() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -109,8 +108,8 @@ public class ELJavaXmlElementMappingTests public void testUpdateXmlPath() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -142,8 +141,8 @@ public class ELJavaXmlElementMappingTests public void testDefault() throws Exception { createTypeWithXmlPath(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); JavaResourceAttribute resourceAttribute = persistentAttribute.getJavaResourceAttribute(); XmlPathAnnotation xmlPathAnnotation = (XmlPathAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_PATH); @@ -186,8 +185,8 @@ public class ELJavaXmlElementMappingTests public void testModifyXmlKey() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -209,8 +208,8 @@ public class ELJavaXmlElementMappingTests public void testUpdateXmlKey() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -242,8 +241,8 @@ public class ELJavaXmlElementMappingTests public void testModifyXmlCDATA() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -265,8 +264,8 @@ public class ELJavaXmlElementMappingTests public void testUpdateXmlCDATA() throws Exception { createTypeWithXmlElement(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java index 9c7e1eb410..e54e6e45d2 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java @@ -1,7 +1,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.dom.AST; import org.eclipse.jdt.core.dom.NormalAnnotation; @@ -12,8 +11,8 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlElementsMapping; import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath; @@ -71,8 +70,8 @@ public class ELJavaXmlElementsMappingTests public void testUpdateXmlElements() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass javaClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = javaClass.getMapping(); ELXmlElementsMapping mapping = (ELXmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -129,8 +128,8 @@ public class ELJavaXmlElementsMappingTests public void testModifyXmlPaths() throws Exception { createTypeWithXmlElements(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass javaClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = javaClass.getMapping(); ELXmlElementsMapping mapping = (ELXmlElementsMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java index 9bf6f3bdf0..a0d1bb0a2b 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.dom.MarkerAnnotation; import org.eclipse.jdt.core.dom.NormalAnnotation; @@ -20,9 +19,9 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlInverseReferenceMapping; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; @@ -58,8 +57,8 @@ public class ELJavaXmlInverseReferenceMappingTests public void testModifyMappedBy() throws Exception { createTypeWithXmlInverseReference(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlInverseReferenceMapping mapping = (ELJavaXmlInverseReferenceMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -82,8 +81,8 @@ public class ELJavaXmlInverseReferenceMappingTests public void testUpdateMappedBy() throws Exception { createTypeWithXmlInverseReference(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlInverseReferenceMapping mapping = (ELJavaXmlInverseReferenceMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java index 88ee75c8cb..ddcdeb4d93 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java @@ -8,9 +8,9 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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.platform.JaxbPlatformConfig; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform; @@ -58,8 +58,8 @@ public class ELJavaXmlJoinNodeTests public void testModifyXmlPath() throws Exception { createTypeWithXmlJoinNode(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELXmlJoinNodesMapping mapping = (ELXmlJoinNodesMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -88,8 +88,8 @@ public class ELJavaXmlJoinNodeTests public void testUpdateXmlPath() throws Exception { createTypeWithXmlJoinNode(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlJoinNodesMapping mapping = (ELJavaXmlJoinNodesMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -134,8 +134,8 @@ public class ELJavaXmlJoinNodeTests public void testModifyReferencedXmlPath() throws Exception { createTypeWithXmlJoinNode(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELXmlJoinNodesMapping mapping = (ELXmlJoinNodesMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -164,8 +164,8 @@ public class ELJavaXmlJoinNodeTests public void testUpdateReferencedXmlPath() throws Exception { createTypeWithXmlJoinNode(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlJoinNodesMapping mapping = (ELJavaXmlJoinNodesMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java index 4e68f19f43..7926b3a507 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java @@ -11,8 +11,8 @@ import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; +import org.eclipse.jpt.jaxb.core.context.java.JavaClass; +import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform; @@ -78,8 +78,8 @@ public class ELJavaXmlJoinNodesMappingTests public void testUpdateXmlJoinNodes() throws Exception { createTypeWithXmlJoinNodes(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); ELXmlJoinNodesMapping mapping = (ELXmlJoinNodesMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -140,8 +140,8 @@ public class ELJavaXmlJoinNodesMappingTests public void testModifyXmlJoinNodes() throws Exception { createTypeWithXmlJoinNodes(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); ELXmlJoinNodesMapping mapping = (ELXmlJoinNodesMapping) IterableTools.get(classMapping.getAttributes(), 0).getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java index 39eaffb6c1..4c9a63e0cc 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java @@ -1,7 +1,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; @@ -9,9 +8,9 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlElementMapping; import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath; @@ -52,8 +51,8 @@ public class ELJavaXmlPathTests public void testModifyValue() throws Exception { createTypeWithXmlPath(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELXmlElementMapping mapping = (ELXmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -82,8 +81,8 @@ public class ELJavaXmlPathTests public void testUpdateValue() throws Exception { createTypeWithXmlPath(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java index 788f3c8edd..755539a205 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java @@ -8,9 +8,9 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; -import org.eclipse.jpt.jaxb.core.context.JaxbClass; -import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; 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.platform.JaxbPlatformConfig; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform; @@ -54,8 +54,8 @@ public class ELJavaXmlValueMappingTests public void testModifyXmlCDATA() throws Exception { createTypeWithXmlValue(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlValueMapping mapping = (ELJavaXmlValueMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); @@ -77,8 +77,8 @@ public class ELJavaXmlValueMappingTests public void testUpdateXmlCDATA() throws Exception { createTypeWithXmlValue(); - JaxbClass jaxbClass = (JaxbClass) IterableTools.get(getContextRoot().getTypes(), 0); - JaxbClassMapping classMapping = jaxbClass.getMapping(); + JavaClass jaxbClass = (JavaClass) IterableTools.get(getContextRoot().getJavaTypes(), 0); + JavaClassMapping classMapping = jaxbClass.getMapping(); JaxbPersistentAttribute persistentAttribute = IterableTools.get(classMapping.getAttributes(), 0); ELJavaXmlValueMapping mapping = (ELJavaXmlValueMapping) persistentAttribute.getMapping(); JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute(); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlBindingsTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlBindingsTests.java index 3175da75fc..4b77906794 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlBindingsTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/oxm/OxmXmlBindingsTests.java @@ -12,9 +12,9 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.oxm; import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder;
+import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
import org.eclipse.jpt.jaxb.eclipselink.core.context.ELJaxbContextRoot;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlAccessOrder;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.ELXmlAccessType;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmFile;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlBindings;
@@ -56,32 +56,32 @@ public class OxmXmlBindingsTests // the value is not exactly specified, but since the attribute has a default value, it's "specified"
assertEquals(EXmlAccessType.PUBLIC_MEMBER, eXmlBindings.getXmlAccessorType());
- assertEquals(ELXmlAccessType.PUBLIC_MEMBER, xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.PUBLIC_MEMBER, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.PUBLIC_MEMBER, xmlBindings.getSpecifiedAccessType());
+ assertEquals(XmlAccessType.PUBLIC_MEMBER, xmlBindings.getAccessType());
eXmlBindings.setXmlAccessorType(EXmlAccessType.FIELD);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-type=\"FIELD\"", true);
assertEquals(EXmlAccessType.FIELD, eXmlBindings.getXmlAccessorType());
- assertEquals(ELXmlAccessType.FIELD, xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.FIELD, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.FIELD, xmlBindings.getSpecifiedAccessType());
+ assertEquals(XmlAccessType.FIELD, xmlBindings.getAccessType());
eXmlBindings.setXmlAccessorType(EXmlAccessType.NONE);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-type=\"NONE\"", true);
assertEquals(EXmlAccessType.NONE, eXmlBindings.getXmlAccessorType());
- assertEquals(ELXmlAccessType.NONE, xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.NONE, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.NONE, xmlBindings.getSpecifiedAccessType());
+ assertEquals(XmlAccessType.NONE, xmlBindings.getAccessType());
eXmlBindings.setXmlAccessorType(EXmlAccessType.PROPERTY);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-type=\"PROPERTY\"", true);
assertEquals(EXmlAccessType.PROPERTY, eXmlBindings.getXmlAccessorType());
- assertEquals(ELXmlAccessType.PROPERTY, xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.PROPERTY, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.PROPERTY, xmlBindings.getSpecifiedAccessType());
+ assertEquals(XmlAccessType.PROPERTY, xmlBindings.getAccessType());
eXmlBindings.setXmlAccessorType(null);
oxmResource.save();
@@ -89,7 +89,7 @@ public class OxmXmlBindingsTests assertFileContentsContains("oxm.xml", "xml-accessor-type=", false);
assertNull(eXmlBindings.getXmlAccessorType());
assertNull(xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.PUBLIC_MEMBER, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.PUBLIC_MEMBER, xmlBindings.getAccessType());
}
public void testModifyAccessType() throws Exception {
@@ -102,32 +102,32 @@ public class OxmXmlBindingsTests // the value is not exactly specified, but since the attribute has a default value, it's "specified"
assertEquals(EXmlAccessType.PUBLIC_MEMBER, eXmlBindings.getXmlAccessorType());
- assertEquals(ELXmlAccessType.PUBLIC_MEMBER, xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.PUBLIC_MEMBER, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.PUBLIC_MEMBER, xmlBindings.getSpecifiedAccessType());
+ assertEquals(XmlAccessType.PUBLIC_MEMBER, xmlBindings.getAccessType());
- xmlBindings.setSpecifiedAccessType(ELXmlAccessType.FIELD);
+ xmlBindings.setSpecifiedAccessType(XmlAccessType.FIELD);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-type=\"FIELD\"", true);
assertEquals(EXmlAccessType.FIELD, eXmlBindings.getXmlAccessorType());
- assertEquals(ELXmlAccessType.FIELD, xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.FIELD, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.FIELD, xmlBindings.getSpecifiedAccessType());
+ assertEquals(XmlAccessType.FIELD, xmlBindings.getAccessType());
- xmlBindings.setSpecifiedAccessType(ELXmlAccessType.NONE);
+ xmlBindings.setSpecifiedAccessType(XmlAccessType.NONE);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-type=\"NONE\"", true);
assertEquals(EXmlAccessType.NONE, eXmlBindings.getXmlAccessorType());
- assertEquals(ELXmlAccessType.NONE, xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.NONE, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.NONE, xmlBindings.getSpecifiedAccessType());
+ assertEquals(XmlAccessType.NONE, xmlBindings.getAccessType());
- xmlBindings.setSpecifiedAccessType(ELXmlAccessType.PROPERTY);
+ xmlBindings.setSpecifiedAccessType(XmlAccessType.PROPERTY);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-type=\"PROPERTY\"", true);
assertEquals(EXmlAccessType.PROPERTY, eXmlBindings.getXmlAccessorType());
- assertEquals(ELXmlAccessType.PROPERTY, xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.PROPERTY, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.PROPERTY, xmlBindings.getSpecifiedAccessType());
+ assertEquals(XmlAccessType.PROPERTY, xmlBindings.getAccessType());
xmlBindings.setSpecifiedAccessType(null);
oxmResource.save();
@@ -135,7 +135,7 @@ public class OxmXmlBindingsTests assertFileContentsContains("oxm.xml", "xml-accessor-type=", false);
assertNull(eXmlBindings.getXmlAccessorType());
assertNull(xmlBindings.getSpecifiedAccessType());
- assertEquals(ELXmlAccessType.PUBLIC_MEMBER, xmlBindings.getAccessType());
+ assertEquals(XmlAccessType.PUBLIC_MEMBER, xmlBindings.getAccessType());
}
public void testUpdateAccessOrder() throws Exception {
@@ -148,24 +148,24 @@ public class OxmXmlBindingsTests // the value is not exactly specified, but since the attribute has a default value, it's "specified"
assertEquals(EXmlAccessOrder.UNDEFINED, eXmlBindings.getXmlAccessorOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getSpecifiedAccessOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getSpecifiedAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
eXmlBindings.setXmlAccessorOrder(EXmlAccessOrder.ALPHABETICAL);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-order=\"ALPHABETICAL\"", true);
assertEquals(EXmlAccessOrder.ALPHABETICAL, eXmlBindings.getXmlAccessorOrder());
- assertEquals(ELXmlAccessOrder.ALPHABETICAL, xmlBindings.getSpecifiedAccessOrder());
- assertEquals(ELXmlAccessOrder.ALPHABETICAL, xmlBindings.getAccessOrder());
+ assertEquals(XmlAccessOrder.ALPHABETICAL, xmlBindings.getSpecifiedAccessOrder());
+ assertEquals(XmlAccessOrder.ALPHABETICAL, xmlBindings.getAccessOrder());
eXmlBindings.setXmlAccessorOrder(EXmlAccessOrder.UNDEFINED);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-order=\"UNDEFINED\"", true);
assertEquals(EXmlAccessOrder.UNDEFINED, eXmlBindings.getXmlAccessorOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getSpecifiedAccessOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getSpecifiedAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
eXmlBindings.setXmlAccessorOrder(null);
oxmResource.save();
@@ -173,7 +173,7 @@ public class OxmXmlBindingsTests assertFileContentsContains("oxm.xml", "xml-accessor-order=", false);
assertNull(eXmlBindings.getXmlAccessorOrder());
assertNull(xmlBindings.getSpecifiedAccessOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
}
public void testModifyAccessOrder() throws Exception {
@@ -186,24 +186,24 @@ public class OxmXmlBindingsTests // the value is not exactly specified, but since the attribute has a default value, it's "specified"
assertEquals(EXmlAccessOrder.UNDEFINED, eXmlBindings.getXmlAccessorOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getSpecifiedAccessOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getSpecifiedAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
- xmlBindings.setSpecifiedAccessOrder(ELXmlAccessOrder.ALPHABETICAL);
+ xmlBindings.setSpecifiedAccessOrder(XmlAccessOrder.ALPHABETICAL);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-order=\"ALPHABETICAL\"", true);
assertEquals(EXmlAccessOrder.ALPHABETICAL, eXmlBindings.getXmlAccessorOrder());
- assertEquals(ELXmlAccessOrder.ALPHABETICAL, xmlBindings.getSpecifiedAccessOrder());
- assertEquals(ELXmlAccessOrder.ALPHABETICAL, xmlBindings.getAccessOrder());
+ assertEquals(XmlAccessOrder.ALPHABETICAL, xmlBindings.getSpecifiedAccessOrder());
+ assertEquals(XmlAccessOrder.ALPHABETICAL, xmlBindings.getAccessOrder());
- xmlBindings.setSpecifiedAccessOrder(ELXmlAccessOrder.UNDEFINED);
+ xmlBindings.setSpecifiedAccessOrder(XmlAccessOrder.UNDEFINED);
oxmResource.save();
assertFileContentsContains("oxm.xml", "xml-accessor-order=\"UNDEFINED\"", true);
assertEquals(EXmlAccessOrder.UNDEFINED, eXmlBindings.getXmlAccessorOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getSpecifiedAccessOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getSpecifiedAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
xmlBindings.setSpecifiedAccessOrder(null);
oxmResource.save();
@@ -211,7 +211,7 @@ public class OxmXmlBindingsTests assertFileContentsContains("oxm.xml", "xml-accessor-order=", false);
assertNull(eXmlBindings.getXmlAccessorOrder());
assertNull(xmlBindings.getSpecifiedAccessOrder());
- assertEquals(ELXmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
+ assertEquals(XmlAccessOrder.UNDEFINED, xmlBindings.getAccessOrder());
}
public void testUpdateXmlMappingMetadataComplete() throws Exception {
|