added schema component ref impl for @XmlSchemaType

2 files changed, 58 insertions, 58 deletions

diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java
index 932d1495fe..84b505a456 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java
@@ -213,8 +213,8 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
 		ListIterator<XmlSchemaType> xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getName());
+		assertEquals("bar", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("foo", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 	}
 	
@@ -253,10 +253,10 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		this.createPackageInfoWithAccessorType();
 		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextPackageInfo.addXmlSchemaType(0).setName("bar");
-		contextPackageInfo.addXmlSchemaType(0).setName("foo");
-		contextPackageInfo.addXmlSchemaType(0).setName("baz");
+		
+		contextPackageInfo.addXmlSchemaType(0).getSchemaTypeRef().setSpecifiedName("bar");
+		contextPackageInfo.addXmlSchemaType(0).getSchemaTypeRef().setSpecifiedName("foo");
+		contextPackageInfo.addXmlSchemaType(0).getSchemaTypeRef().setSpecifiedName("baz");
 
 		Iterator<XmlSchemaTypeAnnotation> xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
 
@@ -278,9 +278,9 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
-		contextPackageInfo.addXmlSchemaType(0).setName("bar");
-		contextPackageInfo.addXmlSchemaType(1).setName("foo");
-		contextPackageInfo.addXmlSchemaType(0).setName("baz");
+		contextPackageInfo.addXmlSchemaType(0).getSchemaTypeRef().setSpecifiedName("bar");
+		contextPackageInfo.addXmlSchemaType(1).getSchemaTypeRef().setSpecifiedName("foo");
+		contextPackageInfo.addXmlSchemaType(0).getSchemaTypeRef().setSpecifiedName("baz");
 
 		Iterator<XmlSchemaTypeAnnotation> xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
 
@@ -295,9 +295,9 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
-		contextPackageInfo.addXmlSchemaType(0).setName("bar");
-		contextPackageInfo.addXmlSchemaType(1).setName("foo");
-		contextPackageInfo.addXmlSchemaType(2).setName("baz");
+		contextPackageInfo.addXmlSchemaType(0).getSchemaTypeRef().setSpecifiedName("bar");
+		contextPackageInfo.addXmlSchemaType(1).getSchemaTypeRef().setSpecifiedName("foo");
+		contextPackageInfo.addXmlSchemaType(2).getSchemaTypeRef().setSpecifiedName("baz");
 
 		Iterator<XmlSchemaTypeAnnotation> xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
 		assertEquals("bar", xmlSchemaTypes.next().getName());		
@@ -327,9 +327,9 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
-		contextPackageInfo.addXmlSchemaType(0).setName("bar");
-		contextPackageInfo.addXmlSchemaType(1).setName("foo");
-		contextPackageInfo.addXmlSchemaType(2).setName("baz");
+		contextPackageInfo.addXmlSchemaType(0).getSchemaTypeRef().setSpecifiedName("bar");
+		contextPackageInfo.addXmlSchemaType(1).getSchemaTypeRef().setSpecifiedName("foo");
+		contextPackageInfo.addXmlSchemaType(2).getSchemaTypeRef().setSpecifiedName("baz");
 
 		Iterator<XmlSchemaTypeAnnotation> xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
 		assertEquals("bar", xmlSchemaTypes.next().getName());		
@@ -373,9 +373,9 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
 		ListIterator<XmlSchemaType> xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getName());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getName());
