consolidation of the java resource model for JAXB and JPA. Changing API to Iterables instead of Iterators

1 files changed, 21 insertions, 11 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/resource/java/source/SourceNamedQuery1_0Annotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/resource/java/source/SourceNamedQuery1_0Annotation.java
index fa1baaabf2..3ce0b644b0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/resource/java/source/SourceNamedQuery1_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/resource/java/source/SourceNamedQuery1_0Annotation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2010 Oracle. All rights reserved.
+* Copyright (c) 2009, 2011 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,11 +9,11 @@
 *******************************************************************************/
 package org.eclipse.jpt.jpa.core.internal.jpa1.resource.java.source;
 
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.Type;
+import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
+import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
+import org.eclipse.jpt.common.core.utility.jdt.IndexedAnnotationAdapter;
+import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
 import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceNamedQueryAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode;
 
 /**
  * <code>javax.persistence.NamedQuery</code>
@@ -21,11 +21,21 @@ import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode;
 public final class SourceNamedQuery1_0Annotation
 	extends SourceNamedQueryAnnotation
 {
-	public SourceNamedQuery1_0Annotation(JavaResourceNode parent, Type type) {
-		super(parent, type);
+	public static SourceNamedQuery1_0Annotation buildSourceNamedQueryAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement, int index) {
+		IndexedDeclarationAnnotationAdapter idaa = buildNamedQueryDeclarationAnnotationAdapter(index);
+		IndexedAnnotationAdapter iaa = buildNamedQueryAnnotationAdapter(annotatedElement, idaa);
+		return new SourceNamedQuery1_0Annotation(
+			parent,
+			annotatedElement,
+			idaa,
+			iaa);
+	}
+
+	private SourceNamedQuery1_0Annotation(
+			JavaResourceAnnotatedElement parent,
+			AnnotatedElement annotatedElement,
+			IndexedDeclarationAnnotationAdapter daa,
+			IndexedAnnotationAdapter annotationAdapter) {
+		super(parent, annotatedElement, daa, annotationAdapter);
 	}
-	
-	public SourceNamedQuery1_0Annotation(JavaResourceNode parent, Type type, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, type, daa, annotationAdapter);
-	}	
 }