cleaned up imports

5 files changed, 26 insertions, 27 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMappingDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMappingDefinition.java
index ee525891f3..b466185ddf 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMappingDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMappingDefinition.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
 
 import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable;
 import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
 import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlAnyElementMappingDefinition;
 import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMappingDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMappingDefinition.java
index 5f1212725a..09f671a718 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMappingDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMappingDefinition.java
@@ -10,9 +10,7 @@
 package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;
 
 import java.util.StringTokenizer;
-
 import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable;
 import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
 import org.eclipse.jpt.jaxb.core.context.java.DefaultJavaAttributeMappingDefinition;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaTypeImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaTypeImpl.java
index efcc1140c2..b544d24825 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaTypeImpl.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmJavaTypeImpl.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
 import java.util.List;

 import java.util.Vector;

 import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;

+import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;

 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;

 import org.eclipse.jpt.common.core.utility.TextRange;

 import org.eclipse.jpt.common.utility.internal.ClassNameTools;

@@ -98,8 +99,11 @@ public class OxmJavaTypeImpl
 	}

 	

 	@Override

-	protected JavaClass buildJavaType(JavaResourceType resourceType) {

-		return new GenericJavaJaxbClass(this, resourceType);

+	protected JavaClass buildJavaType(JavaResourceAbstractType resourceType) {

+		if (resourceType.getAstNodeType() == AstNodeType.TYPE) {

+			return new GenericJavaJaxbClass(this, (JavaResourceType) resourceType);

+		}

+		return null;

 	}

 	

 	@Override

@@ -162,6 +166,23 @@ public class OxmJavaTypeImpl
 	}

 	

 	

+	// ***** type name *****

+	

+	@Override

+	protected void updateTypeName() {

+		String fqName = this.typeName.getFullyQualifiedName();

+		String newFqName = getXmlBindings().getQualifiedName(this.specifiedName);

+		if (! ObjectTools.equals(fqName, newFqName)) {

+			setTypeName_(buildTypeName());

+		}

+	}

+	

+	@Override

+	protected TypeName buildTypeName() {

+		return new OxmTypeName(getXmlBindings().getQualifiedName(this.specifiedName));

+	}

+	

+	

 	// ***** super-type name *****

 	

 	public String getSuperTypeName() {

@@ -249,23 +270,6 @@ public class OxmJavaTypeImpl
 	}

 	

 	

-	// ***** type name *****

-	

-	@Override

-	protected void updateTypeName() {

-		String fqName = this.typeName.getFullyQualifiedName();

-		String newFqName = getXmlBindings().getQualifiedName(this.specifiedName);

-		if (! ObjectTools.equals(fqName, newFqName)) {

-			setTypeName_(buildTypeName());

-		}

-	}

-	

-	@Override

-	protected TypeName buildTypeName() {

-		return new OxmTypeName(getXmlBindings().getQualifiedName(this.specifiedName));

-	}

-	

-	

 	// ***** XmlAccessorOrder *****

 	

 	public XmlAccessOrder getAccessOrder() {

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java
index ace17e6911..1e3be37862 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlElementImpl.java
@@ -9,9 +9,9 @@
  *******************************************************************************/

 package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;
 
-import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlElement;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement;
+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;

+import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmXmlElement;

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement;

 
 public class OxmXmlElementImpl
 		extends AbstractOxmJavaAttribute<EXmlElement>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/AbstractELJaxb_2_1_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/AbstractELJaxb_2_1_PlatformDefinition.java
index ba3d816ef3..498f6d63d0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/AbstractELJaxb_2_1_PlatformDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/AbstractELJaxb_2_1_PlatformDefinition.java
@@ -20,8 +20,6 @@ import org.eclipse.jpt.jaxb.core.JaxbFactory;
 import org.eclipse.jpt.jaxb.core.JaxbResourceModelProvider;
 import org.eclipse.jpt.jaxb.core.context.java.DefaultJavaAttributeMappingDefinition;
 import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jaxb.core.internal.jaxb21.GenericJaxb_2_1_PlatformDefinition;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
 import org.eclipse.jpt.jaxb.eclipselink.core.internal.ELJaxbPlatformDefinition;
 import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlAnyAttributeMappingDefinition;
 import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlAnyElementMappingDefinition;