diff options
Diffstat (limited to 'jaxb/plugins/org.eclipse.jpt.jaxb.core/src')
10 files changed, 65 insertions, 57 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java index 5d02fce87b..400b0c8a7b 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java @@ -16,13 +16,13 @@ import org.eclipse.jpt.core.context.java.JavaEntity; import org.eclipse.jpt.core.context.orm.EntityMappings; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass; -import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode; -import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter; import org.eclipse.jpt.jaxb.core.context.XmlNs; +import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.context.XmlSchema; import org.eclipse.jpt.jaxb.core.context.XmlSchemaType; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage; @@ -88,16 +88,16 @@ public interface JaxbFactory { * The root context node will be built once, but updated many times. * @see JaxbProject#update(org.eclipse.core.runtime.IProgressMonitor) */ - JaxbRootContextNode buildRootContextNode(JaxbProject jaxbProject); + JaxbContextRoot buildContextRoot(JaxbProject jaxbProject); - JaxbPackage buildPackage(JaxbRootContextNode parent, String packageName); + JaxbPackage buildPackage(JaxbContextRoot parent, String packageName); // ********** Java context nodes ********** JaxbPackageInfo buildJavaPackageInfo(JaxbPackage parent, JavaResourcePackage resourcePackage); - JaxbPersistentClass buildPersistentClass(JaxbRootContextNode parent, JavaResourceType resourceType); + JaxbPersistentClass buildPersistentClass(JaxbContextRoot parent, JavaResourceType resourceType); XmlSchema buildJavaXmlSchema(JaxbPackageInfo parent); 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 bff5349067..c3eefbffb7 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 @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.jdt.core.ElementChangedEvent; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatform; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceType; @@ -75,7 +75,7 @@ public interface JaxbProject /** * Return the root of the JAXB project's context model. */ - JaxbRootContextNode getRootContextNode(); + JaxbContextRoot getContextRoot(); /** * The JAXB project has been removed from the JJAXBPA model. Clean up any diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextNode.java index 0b9798ba06..b21228978d 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextNode.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextNode.java @@ -26,8 +26,13 @@ import org.eclipse.jpt.jaxb.core.JaxbNode; * @since 3.0 */ public interface JaxbContextNode - extends JaxbNode -{ + extends JaxbNode { + + /** + * Return the root of the context model + */ + JaxbContextRoot getContextRoot(); + /** * Return the resource type of the context node's resource. */ diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbRootContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextRoot.java index d92cb9fc38..5d20526bf5 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbRootContextNode.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextRoot.java @@ -21,12 +21,11 @@ package org.eclipse.jpt.jaxb.core.context; * @version 3.0 * @since 3.0 */ -public interface JaxbRootContextNode +public interface JaxbContextRoot extends JaxbContextNode { /** * The set of packages. Includes any package with any interesting JAXB content. - * @see #addCollectionChangeListener(String, org.eclipse.jpt.utility.model.listener.CollectionChangeListener) */ Iterable<JaxbPackage> getPackages(); public final static String PACKAGES_COLLECTION = "packages"; //$NON-NLS-1$ diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java index a53f0bca19..2f46330780 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java @@ -17,22 +17,22 @@ import org.eclipse.jpt.jaxb.core.JaxbFile; import org.eclipse.jpt.jaxb.core.JaxbProject; import org.eclipse.jpt.jaxb.core.JaxbProject.Config; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass; -import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode; -import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter; import org.eclipse.jpt.jaxb.core.context.XmlNs; +import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.context.XmlSchema; import org.eclipse.jpt.jaxb.core.context.XmlSchemaType; +import org.eclipse.jpt.jaxb.core.internal.context.GenericContextRoot; import org.eclipse.jpt.jaxb.core.internal.context.GenericPackage; -import org.eclipse.jpt.jaxb.core.internal.context.GenericRootContextNode; import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaPackageInfo; import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaPersistentClass; -import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlRootElement; import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlJavaTypeAdapter; import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlNs; +import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlRootElement; import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlSchema; import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlSchemaType; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage; @@ -67,11 +67,11 @@ public abstract class AbstractJaxbFactory // ********** Non-resource-specific context nodes ********** - public JaxbRootContextNode buildRootContextNode(JaxbProject parent) { - return new GenericRootContextNode(parent); + public JaxbContextRoot buildContextRoot(JaxbProject parent) { + return new GenericContextRoot(parent); } - public JaxbPackage buildPackage(JaxbRootContextNode parent, String packageName) { + public JaxbPackage buildPackage(JaxbContextRoot parent, String packageName) { return new GenericPackage(parent, packageName); } @@ -82,7 +82,7 @@ public abstract class AbstractJaxbFactory return new GenericJavaPackageInfo(parent, resourcePackage); } - public JaxbPersistentClass buildPersistentClass(JaxbRootContextNode parent, JavaResourceType resourceType) { + public JaxbPersistentClass buildPersistentClass(JaxbContextRoot parent, JavaResourceType resourceType) { return new GenericJavaPersistentClass(parent, resourceType); } 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 1899a311a9..fc7a96ac32 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 @@ -39,7 +39,7 @@ import org.eclipse.jpt.core.resource.ResourceLocator; import org.eclipse.jpt.jaxb.core.JaxbFile; import org.eclipse.jpt.jaxb.core.JaxbProject; import org.eclipse.jpt.jaxb.core.JptJaxbCorePlugin; -import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatform; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceCompilationUnit; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceNode; @@ -118,7 +118,7 @@ public abstract class AbstractJaxbProject * The root of the model representing the collated resources associated with * the JAXB project. */ - protected final JaxbRootContextNode rootContextNode; + protected final JaxbContextRoot contextRoot; /** * A pluggable synchronizer that keeps the JAXB @@ -176,7 +176,7 @@ public abstract class AbstractJaxbProject // this.externalJavaResourcePersistentTypeCache = this.buildExternalJavaResourcePersistentTypeCache(); - this.rootContextNode = this.buildRootContextNode(); + this.contextRoot = this.buildContextRoot(); // there *shouldn't* be any changes to the resource model... this.setContextModelSynchronizer_(this.buildSynchronousContextModelSynchronizer()); @@ -212,8 +212,8 @@ public abstract class AbstractJaxbProject // return new BinaryPersistentTypeCache(this.jpaPlatform.getAnnotationProvider()); // } - protected JaxbRootContextNode buildRootContextNode() { - return this.getFactory().buildRootContextNode(this); + protected JaxbContextRoot buildContextRoot() { + return this.getFactory().buildContextRoot(this); } // ***** inner class @@ -532,9 +532,9 @@ public abstract class AbstractJaxbProject // ********** context model ********** - - public JaxbRootContextNode getRootContextNode() { - return this.rootContextNode; + + public JaxbContextRoot getContextRoot() { + return this.contextRoot; } @@ -1386,7 +1386,7 @@ public abstract class AbstractJaxbProject * Called by the context model synchronizer. */ public IStatus synchronizeContextModel(IProgressMonitor monitor) { - this.rootContextNode.synchronizeWithResourceModel(); + this.contextRoot.synchronizeWithResourceModel(); return Status.OK_STATUS; } @@ -1470,7 +1470,7 @@ public abstract class AbstractJaxbProject * Called by the update synchronizer. */ public IStatus update(IProgressMonitor monitor) { - this.rootContextNode.update(); + this.contextRoot.update(); return Status.OK_STATUS; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextNode.java index 6800790732..a2f49bf106 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextNode.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextNode.java @@ -12,36 +12,36 @@ package org.eclipse.jpt.jaxb.core.internal.context; import org.eclipse.jpt.core.JpaResourceType; import org.eclipse.jpt.jaxb.core.JaxbNode; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.internal.AbstractJaxbNode; public abstract class AbstractJaxbContextNode extends AbstractJaxbNode implements JaxbContextNode { - + // ********** constructor ********** - + protected AbstractJaxbContextNode(JaxbNode parent) { super(parent); } - - - // ********** JpaNode implentation ********** - - /** - * covariant override - */ + + + // ********** JaxbNode implentation ********** + @Override public JaxbContextNode getParent() { - return (JaxbContextNode) super.getParent(); + return (JaxbContextNode) super.getParent(); } - - + + // ********** JaxbContextNode implementation ********** + public JaxbContextRoot getContextRoot() { + return getParent().getContextRoot(); + } + public JpaResourceType getResourceType() { return getParent().getResourceType(); } - - } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericRootContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericContextRoot.java index 6431fa2746..f2dcae593c 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericRootContextNode.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericContextRoot.java @@ -15,9 +15,9 @@ import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.jpt.jaxb.core.JaxbProject; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass; -import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceType; @@ -29,9 +29,9 @@ import org.eclipse.jpt.utility.internal.iterables.TransformationIterable; /** * the context model root */ -public class GenericRootContextNode +public class GenericContextRoot extends AbstractJaxbContextNode - implements JaxbRootContextNode { + implements JaxbContextRoot { /* This object has no parent, so it must point to the JAXB project explicitly. */ protected final JaxbProject jaxbProject; @@ -43,7 +43,7 @@ public class GenericRootContextNode protected final Map<String, JaxbPersistentClass> persistentClasses; - public GenericRootContextNode(JaxbProject jaxbProject) { + public GenericContextRoot(JaxbProject jaxbProject) { super(null); // the JPA project is not really a "parent"... if (jaxbProject == null) { throw new NullPointerException(); @@ -56,6 +56,11 @@ public class GenericRootContextNode @Override + public JaxbContextRoot getContextRoot() { + return this; + } + + @Override protected boolean requiresParent() { return false; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java index 886f3a0a9c..118ccb36e0 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jaxb.core.internal.context; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; -import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage; public class GenericPackage @@ -23,7 +23,7 @@ public class GenericPackage protected JaxbPackageInfo packageInfo; - public GenericPackage(JaxbRootContextNode parent, String name) { + public GenericPackage(JaxbContextRoot parent, String name) { super(parent); this.name = name; JavaResourcePackage jrp = getJaxbProject().getAnnotatedJavaResourcePackage(this.name); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentClass.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentClass.java index dedd9617e6..35c7d9632e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentClass.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentClass.java @@ -9,12 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jaxb.core.internal.context.java; +import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass; -import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode; -import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder; import org.eclipse.jpt.jaxb.core.context.XmlAccessType; +import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.internal.context.AbstractJaxbContextNode; import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceType; import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorOrderAnnotation; @@ -24,9 +24,8 @@ import org.eclipse.jpt.jaxb.core.resource.java.XmlTypeAnnotation; import org.eclipse.jpt.utility.internal.iterables.ListIterable; public class GenericJavaPersistentClass - extends AbstractJaxbContextNode - implements JaxbPersistentClass -{ + extends AbstractJaxbContextNode + implements JaxbPersistentClass { protected final JavaResourceType resourceType; @@ -47,7 +46,7 @@ public class GenericJavaPersistentClass protected XmlRootElement rootElement; - public GenericJavaPersistentClass(JaxbRootContextNode parent, JavaResourceType resourceType) { + public GenericJavaPersistentClass(JaxbContextRoot parent, JavaResourceType resourceType) { super(parent); this.resourceType = resourceType; this.factoryClass = this.getResourceFactoryClass(); @@ -64,8 +63,8 @@ public class GenericJavaPersistentClass } @Override - public JaxbRootContextNode getParent() { - return (JaxbRootContextNode) super.getParent(); + public JaxbContextRoot getParent() { + return (JaxbContextRoot) super.getParent(); } protected JaxbPackageInfo getPackageInfo() { |