319736 - switching a few of our Iterators to Iterables

15 files changed, 111 insertions, 132 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFile.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFile.java
index 848cde5b3a..87ea72231d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFile.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFile.java
@@ -9,7 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core;
 
-import java.util.Iterator;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.common.core.JptResourceModel;
@@ -61,13 +60,13 @@ public interface JpaFile
 	/**
 	 * Return the JPA file's root structure nodes.
 	 */
-	Iterator<JpaStructureNode> rootStructureNodes();
+	Iterable<JpaStructureNode> getRootStructureNodes();
 		String ROOT_STRUCTURE_NODES_COLLECTION = "rootStructureNodes"; //$NON-NLS-1$
 
 	/**
 	 * Return the count of the JPA file's root context model objects.
 	 */
-	int rootStructureNodesSize();
+	int getRootStructureNodesSize();
 
 	/**
 	 * Add a root structure node.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
index ba7a6e5c57..642b10598d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
@@ -9,7 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core;
 
-import java.util.Iterator;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResourceDelta;
@@ -104,12 +103,12 @@ public interface JpaProject
 	/**
 	 * Return the JPA project's JPA files.
 	 */
-	Iterator<JpaFile> jpaFiles();
+	Iterable<JpaFile> getJpaFiles();
 
 	/**
 	 * Return the size of the JPA project's JPA files.
 	 */
-	int jpaFilesSize();
+	int getJpaFilesSize();
 
 	/**
 	 * Return the JPA file corresponding to the specified file.
@@ -130,12 +129,12 @@ public interface JpaProject
 	/**
 	 * Return the JPA project's external Java resource compilation units.
 	 */
-	Iterator<JavaResourceCompilationUnit> externalJavaResourceCompilationUnits();
+	Iterable<JavaResourceCompilationUnit> getExternalJavaResourceCompilationUnits();
 
 	/**
 	 * Return the size of the JPA project's external Java resource compilation units.
 	 */
-	int externalJavaResourceCompilationUnitsSize();
+	int getExternalJavaResourceCompilationUnitsSize();
 
 
 	// ********** external Java resource persistent types **********
@@ -182,7 +181,7 @@ public interface JpaProject
 	 * Return the names of the JPA project's annotated Java classes
 	 * (ignoring classes in JARs referenced in the <code>persistence.xml</code>).
 	 */
-	Iterator<String> annotatedJavaSourceClassNames();
+	Iterable<String> getAnnotatedJavaSourceClassNames();
 	
 	/**
 	 * Return only the names of those valid <em>mapped</em> (i.e. annotated with
@@ -334,7 +333,7 @@ public interface JpaProject
 	/**
 	 * Return JPA project's validation messages.
 	 */
-	Iterator<IMessage> validationMessages(IReporter reporter);
+	Iterable<IMessage> getValidationMessages(IReporter reporter);
 
 
 	// ********** database **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
index aea481dfcd..0172b1c125 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
@@ -56,6 +56,7 @@ import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
 import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
 import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
 import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable;
+import org.eclipse.jpt.common.utility.internal.iterables.SnapshotCloneIterable;
 import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper;
 import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
 import org.eclipse.jpt.common.utility.internal.synchronizers.CallbackSynchronousSynchronizer;
@@ -498,15 +499,11 @@ public abstract class AbstractJpaProject
 	
 	// ********** JPA files **********
 