+		assertEquals("bar", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("foo", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("baz", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 
 
@@ -387,9 +387,9 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getName());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getName());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getName());
+		assertEquals("foo", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("baz", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("bar", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 
 
@@ -401,9 +401,9 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getName());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getName());
+		assertEquals("baz", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("foo", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("bar", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 
 
@@ -415,8 +415,8 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getName());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getName());
+		assertEquals("baz", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("bar", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 
 
@@ -428,7 +428,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getName());
+		assertEquals("baz", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 
 
@@ -461,7 +461,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
 		ListIterator<XmlSchemaType> xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getName());
+		assertEquals("bar", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 
 
@@ -475,8 +475,8 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
 		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getName());
+		assertEquals("bar", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("foo", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 
 		//add 1 XmlSchemaType when a container annotations exists
@@ -489,9 +489,9 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
 		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getName());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getName());
+		assertEquals("bar", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("foo", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("baz", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 
 		//add 1 XmlSchemaType to beginning of list when a container annotations exists
@@ -504,10 +504,10 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
 		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
 		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("foobaz", xmlSchemaTypesIterator.next().getName());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getName());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getName());
+		assertEquals("foobaz", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("bar", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("foo", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
+		assertEquals("baz", xmlSchemaTypesIterator.next().getSchemaTypeRef().getName());
 		assertFalse(xmlSchemaTypesIterator.hasNext());
 	}
 
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java
index c4f7022a54..74d59c14b5 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java
@@ -47,18 +47,18 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
-		assertNull(contextXmlSchemaType.getName());
+		assertNull(contextXmlSchemaType.getSchemaTypeRef().getName());
 		
-		contextXmlSchemaType.setName("foo");
+		contextXmlSchemaType.getSchemaTypeRef().setSpecifiedName("foo");
 		XmlSchemaTypeAnnotation schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, XmlSchemaTypeAnnotation.ANNOTATION_NAME);
 		assertEquals("foo", schemaTypeAnnotation.getName());
-		assertEquals("foo", contextXmlSchemaType.getName());
+		assertEquals("foo", contextXmlSchemaType.getSchemaTypeRef().getName());
 		
 		 //verify the xml schema type annotation is not removed when the name is set to null
-		contextXmlSchemaType.setName(null);
+		contextXmlSchemaType.getSchemaTypeRef().setSpecifiedName(null);
 		schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, XmlSchemaTypeAnnotation.ANNOTATION_NAME);
 		assertNull(schemaTypeAnnotation.getName());
-		assertNull(contextXmlSchemaType.getName());
+		assertNull(contextXmlSchemaType.getSchemaTypeRef().getName());
 	}
 	
 	public void testUpdateName() throws Exception {
@@ -67,7 +67,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
-		assertNull(contextXmlSchemaType.getName());
+		assertNull(contextXmlSchemaType.getSchemaTypeRef().getName());
 		
 		//add a name member value pair
 		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
@@ -76,7 +76,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 				GenericJavaXmlSchemaTypeTests.this.addXmlSchemaTypeMemberValuePair(declaration, JAXB.XML_SCHEMA_TYPE__NAME, "foo");
 			}
 		});
-		assertEquals("foo", contextXmlSchemaType.getName());
+		assertEquals("foo", contextXmlSchemaType.getSchemaTypeRef().getName());
 
 		annotatedElement.edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -92,22 +92,22 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
-		assertNull(contextXmlSchemaType.getSpecifiedNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getDefaultNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getNamespace());
+		assertNull(contextXmlSchemaType.getSchemaTypeRef().getSpecifiedNamespace());
+		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getSchemaTypeRef().getDefaultNamespace());
+		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getSchemaTypeRef().getNamespace());
 		
-		contextXmlSchemaType.setSpecifiedNamespace("foo");
+		contextXmlSchemaType.getSchemaTypeRef().setSpecifiedNamespace("foo");
 		XmlSchemaTypeAnnotation schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, XmlSchemaTypeAnnotation.ANNOTATION_NAME);
 		assertEquals("foo", schemaTypeAnnotation.getNamespace());
-		assertEquals("foo", contextXmlSchemaType.getSpecifiedNamespace());
-		assertEquals("foo", contextXmlSchemaType.getNamespace());
+		assertEquals("foo", contextXmlSchemaType.getSchemaTypeRef().getSpecifiedNamespace());
+		assertEquals("foo", contextXmlSchemaType.getSchemaTypeRef().getNamespace());
 		
 		 //verify the xml schema type annotation is not removed when the namespace is set to null
-		contextXmlSchemaType.setSpecifiedNamespace(null);
+		contextXmlSchemaType.getSchemaTypeRef().setSpecifiedNamespace(null);
 		schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, XmlSchemaTypeAnnotation.ANNOTATION_NAME);
 		assertNull(schemaTypeAnnotation.getNamespace());
-		assertNull(contextXmlSchemaType.getSpecifiedNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getNamespace());
+		assertNull(contextXmlSchemaType.getSchemaTypeRef().getSpecifiedNamespace());
+		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getSchemaTypeRef().getNamespace());
 	}
 	
 	public void testUpdateNamespace() throws Exception {
@@ -116,9 +116,9 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
-		assertNull(contextXmlSchemaType.getSpecifiedNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getDefaultNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getNamespace());
+		assertNull(contextXmlSchemaType.getSchemaTypeRef().getSpecifiedNamespace());
+		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getSchemaTypeRef().getDefaultNamespace());
+		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getSchemaTypeRef().getNamespace());
 		
 		//add a namespace member value pair
 		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
@@ -127,8 +127,8 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 				GenericJavaXmlSchemaTypeTests.this.addXmlSchemaTypeMemberValuePair(declaration, JAXB.XML_SCHEMA_TYPE__NAMESPACE, "foo");
 			}
 		});
-		assertEquals("foo", contextXmlSchemaType.getSpecifiedNamespace());
-		assertEquals("foo", contextXmlSchemaType.getNamespace());
+		assertEquals("foo", contextXmlSchemaType.getSchemaTypeRef().getSpecifiedNamespace());
+		assertEquals("foo", contextXmlSchemaType.getSchemaTypeRef().getNamespace());
 		
 		annotatedElement.edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {