diff options
author | Brian Vosburgh | 2013-01-30 21:17:28 +0000 |
---|---|---|
committer | Brian Vosburgh | 2013-01-30 21:25:42 +0000 |
commit | 4fb5bd1b373bb38bf5631086d3ce972f0d306bff (patch) | |
tree | 47ec04108c91c7c85441f976fed697af890a7dc6 /jpa/plugins/org.eclipse.jpt.jpa.core/src/org | |
parent | 7edd60e52e4e5fabeb68bddc00b5cd68dc434772 (diff) | |
download | webtools.dali-4fb5bd1b373bb38bf5631086d3ce972f0d306bff.tar.gz webtools.dali-4fb5bd1b373bb38bf5631086d3ce972f0d306bff.tar.xz webtools.dali-4fb5bd1b373bb38bf5631086d3ce972f0d306bff.zip |
rework clone iterables and iterators etc.
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src/org')
60 files changed, 219 insertions, 235 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java index 4b084646aa..4d1cd05d62 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -23,9 +23,8 @@ import org.eclipse.jpt.common.core.internal.utility.jdt.JDTModifiedDeclaration.A import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterator.CloneIterator; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.common.utility.internal.model.AspectChangeSupport; import org.eclipse.jpt.common.utility.internal.model.ChangeSupport; @@ -297,7 +296,7 @@ public abstract class AbstractJpaNode * Return an Iterable of the context elements */ public Iterable<C> getContextElements() { - return new LiveCloneIterable<C>(this.contextElements); + return IterableTools.cloneLive(this.contextElements); } public C get(int index) { @@ -305,7 +304,7 @@ public abstract class AbstractJpaNode } public Iterator<C> iterator() { - return new CloneIterator<C>(this.contextElements); + return IteratorTools.clone(this.contextElements); } /** @@ -523,7 +522,7 @@ public abstract class AbstractJpaNode @Override public ListIterable<C> getContextElements() { - return new LiveCloneListIterable<C>(this.contextElements); + return IterableTools.cloneLive(this.contextElements); } @Override @@ -615,7 +614,7 @@ public abstract class AbstractJpaNode @Override public ListIterable<C> getContextElements() { - return new LiveCloneListIterable<C>(this.contextElements); + return IterableTools.cloneLive(this.contextElements); } @Override 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 0b3fd9c130..83e2b077bf 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 @@ -72,7 +72,6 @@ import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.JpaDataSource; @@ -402,7 +401,7 @@ public abstract class AbstractJpaProject @SuppressWarnings("unchecked") protected Iterable<JavaResourceCompilationUnit> getCombinedJavaResourceCompilationUnits() { - return IterableTools.compositeIterable( + return IterableTools.concatenate( this.getInternalJavaResourceCompilationUnits(), this.getExternalJavaResourceCompilationUnits() ); @@ -531,7 +530,7 @@ public abstract class AbstractJpaProject // ********** JPA files ********** public Iterable<JpaFile> getJpaFiles() { - return new LiveCloneIterable<JpaFile>(this.jpaFiles.values()); // read-only + return IterableTools.cloneLive(this.jpaFiles.values()); // read-only } public int getJpaFilesSize() { @@ -709,7 +708,7 @@ public abstract class AbstractJpaProject // ********** external Java resource compilation units (source) ********** public Iterable<JavaResourceCompilationUnit> getExternalJavaResourceCompilationUnits() { - return new LiveCloneIterable<JavaResourceCompilationUnit>(this.externalJavaResourceCompilationUnits); // read-only + return IterableTools.cloneLive(this.externalJavaResourceCompilationUnits); // read-only } public int getExternalJavaResourceCompilationUnitsSize() { @@ -871,14 +870,14 @@ public abstract class AbstractJpaProject */ protected Iterable<JavaResourceAbstractType> getInternalSourceJavaResourceTypes() { // get *all* the types in each compilation unit - return IterableTools.compositeIterable(this.getInternalJavaResourceCompilationUnits(), JavaResourceNode.Root.TYPES_TRANSFORMER); + return IterableTools.children(this.getInternalJavaResourceCompilationUnits(), JavaResourceNode.Root.TYPES_TRANSFORMER); } /** * Return the JPA project's resource compilation units. */ protected Iterable<JavaResourceCompilationUnit> getInternalJavaResourceCompilationUnits() { - return IterableTools.subIterable(IterableTools.transform(this.getJavaSourceJpaFiles(), JpaFile.RESOURCE_MODEL_TRANSFORMER)); + return IterableTools.downCast(IterableTools.transform(this.getJavaSourceJpaFiles(), JpaFile.RESOURCE_MODEL_TRANSFORMER)); } /** @@ -915,12 +914,12 @@ public abstract class AbstractJpaProject * persistence.xml */ protected Iterable<JavaResourceAbstractType> getJavaResourceTypes() { - return IterableTools.compositeIterable(this.getJavaResourceNodeRoots(), JavaResourceNode.Root.TYPES_TRANSFORMER); + return IterableTools.children(this.getJavaResourceNodeRoots(), JavaResourceNode.Root.TYPES_TRANSFORMER); } @SuppressWarnings("unchecked") protected Iterable<JavaResourceNode.Root> getJavaResourceNodeRoots() { - return IterableTools.compositeIterable( + return IterableTools.concatenate( this.getInternalJavaResourceCompilationUnits(), this.getInternalJavaResourcePackageFragmentRoots(), this.getExternalJavaResourceCompilationUnits(), @@ -941,7 +940,7 @@ public abstract class AbstractJpaProject } public Iterable<JavaResourcePackage> getJavaResourcePackages(){ - return IterableTools.notNulls(IterableTools.transform(this.getPackageInfoSourceJpaFiles(), JPA_FILE_JAVA_RESOURCE_PACKAGE_TRANSFORMER)); + return IterableTools.removeNulls(IterableTools.transform(this.getPackageInfoSourceJpaFiles(), JPA_FILE_JAVA_RESOURCE_PACKAGE_TRANSFORMER)); } protected static final Transformer<JpaFile, JavaResourcePackage> JPA_FILE_JAVA_RESOURCE_PACKAGE_TRANSFORMER = new JpaFileJavaResourcePackageTransformer(); @@ -980,7 +979,7 @@ public abstract class AbstractJpaProject } protected Iterable<JavaResourcePackageFragmentRoot> getInternalJavaResourcePackageFragmentRoots() { - return IterableTools.subIterable(IterableTools.transform(this.getJarJpaFiles(), JpaFile.RESOURCE_MODEL_TRANSFORMER)); + return IterableTools.downCast(IterableTools.transform(this.getJarJpaFiles(), JpaFile.RESOURCE_MODEL_TRANSFORMER)); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java index e6e3c2c63d..90ccde8731 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java @@ -50,8 +50,8 @@ import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.command.CommandAdapter; import org.eclipse.jpt.common.utility.internal.command.ThreadLocalExtendedCommandExecutor; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.common.utility.reference.BooleanReference; import org.eclipse.jpt.common.utility.reference.ModifiableObjectReference; @@ -404,7 +404,7 @@ class InternalJpaProjectManager } public Iterable<JpaProject> getJpaProjects() { - return new SnapshotCloneIterable<JpaProject>(this.jpaProjects); + return IterableTools.cloneSnapshot(this.jpaProjects); } public int getJpaProjectsSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JpaAnnotationProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JpaAnnotationProvider.java index b4e7897629..07561e66f7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JpaAnnotationProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JpaAnnotationProvider.java @@ -55,11 +55,11 @@ public class JpaAnnotationProvider } protected Iterable<AnnotationDefinition> getAnnotationDefinitions() { - return IterableTools.compositeIterable(this.annotationDefinitionProviders, JpaAnnotationDefinitionProvider.ANNOTATION_DEFINITIONS_TRANSFORMER); + return IterableTools.children(this.annotationDefinitionProviders, JpaAnnotationDefinitionProvider.ANNOTATION_DEFINITIONS_TRANSFORMER); } protected Iterable<NestableAnnotationDefinition> getNestableAnnotationDefinitions() { - return IterableTools.compositeIterable(this.annotationDefinitionProviders, JpaAnnotationDefinitionProvider.NESTABLE_ANNOTATION_DEFINITIONS_TRANSFORMER); + return IterableTools.children(this.annotationDefinitionProviders, JpaAnnotationDefinitionProvider.NESTABLE_ANNOTATION_DEFINITIONS_TRANSFORMER); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java index a2abf5a17f..ac9fccca2d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java @@ -144,7 +144,7 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> * (attribute or association mappings, depending on the specified transformer). */ protected Iterable<String> getEmbeddableAttributeMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { - return IterableTools.compositeIterable(this.getEmbeddableAttributeMappings(), transformer); + return IterableTools.children(this.getEmbeddableAttributeMappings(), transformer); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java index 3f018a66dc..acac13b9e1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java @@ -23,7 +23,6 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper; import org.eclipse.jpt.common.utility.iterable.ListIterable; @@ -294,7 +293,7 @@ public abstract class AbstractJavaEntity // ********** descendants ********** public Iterable<Entity> getDescendants() { - return new LiveCloneListIterable<Entity>(this.descendants); + return IterableTools.cloneLive(this.descendants); } protected void updateDescendants() { @@ -994,7 +993,7 @@ public abstract class AbstractJavaEntity // TODO eliminate duplicate tables? @Override public Iterable<ReadOnlyTable> getAllAssociatedTables() { - return IterableTools.compositeIterable(this.getInheritanceHierarchy(), TypeMappingTools.ASSOCIATED_TABLES_TRANSFORMER); + return IterableTools.children(this.getInheritanceHierarchy(), TypeMappingTools.ASSOCIATED_TABLES_TRANSFORMER); } @Override @@ -1006,7 +1005,7 @@ public abstract class AbstractJavaEntity * strip out <code>null</code> names */ protected Iterable<String> convertToNames(Iterable<ReadOnlyTable> tables) { - return IterableTools.notNulls(IterableTools.transform(tables, ReadOnlyTable.NAME_TRANSFORMER)); + return IterableTools.removeNulls(IterableTools.transform(tables, ReadOnlyTable.NAME_TRANSFORMER)); } public boolean tableNameIsInvalid(String tableName) { @@ -1059,7 +1058,7 @@ public abstract class AbstractJavaEntity * strip out null db tables */ protected Iterable<org.eclipse.jpt.jpa.db.Table> getAllAssociatedDbTables() { - return IterableTools.notNulls(IterableTools.transform(this.getAllAssociatedTables(), ReadOnlyTable.DB_TABLE_TRANSFORMER)); + return IterableTools.removeNulls(IterableTools.transform(this.getAllAssociatedTables(), ReadOnlyTable.DB_TABLE_TRANSFORMER)); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java index 04e7970cb6..99c59e78c0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java @@ -37,7 +37,6 @@ import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaFile; @@ -379,7 +378,7 @@ public abstract class AbstractJavaPersistentType // ********** attributes ********** public ListIterable<JavaPersistentAttribute> getAttributes() { - return new LiveCloneListIterable<JavaPersistentAttribute>(this.attributes); + return IterableTools.cloneLive(this.attributes); } public int getAttributesSize() { @@ -405,7 +404,7 @@ public abstract class AbstractJavaPersistentType } public Iterable<ReadOnlyPersistentAttribute> getAllAttributes() { - return IterableTools.compositeIterable( + return IterableTools.children( this.getInheritanceHierarchy(), PersistentType.ATTRIBUTES_TRANSFORMER ); @@ -868,11 +867,11 @@ public abstract class AbstractJavaPersistentType protected Iterable<PersistentType> buildInheritanceHierarchy(PersistentType start) { // using a chain iterable to traverse up the inheritance tree - return IterableTools.chainIterable(start, SUPER_PERSISTENT_TYPE_TRANSFORMER); + return ObjectTools.chain(start, SUPER_PERSISTENT_TYPE_TRANSFORMER); } protected Iterable<JavaResourceType> getResourceInheritanceHierarchy() { - return IterableTools.chainIterable(this.resourceType, new SuperJavaResourceTypeTransformer()); + return ObjectTools.chain(this.resourceType, new SuperJavaResourceTypeTransformer()); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java index 720f2fd66b..b0a5818999 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Oracle. All rights reserved. + * Copyright (c) 2008, 2013 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. @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.Vector; - -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; @@ -30,7 +29,7 @@ public abstract class AbstractJavaReadOnlyUniqueConstraint // ********** column names ********** public Iterable<String> getColumnNames() { - return new LiveCloneIterable<String>(this.columnNames); + return IterableTools.cloneLive(this.columnNames); } public int getColumnNamesSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java index e305e7b867..4615bce4d2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java @@ -251,7 +251,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp } public Iterable<String> getAllTargetEntityAttributeNames() { - return IterableTools.compositeIterable(this.getAllTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getAllTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } protected Iterable<AttributeMapping> getAllTargetEntityAttributeMappings() { @@ -261,7 +261,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp // Get the names of non-transient attribute mappings public Iterable<String> getTargetEntityNonTransientAttributeNames() { - return IterableTools.compositeIterable(this.getTargetEntityNonTransientAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getTargetEntityNonTransientAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } protected Iterable<AttributeMapping> getTargetEntityNonTransientAttributeMappings() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java index 4d145718a7..03ed021cce 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java @@ -158,7 +158,7 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> // ********** attribute mappings ********** public Iterable<JavaAttributeMapping> getAttributeMappings() { - return IterableTools.subIterable(IterableTools.transform(this.getPersistentType().getAttributes(), ReadOnlyPersistentAttribute.MAPPING_TRANSFORMER)); + return IterableTools.downCast(IterableTools.transform(this.getPersistentType().getAttributes(), ReadOnlyPersistentAttribute.MAPPING_TRANSFORMER)); } public Iterable<JavaAttributeMapping> getAttributeMappings(final String mappingKey) { @@ -171,7 +171,7 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> } public Iterable<AttributeMapping> getAllAttributeMappings() { - return IterableTools.compositeIterable(this.getNonNullInheritanceHierarchy(), TypeMappingTools.ATTRIBUTE_MAPPINGS_TRANSFORMER); + return IterableTools.children(this.getNonNullInheritanceHierarchy(), TypeMappingTools.ATTRIBUTE_MAPPINGS_TRANSFORMER); } protected Iterable<TypeMapping> getNonNullInheritanceHierarchy() { @@ -203,11 +203,11 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> // ********** attribute overrides ********** public Iterable<String> getOverridableAttributeNames() { - return IterableTools.compositeIterable(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); } public Iterable<String> getAllOverridableAttributeNames() { - return IterableTools.compositeIterable(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER); + return IterableTools.children(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER); } public Column resolveOverriddenColumn(String attributeName) { @@ -224,11 +224,11 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> // ********** association overrides ********** public Iterable<String> getOverridableAssociationNames() { - return IterableTools.compositeIterable(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); } public Iterable<String> getAllOverridableAssociationNames() { - return IterableTools.compositeIterable(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER); + return IterableTools.children(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER); } public Relationship resolveOverriddenRelationship(String attributeName) { @@ -245,7 +245,7 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> // ********** generators ********** public Iterable<Generator> getGenerators() { - return IterableTools.compositeIterable(this.getAttributeMappings(), AttributeMapping.GENERATORS_TRANSFORMER); + return IterableTools.children(this.getAttributeMappings(), AttributeMapping.GENERATORS_TRANSFORMER); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java index 14ea60a2af..22cd730cd7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java @@ -32,8 +32,6 @@ import org.eclipse.jpt.common.utility.internal.collection.ListTools; import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaFile; @@ -486,7 +484,7 @@ public abstract class AbstractEntityMappings // ********** persistent types ********** public ListIterable<OrmPersistentType> getPersistentTypes() { - return new LiveCloneListIterable<OrmPersistentType>(this.persistentTypes); + return IterableTools.cloneLive(this.persistentTypes); } public int getPersistentTypesSize() { @@ -811,7 +809,7 @@ public abstract class AbstractEntityMappings protected Iterable<XmlTypeMapping> getXmlTypeMappings() { // clone to reduce chance of concurrency problems - return new LiveCloneIterable<XmlTypeMapping>(this.xmlEntityMappings.getTypeMappings()); + return IterableTools.cloneLive(this.xmlEntityMappings.getTypeMappings()); } protected void movePersistentType_(int index, OrmPersistentType persistentType) { @@ -902,7 +900,7 @@ public abstract class AbstractEntityMappings protected ListIterable<XmlSequenceGenerator> getXmlSequenceGenerators() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlSequenceGenerator>(this.xmlEntityMappings.getSequenceGenerators()); + return IterableTools.cloneLive(this.xmlEntityMappings.getSequenceGenerators()); } protected ContextListContainer<OrmSequenceGenerator, XmlSequenceGenerator> buildSequenceGeneratorContainer() { @@ -985,7 +983,7 @@ public abstract class AbstractEntityMappings protected ListIterable<XmlTableGenerator> getXmlTableGenerators() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlTableGenerator>(this.xmlEntityMappings.getTableGenerators()); + return IterableTools.cloneLive(this.xmlEntityMappings.getTableGenerators()); } protected ContextListContainer<OrmTableGenerator, XmlTableGenerator> buildTableGeneratorContainer() { @@ -1041,7 +1039,7 @@ public abstract class AbstractEntityMappings } protected Iterable<Query> getTypeMappingQueries() { - return IterableTools.compositeIterable(this.getTypeMappings(), TypeMapping.QUERIES_TRANSFORMER); + return IterableTools.children(this.getTypeMappings(), TypeMapping.QUERIES_TRANSFORMER); } @SuppressWarnings("unchecked") @@ -1054,11 +1052,11 @@ public abstract class AbstractEntityMappings } protected Iterable<Generator> getTypeMappingGenerators() { - return IterableTools.compositeIterable(this.getTypeMappings(), TypeMapping.GENERATORS_TRANSFORMER); + return IterableTools.children(this.getTypeMappings(), TypeMapping.GENERATORS_TRANSFORMER); } protected Iterable<OrmTypeMapping> getTypeMappings() { - return IterableTools.subIterable(IterableTools.transform(this.getPersistentTypes(), PersistentType.MAPPING_TRANSFORMER)); + return IterableTools.downCast(IterableTools.transform(this.getPersistentTypes(), PersistentType.MAPPING_TRANSFORMER)); } @@ -1115,15 +1113,15 @@ public abstract class AbstractEntityMappings // ********** refactoring ********** public Iterable<DeleteEdit> createDeleteTypeEdits(IType type) { - return IterableTools.compositeIterable(this.getPersistentTypes(), new DeleteTypeRefactoringParticipant.DeleteTypeEditsTransformer(type)); + return IterableTools.children(this.getPersistentTypes(), new DeleteTypeRefactoringParticipant.DeleteTypeEditsTransformer(type)); } public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) { - return IterableTools.compositeIterable(this.getPersistentTypes(), new TypeRefactoringParticipant.RenameTypeEditsTransformer(originalType, newName)); + return IterableTools.children(this.getPersistentTypes(), new TypeRefactoringParticipant.RenameTypeEditsTransformer(originalType, newName)); } public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) { - return IterableTools.compositeIterable(this.getPersistentTypes(), new TypeRefactoringParticipant.MoveTypeEditsTransformer(originalType, newPackage)); + return IterableTools.children(this.getPersistentTypes(), new TypeRefactoringParticipant.MoveTypeEditsTransformer(originalType, newPackage)); } @SuppressWarnings("unchecked") @@ -1134,7 +1132,7 @@ public abstract class AbstractEntityMappings } protected Iterable<ReplaceEdit> createPersistentTypeRenamePackageEdits(IPackageFragment originalPackage, String newName) { - return IterableTools.compositeIterable(this.getPersistentTypes(), new TypeRefactoringParticipant.RenamePackageEditsTransformer(originalPackage, newName)); + return IterableTools.children(this.getPersistentTypes(), new TypeRefactoringParticipant.RenamePackageEditsTransformer(originalPackage, newName)); } protected Iterable<ReplaceEdit> createRenamePackageEdit(IPackageFragment originalPackage, String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java index fb175d06bb..4a42dda1ca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java @@ -149,7 +149,7 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd * (attribute or association mappings, depending on the specified transformer). */ protected Iterable<String> getEmbeddableAttributeMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { - return IterableTools.compositeIterable(this.getEmbeddableAttributeMappings(), transformer); + return IterableTools.children(this.getEmbeddableAttributeMappings(), transformer); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java index cf8001e709..9d31bb3426 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java @@ -26,7 +26,6 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; @@ -336,7 +335,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> // ********** descendants ********** public Iterable<Entity> getDescendants() { - return new LiveCloneListIterable<Entity>(this.descendants); + return IterableTools.cloneLive(this.descendants); } protected void updateDescendants() { @@ -580,7 +579,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> protected ListIterable<XmlSecondaryTable> getXmlSecondaryTables() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlSecondaryTable>(this.xmlTypeMapping.getSecondaryTables()); + return IterableTools.cloneLive(this.xmlTypeMapping.getSecondaryTables()); } protected ContextListContainer<OrmSecondaryTable, XmlSecondaryTable> buildSpecifiedSecondaryTableContainer() { @@ -847,7 +846,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> protected ListIterable<XmlPrimaryKeyJoinColumn> getXmlPrimaryKeyJoinColumns() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlPrimaryKeyJoinColumn>(this.xmlTypeMapping.getPrimaryKeyJoinColumns()); + return IterableTools.cloneLive(this.xmlTypeMapping.getPrimaryKeyJoinColumns()); } protected ContextListContainer<OrmPrimaryKeyJoinColumn, XmlPrimaryKeyJoinColumn> buildSpecifiedPrimaryKeyJoinColumnContainer() { @@ -976,11 +975,11 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> // ********** virtual primary key join columns ********** protected ListIterable<OrmVirtualPrimaryKeyJoinColumn> getVirtualPrimaryKeyJoinColumns() { - return new LiveCloneListIterable<OrmVirtualPrimaryKeyJoinColumn>(this.virtualPrimaryKeyJoinColumns); + return IterableTools.cloneLive(this.virtualPrimaryKeyJoinColumns); } protected ListIterable<ReadOnlyPrimaryKeyJoinColumn> getReadOnlyVirtualPrimaryKeyJoinColumns() { - return new LiveCloneListIterable<ReadOnlyPrimaryKeyJoinColumn>(this.virtualPrimaryKeyJoinColumns); + return IterableTools.<ReadOnlyPrimaryKeyJoinColumn>cloneLive(this.virtualPrimaryKeyJoinColumns); } protected void initializeVirtualPrimaryKeyJoinColumns() { @@ -1408,7 +1407,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> // TODO eliminate duplicate tables? public Iterable<ReadOnlyTable> getAllAssociatedTables() { - return IterableTools.compositeIterable(this.getInheritanceHierarchy(), TypeMappingTools.ASSOCIATED_TABLES_TRANSFORMER); + return IterableTools.children(this.getInheritanceHierarchy(), TypeMappingTools.ASSOCIATED_TABLES_TRANSFORMER); } public Iterable<String> getAllAssociatedTableNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java index 02854915d7..e227112d53 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -10,10 +10,9 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; - import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumn; @@ -152,7 +151,7 @@ public abstract class AbstractOrmJoinColumnRelationshipStrategy protected ListIterable<XmlJoinColumn> getXmlJoinColumns() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlJoinColumn>(this.getXmlJoinColumnContainer().getJoinColumns()); + return IterableTools.cloneLive(this.getXmlJoinColumnContainer().getJoinColumns()); } protected ContextListContainer<OrmJoinColumn, XmlJoinColumn> buildSpecifiedJoinColumnContainer() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java index f5447599df..236b964d91 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -16,13 +16,13 @@ import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; import org.eclipse.jpt.common.utility.iterable.ListIterable; @@ -765,7 +765,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM protected ListIterable<XmlJoinColumn> getXmlMapKeyJoinColumns() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlJoinColumn>(this.getXmlAttributeMapping().getMapKeyJoinColumns()); + return IterableTools.cloneLive(this.getXmlAttributeMapping().getMapKeyJoinColumns()); } protected ContextListContainer<OrmJoinColumn, XmlJoinColumn> buildSpecifiedMapKeyJoinColumnContainer() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java index 04baa634bf..c844009398 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.collection.ListTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.JpaNamedContextNode; @@ -142,7 +142,7 @@ public abstract class AbstractOrmQuery<X extends XmlQuery> protected ListIterable<XmlQueryHint> getXmlHints() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlQueryHint>(this.xmlQuery.getHints()); + return IterableTools.cloneLive(this.xmlQuery.getHints()); } protected ContextListContainer<OrmQueryHint, XmlQueryHint> buildHintContainer() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java index e06ea85dfc..8b1a2e58fd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2008, 2012 Oracle. All rights reserved. + * Copyright (c) 2008, 2013 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.
@@ -10,9 +10,9 @@ package org.eclipse.jpt.jpa.core.internal.context.orm;
import java.util.Vector;
-import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; -import org.eclipse.jpt.jpa.core.context.JpaContextNode; -import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
+import org.eclipse.jpt.jpa.core.context.JpaContextNode;
+import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint;
public abstract class AbstractOrmReadOnlyUniqueConstraint
extends AbstractOrmXmlContextNode
@@ -29,7 +29,7 @@ public abstract class AbstractOrmReadOnlyUniqueConstraint // ********** column names **********
public Iterable<String> getColumnNames() {
- return new LiveCloneListIterable<String>(this.columnNames);
+ return IterableTools.cloneLive(this.columnNames);
}
public int getColumnNamesSize() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java index f6256d603a..bd0823e5ca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java @@ -277,7 +277,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati } public Iterable<String> getAllTargetEntityAttributeNames() { - return IterableTools.compositeIterable(this.getAllTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getAllTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } protected Iterable<AttributeMapping> getAllTargetEntityAttributeMappings() { @@ -287,7 +287,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati // Get the name of non-transient attribute mappings public Iterable<String> getTargetEntityNonTransientAttributeNames() { - return IterableTools.compositeIterable(this.getNonTransientTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getNonTransientTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } protected Iterable<AttributeMapping> getNonTransientTargetEntityAttributeMappings() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java index 2f98fe1a93..0411a98aa9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.NameTools; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; @@ -325,7 +325,7 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable> return (xmlTable == null) ? EmptyListIterable.<XmlUniqueConstraint>instance() : // clone to reduce chance of concurrency problems - new LiveCloneListIterable<XmlUniqueConstraint>(xmlTable.getUniqueConstraints()); + IterableTools.cloneLive(xmlTable.getUniqueConstraints()); } protected ContextListContainer<OrmUniqueConstraint, XmlUniqueConstraint> buildUniqueConstraintContainer() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java index d87b77f8f3..ae375111cc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java @@ -334,15 +334,15 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> } public Iterable<AttributeMapping> getAllAttributeMappings() { - return IterableTools.compositeIterable(this.getInheritanceHierarchy(), TypeMappingTools.ATTRIBUTE_MAPPINGS_TRANSFORMER); + return IterableTools.children(this.getInheritanceHierarchy(), TypeMappingTools.ATTRIBUTE_MAPPINGS_TRANSFORMER); } public Iterable<String> getOverridableAttributeNames() { - return IterableTools.compositeIterable(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); } public Iterable<String> getAllOverridableAttributeNames() { - return IterableTools.compositeIterable(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER); + return IterableTools.children(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER); } public Iterable<AttributeMapping> getAttributeMappings(final String mappingKey) { @@ -389,11 +389,11 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> } public Iterable<String> getOverridableAssociationNames() { - return IterableTools.compositeIterable(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); } public Iterable<String> getAllOverridableAssociationNames() { - return IterableTools.compositeIterable(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER); + return IterableTools.children(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER); } public Relationship resolveOverriddenRelationship(String attributeName) { @@ -513,7 +513,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> // ********** generators ********** public Iterable<Generator> getGenerators() { - return IterableTools.compositeIterable(this.getAttributeMappings(), AttributeMapping.GENERATORS_TRANSFORMER); + return IterableTools.children(this.getAttributeMappings(), AttributeMapping.GENERATORS_TRANSFORMER); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java index 08155560d4..b5a6ab9959 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; @@ -121,7 +121,7 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy protected ListIterable<XmlPrimaryKeyJoinColumn> getXmlPrimaryKeyJoinColumns() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlPrimaryKeyJoinColumn>(this.getXmlPrimaryKeyJoinColumnContainer().getPrimaryKeyJoinColumns()); + return IterableTools.cloneLive(this.getXmlPrimaryKeyJoinColumnContainer().getPrimaryKeyJoinColumns()); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java index 8ed5bb2d1f..59ce9edc27 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java @@ -38,7 +38,6 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaFile; @@ -366,7 +365,7 @@ public abstract class SpecifiedOrmPersistentType @SuppressWarnings("unchecked") public ListIterable<OrmReadOnlyPersistentAttribute> getAttributes() { - return IterableTools.compositeListIterable(this.getReadOnlySpecifiedAttributes(), this.getDefaultAttributes()); + return IterableTools.concatenate(this.getReadOnlySpecifiedAttributes(), this.getDefaultAttributes()); } public int getAttributesSize() { @@ -383,7 +382,7 @@ public abstract class SpecifiedOrmPersistentType } public Iterable<ReadOnlyPersistentAttribute> getAllAttributes() { - return IterableTools.compositeIterable(this.getInheritanceHierarchy(), PersistentType.ATTRIBUTES_TRANSFORMER); + return IterableTools.children(this.getInheritanceHierarchy(), PersistentType.ATTRIBUTES_TRANSFORMER); } public Iterable<String> getAllAttributeNames() { @@ -598,7 +597,7 @@ public abstract class SpecifiedOrmPersistentType // ********** specified attributes ********** public ListIterable<OrmPersistentAttribute> getSpecifiedAttributes() { - return new LiveCloneListIterable<OrmPersistentAttribute>(this.specifiedAttributes); + return IterableTools.cloneLive(this.specifiedAttributes); } protected ListIterable<OrmReadOnlyPersistentAttribute> getReadOnlySpecifiedAttributes() { @@ -692,7 +691,7 @@ public abstract class SpecifiedOrmPersistentType // ********** default attributes ********** public ListIterable<OrmReadOnlyPersistentAttribute> getDefaultAttributes() { - return new LiveCloneListIterable<OrmReadOnlyPersistentAttribute>(this.defaultAttributes); + return IterableTools.cloneLive(this.defaultAttributes); } public int getDefaultAttributesSize() { @@ -1030,7 +1029,7 @@ public abstract class SpecifiedOrmPersistentType protected Iterable<PersistentType> buildInheritanceHierarchy(PersistentType start) { // using a chain iterable to traverse up the inheritance tree - return IterableTools.chainIterable(start, SUPER_PERSISTENT_TYPE_TRANSFORMER); + return ObjectTools.chain(start, SUPER_PERSISTENT_TYPE_TRANSFORMER); } @@ -1188,7 +1187,7 @@ public abstract class SpecifiedOrmPersistentType } protected Iterable<ReplaceEdit> createSpecifiedAttributesRenameTypeEdits(IType originalType, String newName) { - return IterableTools.compositeIterable(this.getSpecifiedAttributes(), new TypeRefactoringParticipant.RenameTypeEditsTransformer(originalType, newName)); + return IterableTools.children(this.getSpecifiedAttributes(), new TypeRefactoringParticipant.RenameTypeEditsTransformer(originalType, newName)); } @SuppressWarnings("unchecked") @@ -1200,7 +1199,7 @@ public abstract class SpecifiedOrmPersistentType } protected Iterable<ReplaceEdit> createSpecifiedAttributesMoveTypeEdits(IType originalType, IPackageFragment newPackage) { - return IterableTools.compositeIterable(this.getSpecifiedAttributes(), new TypeRefactoringParticipant.MoveTypeEditsTransformer(originalType, newPackage)); + return IterableTools.children(this.getSpecifiedAttributes(), new TypeRefactoringParticipant.MoveTypeEditsTransformer(originalType, newPackage)); } @SuppressWarnings("unchecked") @@ -1212,7 +1211,7 @@ public abstract class SpecifiedOrmPersistentType } protected Iterable<ReplaceEdit> createSpecifiedAttributesRenamePackageEdits(IPackageFragment originalPackage, String newName) { - return IterableTools.compositeIterable(this.getSpecifiedAttributes(), new TypeRefactoringParticipant.RenamePackageEditsTransformer(originalPackage, newName)); + return IterableTools.children(this.getSpecifiedAttributes(), new TypeRefactoringParticipant.RenamePackageEditsTransformer(originalPackage, newName)); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java index 9444ee491f..e36f9e4398 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java @@ -47,8 +47,6 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools; @@ -588,7 +586,7 @@ public abstract class AbstractPersistenceUnit protected ListIterable<XmlMappingFileRef> getXmlMappingFileRefs() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlMappingFileRef>(this.xmlPersistenceUnit.getMappingFiles()); + return IterableTools.cloneLive(this.xmlPersistenceUnit.getMappingFiles()); } protected ContextListContainer<MappingFileRef, XmlMappingFileRef> buildSpecifiedMappingFileRefContainer() { @@ -733,7 +731,7 @@ public abstract class AbstractPersistenceUnit protected ListIterable<XmlJarFileRef> getXmlJarFileRefs() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlJarFileRef>(this.xmlPersistenceUnit.getJarFiles()); + return IterableTools.cloneLive(this.xmlPersistenceUnit.getJarFiles()); } protected ContextListContainer<JarFileRef, XmlJarFileRef> buildJarFileRefContainer() { @@ -858,7 +856,7 @@ public abstract class AbstractPersistenceUnit protected ListIterable<XmlJavaClassRef> getXmlClassRefs() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlJavaClassRef>(this.xmlPersistenceUnit.getClasses()); + return IterableTools.cloneLive(this.xmlPersistenceUnit.getClasses()); } protected ContextListContainer<ClassRef, XmlJavaClassRef> buildSpecifiedClassRefContainer() { @@ -1210,7 +1208,7 @@ public abstract class AbstractPersistenceUnit // clone to reduce chance of concurrency problems return (xmlProperties == null) ? EmptyListIterable.<XmlProperty>instance() : - new LiveCloneListIterable<XmlProperty>(xmlProperties.getProperties()); + IterableTools.cloneLive(xmlProperties.getProperties()); } protected Property addProperty_(int index, XmlProperty xmlProperty) { @@ -1493,7 +1491,7 @@ public abstract class AbstractPersistenceUnit // ********** generators ********** public Iterable<Generator> getGenerators() { - return new LiveCloneIterable<Generator>(this.generators); + return IterableTools.cloneLive(this.generators); } public int getGeneratorsSize() { @@ -1535,14 +1533,14 @@ public abstract class AbstractPersistenceUnit } protected Iterable<Generator> getMappingFileGenerators() { - return IterableTools.compositeIterable(this.getMappingFileRefs(), MappingFileRef.MAPPING_FILE_GENERATORS_TRANSFORMER); + return IterableTools.children(this.getMappingFileRefs(), MappingFileRef.MAPPING_FILE_GENERATORS_TRANSFORMER); } /** * Include "overridden" Java generators. */ protected Iterable<JavaGenerator> getAllJavaGenerators() { - return IterableTools.compositeIterable(this.getAllJavaTypeMappingsUnique(), TYPE_MAPPING_JAVA_GENERATORS_TRANSFORMER); + return IterableTools.children(this.getAllJavaTypeMappingsUnique(), TYPE_MAPPING_JAVA_GENERATORS_TRANSFORMER); } protected static final Transformer<TypeMapping, Iterable<JavaGenerator>> TYPE_MAPPING_JAVA_GENERATORS_TRANSFORMER = TransformerTools.lateralTransformer(TypeMapping.GENERATORS_TRANSFORMER); @@ -1578,7 +1576,7 @@ public abstract class AbstractPersistenceUnit // ********** queries ********** public Iterable<Query> getQueries() { - return new LiveCloneIterable<Query>(this.queries); + return IterableTools.cloneLive(this.queries); } public int getQueriesSize() { @@ -1617,14 +1615,14 @@ public abstract class AbstractPersistenceUnit } protected Iterable<Query> getMappingFileQueries() { - return IterableTools.compositeIterable(this.getMappingFileRefs(), MappingFileRef.MAPPING_FILE_QUERIES_TRANSFORMER); + return IterableTools.children(this.getMappingFileRefs(), MappingFileRef.MAPPING_FILE_QUERIES_TRANSFORMER); } /** * Include "overridden" Java queries. */ protected Iterable<JavaQuery> getAllJavaQueries() { - return IterableTools.compositeIterable(this.getAllJavaTypeMappingsUnique(), TYPE_MAPPING_JAVA_QUERIES_TRANSFORMER); + return IterableTools.children(this.getAllJavaTypeMappingsUnique(), TYPE_MAPPING_JAVA_QUERIES_TRANSFORMER); } protected static final Transformer<TypeMapping, Iterable<JavaQuery>> TYPE_MAPPING_JAVA_QUERIES_TRANSFORMER = TransformerTools.lateralTransformer(TypeMapping.QUERIES_TRANSFORMER); @@ -1674,7 +1672,7 @@ public abstract class AbstractPersistenceUnit } protected Iterable<PersistentType> getMappingFilePersistentTypes() { - return IterableTools.compositeIterable(this.getMappingFileRefs(), PersistentTypeContainer.TRANSFORMER); + return IterableTools.children(this.getMappingFileRefs(), PersistentTypeContainer.TRANSFORMER); } @SuppressWarnings("unchecked") @@ -1710,7 +1708,7 @@ public abstract class AbstractPersistenceUnit * We only get <em>annotated</em> types from jar files. */ protected Iterable<PersistentType> getJarFilePersistentTypes() { - return IterableTools.compositeIterable(this.getJarFileRefs(), PersistentTypeContainer.TRANSFORMER); + return IterableTools.children(this.getJarFileRefs(), PersistentTypeContainer.TRANSFORMER); } public PersistentType getPersistentType(String typeName) { @@ -2560,11 +2558,11 @@ public abstract class AbstractPersistenceUnit // ********** refactoring ********** public Iterable<DeleteEdit> createDeleteTypeEdits(final IType type) { - return IterableTools.compositeIterable(this.getSpecifiedClassRefs(), new DeleteTypeRefactoringParticipant.DeleteTypeEditsTransformer(type)); + return IterableTools.children(this.getSpecifiedClassRefs(), new DeleteTypeRefactoringParticipant.DeleteTypeEditsTransformer(type)); } public Iterable<DeleteEdit> createDeleteMappingFileEdits(IFile file) { - return IterableTools.compositeIterable(this.getSpecifiedMappingFileRefs(), new MappingFileRefactoringParticipant.DeleteMappingFileEditsTransformer(file)); + return IterableTools.children(this.getSpecifiedMappingFileRefs(), new MappingFileRefactoringParticipant.DeleteMappingFileEditsTransformer(file)); } @SuppressWarnings("unchecked") @@ -2575,7 +2573,7 @@ public abstract class AbstractPersistenceUnit } protected Iterable<ReplaceEdit> createSpecifiedClassRefRenameTypeEdits(IType originalType, String newName) { - return IterableTools.compositeIterable(this.getSpecifiedClassRefs(), new TypeRefactoringParticipant.RenameTypeEditsTransformer(originalType, newName)); + return IterableTools.children(this.getSpecifiedClassRefs(), new TypeRefactoringParticipant.RenameTypeEditsTransformer(originalType, newName)); } protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesRenameTypeEdits(IType originalType, String newName) { @@ -2590,7 +2588,7 @@ public abstract class AbstractPersistenceUnit } protected Iterable<ReplaceEdit> createSpecifiedClassRefMoveTypeEdits(IType originalType, IPackageFragment newPackage) { - return IterableTools.compositeIterable(this.getSpecifiedClassRefs(), new TypeRefactoringParticipant.MoveTypeEditsTransformer(originalType, newPackage)); + return IterableTools.children(this.getSpecifiedClassRefs(), new TypeRefactoringParticipant.MoveTypeEditsTransformer(originalType, newPackage)); } protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesMoveTypeEdits(IType originalType, IPackageFragment newPackage) { @@ -2606,7 +2604,7 @@ public abstract class AbstractPersistenceUnit } protected Iterable<ReplaceEdit> createSpecifiedClassRefRenamePackageEdits(IPackageFragment originalPackage, String newName) { - return IterableTools.compositeIterable(this.getSpecifiedClassRefs(), new TypeRefactoringParticipant.RenamePackageEditsTransformer(originalPackage, newName)); + return IterableTools.children(this.getSpecifiedClassRefs(), new TypeRefactoringParticipant.RenamePackageEditsTransformer(originalPackage, newName)); } protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesRenamePackageEdits(IPackageFragment originalPackage, String newName) { @@ -2618,11 +2616,11 @@ public abstract class AbstractPersistenceUnit } protected Iterable<ReplaceEdit> createMappingFileRefRenameFolderEdits(IFolder originalFolder, String newName) { - return IterableTools.compositeIterable(this.getSpecifiedMappingFileRefs(), new MappingFileRefactoringParticipant.RenameFolderEditsTransformer(originalFolder, newName)); + return IterableTools.children(this.getSpecifiedMappingFileRefs(), new MappingFileRefactoringParticipant.RenameFolderEditsTransformer(originalFolder, newName)); } public Iterable<ReplaceEdit> createRenameMappingFileEdits(IFile originalFile, String newName) { - return IterableTools.compositeIterable(this.getSpecifiedMappingFileRefs(), new MappingFileRefactoringParticipant.RenameMappingFileEditsTransformer(originalFile, newName)); + return IterableTools.children(this.getSpecifiedMappingFileRefs(), new MappingFileRefactoringParticipant.RenameMappingFileEditsTransformer(originalFile, newName)); } public int findInsertLocationForMappingFileRef() { @@ -2630,7 +2628,7 @@ public abstract class AbstractPersistenceUnit } public Iterable<ReplaceEdit> createMoveMappingFileEdits(IFile originalFile, IPath destination) { - return IterableTools.compositeIterable(this.getMappingFileRefs(), new MappingFileRefactoringParticipant.MoveMappingFileEditsTransformer(originalFile, destination)); + return IterableTools.children(this.getMappingFileRefs(), new MappingFileRefactoringParticipant.MoveMappingFileEditsTransformer(originalFile, destination)); } public Iterable<ReplaceEdit> createMoveFolderEdits(final IFolder originalFolder, final IPath runtimeDestination) { @@ -2638,7 +2636,7 @@ public abstract class AbstractPersistenceUnit } protected Iterable<ReplaceEdit> createMappingFileRefMoveFolderReplaceEdits(IFolder originalFolder, IPath destination) { - return IterableTools.compositeIterable(this.getMappingFileRefs(), new MappingFileRefactoringParticipant.MoveFolderEditsTransformer(originalFolder, destination)); + return IterableTools.children(this.getMappingFileRefs(), new MappingFileRefactoringParticipant.MoveFolderEditsTransformer(originalFolder, destination)); } 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 9ed3eddc4a..849b9c8a7b 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 Oracle. All rights reserved. + * Copyright (c) 2006, 2013 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. @@ -15,7 +15,7 @@ import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jpt.common.core.JptResourceModel; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaStructureNode; @@ -102,7 +102,7 @@ public class GenericJpaFile // ********** root structure nodes ********** public Iterable<JpaStructureNode> getRootStructureNodes() { - return new LiveCloneIterable<JpaStructureNode>(this.rootStructureNodes); + return IterableTools.cloneLive(this.rootStructureNodes); } public int getRootStructureNodesSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java index f477d5de35..9f3384aeb3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java @@ -18,7 +18,6 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; @@ -106,7 +105,7 @@ public abstract class AbstractJavaOverrideContainer< @SuppressWarnings("unchecked") public ListIterable<R> getOverrides() { - return IterableTools.compositeListIterable(this.getReadOnlySpecifiedOverrides(), this.getReadOnlyVirtualOverrides()); + return IterableTools.concatenate(this.getReadOnlySpecifiedOverrides(), this.getReadOnlyVirtualOverrides()); } public int getOverridesSize() { @@ -118,7 +117,7 @@ public abstract class AbstractJavaOverrideContainer< } public Iterable<String> getOverrideNames() { - return IterableTools.notNulls(IterableTools.transform(this.getOverrides(), ReadOnlyOverride.NAME_TRANSFORMER)); + return IterableTools.removeNulls(IterableTools.transform(this.getOverrides(), ReadOnlyOverride.NAME_TRANSFORMER)); } @@ -197,7 +196,7 @@ public abstract class AbstractJavaOverrideContainer< // ********** specified overrides ********** public ListIterable<S> getSpecifiedOverrides() { - return new LiveCloneListIterable<S>(this.specifiedOverrides); + return IterableTools.cloneLive(this.specifiedOverrides); } @SuppressWarnings("unchecked") @@ -375,7 +374,7 @@ public abstract class AbstractJavaOverrideContainer< // ********** virtual overrides ********** public ListIterable<V> getVirtualOverrides() { - return new LiveCloneListIterable<V>(this.virtualOverrides); + return IterableTools.cloneLive(this.virtualOverrides); } public int getVirtualOverridesSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java index ce408426e4..f3aee0731d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java @@ -15,7 +15,6 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.Override_; @@ -84,7 +83,7 @@ public abstract class AbstractOrmOverrideContainer< @SuppressWarnings("unchecked") public ListIterable<R> getOverrides() { - return IterableTools.compositeListIterable(this.getReadOnlySpecifiedOverrides(), this.getReadOnlyVirtualOverrides()); + return IterableTools.concatenate(this.getReadOnlySpecifiedOverrides(), this.getReadOnlyVirtualOverrides()); } public int getOverridesSize() { @@ -173,7 +172,7 @@ public abstract class AbstractOrmOverrideContainer< // ********** specified overrides ********** public ListIterable<S> getSpecifiedOverrides() { - return new LiveCloneListIterable<S>(this.specifiedOverrides); + return IterableTools.cloneLive(this.specifiedOverrides); } @SuppressWarnings("unchecked") @@ -297,7 +296,7 @@ public abstract class AbstractOrmOverrideContainer< // ********** virtual overrides ********** public ListIterable<V> getVirtualOverrides() { - return new LiveCloneListIterable<V>(this.virtualOverrides); + return IterableTools.cloneLive(this.virtualOverrides); } @SuppressWarnings("unchecked") diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java index 47296cd3c5..0c4640f9d5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; @@ -70,7 +70,7 @@ public class GenericOrmAssociationOverrideContainer @Override protected Iterable<XmlAssociationOverride> getXmlOverrides_() { // clone to reduce chance of concurrency problems - return new LiveCloneIterable<XmlAssociationOverride>(this.owner.getXmlOverrides()); + return IterableTools.cloneLive(this.owner.getXmlOverrides()); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java index 0ce8ddb021..1d25baa348 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; @@ -44,7 +44,7 @@ public class GenericOrmAttributeOverrideContainer @Override protected Iterable<XmlAttributeOverride> getXmlOverrides_() { // clone to reduce chance of concurrency problems - return new LiveCloneIterable<XmlAttributeOverride>(this.owner.getXmlOverrides()); + return IterableTools.cloneLive(this.owner.getXmlOverrides()); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java index c9820f3dca..ec21fa8c03 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; @@ -172,7 +172,7 @@ public class GenericOrmJoinTable return (xmlTable == null) ? EmptyListIterable.<XmlJoinColumn>instance() : // clone to reduce chance of concurrency problems - new LiveCloneListIterable<XmlJoinColumn>(xmlTable.getInverseJoinColumns()); + IterableTools.cloneLive(xmlTable.getInverseJoinColumns()); } protected ContextListContainer<OrmJoinColumn, XmlJoinColumn> buildSpecifiedInverseJoinColumnContainer() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java index 48352725ac..9f58e34642 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.NamedNativeQuery; @@ -124,7 +124,7 @@ public class GenericOrmQueryContainer protected ListIterable<XmlNamedQuery> getXmlNamedQueries() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlNamedQuery>(this.xmlQueryContainer.getNamedQueries()); + return IterableTools.cloneLive(this.xmlQueryContainer.getNamedQueries()); } protected ContextListContainer<OrmNamedQuery, XmlNamedQuery> buildNamedQueryContainer() { @@ -206,7 +206,7 @@ public class GenericOrmQueryContainer protected ListIterable<XmlNamedNativeQuery> getXmlNamedNativeQueries() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlNamedNativeQuery>(this.xmlQueryContainer.getNamedNativeQueries()); + return IterableTools.cloneLive(this.xmlQueryContainer.getNamedNativeQueries()); } protected ContextListContainer<OrmNamedNativeQuery, XmlNamedNativeQuery> buildNamedNativeQueryContainer() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java index d5d49c2a47..b7a79d8b14 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -10,9 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; - import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumn; @@ -143,7 +142,7 @@ public abstract class GenericOrmReferenceTable<X extends AbstractXmlReferenceTab return (xmlTable == null) ? EmptyListIterable.<XmlJoinColumn>instance() : // clone to reduce chance of concurrency problems - new LiveCloneListIterable<XmlJoinColumn>(xmlTable.getJoinColumns()); + IterableTools.cloneLive(xmlTable.getJoinColumns()); } protected ContextListContainer<OrmJoinColumn, XmlJoinColumn> buildSpecifiedJoinColumnContainer() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java index 5ebc8b684b..43a40c9974 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; @@ -194,7 +194,7 @@ public class GenericOrmSecondaryTable protected ListIterable<XmlPrimaryKeyJoinColumn> getXmlPrimaryKeyJoinColumns() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlPrimaryKeyJoinColumn>(this.xmlSecondaryTable.getPrimaryKeyJoinColumns()); + return IterableTools.cloneLive(this.xmlSecondaryTable.getPrimaryKeyJoinColumns()); } protected ContextListContainer<OrmPrimaryKeyJoinColumn, XmlPrimaryKeyJoinColumn> buildSpecifiedPrimaryKeyJoinColumnContainer() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java index d2f0f3d16d..a7632c0798 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -13,7 +13,7 @@ import java.util.ArrayList; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.collection.ListTools; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.DbGenerator; import org.eclipse.jpt.jpa.core.context.JpaContextNode; @@ -383,7 +383,7 @@ public class GenericOrmTableGenerator protected ListIterable<XmlUniqueConstraint> getXmlUniqueConstraints() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlUniqueConstraint>(this.xmlGenerator.getUniqueConstraints()); + return IterableTools.cloneLive(this.xmlGenerator.getUniqueConstraints()); } protected ContextListContainer<OrmUniqueConstraint, XmlUniqueConstraint> buildUniqueConstraintContainer() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java index 1789adb057..3fc2e04e3e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java @@ -1221,7 +1221,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 * (non-transient attribute or association mappings, depending on the specified transformer). */ protected Iterable<String> getAllTargetEmbeddableNonTransientAttributeNames() { - return IterableTools.compositeIterable(this.getTargetEmbeddableNonTransientAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getTargetEmbeddableNonTransientAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } protected Iterable<AttributeMapping> getTargetEmbeddableNonTransientAttributeMappings() { @@ -1259,7 +1259,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 * (attribute or association mappings, depending on the specified transformer). */ protected Iterable<String> getEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { - return IterableTools.compositeIterable(this.getEmbeddableAttributeMappings(), transformer); + return IterableTools.children(this.getEmbeddableAttributeMappings(), transformer); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java index 81899c15b0..54914672ee 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java @@ -193,7 +193,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 * @see #getEmbeddedIdMappingChoiceIterable(EmbeddedIdMapping) */ protected Iterable<AttributeMapping> buildAttributeMappingChoices(Iterable<AttributeMapping> attributeMappings) { - return IterableTools.compositeIterable(attributeMappings, new AttributeMappingTransformer()); + return IterableTools.children(attributeMappings, new AttributeMappingTransformer()); } public class AttributeMappingTransformer diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java index b9f83c4430..9312960f69 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java @@ -23,7 +23,6 @@ import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; @@ -1094,7 +1093,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen protected ListIterable<XmlJoinColumn> getXmlMapKeyJoinColumns() { // clone to reduce chance of concurrency problems - return new LiveCloneListIterable<XmlJoinColumn>(this.getXmlAttributeMapping().getMapKeyJoinColumns()); + return IterableTools.cloneLive(this.getXmlAttributeMapping().getMapKeyJoinColumns()); } protected ContextListContainer<OrmJoinColumn, XmlJoinColumn> buildSpecifiedMapKeyJoinColumnContainer() { @@ -1246,7 +1245,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen * (non-transient attribute or association mappings, depending on the specified transformer). */ public Iterable<String> getCandidateMapKeyNames() { - return IterableTools.compositeIterable(this.getTargetEmbeddableNonTransientAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + return IterableTools.children(this.getTargetEmbeddableNonTransientAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } protected Iterable<AttributeMapping> getTargetEmbeddableNonTransientAttributeMappings() { @@ -1284,7 +1283,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen * (attribute or association mappings, depending on the specified transformer). */ protected Iterable<String> getEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { - return IterableTools.compositeIterable(this.getEmbeddableAttributeMappings(), transformer); + return IterableTools.children(this.getEmbeddableAttributeMappings(), transformer); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java index 698b25eda9..c19c0003e4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java @@ -136,7 +136,7 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0 } protected Iterable<AttributeMapping> buildCandidateIdAttributeMappings(Iterable<AttributeMapping> attributeMappings) { - return IterableTools.compositeIterable(attributeMappings, CANDIDATE_ID_ATTRIBUTE_MAPPING_LISTS_TRANSFORMER); + return IterableTools.children(attributeMappings, CANDIDATE_ID_ATTRIBUTE_MAPPING_LISTS_TRANSFORMER); } protected static final Transformer<AttributeMapping, Iterable<AttributeMapping>> CANDIDATE_ID_ATTRIBUTE_MAPPING_LISTS_TRANSFORMER = new CandidateIdAttributeMappingListsTransformer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java index a47bfbb6bf..e18157d1d8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2009, 2011 Oracle. All rights reserved. +* Copyright (c) 2009, 2013 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. @@ -11,8 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.persistence.options; import java.util.List; import java.util.Map; - -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties; @@ -171,7 +170,7 @@ public class GenericOptions2_0 extends AbstractPersistenceUnitProperties // ********** ValidationGroupPrePersists ********** public ListIterable<String> getValidationGroupPrePersists(){ - return new LiveCloneListIterable<String>(this.validationGroupPrePersists); + return IterableTools.cloneLive(this.validationGroupPrePersists); } public int getValidationGroupPrePersistsSize(){ @@ -225,7 +224,7 @@ public class GenericOptions2_0 extends AbstractPersistenceUnitProperties // ********** ValidationGroupPreUpdates ********** public ListIterable<String> getValidationGroupPreUpdates(){ - return new LiveCloneListIterable<String>(this.validationGroupPreUpdates); + return IterableTools.cloneLive(this.validationGroupPreUpdates); } public int getValidationGroupPreUpdatesSize(){ @@ -280,7 +279,7 @@ public class GenericOptions2_0 extends AbstractPersistenceUnitProperties // ********** ValidationGroupPreRemoves ********** public ListIterable<String> getValidationGroupPreRemoves(){ - return new LiveCloneListIterable<String>(this.validationGroupPreRemoves); + return IterableTools.cloneLive(this.validationGroupPreRemoves); } public int getValidationGroupPreRemovesSize(){ 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 1b749168bb..8ad31cd94a 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, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.binary; import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.internal.resource.java.binary.BinaryBaseTableAnnotation; import org.eclipse.jpt.jpa.core.internal.resource.java.binary.BinaryJoinColumnAnnotation; @@ -73,7 +73,7 @@ public final class BinaryCollectionTable2_0Annotation // ***** join columns public ListIterable<JoinColumnAnnotation> getJoinColumns() { - return new LiveCloneListIterable<JoinColumnAnnotation>(this.joinColumns); + return IterableTools.cloneLive(this.joinColumns); } public int getJoinColumnsSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryGeneratedAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryGeneratedAnnotation.java index 6c54460346..2e77f7116e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryGeneratedAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryGeneratedAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 20133 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. @@ -13,7 +13,7 @@ import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.jpa2.resource.java.GeneratedAnnotation; @@ -58,7 +58,7 @@ public final class BinaryGeneratedAnnotation // ***** values public ListIterable<String> getValues() { - return new LiveCloneListIterable<String>(this.values); + return IterableTools.cloneLive(this.values); } public int getValuesSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceGeneratedAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceGeneratedAnnotation.java index 2aabdcd922..83ca9ac73b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceGeneratedAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceGeneratedAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -24,7 +24,7 @@ import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.ExpressionConverter; import org.eclipse.jpt.common.utility.internal.collection.ListTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.jpa2.resource.java.GeneratedAnnotation; @@ -103,7 +103,7 @@ public final class SourceGeneratedAnnotation // ***** values public ListIterable<String> getValues() { - return new LiveCloneListIterable<String>(this.values); + return IterableTools.cloneLive(this.values); } public int getValuesSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaDeleteTypeParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaDeleteTypeParticipant.java index 9c7222039c..40e400c9c9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaDeleteTypeParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaDeleteTypeParticipant.java @@ -213,7 +213,7 @@ public abstract class AbstractJpaDeleteTypeParticipant } protected Iterable<DeleteEdit> createPersistenceXmlDeleteEdits(PersistenceUnit persistenceUnit) { - return IterableTools.compositeIterable(this.getTypesOnClasspath(persistenceUnit.getJpaProject()), new PersistenceUnitDeleteTypeEditsTransformer(persistenceUnit)); + return IterableTools.children(this.getTypesOnClasspath(persistenceUnit.getJpaProject()), new PersistenceUnitDeleteTypeEditsTransformer(persistenceUnit)); } public static class PersistenceUnitDeleteTypeEditsTransformer @@ -257,7 +257,7 @@ public abstract class AbstractJpaDeleteTypeParticipant } private Iterable<DeleteEdit> createMappingFileDeleteTypeEdits(MappingFileRef mappingFileRef) { - return IterableTools.compositeIterable(this.getTypesOnClasspath(mappingFileRef.getJpaProject()), new MappingFileDeleteTypeEditsTransformer(mappingFileRef)); + return IterableTools.children(this.getTypesOnClasspath(mappingFileRef.getJpaProject()), new MappingFileDeleteTypeEditsTransformer(mappingFileRef)); } public static class MappingFileDeleteTypeEditsTransformer diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaMoveJavaElementParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaMoveJavaElementParticipant.java index 4374a256d6..f85ea996f4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaMoveJavaElementParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaMoveJavaElementParticipant.java @@ -216,7 +216,7 @@ public abstract class AbstractJpaMoveJavaElementParticipant return createPersistenceXmlReplaceEdits(persistenceUnit, javaElement, getArguments(javaElement).getDestination()); } }; - return IterableTools.compositeIterable(this.getElementsOnClasspath(persistenceUnit.getJpaProject()), transformer); + return IterableTools.children(this.getElementsOnClasspath(persistenceUnit.getJpaProject()), transformer); } protected Iterable<IJavaElement> getElementsOnClasspath(final JpaProject jpaProject) { @@ -257,7 +257,7 @@ public abstract class AbstractJpaMoveJavaElementParticipant return createMappingFileReplaceEdits(mappingFileRef, javaElement, getArguments(javaElement).getDestination()); } }; - return IterableTools.compositeIterable(this.getElementsOnClasspath(mappingFileRef.getJpaProject()), transformer); + return IterableTools.children(this.getElementsOnClasspath(mappingFileRef.getJpaProject()), transformer); } protected abstract Iterable<ReplaceEdit> createMappingFileReplaceEdits(MappingFileRef mappingFileRef, IJavaElement javaElement, Object destination); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeleteMappingFileParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeleteMappingFileParticipant.java index e3ad58f512..3546d74b06 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeleteMappingFileParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeleteMappingFileParticipant.java @@ -182,7 +182,7 @@ public class JpaDeleteMappingFileParticipant return persistenceUnit.createDeleteMappingFileEdits(file); } }; - return IterableTools.compositeIterable(this.mappingFiles.keySet(), transformer); + return IterableTools.children(this.mappingFiles.keySet(), transformer); } protected void addPersistenceXmlDeleteMappingFileChange(IFile persistenceXmlFile, CompositeChange compositeChange) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeletePackageOrFolderParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeletePackageOrFolderParticipant.java index 3425e51435..75be67c741 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeletePackageOrFolderParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeletePackageOrFolderParticipant.java @@ -167,7 +167,7 @@ public class JpaDeletePackageOrFolderParticipant }; return new CompositeIterable<DeleteEdit>( super.createPersistenceXmlDeleteEdits(persistenceUnit), - IterableTools.compositeIterable(this.getMappingFilesOnClasspath(persistenceUnit.getJpaProject()), transformer) + IterableTools.children(this.getMappingFilesOnClasspath(persistenceUnit.getJpaProject()), transformer) ); } @@ -200,7 +200,7 @@ public class JpaDeletePackageOrFolderParticipant } protected Iterable<IFile> getPossibleMappingFilesInPackageFragments() { - return IterableTools.compositeIterable(this.packageFragments, PACKAGE_FRAGMENT_NON_JAVA_FILES_TRANSFORMER); + return IterableTools.children(this.packageFragments, PACKAGE_FRAGMENT_NON_JAVA_FILES_TRANSFORMER); } protected static final Transformer<IPackageFragment, Iterable<IFile>> PACKAGE_FRAGMENT_NON_JAVA_FILES_TRANSFORMER = new PackageFragmentNonJavaFilesTransformer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveFolderParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveFolderParticipant.java index a3e89f686a..f5ca603eec 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveFolderParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveFolderParticipant.java @@ -192,7 +192,7 @@ public class JpaMoveFolderParticipant return createPersistenceUnitReplaceEdits(persistenceUnit, folder, (IContainer) getArguments(folder).getDestination()); } }; - return IterableTools.compositeIterable(this.getOriginalFoldersOnClasspath(persistenceUnit.getJpaProject()), transformer); + return IterableTools.children(this.getOriginalFoldersOnClasspath(persistenceUnit.getJpaProject()), transformer); } protected Iterable<IFolder> getOriginalFoldersOnClasspath(final JpaProject jpaProject) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveMappingFileParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveMappingFileParticipant.java index 963ac71e9b..7265733c4b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveMappingFileParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveMappingFileParticipant.java @@ -197,7 +197,7 @@ public class JpaMoveMappingFileParticipant return createPersistenceUnitReplaceEdits(persistenceUnit, mappingFile, (IFolder) getArguments(mappingFile).getDestination()); } }; - return IterableTools.compositeIterable(this.getOriginalFoldersOnClasspath(persistenceUnit.getJpaProject()), transformer); + return IterableTools.children(this.getOriginalFoldersOnClasspath(persistenceUnit.getJpaProject()), transformer); } protected Iterable<IFile> getOriginalFoldersOnClasspath(final JpaProject jpaProject) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameTypeParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameTypeParticipant.java index 67c1a16bea..43aba5217a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameTypeParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameTypeParticipant.java @@ -87,7 +87,7 @@ public class JpaRenameTypeParticipant } private Iterable<ReplaceEdit> createPersistenceXmlReplaceNestedTypeEdits(PersistenceUnit persistenceUnit) { - return IterableTools.compositeIterable(this.nestedTypes, new PersistenceUnitNestedTypeRenameTypeEditsTransformer(persistenceUnit)); + return IterableTools.children(this.nestedTypes, new PersistenceUnitNestedTypeRenameTypeEditsTransformer(persistenceUnit)); } public class PersistenceUnitNestedTypeRenameTypeEditsTransformer @@ -118,7 +118,7 @@ public class JpaRenameTypeParticipant } private Iterable<ReplaceEdit> createMappingFileReplaceNestedTypeEdits(final MappingFileRef mappingFileRef) { - return IterableTools.compositeIterable(this.nestedTypes, new MappingFileNestedTypeRenameTypeEditsTransformer(mappingFileRef)); + return IterableTools.children(this.nestedTypes, new MappingFileNestedTypeRenameTypeEditsTransformer(mappingFileRef)); } public class MappingFileNestedTypeRenameTypeEditsTransformer diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryAssociationOverrideAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryAssociationOverrideAnnotation.java index 9e6f6833ab..2b47296e77 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryAssociationOverrideAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryAssociationOverrideAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.resource.java.binary; import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -56,7 +56,7 @@ public abstract class BinaryAssociationOverrideAnnotation // ***** join columns public ListIterable<JoinColumnAnnotation> getJoinColumns() { - return new LiveCloneListIterable<JoinColumnAnnotation>(this.joinColumns); + return IterableTools.cloneLive(this.joinColumns); } public int getJoinColumnsSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java index 6818c0bb0b..ba7b3ddf66 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.BaseTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; @@ -156,7 +156,7 @@ public abstract class BinaryBaseTableAnnotation // ***** unique constraints public ListIterable<UniqueConstraintAnnotation> getUniqueConstraints() { - return new LiveCloneListIterable<UniqueConstraintAnnotation>(this.uniqueConstraints); + return IterableTools.cloneLive(this.uniqueConstraints); } public int getUniqueConstraintsSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryJoinTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryJoinTableAnnotation.java index 4df37025a4..7ed204bcef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryJoinTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryJoinTableAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.resource.java.binary; import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; @@ -74,7 +74,7 @@ public final class BinaryJoinTableAnnotation // ***** join columns public ListIterable<JoinColumnAnnotation> getJoinColumns() { - return new LiveCloneListIterable<JoinColumnAnnotation>(this.joinColumns); + return IterableTools.cloneLive(this.joinColumns); } public int getJoinColumnsSize() { @@ -114,7 +114,7 @@ public final class BinaryJoinTableAnnotation // ***** inverse join columns public ListIterable<JoinColumnAnnotation> getInverseJoinColumns() { - return new LiveCloneListIterable<JoinColumnAnnotation>(this.inverseJoinColumns); + return IterableTools.cloneLive(this.inverseJoinColumns); } public int getInverseJoinColumnsSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryQueryAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryQueryAnnotation.java index ed5195677a..7c08b89294 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryQueryAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryQueryAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -15,7 +15,7 @@ import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.QueryAnnotation; import org.eclipse.jpt.jpa.core.resource.java.QueryHintAnnotation; @@ -109,7 +109,7 @@ abstract class BinaryQueryAnnotation // ***** hints public ListIterable<QueryHintAnnotation> getHints() { - return new LiveCloneListIterable<QueryHintAnnotation>(this.hints); + return IterableTools.cloneLive(this.hints); } public int getHintsSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinarySecondaryTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinarySecondaryTableAnnotation.java index bfc4336bd4..ea9159b38d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinarySecondaryTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinarySecondaryTableAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.resource.java.binary; import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation; @@ -70,7 +70,7 @@ public final class BinarySecondaryTableAnnotation // ***** pk join columns public ListIterable<PrimaryKeyJoinColumnAnnotation> getPkJoinColumns() { - return new LiveCloneListIterable<PrimaryKeyJoinColumnAnnotation>(this.pkJoinColumns); + return IterableTools.cloneLive(this.pkJoinColumns); } public int getPkJoinColumnsSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryTableGeneratorAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryTableGeneratorAnnotation.java index f6f6d33489..b34fef99fd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryTableGeneratorAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryTableGeneratorAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -13,7 +13,7 @@ import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation; @@ -247,7 +247,7 @@ public final class BinaryTableGeneratorAnnotation // ***** unique constraints public ListIterable<UniqueConstraintAnnotation> getUniqueConstraints() { - return new LiveCloneListIterable<UniqueConstraintAnnotation>(this.uniqueConstraints); + return IterableTools.cloneLive(this.uniqueConstraints); } public int getUniqueConstraintsSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryUniqueConstraintAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryUniqueConstraintAnnotation.java index 4a3288407c..c8b8a7e744 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryUniqueConstraintAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryUniqueConstraintAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 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. @@ -13,7 +13,7 @@ import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; @@ -53,7 +53,7 @@ final class BinaryUniqueConstraintAnnotation // ***** column names public ListIterable<String> getColumnNames() { - return new LiveCloneListIterable<String>(this.columnNames); + return IterableTools.cloneLive(this.columnNames); } public int getColumnNamesSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceUniqueConstraintAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceUniqueConstraintAnnotation.java index f783cd626d..2a63239d61 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceUniqueConstraintAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceUniqueConstraintAnnotation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 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. @@ -26,7 +26,7 @@ import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapt import org.eclipse.jpt.common.core.utility.jdt.ExpressionConverter; import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.common.utility.internal.collection.ListTools; -import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; @@ -73,7 +73,7 @@ public final class SourceUniqueConstraintAnnotation // ***** column names public ListIterable<String> getColumnNames() { - return new LiveCloneListIterable<String>(this.columnNames); + return IterableTools.cloneLive(this.columnNames); } public int getColumnNamesSize() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaType.java index f2224e48df..c9c83db9d5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaType.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 * which accompanies this distribution. @@ -17,7 +17,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Collection; -import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.persistence.jpa.jpql.ExpressionTools; import org.eclipse.persistence.jpa.jpql.TypeHelper; import org.eclipse.persistence.jpa.jpql.spi.IConstructor; @@ -120,7 +120,7 @@ public class JavaType implements IJpaType { if (constructors == null) { constructors = buildConstructors(); } - return new SnapshotCloneIterable<IConstructor>(constructors); + return IterableTools.cloneSnapshot(constructors); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedType.java index bf5d611f66..02fabeb3a5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedType.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 * which accompanies this distribution. @@ -15,7 +15,7 @@ package org.eclipse.jpt.jpa.core.jpql.spi; import java.util.HashMap; import java.util.Map; -import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.persistence.jpa.jpql.spi.IManagedType; @@ -173,6 +173,6 @@ public abstract class JpaManagedType implements IManagedType { */ public Iterable<IMapping> mappings() { initializeMappings(); - return new SnapshotCloneIterable<IMapping>(mappings.values()); + return IterableTools.cloneSnapshot(mappings.values()); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedTypeProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedTypeProvider.java index c5a97655b6..f7642b1de7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedTypeProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedTypeProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 * which accompanies this distribution. @@ -17,7 +17,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; -import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Embeddable; @@ -31,6 +31,7 @@ import org.eclipse.persistence.jpa.jpql.spi.IEntity; import org.eclipse.persistence.jpa.jpql.spi.IManagedType; import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeProvider; import org.eclipse.persistence.jpa.jpql.spi.IMappedSuperclass; +import org.eclipse.persistence.jpa.jpql.spi.IMapping; import org.eclipse.persistence.jpa.jpql.spi.IMappingBuilder; import org.eclipse.persistence.jpa.jpql.spi.IType; @@ -196,7 +197,7 @@ public class JpaManagedTypeProvider implements IManagedTypeProvider { */ public Iterable<IEntity> entities() { initializeManagedTypes(); - return new SnapshotCloneIterable<IEntity>(entities); + return IterableTools.cloneSnapshot(entities); } /** @@ -327,6 +328,6 @@ public class JpaManagedTypeProvider implements IManagedTypeProvider { */ public Iterable<IManagedType> managedTypes() { initializeManagedTypes(); - return new SnapshotCloneIterable<IManagedType>(managedTypes.values()); + return IterableTools.cloneSnapshot(managedTypes.values()); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaType.java index 39bc6f484d..699fef14f2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaType.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 * which accompanies this distribution. @@ -38,7 +38,7 @@ import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.NodeFinder; import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools; import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; import org.eclipse.persistence.jpa.jpql.ExpressionTools; import org.eclipse.persistence.jpa.jpql.spi.IConstructor; @@ -256,7 +256,7 @@ public class JpaType implements IJpaType { if (this.constructors == null) { this.constructors = buildConstructors(); } - return new SnapshotCloneIterable<IConstructor>(this.constructors); + return IterableTools.cloneSnapshot(this.constructors); } /** |