From c7a08672e168714087c16ed7123975c92c21d7d9 Mon Sep 17 00:00:00 2001 From: kmoore Date: Mon, 1 Aug 2011 15:10:18 +0000 Subject: consolidation of the java resource model for JAXB and JPA. Changing API to Iterables instead of Iterators --- .../binary/BinaryCollectionTable2_0Annotation.java | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryCollectionTable2_0Annotation.java') diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryCollectionTable2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryCollectionTable2_0Annotation.java index 324ac63515..00024b61cb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryCollectionTable2_0Annotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryCollectionTable2_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,16 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.binary; -import java.util.ListIterator; import java.util.Vector; - import org.eclipse.jdt.core.IAnnotation; -import org.eclipse.jpt.common.utility.internal.iterators.CloneListIterator; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.jpa.core.internal.resource.java.binary.BinaryBaseTableAnnotation; import org.eclipse.jpt.jpa.core.internal.resource.java.binary.BinaryJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.CollectionTable2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; /** @@ -31,7 +30,7 @@ public final class BinaryCollectionTable2_0Annotation private final Vector joinColumns; - public BinaryCollectionTable2_0Annotation(JavaResourcePersistentAttribute parent, IAnnotation jdtAnnotation) { + public BinaryCollectionTable2_0Annotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) { super(parent, jdtAnnotation); this.joinColumns = this.buildJoinColumns(); } @@ -73,11 +72,11 @@ public final class BinaryCollectionTable2_0Annotation // ********** CollectionTable2_0Annotation implementation ********** // ***** join columns - public ListIterator joinColumns() { - return new CloneListIterator(this.joinColumns); + public ListIterable getJoinColumns() { + return new LiveCloneListIterable(this.joinColumns); } - public int joinColumnsSize() { + public int getJoinColumnsSize() { return this.joinColumns.size(); } @@ -85,10 +84,6 @@ public final class BinaryCollectionTable2_0Annotation return this.joinColumns.get(index); } - public int indexOfJoinColumn(JoinColumnAnnotation joinColumn) { - return this.joinColumns.indexOf(joinColumn); - } - public JoinColumnAnnotation addJoinColumn(int index) { throw new UnsupportedOperationException(); } -- cgit v1.2.3