-	public Iterator<JpaFile> jpaFiles() {
-		return this.getJpaFiles().iterator();
-	}
-
-	protected Iterable<JpaFile> getJpaFiles() {
+	public Iterable<JpaFile> getJpaFiles() {
 		return new LiveCloneIterable<JpaFile>(this.jpaFiles);  // read-only
 	}
 
-	public int jpaFilesSize() {
+	public int getJpaFilesSize() {
 		return this.jpaFiles.size();
 	}
 
@@ -679,15 +676,11 @@ public abstract class AbstractJpaProject
 
 	// ********** external Java resource compilation units (source) **********
 
-	public Iterator<JavaResourceCompilationUnit> externalJavaResourceCompilationUnits() {
-		return this.getExternalJavaResourceCompilationUnits().iterator();
-	}
-
-	protected Iterable<JavaResourceCompilationUnit> getExternalJavaResourceCompilationUnits() {
+	public Iterable<JavaResourceCompilationUnit> getExternalJavaResourceCompilationUnits() {
 		return new LiveCloneIterable<JavaResourceCompilationUnit>(this.externalJavaResourceCompilationUnits);  // read-only
 	}
 
-	public int externalJavaResourceCompilationUnitsSize() {
+	public int getExternalJavaResourceCompilationUnitsSize() {
 		return this.externalJavaResourceCompilationUnits.size();
 	}
 
@@ -794,11 +787,7 @@ public abstract class AbstractJpaProject
 
 	// ********** annotated Java source classes **********
 
-	public Iterator<String> annotatedJavaSourceClassNames() {
-		return this.getAnnotatedJavaSourceClassNames().iterator();
-	}
-
-	protected Iterable<String> getAnnotatedJavaSourceClassNames() {
+	public Iterable<String> getAnnotatedJavaSourceClassNames() {
 		return new TransformationIterable<JavaResourcePersistentType, String>(this.getInternalAnnotatedSourceJavaResourcePersistentTypes()) {
 			@Override
 			protected String transform(JavaResourcePersistentType jrpType) {
@@ -1401,10 +1390,10 @@ public abstract class AbstractJpaProject
 
 	// ********** validation **********
 	
-	public Iterator<IMessage> validationMessages(IReporter reporter) {
+	public Iterable<IMessage> getValidationMessages(IReporter reporter) {
 		List<IMessage> messages = new ArrayList<IMessage>();
 		this.validate(messages, reporter);
-		return messages.iterator();
+		return new SnapshotCloneIterable<IMessage>(messages);
 	}
 	
 	protected void validate(List<IMessage> messages, IReporter reporter) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/GenericJpaFile.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/GenericJpaFile.java
index ff1204c53c..dcab4d606f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/GenericJpaFile.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/GenericJpaFile.java
@@ -100,15 +100,11 @@ public class GenericJpaFile
 
 	// ********** root structure nodes **********
 
-	public Iterator<JpaStructureNode> rootStructureNodes() {
-		return this.getRootStructureNodes().iterator();
-	}
-
-	protected Iterable<JpaStructureNode> getRootStructureNodes() {
+	public Iterable<JpaStructureNode> getRootStructureNodes() {
 		return new LiveCloneIterable<JpaStructureNode>(this.rootStructureNodes.values());
 	}
 
-	public int rootStructureNodesSize() {
+	public int getRootStructureNodesSize() {
 		return this.rootStructureNodes.size();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java
index cee97f3904..3a76710677 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java
@@ -250,7 +250,7 @@ public class GenericRootContextNode
 		}
 
 		PersistenceUnit persistenceUnit = persistence.persistenceUnits().next();
-		HashBag<String> annotatedClassNames = CollectionTools.bag(this.jpaProject.annotatedJavaSourceClassNames());
+		HashBag<String> annotatedClassNames = CollectionTools.bag(this.jpaProject.getAnnotatedJavaSourceClassNames());
 		HashBag<String> orphans = annotatedClassNames.clone();
 		for (String annotatedClassName : annotatedClassNames) {
 			if (persistenceUnit.specifiesPersistentType(annotatedClassName)) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java
index e56712c0f4..ec844cf87f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java
@@ -16,7 +16,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jpt.common.core.IResourcePart;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
@@ -100,7 +99,7 @@ public class JpaValidator extends AbstractValidator implements IValidator {
 	private Iterable<IMessage> getValidationMessages(IReporter reporter, IProject project) {
 		JpaProject jpaProject = JptJpaCorePlugin.getJpaProject(project);
 		if (jpaProject != null) {
-			return CollectionTools.iterable(jpaProject.validationMessages(reporter));
+			return jpaProject.getValidationMessages(reporter);
 		}
 		return new SingleElementIterable<IMessage>(
 			DefaultJpaValidationMessages.buildMessage(
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 d88d3da7a3..4b271ef922 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
@@ -111,7 +111,7 @@ public class JpaJavaCompletionProposalComputer implements IJavaCompletionProposa
 			return Collections.emptyList();
 		}
 		
-		Collection<JpaStructureNode> rootStructureNodes = CollectionTools.collection(jpaFile.rootStructureNodes());
+		Collection<JpaStructureNode> rootStructureNodes = CollectionTools.collection(jpaFile.getRootStructureNodes());
 		if (rootStructureNodes.isEmpty()) {
 			return Collections.emptyList();
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/ResourceModelItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/ResourceModelItemContentProvider.java
index ef3a7db03a..65dceed9f9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/ResourceModelItemContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/ResourceModelItemContentProvider.java
@@ -9,8 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.structure;
 
-import java.util.Iterator;
-
 import org.eclipse.jpt.common.ui.internal.jface.AbstractTreeItemContentProvider;
 import org.eclipse.jpt.common.ui.internal.jface.DelegatingTreeContentAndLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter;
@@ -43,8 +41,8 @@ public class ResourceModelItemContentProvider extends AbstractTreeItemContentPro
 		return new CollectionAspectAdapter<JpaFile, JpaStructureNode>(
 			buildJpaFileValueModel(), JpaFile.ROOT_STRUCTURE_NODES_COLLECTION) {
 			@Override
-			protected Iterator<JpaStructureNode> iterator_() {
-				return subject.rootStructureNodes();
+			protected Iterable<JpaStructureNode> getIterable() {
+				return this.subject.getRootStructureNodes();
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java
index 10da49bc40..556f30dd0f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java
@@ -136,7 +136,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 		return new FilteringIterable<IType>(selectedTypes) {
 			@Override
 			protected boolean accept(IType jdtType) {
-				return getJpaProject().getJpaFile((IFile) jdtType.getResource()).rootStructureNodesSize() == 0;
+				return getJpaProject().getJpaFile((IFile) jdtType.getResource()).getRootStructureNodesSize() == 0;
 			}
 		};
 	}
@@ -440,7 +440,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 			if (ormXmlResource == null) {
 				errorMessage = JptUiMessages.JpaMakePersistentWizardPage_mappingFileDoesNotExistError;
 			}
-			else if (getJpaProject().getJpaFile(ormXmlResource.getFile()).rootStructureNodesSize() == 0) {
+			else if (getJpaProject().getJpaFile(ormXmlResource.getFile()).getRootStructureNodesSize() == 0) {
 				errorMessage = JptUiMessages.JpaMakePersistentWizardPage_mappingFileNotListedInPersistenceXmlError;
 			}
 		}
@@ -474,7 +474,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 
 	protected EntityMappings getEntityMappings() {
 		JpaXmlResource xmlResource = getOrmXmlResource();
-		return (EntityMappings) getJpaProject().getJpaFile(xmlResource.getFile()).rootStructureNodes().next();
+		return (EntityMappings) getJpaProject().getJpaFile(xmlResource.getFile()).getRootStructureNodes().iterator().next();
 	}
 	
 	protected boolean isListInPersistenceXml() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
index dab8489d17..7054540b93 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
@@ -280,7 +280,7 @@ public class EntityDataModelProvider extends NewJavaClassDataModelProvider imple
 							IStatus.ERROR, JptJpaUiPlugin.PLUGIN_ID,
 							EntityWizardMsg.INVALID_XML_NAME);
 				}
-				else if (getTargetJpaProject().getJpaFile(ormXmlResource.getFile()).rootStructureNodesSize() == 0) {
+				else if (getTargetJpaProject().getJpaFile(ormXmlResource.getFile()).getRootStructureNodesSize() == 0) {
 					return new Status(
 						IStatus.ERROR, JptJpaUiPlugin.PLUGIN_ID,
 						EntityWizardMsg.MAPPING_FILE_NOT_LISTED_ERROR);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
index 1e612dbc85..4e5db57535 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
@@ -52,7 +52,6 @@ import org.eclipse.jpt.jpa.core.context.InheritanceType;
 import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
 import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef;
@@ -392,7 +391,7 @@ public class NewEntityClassOperation extends AbstractDataModelOperation {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				final JpaXmlResource xmlResource = getOrmXmlResource(model, project);
-				EntityMappings entityMappings = (EntityMappings) JptJpaCorePlugin.getJpaProject(project).getJpaFile(xmlResource.getFile()).rootStructureNodes().next();
+				EntityMappings entityMappings = (EntityMappings) JptJpaCorePlugin.getJpaProject(project).getJpaFile(xmlResource.getFile()).getRootStructureNodes().iterator().next();
 				OrmPersistentType persistentType = entityMappings.addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, model.getQualifiedJavaClassName());
 				Entity entity = (Entity) persistentType.getMapping();
 				if (model.isInheritanceSet()) {
@@ -445,7 +444,7 @@ public class NewEntityClassOperation extends AbstractDataModelOperation {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				final JpaXmlResource xmlResource = getOrmXmlResource(model, project);
-				EntityMappings entityMappings = (EntityMappings) JptJpaCorePlugin.getJpaProject(project).getJpaFile(xmlResource.getFile()).rootStructureNodes().next();
+				EntityMappings entityMappings = (EntityMappings) JptJpaCorePlugin.getJpaProject(project).getJpaFile(xmlResource.getFile()).getRootStructureNodes().iterator().next();
 				OrmPersistentType persistentType = entityMappings.addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, model.getQualifiedJavaClassName());
 				MappedSuperclass mappedSuperclass = (MappedSuperclass) persistentType.getMapping();
 				
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java
index b23d196eda..10cc74ec73 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java
@@ -62,37 +62,37 @@ public class JpaFileTests extends ContextModelTestCase
 		IFile file = getOrmXmlResource().getFile();
 		JpaFile ormXmlJpaFile = JptJpaCorePlugin.getJpaFile(file);
 		
-		assertEquals(getEntityMappings(), ormXmlJpaFile.rootStructureNodes().next());
+		assertEquals(getEntityMappings(), ormXmlJpaFile.getRootStructureNodes().iterator().next());
 		
 		
 		ICompilationUnit cu = createTestEntity();
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
-		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
 
 		//verify the mapping file reference "wins" as the root structure node when both
 		//persistence.xml <class> tag and mapping file <entity> tag exist for a particulary java class
-		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 
 		getEntityMappings().removePersistentType(ormPersistentType);
 
-		assertEquals(getJavaEntity().getPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(getJavaEntity().getPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 
 		ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
-		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 	}
 	
 	public void testEntityMappingsRootStructureNodeRemoved() throws Exception {
 		IFile file = getOrmXmlResource().getFile();
 		JpaFile ormXmlJpaFile = JptJpaCorePlugin.getJpaFile(file);
-		assertEquals(getEntityMappings(), ormXmlJpaFile.rootStructureNodes().next());
+		assertEquals(getEntityMappings(), ormXmlJpaFile.getRootStructureNodes().iterator().next());
 		
 		JpaXmlResource resource = (JpaXmlResource) ormXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
-		assertFalse(ormXmlJpaFile.rootStructureNodes().hasNext());
+		assertFalse(ormXmlJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 
 	public void testImpliedEntityMappingsRootStructureNodeRemoved() throws Exception {
@@ -103,33 +103,33 @@ public class JpaFileTests extends ContextModelTestCase
 		
 		getXmlPersistenceUnit().getMappingFiles().remove(0);
 		assertNotNull(getPersistenceUnit().getImpliedMappingFileRef());
-		assertEquals(getPersistenceUnit().getImpliedMappingFileRef().getMappingFile().getRoot(), ormXmlJpaFile.rootStructureNodes().next());
+		assertEquals(getPersistenceUnit().getImpliedMappingFileRef().getMappingFile().getRoot(), ormXmlJpaFile.getRootStructureNodes().iterator().next());
 		
 		JpaXmlResource resource = (JpaXmlResource) ormXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
-		assertFalse(ormXmlJpaFile.rootStructureNodes().hasNext());
+		assertFalse(ormXmlJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 	
 	public void testEntityMappingsRootStructureNodeRemovedFromResourceModel() throws Exception {
 		IFile file = getOrmXmlResource().getFile();
 		JpaFile ormXmlJpaFile = JptJpaCorePlugin.getJpaFile(file);
-		assertEquals(getEntityMappings(), ormXmlJpaFile.rootStructureNodes().next());
+		assertEquals(getEntityMappings(), ormXmlJpaFile.getRootStructureNodes().iterator().next());
 		
 		getOrmXmlResource().getContents().remove(getOrmXmlResource().getRootObject());
 		
-		assertFalse(ormXmlJpaFile.rootStructureNodes().hasNext());
+		assertFalse(ormXmlJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 
 	public void testUpdatePersistenceRootStructureNodePersistenceRemoved() throws Exception {
 		IFile file = getPersistenceXmlResource().getFile();
 		JpaFile persistenceXmlJpaFile = JptJpaCorePlugin.getJpaFile(file);
-		assertEquals(getRootContextNode().getPersistenceXml().getPersistence(), persistenceXmlJpaFile.rootStructureNodes().next());
+		assertEquals(getRootContextNode().getPersistenceXml().getPersistence(), persistenceXmlJpaFile.getRootStructureNodes().iterator().next());
 		
 		JpaXmlResource resource = (JpaXmlResource) persistenceXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
-		assertFalse(persistenceXmlJpaFile.rootStructureNodes().hasNext());
+		assertFalse(persistenceXmlJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 	
 	public void testUpdateOrmJavaRootStructureNodePersistenceRemoved() throws Exception {		
@@ -140,12 +140,12 @@ public class JpaFileTests extends ContextModelTestCase
 		ICompilationUnit cu = createTestEntity();
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
-		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		JpaXmlResource resource = (JpaXmlResource) persistenceXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
-		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
+		assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 	
 	public void testUpdateJavaRootStructureNodePersistenceRemoved() throws Exception {		
@@ -156,23 +156,23 @@ public class JpaFileTests extends ContextModelTestCase
 		
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
-		assertEquals(getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		JpaXmlResource resource = (JpaXmlResource) persistenceXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
-		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
+		assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 
 	public void testPersistenceRootStructureNodeRemovedFromResourceModel() throws Exception {
 		IFile file = getPersistenceXmlResource().getFile();
 		JpaFile persistenceXmlJpaFile = JptJpaCorePlugin.getJpaFile(file);
 		getRootContextNode().getPersistenceXml().getPersistence();
-		assertEquals(getRootContextNode().getPersistenceXml().getPersistence(), persistenceXmlJpaFile.rootStructureNodes().next());
+		assertEquals(getRootContextNode().getPersistenceXml().getPersistence(), persistenceXmlJpaFile.getRootStructureNodes().iterator().next());
 		
 		getPersistenceXmlResource().getContents().remove(getXmlPersistence());
 		
-		assertFalse(persistenceXmlJpaFile.rootStructureNodes().hasNext());
+		assertFalse(persistenceXmlJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 	
 	public void testUpdateOrmJavaRootStructureNodePersistenceXmlRemoved() throws Exception {		
@@ -181,10 +181,10 @@ public class JpaFileTests extends ContextModelTestCase
 		ICompilationUnit cu = createTestEntity();
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
-		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		getPersistenceXmlResource().getContents().remove(getXmlPersistence());
-		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
+		assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 	
 	public void testUpdateJavaRootStructureNodePersistenceXmlRemoved() throws Exception {		
@@ -193,10 +193,10 @@ public class JpaFileTests extends ContextModelTestCase
 		
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
-		assertEquals(getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		getPersistenceXmlResource().getContents().remove(getXmlPersistence());
-		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
+		assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 	
 	public void testOrmJavaPersistentTypeRootStructureNodeRemoved() throws Exception {
@@ -205,15 +205,15 @@ public class JpaFileTests extends ContextModelTestCase
 		ICompilationUnit cu = createTestEntity();
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
-		assertTrue(javaJpaFile.rootStructureNodes().next().getParent() instanceof OrmPersistentType);
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
+		assertTrue(javaJpaFile.getRootStructureNodes().iterator().next().getParent() instanceof OrmPersistentType);
 		
 		
 		getEntityMappings().removePersistentType(0);
 		
-		assertEquals(1, javaJpaFile.rootStructureNodesSize());
-		assertTrue(javaJpaFile.rootStructureNodes().next().getParent() instanceof ClassRef);
-		assertNotSame(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(1, javaJpaFile.getRootStructureNodesSize());
+		assertTrue(javaJpaFile.getRootStructureNodes().iterator().next().getParent() instanceof ClassRef);
+		assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 	}
 	
 	public void testOrmJavaPersistentTypeRootStructureNodeRemovedFromResourceModel() throws Exception {
@@ -223,14 +223,14 @@ public class JpaFileTests extends ContextModelTestCase
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
-		assertTrue(javaJpaFile.rootStructureNodes().next().getParent() instanceof OrmPersistentType);
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
+		assertTrue(javaJpaFile.getRootStructureNodes().iterator().next().getParent() instanceof OrmPersistentType);
 		
 		getXmlEntityMappings().getEntities().remove(0);
 		
-		assertEquals(1, javaJpaFile.rootStructureNodesSize());
-		assertTrue(javaJpaFile.rootStructureNodes().next().getParent() instanceof ClassRef);
-		assertNotSame(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(1, javaJpaFile.getRootStructureNodesSize());
+		assertTrue(javaJpaFile.getRootStructureNodes().iterator().next().getParent() instanceof ClassRef);
+		assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 	}
 
 	public void testJavaPersistentTypeRootStructureNodeRemoved() throws Exception {
@@ -239,12 +239,12 @@ public class JpaFileTests extends ContextModelTestCase
 		
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
 		JavaPersistentType javaPersistentType = getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
-		assertEquals(getEntityMappings().getPersistenceUnit().specifiedClassRefs().next(), javaJpaFile.rootStructureNodes().next().getParent());
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
+		assertEquals(getEntityMappings().getPersistenceUnit().specifiedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent());
 		
 		getEntityMappings().getPersistenceUnit().removeSpecifiedClassRef(0);
-		assertNotSame(javaPersistentType, javaJpaFile.rootStructureNodes().next());
-		assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.rootStructureNodes().next().getParent());
+		assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
+		assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent());
 	}
 	
 	public void testJavaPersistentTypeRootStructureNodeRemovedFromResourceModel() throws Exception {
@@ -253,15 +253,15 @@ public class JpaFileTests extends ContextModelTestCase
 		
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
 		JavaPersistentType javaPersistentType = getJavaPersistentType();
-		Iterator<JpaStructureNode> rootStructureNodes = javaJpaFile.rootStructureNodes();
+		Iterator<JpaStructureNode> rootStructureNodes = javaJpaFile.getRootStructureNodes().iterator();
 		JpaStructureNode rootStructureNode = rootStructureNodes.next();
 		assertEquals(javaPersistentType, rootStructureNode);
 		assertEquals(getEntityMappings().getPersistenceUnit().specifiedClassRefs().next(), rootStructureNode.getParent());
 		assertFalse(rootStructureNodes.hasNext());
 		
 		removeXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
-		assertNotSame(javaPersistentType, javaJpaFile.rootStructureNodes().next());
-		assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.rootStructureNodes().next().getParent());
+		assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
+		assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent());
 	}
 
 	public void testImpliedJavaPersistentTypeRootStructureNodeRemoved() throws Exception {
@@ -270,11 +270,11 @@ public class JpaFileTests extends ContextModelTestCase
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
 		JavaPersistentType javaPersistentType = getPersistenceUnit().impliedClassRefs().next().getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		javaPersistentType.setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY);
 		
-		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
+		assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext());
 	}
 	
 	public void testJavaRootStructureNodesEntityMappingsRemoved() throws Exception {
@@ -284,12 +284,12 @@ public class JpaFileTests extends ContextModelTestCase
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		getOrmXmlResource().getContents().remove(getXmlEntityMappings());
-		assertNotSame(javaPersistentType, javaJpaFile.rootStructureNodes().next());
-		assertEquals(1, javaJpaFile.rootStructureNodesSize());
-		assertEquals(getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.rootStructureNodes().next().getParent());
+		assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
+		assertEquals(1, javaJpaFile.getRootStructureNodesSize());
+		assertEquals(getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent());
 	}
 	
 	public void testJavaRootStructureNodesPersistenceUnitRemovedFromResourceModel() throws Exception {
@@ -299,12 +299,12 @@ public class JpaFileTests extends ContextModelTestCase
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		getXmlPersistence().getPersistenceUnits().remove(0);
 
-		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
-		assertEquals(0, javaJpaFile.rootStructureNodesSize());
+		assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext());
+		assertEquals(0, javaJpaFile.getRootStructureNodesSize());
 	}
 	
 	public void testJavaRootStructureNodesPersistenceUnitRemoved() throws Exception {
@@ -314,12 +314,12 @@ public class JpaFileTests extends ContextModelTestCase
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		getJpaProject().getRootContextNode().getPersistenceXml().getPersistence().removePersistenceUnit(0);
 
-		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
-		assertEquals(0, javaJpaFile.rootStructureNodesSize());
+		assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext());
+		assertEquals(0, javaJpaFile.getRootStructureNodesSize());
 	}
 
 	public void testJavaRootStructureNodesOrmPersistentTypeRemoved() throws Exception {
@@ -329,12 +329,12 @@ public class JpaFileTests extends ContextModelTestCase
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		getEntityMappings().removePersistentType(0);
-		assertNotSame(javaPersistentType, javaJpaFile.rootStructureNodes().next());
-		assertEquals(1, javaJpaFile.rootStructureNodesSize());
-		assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.rootStructureNodes().next().getParent());
+		assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
+		assertEquals(1, javaJpaFile.getRootStructureNodesSize());
+		assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent());
 	}
 	
 	public void testJavaRootStructureNodesOrmTypeMappingMorphed() throws Exception {
@@ -344,17 +344,17 @@ public class JpaFileTests extends ContextModelTestCase
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 	
 		ormPersistentType.setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
-		assertEquals(1, javaJpaFile.rootStructureNodesSize());
+		assertEquals(1, javaJpaFile.getRootStructureNodesSize());
 		javaPersistentType = getEntityMappings().getPersistentTypes().iterator().next().getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		getEntityMappings().removePersistentType(0);
-		assertNotSame(javaPersistentType, javaJpaFile.rootStructureNodes().next());
-		assertEquals(1, javaJpaFile.rootStructureNodesSize());
-		assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.rootStructureNodes().next().getParent());
+		assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
+		assertEquals(1, javaJpaFile.getRootStructureNodesSize());
+		assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent());
 	}
 	
 	public void testUpdateOrmJavaRootStructureNodeMappingFileRefChanged() throws Exception {		
@@ -363,18 +363,18 @@ public class JpaFileTests extends ContextModelTestCase
 		ICompilationUnit cu = createTestEntity();
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
-		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		MappingFileRef mappingFileRef = getPersistenceUnit().mappingFileRefs().next();
 		mappingFileRef.setFileName("foo");
 		
 		ormPersistentType = ((EntityMappings) getPersistenceUnit().getImpliedMappingFileRef().getMappingFile().getRoot()).getPersistentTypes().iterator().next();
-		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		IFile file = getPersistenceXmlResource().getFile();
 		JpaFile ormXmlJpaFile = JptJpaCorePlugin.getJpaFile(file);		
 		
-		assertEquals(1, ormXmlJpaFile.rootStructureNodesSize());
+		assertEquals(1, ormXmlJpaFile.getRootStructureNodesSize());
 	}
 	
 	public void testUpdateJavaRootStructureNodeMappingFileRefChanged() throws Exception {		
@@ -383,11 +383,11 @@ public class JpaFileTests extends ContextModelTestCase
 		
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
-		assertEquals(getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
 		MappingFileRef mappingFileRef = getPersistenceUnit().mappingFileRefs().next();
 		mappingFileRef.setFileName("foo");
-		assertEquals(getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
+		assertEquals(getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 	}
 
 	
@@ -398,14 +398,14 @@ public class JpaFileTests extends ContextModelTestCase
 		JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource());
 		
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
-		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
+		assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
 
 		
 		deleteResource(getOrmXmlResource());
 		
-		assertNotSame(javaPersistentType, javaJpaFile.rootStructureNodes().next());
-		assertEquals(1, javaJpaFile.rootStructureNodesSize());
-		assertEquals(getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.rootStructureNodes().next().getParent());
+		assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next());
+		assertEquals(1, javaJpaFile.getRootStructureNodesSize());
+		assertEquals(getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent());
 	}
 	//TODO test rootStructureNodes with a static inner class
 }
\ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java
index 554ef4cb2c..8978f9faa1 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java
@@ -40,14 +40,14 @@ public class OrmXmlTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateAddEntityMappings() throws Exception {
-		assertEquals(2, getJpaProject().jpaFilesSize());
+		assertEquals(2, getJpaProject().getJpaFilesSize());
 		JpaXmlResource ormResource = getOrmXmlResource();
 		ormResource.getContents().clear();
 		ormResource.save(null);
 		
 		//the ContentType of the orm.xml file is no longer orm, so the jpa file is removed
 		assertNull(getOrmXml());
-		assertEquals(1, getJpaProject().jpaFilesSize()); //should only be the persistence.xml file
+		assertEquals(1, getJpaProject().getJpaFilesSize()); //should only be the persistence.xml file
 		
 		XmlEntityMappings xmlEntityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
 		xmlEntityMappings.setVersion("1.0");
@@ -55,7 +55,7 @@ public class OrmXmlTests extends ContextModelTestCase
 		ormResource.save(null);
 		
 		assertNotNull(getOrmXml().getRoot());
-		assertEquals(2, getJpaProject().jpaFilesSize());
+		assertEquals(2, getJpaProject().getJpaFilesSize());
 	}
 	
 	public void testUpdateRemoveEntityMappings() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java
index 0dcb6ec06b..11bd30a5ef 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java
@@ -27,14 +27,14 @@ public class PersistenceXmlTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateAddPersistence() throws Exception {
-		assertEquals(2, getJpaProject().jpaFilesSize());
+		assertEquals(2, getJpaProject().getJpaFilesSize());
 		JpaXmlResource prm = getPersistenceXmlResource();
 		prm.getContents().clear();
 		prm.save(null);
 		
 		//the ContentType of the persistence.xml file is no longer persistence, so the jpa file is removed
 		assertNull(getPersistenceXml());
-		assertEquals(1, getJpaProject().jpaFilesSize()); //should only be the orm.xml file
+		assertEquals(1, getJpaProject().getJpaFilesSize()); //should only be the orm.xml file
 		
 		XmlPersistence xmlPersistence = PersistenceFactory.eINSTANCE.createXmlPersistence();
 		xmlPersistence.setVersion("1.0");
@@ -42,7 +42,7 @@ public class PersistenceXmlTests extends ContextModelTestCase
 		prm.save(null);
 		
 		assertNotNull(getPersistenceXml().getPersistence());
-		assertEquals(2, getJpaProject().jpaFilesSize());	
+		assertEquals(2, getJpaProject().getJpaFilesSize());	
 	}
 	
 	public void testUpdateRemovePersistence() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/model/JpaProjectManagerTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/model/JpaProjectManagerTests.java
index d11f89a44d..ea45687534 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/model/JpaProjectManagerTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/model/JpaProjectManagerTests.java
@@ -133,7 +133,7 @@ public class JpaProjectManagerTests extends TestCase {
 		assertTrue(this.testProject.getProject().isOpen());
 		jpaProject = JptJpaCorePlugin.getJpaProject(this.testProject.getProject());
 		assertNotNull("JpaProject is null", jpaProject);
-		assertEquals(4, jpaProject.jpaFilesSize());
+		assertEquals(4, jpaProject.getJpaFilesSize());
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity.java")));
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity2.java")));
 
@@ -162,7 +162,7 @@ public class JpaProjectManagerTests extends TestCase {
 		assertTrue(JpaFacet.isInstalled(project));
 		jpaProject = JptJpaCorePlugin.getJpaProject(project);
 		assertNotNull(jpaProject);
-		assertEquals(4, jpaProject.jpaFilesSize());
+		assertEquals(4, jpaProject.getJpaFilesSize());
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity.java")));
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity2.java")));
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/META-INF/persistence.xml")));
@@ -176,7 +176,7 @@ public class JpaProjectManagerTests extends TestCase {
 		assertEquals(1, JptJpaCorePlugin.getJpaProjectManager().getJpaProjectsSize());
 		JpaProject jpaProject = JptJpaCorePlugin.getJpaProject(this.testProject.getProject());
 		assertNotNull(jpaProject);
-		assertEquals(4, jpaProject.jpaFilesSize());
+		assertEquals(4, jpaProject.getJpaFilesSize());
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity.java")));
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity2.java")));
 
@@ -211,7 +211,7 @@ public class JpaProjectManagerTests extends TestCase {
 		JpaProject jpaProject = JptJpaCorePlugin.getJpaProject(this.testProject.getProject());
 		assertNotNull(jpaProject);
 		// persistence.xml and orm.xml do not get created in this situation (?)
-		assertEquals(2, jpaProject.jpaFilesSize());
+		assertEquals(2, jpaProject.getJpaFilesSize());
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity.java")));
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity2.java")));
 //		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/META-INF/persistence.xml")));
@@ -253,7 +253,7 @@ public class JpaProjectManagerTests extends TestCase {
 		assertEquals(1, JptJpaCorePlugin.getJpaProjectManager().getJpaProjectsSize());
 		jpaProject = JptJpaCorePlugin.getJpaProject(this.testProject.getProject());
 		assertNotNull(jpaProject);
-		assertEquals(4, jpaProject.jpaFilesSize());
+		assertEquals(4, jpaProject.getJpaFilesSize());
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity.java")));
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/test/pkg/TestEntity2.java")));
 		assertNotNull(jpaProject.getJpaFile(this.getFile(this.testProject, "src/META-INF/persistence.xml")));