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 /jaxb/tests | |
| parent | 01082bf0fd6fd80b9718eaab23d3e81d70858b61 (diff) | |
| download | webtools.dali-8938081bb4d9e724c80fa880f8f54d6c655e99d5.tar.gz webtools.dali-8938081bb4d9e724c80fa880f8f54d6c655e99d5.tar.xz webtools.dali-8938081bb4d9e724c80fa880f8f54d6c655e99d5.zip | |
refactoring for oxm - checkpoint
Diffstat (limited to 'jaxb/tests')
34 files changed, 583 insertions, 593 deletions
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 {
|