Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2010-11-09 12:26:13 -0500
committerkmoore2010-11-09 12:26:13 -0500
commit18e605b92f70b9d1952aa14eb7b919b178c08e58 (patch)
tree07635dd84c01c853d826faec15d4f089dfe7079f
parent4b353f3eeb61f3230d1a6d047e0f22a20b478e00 (diff)
downloadwebtools.dali-18e605b92f70b9d1952aa14eb7b919b178c08e58.tar.gz
webtools.dali-18e605b92f70b9d1952aa14eb7b919b178c08e58.tar.xz
webtools.dali-18e605b92f70b9d1952aa14eb7b919b178c08e58.zip
another AnnotationContainer API change, return a ListIterable
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementRefsAnnotation.java7
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementsAnnotation.java7
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementRefsAnnotation.java7
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlElementsAnnotation.java7
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlJavaTypeAdaptersAnnotation.java7
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaAnnotation.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlSchemaTypesAnnotation.java7
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/resource/java/AnnotationContainer.java3
8 files changed, 27 insertions, 20 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementRefsAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementRefsAnnotation.java
index 92d74f006f..36fe72441e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementRefsAnnotation.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementRefsAnnotation.java
@@ -15,7 +15,8 @@ import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceAttribute;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefsAnnotation;
-import org.eclipse.jpt.utility.internal.iterables.LiveCloneIterable;
+import org.eclipse.jpt.utility.internal.iterables.ListIterable;
+import org.eclipse.jpt.utility.internal.iterables.LiveCloneListIterable;
/**
* javax.xml.bind.annotation.adapters.XmlElementRefs
@@ -36,8 +37,8 @@ public class BinaryXmlElementRefsAnnotation
return ANNOTATION_NAME;
}
- public Iterable<XmlElementRefAnnotation> getNestedAnnotations() {
- return new LiveCloneIterable<XmlElementRefAnnotation>(this.xmlElementRefs);
+ public ListIterable<XmlElementRefAnnotation> getNestedAnnotations() {
+ return new LiveCloneListIterable<XmlElementRefAnnotation>(this.xmlElementRefs);
}
public int getNestedAnnotationsSize() {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementsAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementsAnnotation.java
index 380f0019df..39a235a79d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementsAnnotation.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlElementsAnnotation.java
@@ -15,7 +15,8 @@ import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceAttribute;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementsAnnotation;
-import org.eclipse.jpt.utility.internal.iterables.LiveCloneIterable;
+import org.eclipse.jpt.utility.internal.iterables.ListIterable;
+import org.eclipse.jpt.utility.internal.iterables.LiveCloneListIterable;
/**
* javax.xml.bind.annotation.adapters.XmlElements
@@ -36,8 +37,8 @@ public class BinaryXmlElementsAnnotation
return ANNOTATION_NAME;
}
- public Iterable<XmlElementAnnotation> getNestedAnnotations() {
- return new LiveCloneIterable<XmlElementAnnotation>(this.xmlElements);
+ public ListIterable<XmlElementAnnotation> getNestedAnnotations() {
+ return new LiveCloneListIterable<XmlElementAnnotation>(this.xmlElements);
}
public int getNestedAnnotationsSize() {
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 3e603906ff..df6cb9e904 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
@@ -20,7 +20,8 @@ import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceAttribute;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefsAnnotation;
import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterables.LiveCloneIterable;
+import org.eclipse.jpt.utility.internal.iterables.ListIterable;
+import org.eclipse.jpt.utility.internal.iterables.LiveCloneListIterable;
/**
* javax.xml.bind.annotation.adapters.XmlElementRefs
@@ -66,8 +67,8 @@ public class SourceXmlElementRefsAnnotation
return XmlElementRefAnnotation.ANNOTATION_NAME;
}
- public Iterable<XmlElementRefAnnotation> getNestedAnnotations() {
- return new LiveCloneIterable<XmlElementRefAnnotation>(this.elementRefs);
+ public ListIterable<XmlElementRefAnnotation> getNestedAnnotations() {
+ return new LiveCloneListIterable<XmlElementRefAnnotation>(this.elementRefs);
}
public int getNestedAnnotationsSize() {
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 39992007a5..d876ea0034 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
@@ -20,7 +20,8 @@ import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceAttribute;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation;
import org.eclipse.jpt.jaxb.core.resource.java.XmlElementsAnnotation;
import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterables.LiveCloneIterable;
+import org.eclipse.jpt.utility.internal.iterables.ListIterable;
+import org.eclipse.jpt.utility.internal.iterables.LiveCloneListIterable;
/**
* javax.xml.bind.annotation.adapters.XmlElements
@@ -66,8 +67,8 @@ public class SourceXmlElementsAnnotation
return XmlElementAnnotation.ANNOTATION_NAME;
}
- public Iterable<XmlElementAnnotation> getNestedAnnotations() {
- return new LiveCloneIterable<XmlElementAnnotation>(this.elements);
+ public ListIterable<XmlElementAnnotation> getNestedAnnotations() {
+ return new LiveCloneListIterable<XmlElementAnnotation>(this.elements);
}
public int getNestedAnnotationsSize() {
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 50dacb9a24..1387e172be 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
@@ -20,7 +20,8 @@ import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage;
import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdaptersAnnotation;
import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterables.LiveCloneIterable;
+import org.eclipse.jpt.utility.internal.iterables.ListIterable;
+import org.eclipse.jpt.utility.internal.iterables.LiveCloneListIterable;
/**
* javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters
@@ -66,8 +67,8 @@ public class SourceXmlJavaTypeAdaptersAnnotation
return XmlJavaTypeAdapterAnnotation.ANNOTATION_NAME;
}
- public Iterable<XmlJavaTypeAdapterAnnotation> getNestedAnnotations() {
- return new LiveCloneIterable<XmlJavaTypeAdapterAnnotation>(this.adapters);
+ public ListIterable<XmlJavaTypeAdapterAnnotation> getNestedAnnotations() {
+ return new LiveCloneListIterable<XmlJavaTypeAdapterAnnotation>(this.adapters);
}
public int getNestedAnnotationsSize() {
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 25cb750628..b3016a8365 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
@@ -322,7 +322,7 @@ public class SourceXmlSchemaAnnotation
return JAXB.XML_NS;
}
- public Iterable<XmlNsAnnotation> getNestedAnnotations() {
+ public ListIterable<XmlNsAnnotation> getNestedAnnotations() {
return SourceXmlSchemaAnnotation.this.getXmlns();
}
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 e9d8fb2d0e..6e1d2a32a0 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
@@ -20,7 +20,8 @@ import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage;
import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypeAnnotation;
import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypesAnnotation;
import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterables.LiveCloneIterable;
+import org.eclipse.jpt.utility.internal.iterables.ListIterable;
+import org.eclipse.jpt.utility.internal.iterables.LiveCloneListIterable;
public class SourceXmlSchemaTypesAnnotation
@@ -66,8 +67,8 @@ public class SourceXmlSchemaTypesAnnotation
return JAXB.XML_SCHEMA_TYPE;
}
- public Iterable<XmlSchemaTypeAnnotation> getNestedAnnotations() {
- return new LiveCloneIterable<XmlSchemaTypeAnnotation>(this.schemaTypes);
+ public ListIterable<XmlSchemaTypeAnnotation> getNestedAnnotations() {
+ return new LiveCloneListIterable<XmlSchemaTypeAnnotation>(this.schemaTypes);
}
public int getNestedAnnotationsSize() {
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 bfa81e762c..003908c0f4 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
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jaxb.core.resource.java;
import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jpt.utility.internal.iterables.ListIterable;
/**
* Common behavior for all annotation "containers".
@@ -49,7 +50,7 @@ public interface AnnotationContainer<T extends NestableAnnotation>
/**
* Return the nested annotations held by the container.
*/
- Iterable<T> getNestedAnnotations();
+ ListIterable<T> getNestedAnnotations();
/**
* Return the number of nested annotations held by the container.

Back to the top