diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableArrayBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableArrayBag.java index d6564c8485..5270dd3fb7 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableArrayBag.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableArrayBag.java @@ -495,7 +495,7 @@ public ImmutableBag> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - HashBag> target = HashBag.newBag(Math.min(this.size(), thatSize)); + MutableBag> target = HashBag.newBag(Math.min(this.size(), thatSize)); return this.zip(that, target).toImmutable(); } return this.zip(that, HashBag.newBag()).toImmutable(); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableHashBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableHashBag.java index b9d5d18752..c46cf536a2 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableHashBag.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableHashBag.java @@ -110,7 +110,7 @@ public ImmutableBag newWith(T element) @Override public ImmutableBag newWithout(T element) { - HashBag hashBag = HashBag.newBag(this.delegate); + MutableBag hashBag = HashBag.newBag(this.delegate); hashBag.remove(element); return hashBag.toImmutable(); } diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/AbstractMutableBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/AbstractMutableBag.java index 381dbbff5b..5b6378e57e 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/AbstractMutableBag.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/AbstractMutableBag.java @@ -189,7 +189,7 @@ public MutableBag> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - HashBag> target = HashBag.newBag(Math.min(this.size(), thatSize)); + MutableBag> target = HashBag.newBag(Math.min(this.size(), thatSize)); return this.zip(that, target); } return this.zip(that, HashBag.newBag()); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/primitive/BooleanHashBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/primitive/BooleanHashBag.java index a6454b6fab..b048b9fab3 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/primitive/BooleanHashBag.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/primitive/BooleanHashBag.java @@ -803,7 +803,7 @@ public boolean detectIfNone(BooleanPredicate predicate, boolean ifNone) @Override public MutableBag collect(BooleanToObjectFunction function) { - HashBag result = HashBag.newBag(); + MutableBag result = HashBag.newBag(); if (this.containsFalse()) { result.addOccurrences(function.valueOf(false), this.falseCount); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/immutable/AbstractImmutableSortedBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/immutable/AbstractImmutableSortedBag.java index cafd397555..06448d0aab 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/immutable/AbstractImmutableSortedBag.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/immutable/AbstractImmutableSortedBag.java @@ -61,6 +61,7 @@ import org.eclipse.collections.api.partition.bag.sorted.PartitionImmutableSortedBag; import org.eclipse.collections.api.partition.bag.sorted.PartitionMutableSortedBag; import org.eclipse.collections.api.set.sorted.ImmutableSortedSet; +import org.eclipse.collections.api.set.sorted.MutableSortedSet; import org.eclipse.collections.api.tuple.Pair; import org.eclipse.collections.api.tuple.primitive.ObjectIntPair; import org.eclipse.collections.impl.bag.immutable.AbstractImmutableBagIterable; @@ -375,7 +376,7 @@ public ImmutableSortedSet> zipWithIndex() Comparator comparator = this.comparator() == null ? Comparators.naturalOrder() : this.comparator(); - TreeSortedSet> pairs = TreeSortedSet.newSet( + MutableSortedSet> pairs = TreeSortedSet.newSet( Comparators.>chain( Comparators.byFunction(Functions.firstOfPair(), comparator), Comparators.byFunction(Functions.secondOfPair()))); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/AbstractMutableSortedBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/AbstractMutableSortedBag.java index 1993de73f0..fc131bece7 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/AbstractMutableSortedBag.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/AbstractMutableSortedBag.java @@ -326,7 +326,7 @@ public MutableList> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - FastList> target = FastList.newList(Math.min(this.size(), thatSize)); + MutableList> target = FastList.newList(Math.min(this.size(), thatSize)); return this.zip(that, target); } return this.zip(that, FastList.newList()); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/immutable/AbstractImmutableBiMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/immutable/AbstractImmutableBiMap.java index 7bbfcd81d6..702de1ef35 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/immutable/AbstractImmutableBiMap.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/immutable/AbstractImmutableBiMap.java @@ -397,7 +397,7 @@ public ImmutableSet> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - UnifiedSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); + MutableSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); return this.delegate.zip(that, target).toImmutable(); } return this.delegate.zip(that, Sets.mutable.empty()).toImmutable(); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java index f21cc20f95..f5f06632be 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java @@ -590,7 +590,7 @@ public MutableSet> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - UnifiedSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); + MutableSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); return this.delegate.zip(that, target); } return this.delegate.zip(that, Sets.mutable.empty()); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/collection/mutable/AbstractCollectionAdapter.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/collection/mutable/AbstractCollectionAdapter.java index 951c65b02f..297d98c5e9 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/collection/mutable/AbstractCollectionAdapter.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/collection/mutable/AbstractCollectionAdapter.java @@ -728,7 +728,7 @@ public MutableMap toMap( Function keyFunction, Function valueFunction) { - UnifiedMap map = UnifiedMap.newMap(this.size()); + MutableMap map = UnifiedMap.newMap(this.size()); map.collectKeysAndValues(this.getDelegate(), keyFunction, valueFunction); return map; } diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/lazy/parallel/AbstractParallelIterable.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/lazy/parallel/AbstractParallelIterable.java index 4784d1f7e6..79cefca029 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/lazy/parallel/AbstractParallelIterable.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/lazy/parallel/AbstractParallelIterable.java @@ -475,8 +475,8 @@ public E[] toArray(E[] array) @Override public MutableList toList() { - Function, FastList> map = batch -> { - FastList list = FastList.newList(); + Function, MutableList> map = batch -> { + MutableList list = FastList.newList(); batch.forEach(CollectionAddProcedure.on(list)); return list; }; diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/Interval.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/Interval.java index 19c4dd7157..3e6d2628df 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/Interval.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/Interval.java @@ -925,7 +925,7 @@ public int lastIndexOf(Object object) @Override public MutableList toList() { - FastList list = FastList.newList(this.size()); + MutableList list = FastList.newList(this.size()); this.forEach(CollectionAddProcedure.on(list)); return list; } diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/immutable/AbstractImmutableList.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/immutable/AbstractImmutableList.java index 64c290cc1b..561f32a130 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/immutable/AbstractImmutableList.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/immutable/AbstractImmutableList.java @@ -211,7 +211,7 @@ public ImmutableList newWithAll(Iterable elements) @Override public ImmutableList newWithoutAll(Iterable elements) { - FastList result = FastList.newListWith((T[]) this.toArray()); + MutableList result = FastList.newListWith((T[]) this.toArray()); this.removeAllFrom(elements, result); return result.toImmutable(); } @@ -289,7 +289,7 @@ public

PartitionImmutableList partitionWith(Predicate2 ImmutableList selectInstancesOf(Class clazz) { - FastList result = FastList.newList(this.size()); + MutableList result = FastList.newList(this.size()); this.forEach(new SelectInstancesOfProcedure<>(clazz, result)); return result.toImmutable(); } @@ -778,7 +778,7 @@ public ImmutableList> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - FastList> target = FastList.newList(Math.min(this.size(), thatSize)); + MutableList> target = FastList.newList(Math.min(this.size(), thatSize)); return this.zip(that, target).toImmutable(); } return this.zip(that, FastList.newList()).toImmutable(); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/immutable/primitive/ImmutableBooleanArrayList.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/immutable/primitive/ImmutableBooleanArrayList.java index 4a395658d1..d9dd2951e0 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/immutable/primitive/ImmutableBooleanArrayList.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/immutable/primitive/ImmutableBooleanArrayList.java @@ -278,7 +278,7 @@ public boolean detectIfNone(BooleanPredicate predicate, boolean ifNone) @Override public ImmutableList collect(BooleanToObjectFunction function) { - FastList target = FastList.newList(this.size); + MutableList target = FastList.newList(this.size); for (int i = 0; i < this.size; i++) { target.add(function.valueOf(this.items.get(i))); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/CompositeFastList.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/CompositeFastList.java index 24cf6bdd53..ba476f17e0 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/CompositeFastList.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/CompositeFastList.java @@ -631,7 +631,7 @@ private final class CompositeIterator private Iterator currentIterator; private int currentIndex; - private CompositeIterator(FastList> newLists) + private CompositeIterator(MutableList> newLists) { this.iterators = new Iterator[newLists.size()]; for (int i = 0; i < newLists.size(); ++i) diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/primitive/BooleanArrayList.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/primitive/BooleanArrayList.java index 86b93af049..5f67605a26 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/primitive/BooleanArrayList.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/primitive/BooleanArrayList.java @@ -786,7 +786,7 @@ public boolean detectIfNone(BooleanPredicate predicate, boolean ifNone) @Override public MutableList collect(BooleanToObjectFunction function) { - FastList target = FastList.newList(this.size); + MutableList target = FastList.newList(this.size); for (int i = 0; i < this.size; i++) { target.add(function.valueOf(this.items.get(i))); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/immutable/AbstractImmutableMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/immutable/AbstractImmutableMap.java index b0c7d5ea40..7f6dd5f5f9 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/immutable/AbstractImmutableMap.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/immutable/AbstractImmutableMap.java @@ -146,7 +146,7 @@ public Set> entrySet() @Override public ImmutableMap newWithKeyValue(K key, V value) { - UnifiedMap map = UnifiedMap.newMap(this); + MutableMap map = UnifiedMap.newMap(this); map.put(key, value); return map.toImmutable(); } @@ -154,7 +154,7 @@ public ImmutableMap newWithKeyValue(K key, V value) @Override public ImmutableMap newWithAllKeyValues(Iterable> keyValues) { - UnifiedMap map = UnifiedMap.newMap(this); + MutableMap map = UnifiedMap.newMap(this); for (Pair keyValuePair : keyValues) { map.put(keyValuePair.getOne(), keyValuePair.getTwo()); @@ -181,7 +181,7 @@ public ImmutableMap newWithMapIterable(MapIterable newWithAllKeyValueArguments(Pair... keyValuePairs) { - UnifiedMap map = UnifiedMap.newMap(this); + MutableMap map = UnifiedMap.newMap(this); for (Pair keyValuePair : keyValuePairs) { map.put(keyValuePair.getOne(), keyValuePair.getTwo()); @@ -192,7 +192,7 @@ public ImmutableMap newWithAllKeyValueArguments(Pair newWithoutKey(K key) { - UnifiedMap map = UnifiedMap.newMap(this); + MutableMap map = UnifiedMap.newMap(this); map.removeKey(key); return map.toImmutable(); } @@ -200,7 +200,7 @@ public ImmutableMap newWithoutKey(K key) @Override public ImmutableMap newWithoutAllKeys(Iterable keys) { - UnifiedMap map = UnifiedMap.newMap(this); + MutableMap map = UnifiedMap.newMap(this); for (K key : keys) { map.removeKey(key); @@ -229,28 +229,28 @@ public ImmutableMap flipUniqueValues() @Override public ImmutableMap collect(Function2> function) { - UnifiedMap result = MapIterate.collect(this, function, UnifiedMap.newMap()); + MutableMap result = MapIterate.collect(this, function, UnifiedMap.newMap()); return result.toImmutable(); } @Override public ImmutableMap collectValues(Function2 function) { - UnifiedMap result = MapIterate.collectValues(this, function, UnifiedMap.newMap(this.size())); + MutableMap result = MapIterate.collectValues(this, function, UnifiedMap.newMap(this.size())); return result.toImmutable(); } @Override public ImmutableMap select(Predicate2 predicate) { - UnifiedMap result = MapIterate.selectMapOnEntry(this, predicate, UnifiedMap.newMap()); + MutableMap result = MapIterate.selectMapOnEntry(this, predicate, UnifiedMap.newMap()); return result.toImmutable(); } @Override public ImmutableMap reject(Predicate2 predicate) { - UnifiedMap result = MapIterate.rejectMapOnEntry(this, predicate, UnifiedMap.newMap()); + MutableMap result = MapIterate.rejectMapOnEntry(this, predicate, UnifiedMap.newMap()); return result.toImmutable(); } diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java index ec5ab8134d..1be486a555 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java @@ -37,9 +37,11 @@ import org.eclipse.collections.api.block.procedure.Procedure2; import org.eclipse.collections.api.block.procedure.primitive.ObjectIntProcedure; import org.eclipse.collections.api.factory.Sets; +import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.api.map.MapIterable; import org.eclipse.collections.api.map.MutableMap; import org.eclipse.collections.api.map.UnsortedMapIterable; +import org.eclipse.collections.api.set.MutableSet; import org.eclipse.collections.api.tuple.Pair; import org.eclipse.collections.impl.block.factory.Functions; import org.eclipse.collections.impl.block.factory.Predicates; @@ -2474,7 +2476,7 @@ public T[] toArray(T[] result) protected Object writeReplace() { - UnifiedSet replace = UnifiedSet.newSet(UnifiedMap.this.size()); + MutableSet replace = UnifiedSet.newSet(UnifiedMap.this.size()); for (int i = 0; i < UnifiedMap.this.table.length; i += 2) { Object cur = UnifiedMap.this.table[i]; @@ -2490,7 +2492,7 @@ else if (cur != null) return replace; } - private void chainedAddToSet(Object[] chain, UnifiedSet replace) + private void chainedAddToSet(Object[] chain, MutableSet replace) { for (int i = 0; i < chain.length; i += 2) { @@ -3304,7 +3306,7 @@ public T[] toArray(T[] result) protected Object writeReplace() { - FastList replace = FastList.newList(UnifiedMap.this.size()); + MutableList replace = FastList.newList(UnifiedMap.this.size()); for (int i = 0; i < UnifiedMap.this.table.length; i += 2) { Object cur = UnifiedMap.this.table[i]; @@ -3320,7 +3322,7 @@ else if (cur != null) return replace; } - private void chainedAddToList(Object[] chain, FastList replace) + private void chainedAddToList(Object[] chain, MutableList replace) { for (int i = 0; i < chain.length; i += 2) { diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/immutable/AbstractImmutableSortedMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/immutable/AbstractImmutableSortedMap.java index 3896eddc9a..bc8f1c0424 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/immutable/AbstractImmutableSortedMap.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/immutable/AbstractImmutableSortedMap.java @@ -47,6 +47,7 @@ import org.eclipse.collections.api.factory.primitive.ObjectLongMaps; import org.eclipse.collections.api.factory.primitive.ShortLists; import org.eclipse.collections.api.list.ImmutableList; +import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.api.list.primitive.ImmutableBooleanList; import org.eclipse.collections.api.list.primitive.ImmutableByteList; import org.eclipse.collections.api.list.primitive.ImmutableCharList; @@ -300,7 +301,7 @@ public

PartitionImmutableList partitionWith(Predicate2 ImmutableList selectInstancesOf(Class clazz) { - FastList result = FastList.newList(this.size()); + MutableList result = FastList.newList(this.size()); this.forEach(new SelectInstancesOfProcedure<>(clazz, result)); return result.toImmutable(); } diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/immutable/ImmutableUnifiedMapWithHashingStrategy.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/immutable/ImmutableUnifiedMapWithHashingStrategy.java index 82c9e62539..76dd46b6d4 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/immutable/ImmutableUnifiedMapWithHashingStrategy.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/immutable/ImmutableUnifiedMapWithHashingStrategy.java @@ -183,7 +183,7 @@ public

void forEachWith(Procedure2 procedure, P parame @Override public ImmutableMap newWithKeyValue(K key, V value) { - UnifiedMapWithHashingStrategy result = UnifiedMapWithHashingStrategy.newMap(this.delegate); + MutableMap result = UnifiedMapWithHashingStrategy.newMap(this.delegate); result.put(key, value); return result.toImmutable(); } @@ -191,7 +191,7 @@ public ImmutableMap newWithKeyValue(K key, V value) @Override public ImmutableMap newWithAllKeyValues(Iterable> keyValues) { - UnifiedMapWithHashingStrategy result = UnifiedMapWithHashingStrategy.newMap(this.delegate); + MutableMap result = UnifiedMapWithHashingStrategy.newMap(this.delegate); for (Pair pair : keyValues) { result.put(pair.getOne(), pair.getTwo()); @@ -218,7 +218,7 @@ public ImmutableMap newWithMapIterable(MapIterable newWithAllKeyValueArguments(Pair... keyValuePairs) { - UnifiedMapWithHashingStrategy result = UnifiedMapWithHashingStrategy.newMap(this.delegate); + MutableMap result = UnifiedMapWithHashingStrategy.newMap(this.delegate); for (Pair keyValuePair : keyValuePairs) { result.put(keyValuePair.getOne(), keyValuePair.getTwo()); @@ -229,7 +229,7 @@ public ImmutableMap newWithAllKeyValueArguments(Pair newWithoutKey(K key) { - UnifiedMapWithHashingStrategy result = UnifiedMapWithHashingStrategy.newMap(this.delegate); + MutableMap result = UnifiedMapWithHashingStrategy.newMap(this.delegate); result.remove(key); return result.toImmutable(); } @@ -237,7 +237,7 @@ public ImmutableMap newWithoutKey(K key) @Override public ImmutableMap newWithoutAllKeys(Iterable keys) { - UnifiedMapWithHashingStrategy result = UnifiedMapWithHashingStrategy.newMap(this.delegate); + MutableMap result = UnifiedMapWithHashingStrategy.newMap(this.delegate); for (K key : keys) { result.remove(key); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java index b6dd1f8ea8..080190095e 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java @@ -38,10 +38,12 @@ import org.eclipse.collections.api.block.procedure.Procedure2; import org.eclipse.collections.api.block.procedure.primitive.ObjectIntProcedure; import org.eclipse.collections.api.factory.Sets; +import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.api.map.ImmutableMap; import org.eclipse.collections.api.map.MapIterable; import org.eclipse.collections.api.map.MutableMap; import org.eclipse.collections.api.map.UnsortedMapIterable; +import org.eclipse.collections.api.set.MutableSet; import org.eclipse.collections.api.tuple.Pair; import org.eclipse.collections.impl.block.factory.Functions; import org.eclipse.collections.impl.block.factory.Predicates; @@ -2532,7 +2534,7 @@ public T[] toArray(T[] result) protected Object writeReplace() { - UnifiedSetWithHashingStrategy replace = UnifiedSetWithHashingStrategy.newSet( + MutableSet replace = UnifiedSetWithHashingStrategy.newSet( UnifiedMapWithHashingStrategy.this.hashingStrategy, UnifiedMapWithHashingStrategy.this.size()); for (int i = 0; i < UnifiedMapWithHashingStrategy.this.table.length; i += 2) { @@ -2549,7 +2551,7 @@ else if (cur != null) return replace; } - private void chainedAddToSet(Object[] chain, UnifiedSetWithHashingStrategy replace) + private void chainedAddToSet(Object[] chain, MutableSet replace) { for (int i = 0; i < chain.length; i += 2) { @@ -3373,7 +3375,7 @@ public T[] toArray(T[] result) protected Object writeReplace() { - FastList replace = FastList.newList(UnifiedMapWithHashingStrategy.this.size()); + MutableList replace = FastList.newList(UnifiedMapWithHashingStrategy.this.size()); for (int i = 0; i < UnifiedMapWithHashingStrategy.this.table.length; i += 2) { Object cur = UnifiedMapWithHashingStrategy.this.table[i]; @@ -3389,7 +3391,7 @@ else if (cur != null) return replace; } - private void chainedAddToList(Object[] chain, FastList replace) + private void chainedAddToList(Object[] chain, MutableList replace) { for (int i = 0; i < chain.length; i += 2) { diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/AbstractUnifiedSet.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/AbstractUnifiedSet.java index 679028f771..0b51940f4c 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/AbstractUnifiedSet.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/AbstractUnifiedSet.java @@ -261,7 +261,7 @@ public MutableSet> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - UnifiedSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); + MutableSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); return this.zip(that, target); } return this.zip(that, UnifiedSet.newSet()); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/fixed/FixedSizeSetFactoryImpl.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/fixed/FixedSizeSetFactoryImpl.java index fe33a7fc19..6940ceb8db 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/fixed/FixedSizeSetFactoryImpl.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/fixed/FixedSizeSetFactoryImpl.java @@ -141,7 +141,7 @@ public MutableSet ofAll(Iterable items) @Override public MutableSet withAll(Iterable items) { - UnifiedSet set = UnifiedSet.newSet(items); + MutableSet set = UnifiedSet.newSet(items); T[] itemArray; switch (set.size()) { diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/immutable/AbstractImmutableSet.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/immutable/AbstractImmutableSet.java index 95b1b5d412..375a6b1593 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/immutable/AbstractImmutableSet.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/immutable/AbstractImmutableSet.java @@ -361,7 +361,7 @@ public ImmutableSet> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - UnifiedSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); + MutableSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); return this.zip(that, target).toImmutable(); } return this.zip(that, Sets.mutable.empty()).toImmutable(); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/SetAdapter.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/SetAdapter.java index 38f2ce6a25..3ccc7c982e 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/SetAdapter.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/SetAdapter.java @@ -296,7 +296,7 @@ public MutableSet> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - UnifiedSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); + MutableSet> target = UnifiedSet.newSet(Math.min(this.size(), thatSize)); return Iterate.zip(this, that, target); } return Iterate.zip(this, that, Sets.mutable.empty()); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/primitive/BooleanHashSet.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/primitive/BooleanHashSet.java index 28162f7387..a9dab5a633 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/primitive/BooleanHashSet.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/primitive/BooleanHashSet.java @@ -579,7 +579,7 @@ public boolean detectIfNone(BooleanPredicate predicate, boolean ifNone) @Override public MutableSet collect(BooleanToObjectFunction function) { - UnifiedSet target = UnifiedSet.newSet(this.size()); + MutableSet target = UnifiedSet.newSet(this.size()); switch (this.state) { case 0: diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/sorted/immutable/AbstractImmutableSortedSet.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/sorted/immutable/AbstractImmutableSortedSet.java index c1d5e3544e..6217cb665c 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/sorted/immutable/AbstractImmutableSortedSet.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/sorted/immutable/AbstractImmutableSortedSet.java @@ -124,7 +124,7 @@ public ImmutableSortedSet newWithout(T element) { if (this.contains(element)) { - TreeSortedSet result = TreeSortedSet.newSet(this); + MutableSortedSet result = TreeSortedSet.newSet(this); result.remove(element); return result.toImmutable(); } @@ -134,7 +134,7 @@ public ImmutableSortedSet newWithout(T element) @Override public ImmutableSortedSet newWithAll(Iterable elements) { - TreeSortedSet result = TreeSortedSet.newSet(this); + MutableSortedSet result = TreeSortedSet.newSet(this); result.addAllIterable(elements); return result.toImmutable(); } @@ -142,7 +142,7 @@ public ImmutableSortedSet newWithAll(Iterable elements) @Override public ImmutableSortedSet newWithoutAll(Iterable elements) { - TreeSortedSet result = TreeSortedSet.newSet(this); + MutableSortedSet result = TreeSortedSet.newSet(this); this.removeAllFrom(elements, result); return result.toImmutable(); } @@ -237,7 +237,7 @@ public boolean corresponds(OrderedIterable other, Predicate2 select(Predicate predicate) { - TreeSortedSet result = TreeSortedSet.newSet(this.comparator()); + MutableSortedSet result = TreeSortedSet.newSet(this.comparator()); this.forEach(new SelectProcedure<>(predicate, result)); return result.toImmutable(); } @@ -251,7 +251,7 @@ public

ImmutableSortedSet selectWith(Predicate2 pre @Override public ImmutableSortedSet reject(Predicate predicate) { - TreeSortedSet result = TreeSortedSet.newSet(this.comparator()); + MutableSortedSet result = TreeSortedSet.newSet(this.comparator()); this.forEach(new RejectProcedure<>(predicate, result)); return result.toImmutable(); } @@ -288,7 +288,7 @@ public PartitionImmutableSortedSet partitionWhile(Predicate predic @Override public ImmutableSortedSet selectInstancesOf(Class clazz) { - TreeSortedSet result = TreeSortedSet.newSet((Comparator) this.comparator()); + MutableSortedSet result = TreeSortedSet.newSet((Comparator) this.comparator()); this.forEach(new SelectInstancesOfProcedure<>(clazz, result)); return result.toImmutable(); } @@ -347,7 +347,7 @@ public ImmutableList> zip(Iterable that) if (that instanceof Collection || that instanceof RichIterable) { int thatSize = Iterate.sizeOf(that); - FastList> target = FastList.newList(Math.min(this.size(), thatSize)); + MutableList> target = FastList.newList(Math.min(this.size(), thatSize)); return Iterate.zip(this, that, target).toImmutable(); } return Iterate.zip(this, that, FastList.newList()).toImmutable(); @@ -359,7 +359,7 @@ public ImmutableSortedSet> zipWithIndex() Comparator comparator = this.comparator(); if (comparator == null) { - TreeSortedSet> pairs = TreeSortedSet.newSet(Comparators.byFunction(Functions.firstOfPair(), Comparators.naturalOrder())); + MutableSortedSet> pairs = TreeSortedSet.newSet(Comparators.byFunction(Functions.firstOfPair(), Comparators.naturalOrder())); return Iterate.zipWithIndex(this, pairs).toImmutable(); } return Iterate.zipWithIndex(this, TreeSortedSet.newSet(Comparators.byFirstOfPair(comparator))).toImmutable(); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/sorted/immutable/ImmutableTreeSet.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/sorted/immutable/ImmutableTreeSet.java index 2f39490bab..916eb24366 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/sorted/immutable/ImmutableTreeSet.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/sorted/immutable/ImmutableTreeSet.java @@ -28,6 +28,7 @@ import org.eclipse.collections.api.block.procedure.primitive.ObjectIntProcedure; import org.eclipse.collections.api.factory.SortedSets; import org.eclipse.collections.api.list.ImmutableList; +import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.api.map.MapIterable; import org.eclipse.collections.api.multimap.sortedset.ImmutableSortedSetMultimap; import org.eclipse.collections.api.ordered.OrderedIterable; @@ -219,7 +220,7 @@ public void each(Procedure procedure) @Override public ImmutableList collectWithIndex(ObjectIntToObjectFunction function) { - FastList result = FastList.newList(this.size()); + MutableList result = FastList.newList(this.size()); int index = 0; for (T t : this.delegate) { diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableArrayStack.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableArrayStack.java index 5141827bfa..53edcf58e4 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableArrayStack.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableArrayStack.java @@ -120,14 +120,14 @@ final class ImmutableArrayStack implements ImmutableStack, Serializable { private static final long serialVersionUID = 1L; - private final FastList delegate; + private final MutableList delegate; private ImmutableArrayStack(T[] newElements) { this.delegate = FastList.newListWith(newElements); } - private ImmutableArrayStack(FastList newElements) + private ImmutableArrayStack(MutableList newElements) { this.delegate = newElements; } @@ -160,7 +160,7 @@ public static ImmutableArrayStack newStackFromTopToBottom(T... items) @Override public ImmutableStack push(T item) { - FastList newDelegate = FastList.newList(this.delegate); + MutableList newDelegate = FastList.newList(this.delegate); newDelegate.add(item); return new ImmutableArrayStack<>(newDelegate); } @@ -169,7 +169,7 @@ public ImmutableStack push(T item) public ImmutableStack pop() { this.checkEmptyStack(); - FastList newDelegate = FastList.newList(this.delegate); + MutableList newDelegate = FastList.newList(this.delegate); newDelegate.remove(this.delegate.size() - 1); return new ImmutableArrayStack<>(newDelegate); } @@ -184,7 +184,7 @@ public ImmutableStack pop(int count) } this.checkEmptyStack(); this.checkSizeLessThanCount(count); - FastList newDelegate = this.delegate.clone(); + MutableList newDelegate = this.delegate.clone(); while (count > 0) { newDelegate.remove(this.delegate.size() - 1); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/ArrayStack.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/ArrayStack.java index b413ffad93..7df742373a 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/ArrayStack.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/ArrayStack.java @@ -115,7 +115,7 @@ public class ArrayStack implements MutableStack, Externalizable { private static final long serialVersionUID = 1L; - private FastList delegate; + private MutableList delegate; public ArrayStack() { @@ -165,7 +165,7 @@ public static ArrayStack newStackFromTopToBottom(T... items) public static ArrayStack newStackFromTopToBottom(Iterable items) { ArrayStack stack = ArrayStack.newStack(); - FastList list = FastList.newList(items); + MutableList list = FastList.newList(items); stack.delegate = list.reverseThis(); return stack; } @@ -275,7 +275,7 @@ public ListIterable peek(int count) this.checkEmptyStack(); this.checkSizeLessThanCount(count); - FastList result = FastList.newList(count); + MutableList result = FastList.newList(count); for (int i = 0; i < count; i++) { result.add(this.delegate.get(this.delegate.size() - (i + 1))); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/MutableStackFactoryImpl.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/MutableStackFactoryImpl.java index 5e4385c398..0af0cdf5cd 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/MutableStackFactoryImpl.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/MutableStackFactoryImpl.java @@ -41,7 +41,7 @@ public MutableStack withAll(Iterable elements) @Override public MutableStack fromStream(Stream stream) { - ArrayStack stack = ArrayStack.newStack(); + MutableStack stack = ArrayStack.newStack(); stream.forEach(stack::push); return stack; } diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/string/immutable/CharAdapter.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/string/immutable/CharAdapter.java index ab50d35941..bc82c47eaf 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/string/immutable/CharAdapter.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/string/immutable/CharAdapter.java @@ -332,7 +332,7 @@ public CharAdapter reject(CharPredicate predicate) public ImmutableList collect(CharToObjectFunction function) { int size = this.size(); - FastList list = FastList.newList(size); + MutableList list = FastList.newList(size); for (int i = 0; i < size; i++) { list.add(function.valueOf(this.get(i))); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/string/immutable/CodePointAdapter.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/string/immutable/CodePointAdapter.java index d759cfba4e..bc5c5dc649 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/string/immutable/CodePointAdapter.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/string/immutable/CodePointAdapter.java @@ -387,7 +387,7 @@ public CodePointAdapter reject(IntPredicate predicate) @Override public ImmutableList collect(IntToObjectFunction function) { - FastList list = FastList.newList(this.adapted.length()); + MutableList list = FastList.newList(this.adapted.length()); for (int i = 0; i < this.adapted.length(); ) { int codePoint = this.adapted.codePointAt(i); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/ArrayListIterate.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/ArrayListIterate.java index 75fdb21a7b..1bea68f0ac 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/ArrayListIterate.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/ArrayListIterate.java @@ -1586,7 +1586,7 @@ public static > R distinct(ArrayList list, R targetList) public static ArrayList distinct(ArrayList list, HashingStrategy hashingStrategy) { int size = list.size(); - MutableSet seenSoFar = UnifiedSetWithHashingStrategy.newSet(hashingStrategy); + MutableSet seenSoFar = new UnifiedSetWithHashingStrategy<>(hashingStrategy); ArrayList result = new ArrayList<>(); if (ArrayListIterate.isOptimizableArrayList(list, size)) { @@ -1863,7 +1863,7 @@ public static MutableList> zip(ArrayList xs, Iterable ys { int xSize = xs.size(); int ySize = Iterate.sizeOf(ys); - FastList> target = FastList.newList(Math.min(xSize, ySize)); + MutableList> target = FastList.newList(Math.min(xSize, ySize)); return ArrayListIterate.zip(xs, ys, target); } return ArrayListIterate.zip(xs, ys, FastList.newList()); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/ListIterate.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/ListIterate.java index 8301cd8bcd..9063000a82 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/ListIterate.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/ListIterate.java @@ -1689,7 +1689,7 @@ public static MutableList> zip( { int listSize = list.size(); int iterableSize = Iterate.sizeOf(iterable); - FastList> target = FastList.newList(Math.min(listSize, iterableSize)); + MutableList> target = FastList.newList(Math.min(listSize, iterableSize)); return ListIterate.zip(list, iterable, target); } return ListIterate.zip(list, iterable, FastList.newList()); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/IteratorIterate.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/IteratorIterate.java index 91c44c55c7..8198747dbc 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/IteratorIterate.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/IteratorIterate.java @@ -1117,7 +1117,7 @@ public static MutableList distinct(Iterator iterator) public static MutableList distinct(Iterator iterator, HashingStrategy hashingStrategy) { Set seenSoFar = UnifiedSetWithHashingStrategy.newSet(hashingStrategy); - FastList result = FastList.newList(); + MutableList result = FastList.newList(); while (iterator.hasNext()) { T item = iterator.next(); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/RandomAccessListIterate.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/RandomAccessListIterate.java index acacbb284a..4af86e0c87 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/RandomAccessListIterate.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/RandomAccessListIterate.java @@ -1282,7 +1282,7 @@ public static MutableList distinct(List list) public static MutableList distinct(List list, HashingStrategy hashingStrategy) { MutableSet seenSoFar = UnifiedSetWithHashingStrategy.newSet(hashingStrategy); - FastList result = FastList.newList(); + MutableList result = FastList.newList(); int size = list.size(); for (int i = 0; i < size; i++) { @@ -1599,7 +1599,7 @@ public static MutableList> zip( { int listSize = list.size(); int iterableSize = Iterate.sizeOf(iterable); - FastList> target = FastList.newList(Math.min(listSize, iterableSize)); + MutableList> target = FastList.newList(Math.min(listSize, iterableSize)); return RandomAccessListIterate.zip(list, iterable, target); } return RandomAccessListIterate.zip(list, iterable, FastList.newList()); diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/SortedSetIterables.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/SortedSetIterables.java index a154bb804b..1a3695def7 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/SortedSetIterables.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/internal/SortedSetIterables.java @@ -35,7 +35,7 @@ public static MutableSortedSet> powerSet(SortedSet se { Comparator comparator = set.comparator(); MutableSortedSet innerTree = TreeSortedSet.newSet(comparator); - TreeSortedSet> sortedSetIterables = TreeSortedSet.newSet(Comparators.powerSet()); + MutableSortedSet> sortedSetIterables = TreeSortedSet.newSet(Comparators.powerSet()); MutableSortedSet> seed = sortedSetIterables.with(innerTree); return Iterate.injectInto(seed, set, (accumulator, element) -> accumulator.union(accumulator.collect(set1 -> {