changing the rest of the Iterator API to Iterable

4 files changed, 15 insertions, 20 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java
index 4b271ef922..8e49cc725e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.ui.internal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -143,8 +142,7 @@ public class JpaJavaCompletionProposalComputer implements IJavaCompletionProposa
 		CompilationUnit astRoot = ASTTools.buildASTRoot(cu);
 		List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
 		for (JpaStructureNode structureNode : rootStructureNodes) {
-			for (Iterator<String> stream = ((JavaPersistentType) structureNode).javaCompletionProposals(context.getInvocationOffset(), filter, astRoot); stream.hasNext(); ) {
-				String s = stream.next();
+			for (String s : ((JavaPersistentType) structureNode).getJavaCompletionProposals(context.getInvocationOffset(), filter, astRoot)) {
 				proposals.add(new CompletionProposal(s, tokenStart, tokenEnd - tokenStart + 1, s.length()));
 			}
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java
index 3003fb8e4e..f9257b25ef 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java
@@ -13,7 +13,6 @@ import java.util.Collection;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
@@ -236,7 +235,7 @@ public class ColumnComposite
 			@Override
 			protected Iterable<String> getValues_() {
 				ReadOnlyColumn column = this.getSubject();
-				return (column != null) ? CollectionTools.iterable(column.candidateTableNames()) : EmptyIterable.<String> instance();
+				return (column != null) ? column.getCandidateTableNames() : EmptyIterable.<String> instance();
 			}
 			
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java
index 913fb2dfa2..4240d57902 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java
@@ -9,7 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
-import java.util.Iterator;
 import org.eclipse.jpt.common.core.internal.utility.ICUStringCollator;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter;
@@ -71,8 +70,8 @@ public class MappedByPane
 			new CollectionAspectAdapter<MappedByRelationshipStrategy, String>(
 					getSubjectHolder()) {
 				@Override
-				protected Iterator<String> iterator_() {
-					return this.subject.candidateMappedByAttributeNames();
+				protected Iterable<String> getIterable() {
+					return this.subject.getCandidateMappedByAttributeNames();
 				}
 			},
 			new ICUStringCollator()
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java
index f6f6fce40f..7954724376 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.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,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.options;
 
-import java.util.ListIterator;
-
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
@@ -26,6 +24,7 @@ import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
+import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
 import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
@@ -135,13 +134,13 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 	private ListValueModel<String> buildPrePersistListHolder() {
 		return new ListAspectAdapter<JpaOptions2_0, String>(getSubjectHolder(), JpaOptions2_0.VALIDATION_GROUP_PRE_PERSIST_LIST) {
 			@Override
-			protected ListIterator<String> listIterator_() {
-				return subject.validationGroupPrePersists();
+			protected ListIterable<String> getListIterable() {
+				return subject.getValidationGroupPrePersists();
 			}
 
 			@Override
 			protected int size_() {
-				return subject.validationGroupPrePersistsSize();
+				return subject.getValidationGroupPrePersistsSize();
 			}
 		};
 	}
@@ -212,13 +211,13 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 	private ListValueModel<String> buildPreUpdateListHolder() {
 		return new ListAspectAdapter<JpaOptions2_0, String>(getSubjectHolder(), JpaOptions2_0.VALIDATION_GROUP_PRE_UPDATE_LIST) {
 			@Override
-			protected ListIterator<String> listIterator_() {
-				return subject.validationGroupPreUpdates();
+			protected ListIterable<String> getListIterable() {
+				return subject.getValidationGroupPreUpdates();
 			}
 
 			@Override
 			protected int size_() {
-				return subject.validationGroupPreUpdatesSize();
+				return subject.getValidationGroupPreUpdatesSize();
 			}
 		};
 	}
@@ -289,13 +288,13 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 	private ListValueModel<String> buildPreRemoveListHolder() {
 		return new ListAspectAdapter<JpaOptions2_0, String>(getSubjectHolder(), JpaOptions2_0.VALIDATION_GROUP_PRE_REMOVE_LIST) {
 			@Override
-			protected ListIterator<String> listIterator_() {
-				return subject.validationGroupPreRemoves();
+			protected ListIterable<String> getListIterable() {
+				return subject.getValidationGroupPreRemoves();
 			}
 
 			@Override
 			protected int size_() {
-				return subject.validationGroupPreRemovesSize();
+				return subject.getValidationGroupPreRemovesSize();
 			}
 		};
 	}