external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved CountAll method implementation using Maps

Browse Source
This commit is contained in:
leriomaggio
2021-08-28 20:46:44 +01:00
parent 8768900cf8
commit a8acbf0491
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
forge-core/src/main/java/forge/util/ItemPool.java
View File

@@ -31,7 +31,9 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import forge.item.InventoryItem;
import org.checkerframework.checker.nullness.compatqual.NullableDecl;
/**
* <p>
@@ -137,30 +139,26 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
return count;
}
public final <U extends InventoryItem> int countAll(Predicate<U> condition){
public int countAll(Predicate<T> condition){
int count = 0;
Iterable<T> matchingKeys = Iterables.filter(this.items.keySet(), new Predicate<T>() {
@Override
public boolean apply(T item) {
return condition.apply((U)item);
}
});
for (T key : matchingKeys)
count += this.items.get(key);
for (Integer v : Maps.filterKeys(this.items, condition).values())
count += v;
return count;
}
@SuppressWarnings("unchecked")
public final <U extends InventoryItem> int countAll(Predicate<U> condition, Class<U> cls) {
int count = 0;
Iterable<T> matchingKeys = Iterables.filter(this.items.keySet(), new Predicate<T>() {
Map<T, Integer> matchingKeys = Maps.filterKeys(this.items, new Predicate<T>() {
@Override
public boolean apply(T item) {
return cls.isInstance(item) && condition.apply((U)item);
return cls.isInstance(item) && (condition.apply((U)item));
}
});
for (T key : matchingKeys)
count += this.items.get(key);
for (Integer i : matchingKeys.values()) {
count += i;
}
return count;
}