diff options
author | pfullbright | 2011-11-02 21:00:23 +0000 |
---|---|---|
committer | pfullbright | 2011-11-02 21:00:23 +0000 |
commit | e6edb452747f233d6f223a4bac1a0d174d4820f5 (patch) | |
tree | dadf11b76ca0f5e5c6f97170603486e09ea2afe5 /jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java | |
parent | 2746feaf38160c0d7b308f540fea5625165b9e67 (diff) | |
download | webtools.dali-e6edb452747f233d6f223a4bac1a0d174d4820f5.tar.gz webtools.dali-e6edb452747f233d6f223a4bac1a0d174d4820f5.tar.xz webtools.dali-e6edb452747f233d6f223a4bac1a0d174d4820f5.zip |
reworked SchemaLibrary for better usability
Diffstat (limited to 'jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java')
-rw-r--r-- | jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java index 375ff625d3..148869d2aa 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java @@ -20,6 +20,7 @@ import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod; +import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.JaxbQName; import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping; import org.eclipse.jpt.jaxb.core.context.XmlRegistry; @@ -238,6 +239,11 @@ public class GenericJavaElementFactoryMethod } + protected XsdSchema getXsdSchema() { + JaxbPackage jaxbPackage = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbClass().getJaxbPackage(); + return (jaxbPackage == null) ? null : jaxbPackage.getXsdSchema(); + } + @Override public String getDefaultName() { return null; @@ -245,7 +251,8 @@ public class GenericJavaElementFactoryMethod @Override public String getDefaultNamespace() { - return GenericJavaElementFactoryMethod.this.getRegistry().getJaxbPackage().getNamespace(); + JaxbPackage jaxbPackage = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbClass().getJaxbPackage(); + return (jaxbPackage == null) ? null : jaxbPackage.getNamespace(); } @Override @@ -262,7 +269,7 @@ public class GenericJavaElementFactoryMethod } } - XsdSchema xsdSchema = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbPackage().getXsdSchema(); + XsdSchema xsdSchema = getXsdSchema(); if (xsdSchema != null) { return xsdSchema.getElementNameProposals(getNamespace(), filter); } @@ -272,7 +279,7 @@ public class GenericJavaElementFactoryMethod @Override public Iterable<String> getNamespaceProposals(Filter<String> filter) { - XsdSchema xsdSchema = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbPackage().getXsdSchema(); + XsdSchema xsdSchema = getXsdSchema(); return (xsdSchema == null) ? EmptyIterable.<String>instance() : xsdSchema.getNamespaceProposals(filter); } @@ -299,7 +306,7 @@ public class GenericJavaElementFactoryMethod } } else { - XsdSchema xsdSchema = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbPackage().getXsdSchema(); + XsdSchema xsdSchema = getXsdSchema(); if (xsdSchema != null) { if (xsdSchema.getElementDeclaration(getNamespace(), getName()) == null) { messages.add(getUnresolveSchemaComponentMessage(astRoot)); @@ -328,6 +335,11 @@ public class GenericJavaElementFactoryMethod } + protected XsdSchema getXsdSchema() { + JaxbPackage jaxbPackage = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbClass().getJaxbPackage(); + return (jaxbPackage == null) ? null : jaxbPackage.getXsdSchema(); + } + @Override public String getDefaultName() { return null; @@ -335,7 +347,8 @@ public class GenericJavaElementFactoryMethod @Override public String getDefaultNamespace() { - return GenericJavaElementFactoryMethod.this.getRegistry().getJaxbPackage().getNamespace(); + JaxbPackage jaxbPackage = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbClass().getJaxbPackage(); + return (jaxbPackage == null) ? null : jaxbPackage.getNamespace(); } @Override @@ -350,7 +363,7 @@ public class GenericJavaElementFactoryMethod } } - XsdSchema xsdSchema = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbPackage().getXsdSchema(); + XsdSchema xsdSchema = getXsdSchema(); if (xsdSchema != null) { return xsdSchema.getElementNameProposals(getNamespace(), filter); } @@ -360,7 +373,7 @@ public class GenericJavaElementFactoryMethod @Override public Iterable<String> getNamespaceProposals(Filter<String> filter) { - XsdSchema xsdSchema = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbPackage().getXsdSchema(); + XsdSchema xsdSchema = getXsdSchema(); return (xsdSchema == null) ? EmptyIterable.<String>instance() : xsdSchema.getNamespaceProposals(filter); } @@ -395,7 +408,7 @@ public class GenericJavaElementFactoryMethod @Override protected void validateReference(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - XsdSchema xsdSchema = GenericJavaElementFactoryMethod.this.getRegistry().getJaxbPackage().getXsdSchema(); + XsdSchema xsdSchema = getXsdSchema(); if (xsdSchema != null) { if (xsdSchema.getElementDeclaration(getNamespace(), getName()) == null) { messages.add(getUnresolveSchemaComponentMessage(astRoot)); |