diff options
| author | kmoore | 2010-11-15 19:19:33 +0000 |
|---|---|---|
| committer | kmoore | 2010-11-15 19:19:33 +0000 |
| commit | f046bdd0f60d1ddea99637db4947d6067dfc0356 (patch) | |
| tree | 80c76cf0c70cc495772d79cd3c9ca23e02d1d0b9 /jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21 | |
| parent | 8ce6f613d8779993bf2186bb693b6094f7bb6a4c (diff) | |
| download | webtools.dali-f046bdd0f60d1ddea99637db4947d6067dfc0356.tar.gz webtools.dali-f046bdd0f60d1ddea99637db4947d6067dfc0356.tar.xz webtools.dali-f046bdd0f60d1ddea99637db4947d6067dfc0356.zip | |
changed our resource model so that we can use CombinationIndexedDAA for manipulating nestable annotations
Diffstat (limited to 'jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21')
| -rw-r--r-- | jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/Generic_2_1_JaxbPlatformDefinition.java | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/Generic_2_1_JaxbPlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/Generic_2_1_JaxbPlatformDefinition.java index 70a119e6a8..1c1e21d5e4 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/Generic_2_1_JaxbPlatformDefinition.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/Generic_2_1_JaxbPlatformDefinition.java @@ -26,16 +26,13 @@ import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAttributeAnnotationDe import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementDeclAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementRefAnnotationDefinition; -import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementRefsAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementWrapperAnnotationDefinition; -import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementsAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlEnumAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlEnumValueAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlIDAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlIDREFAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlInlineBinaryDataAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlJavaTypeAdapterAnnotationDefinition; -import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlJavaTypeAdaptersAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlListAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlMimeTypeAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlMixedAnnotationDefinition; @@ -43,13 +40,13 @@ import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlRegistryAnnotationDef import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlRootElementAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSchemaAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSchemaTypeAnnotationDefinition; -import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSchemaTypesAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSeeAlsoAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlTransientAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlTypeAnnotationDefinition; import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlValueAnnotationDefinition; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition; import org.eclipse.jpt.jaxb.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.jaxb.core.resource.java.NestableAnnotationDefinition; public class Generic_2_1_JaxbPlatformDefinition extends AbstractJaxbPlatformDefinition @@ -84,32 +81,34 @@ public class Generic_2_1_JaxbPlatformDefinition XmlAnyElementAnnotationDefinition.instance(), XmlAttachmentRefAnnotationDefinition.instance(), XmlAttributeAnnotationDefinition.instance(), - XmlElementAnnotationDefinition.instance(), XmlElementDeclAnnotationDefinition.instance(), - XmlElementsAnnotationDefinition.instance(), - XmlElementRefAnnotationDefinition.instance(), - XmlElementRefsAnnotationDefinition.instance(), XmlElementWrapperAnnotationDefinition.instance(), XmlEnumAnnotationDefinition.instance(), XmlEnumValueAnnotationDefinition.instance(), XmlIDAnnotationDefinition.instance(), XmlIDREFAnnotationDefinition.instance(), XmlInlineBinaryDataAnnotationDefinition.instance(), - XmlJavaTypeAdapterAnnotationDefinition.instance(), - XmlJavaTypeAdaptersAnnotationDefinition.instance(), XmlListAnnotationDefinition.instance(), XmlMimeTypeAnnotationDefinition.instance(), XmlMixedAnnotationDefinition.instance(), XmlRegistryAnnotationDefinition.instance(), XmlRootElementAnnotationDefinition.instance(), XmlSchemaAnnotationDefinition.instance(), - XmlSchemaTypeAnnotationDefinition.instance(), - XmlSchemaTypesAnnotationDefinition.instance(), XmlSeeAlsoAnnotationDefinition.instance(), XmlTransientAnnotationDefinition.instance(), XmlTypeAnnotationDefinition.instance(), XmlValueAnnotationDefinition.instance()}; } + + @Override + protected NestableAnnotationDefinition[] buildNestableAnnotationDefinitions() { + return new NestableAnnotationDefinition[] { + XmlElementAnnotationDefinition.instance(), + XmlElementRefAnnotationDefinition.instance(), + XmlJavaTypeAdapterAnnotationDefinition.instance(), + XmlSchemaTypeAnnotationDefinition.instance() + }; + } // ********** resource models ********** |