From ce2e5c4d84358e66d86dd48cde07b9a609e04e33 Mon Sep 17 00:00:00 2001 From: Karen Butzke Date: Mon, 10 Dec 2012 09:34:44 -0500 Subject: JavaResourceAnnotatedElement.Kind renamed to JavaResourceAnnotatedElement.AstNodeType --- .../src/org/eclipse/jpt/jaxb/core/JaxbProject.java | 7 ++++--- .../jpt/jaxb/core/internal/AbstractJaxbProject.java | 4 ++-- .../core/internal/context/AbstractJaxbContextRoot.java | 16 ++++++---------- .../context/java/AbstractJavaXmlJavaTypeAdapter.java | 2 +- .../internal/context/java/GenericJavaClassMapping.java | 2 +- .../internal/context/java/GenericJavaXmlAdapter.java | 2 +- 6 files changed, 15 insertions(+), 18 deletions(-) (limited to 'jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core') diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java index 0e56318228..09f9e6e24d 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java @@ -18,6 +18,7 @@ import org.eclipse.jdt.core.ElementChangedEvent; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage; import org.eclipse.jpt.common.utility.command.ExtendedCommandExecutor; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; @@ -199,10 +200,10 @@ public interface JaxbProject JavaResourceAbstractType getJavaResourceType(String typeName); /** - * Return the {@link JavaResourceAbstractType} with the specified type name and kind. - * Return null if invalid or absent or if the kind does not match. + * Return the {@link JavaResourceAbstractType} with the specified type name and astNodeType. + * Return null if invalid or absent or if the astNodeType does not match. */ - JavaResourceAbstractType getJavaResourceType(String typeName, JavaResourceAbstractType.Kind kind); + JavaResourceAbstractType getJavaResourceType(String typeName, JavaResourceAnnotatedElement.AstNodeType astNodeType); // **************** jaxb.index resources ********************************** diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java index 776b9d0b74..e2f5e930df 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java @@ -780,9 +780,9 @@ public abstract class AbstractJaxbProject // return this.buildPersistableExternalJavaResourcePersistentType(typeName); } - public JavaResourceAbstractType getJavaResourceType(String typeName, JavaResourceAbstractType.Kind kind) { + public JavaResourceAbstractType getJavaResourceType(String typeName, JavaResourceAbstractType.AstNodeType astNodeType) { JavaResourceAbstractType resourceType = getJavaResourceType(typeName); - if (resourceType == null || resourceType.getKind() != kind) { + if (resourceType == null || resourceType.getAstNodeType() != astNodeType) { return null; } return resourceType; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java index cf51426f6d..d799c99145 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java @@ -252,12 +252,12 @@ public abstract class AbstractJaxbContextRoot getJaxbProject().getJavaSourceResourceTypes()) { @Override protected boolean accept(JavaResourceAbstractType o) { - if (o.getKind() == JavaResourceAbstractType.Kind.TYPE) { + if (o.getAstNodeType() == JavaResourceAbstractType.AstNodeType.TYPE) { if (o.getAnnotation(JAXB.XML_REGISTRY) != null) { return true; } } - if (o.getKind() == JavaResourceAbstractType.Kind.ENUM) { + if (o.getAstNodeType() == JavaResourceAbstractType.AstNodeType.ENUM) { if (o.getAnnotation(JAXB.XML_ENUM) != null) { return true; } @@ -298,9 +298,7 @@ public abstract class AbstractJaxbContextRoot type.setDefaultMapped(defaultMapped); return; } - else { - this.removeType(className); // this will remove a type of another kind - } + this.removeType(className); // this will remove a type of another kind } JavaType type = buildType(resourceType); @@ -309,13 +307,11 @@ public abstract class AbstractJaxbContextRoot } protected TypeKind calculateJaxbTypeKind(JavaResourceAbstractType resourceType) { - if (resourceType.getKind() == JavaResourceAbstractType.Kind.ENUM) { + if (resourceType.getAstNodeType() == JavaResourceAbstractType.AstNodeType.ENUM) { return TypeKind.ENUM; } - // else is of kind TYPE - else { - return TypeKind.CLASS; - } + // else is of kind CLASS + return TypeKind.CLASS; } protected JavaType buildType(JavaResourceAbstractType resourceType) { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlJavaTypeAdapter.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlJavaTypeAdapter.java index 3a397823ee..a754fa3632 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlJavaTypeAdapter.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlJavaTypeAdapter.java @@ -105,7 +105,7 @@ public abstract class AbstractJavaXmlJavaTypeAdapter protected JavaResourceType getXmlAdapterResourceType() { String xmlAdapterName = getFullyQualifiedValue(); - return (JavaResourceType) getJaxbProject().getJavaResourceType(xmlAdapterName, JavaResourceAbstractType.Kind.TYPE); + return (JavaResourceType) getJaxbProject().getJavaResourceType(xmlAdapterName, JavaResourceAbstractType.AstNodeType.TYPE); } protected XmlAdapter buildXmlAdapter(JavaResourceType xmlAdapterResourceType) { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java index 7df0a2cb43..59a4740c43 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java @@ -468,7 +468,7 @@ public class GenericJavaClassMapping } return (JavaResourceType) getJaxbProject().getJavaResourceType( - superclassName, JavaResourceType.Kind.TYPE); + superclassName, JavaResourceType.AstNodeType.TYPE); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAdapter.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAdapter.java index 0fe5d68527..53cbc641eb 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAdapter.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAdapter.java @@ -84,7 +84,7 @@ public class GenericJavaXmlAdapter String superResourceTypeName = resourceType.getSuperclassQualifiedName(); if (! StringTools.isBlank(superResourceTypeName)) { JavaResourceType superResourceType - = (JavaResourceType) getJaxbProject().getJavaResourceType(superResourceTypeName, JavaResourceAbstractType.Kind.TYPE); + = (JavaResourceType) getJaxbProject().getJavaResourceType(superResourceTypeName, JavaResourceAbstractType.AstNodeType.TYPE); if (superResourceType != null) { return findBoundAndValueTypes(superResourceType); } -- cgit v1.2.3