diff options
Diffstat (limited to 'jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org')
9 files changed, 12 insertions, 32 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryContainerAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryContainerAnnotation.java index c90f6da7c9..cb3aa63ecd 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryContainerAnnotation.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryContainerAnnotation.java @@ -35,7 +35,7 @@ public abstract class BinaryContainerAnnotation<T extends NestableAnnotation> throw new UnsupportedOperationException(); } - public T addNestedAnnotation() { + public T addNestedAnnotation(int index) { throw new UnsupportedOperationException(); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/AnnotationContainerTools.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/AnnotationContainerTools.java index d00a9ea415..3da45631b9 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/AnnotationContainerTools.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/AnnotationContainerTools.java @@ -39,7 +39,7 @@ public final class AnnotationContainerTools { public static <T extends NestableAnnotation> NestableAnnotation addNestedAnnotation(int index, AnnotationContainer<T> annotationContainer) { // add a new annotation to the end of the list... int sourceIndex = annotationContainer.getNestedAnnotationsSize(); - T nestedAnnotation = annotationContainer.addNestedAnnotation(); + T nestedAnnotation = annotationContainer.addNestedAnnotation(sourceIndex); nestedAnnotation.newAnnotation(); // ...then move it to the specified index moveNestedAnnotation(index, sourceIndex, annotationContainer); @@ -124,7 +124,7 @@ public final class AnnotationContainerTools { // (maybe someday we can use them during initialization...) int size = getNestedAstAnnotations(astRoot, annotationContainer).size(); for (int i = 0; i < size; i++) { - T nestedAnnotation = annotationContainer.addNestedAnnotation(); + T nestedAnnotation = annotationContainer.addNestedAnnotation(i); nestedAnnotation.initialize(astRoot); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceAnnotatedElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceAnnotatedElement.java index b7157a472f..a32db337fa 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceAnnotatedElement.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceAnnotatedElement.java @@ -171,9 +171,9 @@ abstract class SourceAnnotatedElement<A extends AnnotatedElement> this.annotations.add(containerAnnotation); containerAnnotation.newAnnotation(); - NestableAnnotation nestedAnnotation0 = containerAnnotation.addNestedAnnotation(); + NestableAnnotation nestedAnnotation0 = containerAnnotation.addNestedAnnotation(0); nestedAnnotation0.newAnnotation(); - NestableAnnotation nestedAnnotation1 = containerAnnotation.addNestedAnnotation(); + NestableAnnotation nestedAnnotation1 = containerAnnotation.addNestedAnnotation(1); nestedAnnotation1.newAnnotation(); this.removeAnnotation(standAloneAnnotation); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementRefsAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementRefsAnnotation.java index af464afc4e..3e603906ff 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementRefsAnnotation.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementRefsAnnotation.java @@ -74,11 +74,7 @@ public class SourceXmlElementRefsAnnotation return this.elementRefs.size(); } - public XmlElementRefAnnotation addNestedAnnotation() { - return this.addNestedAnnotation(this.elementRefs.size()); - } - - private XmlElementRefAnnotation addNestedAnnotation(int index) { + public XmlElementRefAnnotation addNestedAnnotation(int index) { XmlElementRefAnnotation elementRef = this.buildXmlElementRefAnnotation(index); this.elementRefs.add(elementRef); return elementRef; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementsAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementsAnnotation.java index 8394656124..39992007a5 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementsAnnotation.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementsAnnotation.java @@ -74,11 +74,7 @@ public class SourceXmlElementsAnnotation return this.elements.size(); } - public XmlElementAnnotation addNestedAnnotation() { - return this.addNestedAnnotation(this.elements.size()); - } - - private XmlElementAnnotation addNestedAnnotation(int index) { + public XmlElementAnnotation addNestedAnnotation(int index) { XmlElementAnnotation element = this.buildXmlElementAnnotation(index); this.elements.add(element); return element; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlJavaTypeAdaptersAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlJavaTypeAdaptersAnnotation.java index 36841fa76d..50dacb9a24 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlJavaTypeAdaptersAnnotation.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlJavaTypeAdaptersAnnotation.java @@ -78,11 +78,7 @@ public class SourceXmlJavaTypeAdaptersAnnotation return this.adapters.get(index); } - public XmlJavaTypeAdapterAnnotation addNestedAnnotation() { - return this.addNestedAnnotation(this.adapters.size()); - } - - private XmlJavaTypeAdapterAnnotation addNestedAnnotation(int index) { + public XmlJavaTypeAdapterAnnotation addNestedAnnotation(int index) { XmlJavaTypeAdapterAnnotation adapter = this.buildXmlJavaTypeAdapterAnnotation(index); this.adapters.add(adapter); return adapter; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaAnnotation.java index 6166777de5..25cb750628 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaAnnotation.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaAnnotation.java @@ -261,10 +261,6 @@ public class SourceXmlSchemaAnnotation return (XmlNsAnnotation) AnnotationContainerTools.addNestedAnnotation(index, this.xmlnsContainer); } - protected XmlNsAnnotation addXmlns_() { - return addXmlns_(this.xmlns.size()); - } - protected XmlNsAnnotation addXmlns_(int index) { XmlNsAnnotation xmlns = buildXmlns(index); this.xmlns.add(index, xmlns); @@ -334,8 +330,8 @@ public class SourceXmlSchemaAnnotation return SourceXmlSchemaAnnotation.this.getXmlnsSize(); } - public XmlNsAnnotation addNestedAnnotation() { - return SourceXmlSchemaAnnotation.this.addXmlns_(); + public XmlNsAnnotation addNestedAnnotation(int index) { + return SourceXmlSchemaAnnotation.this.addXmlns_(index); } public void syncAddNestedAnnotation(org.eclipse.jdt.core.dom.Annotation astAnnotation) { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaTypesAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaTypesAnnotation.java index b89afcdefe..e9d8fb2d0e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaTypesAnnotation.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaTypesAnnotation.java @@ -78,11 +78,7 @@ public class SourceXmlSchemaTypesAnnotation return this.schemaTypes.get(index); } - public XmlSchemaTypeAnnotation addNestedAnnotation() { - return this.addNestedAnnotation(this.schemaTypes.size()); - } - - private XmlSchemaTypeAnnotation addNestedAnnotation(int index) { + public XmlSchemaTypeAnnotation addNestedAnnotation(int index) { XmlSchemaTypeAnnotation adapter = this.buildXmlSchemaTypeAnnotation(index); this.schemaTypes.add(adapter); return adapter; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/resource/java/AnnotationContainer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/resource/java/AnnotationContainer.java index a981008e6e..bfa81e762c 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/resource/java/AnnotationContainer.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/resource/java/AnnotationContainer.java @@ -60,7 +60,7 @@ public interface AnnotationContainer<T extends NestableAnnotation> * Add a nested annotation to the container * without firing change notification. */ - T addNestedAnnotation(); + T addNestedAnnotation(int index); /** * The specified nested annotation was added to the container at the |