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/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java | |
| 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/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java')
| -rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java | 7 |
1 files changed, 3 insertions, 4 deletions
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") |