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

refactor CardDB

Browse Source 
use filterentries instead of declaring maps
This commit is contained in:
Anthony Calosa
2021-03-30 23:42:33 +08:00
parent 930c27a890
commit ca63763d04
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -32,6 +32,7 @@ import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
import forge.StaticData; import forge.StaticData;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@@ -56,9 +57,6 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
public final static String foilSuffix = "+"; public final static String foilSuffix = "+";
public final static char NameSetSeparator = '|'; public final static char NameSetSeparator = '|';
// for deck editor only
private final ListMultimap<String, PaperCard> allCardsByNameNoAlt = Multimaps.newListMultimap(new TreeMap<>(String.CASE_INSENSITIVE_ORDER), CollectionSuppliers.arrayLists());
private final Map<String, PaperCard> uniqueCardsByNameNoAlt = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
// need this to obtain cardReference by name+set+artindex // need this to obtain cardReference by name+set+artindex
private final ListMultimap<String, PaperCard> allCardsByName = Multimaps.newListMultimap(new TreeMap<>(String.CASE_INSENSITIVE_ORDER), CollectionSuppliers.arrayLists()); private final ListMultimap<String, PaperCard> allCardsByName = Multimaps.newListMultimap(new TreeMap<>(String.CASE_INSENSITIVE_ORDER), CollectionSuppliers.arrayLists());
private final Map<String, PaperCard> uniqueCardsByName = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER); private final Map<String, PaperCard> uniqueCardsByName = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
@@ -70,7 +68,6 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
private final Map<String, Integer> artIds = new HashMap<>(); private final Map<String, Integer> artIds = new HashMap<>();
private final Collection<PaperCard> roAllCards = Collections.unmodifiableCollection(allCardsByName.values()); private final Collection<PaperCard> roAllCards = Collections.unmodifiableCollection(allCardsByName.values());
private final Collection<PaperCard> roAllCardsNoAlt = Collections.unmodifiableCollection(allCardsByNameNoAlt.values());
private final CardEdition.Collection editions; private final CardEdition.Collection editions;
public enum SetPreference { public enum SetPreference {
@@ -260,7 +257,6 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
public void addCard(PaperCard paperCard) { public void addCard(PaperCard paperCard) {
allCardsByName.put(paperCard.getName(), paperCard); allCardsByName.put(paperCard.getName(), paperCard);
allCardsByNameNoAlt.put(paperCard.getName(), paperCard);
if (paperCard.getRules().getSplitType() == CardSplitType.None) { return; } if (paperCard.getRules().getSplitType() == CardSplitType.None) { return; }
@@ -276,13 +272,9 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
private void reIndex() { private void reIndex() {
uniqueCardsByName.clear(); uniqueCardsByName.clear();
uniqueCardsByNameNoAlt.clear();
for (Entry<String, Collection<PaperCard>> kv : allCardsByName.asMap().entrySet()) { for (Entry<String, Collection<PaperCard>> kv : allCardsByName.asMap().entrySet()) {
uniqueCardsByName.put(kv.getKey(), getFirstWithImage(kv.getValue())); uniqueCardsByName.put(kv.getKey(), getFirstWithImage(kv.getValue()));
} }
for (Entry<String, Collection<PaperCard>> kv : allCardsByNameNoAlt.asMap().entrySet()) {
uniqueCardsByNameNoAlt.put(kv.getKey(), getFirstWithImage(kv.getValue()));
}
} }
private static PaperCard getFirstWithImage(final Collection<PaperCard> cards) { private static PaperCard getFirstWithImage(final Collection<PaperCard> cards) {
@@ -571,7 +563,14 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
} }
public Collection<PaperCard> getUniqueCardsNoAlt() { public Collection<PaperCard> getUniqueCardsNoAlt() {
return uniqueCardsByNameNoAlt.values(); return Maps.filterEntries(this.uniqueCardsByName, new Predicate<Entry<String, PaperCard>>() {
@Override
public boolean apply(Entry<String, PaperCard> e) {
if (e == null)
return false;
return e.getKey().equals(e.getValue().getName());
}
}).values();
} }
public PaperCard getUniqueByName(final String name) { public PaperCard getUniqueByName(final String name) {
@@ -592,7 +591,12 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
} }
public Collection<PaperCard> getAllCardsNoAlt() { public Collection<PaperCard> getAllCardsNoAlt() {
return roAllCardsNoAlt; return Multimaps.filterEntries(allCardsByName, new Predicate<Entry<String, PaperCard>>() {
@Override
public boolean apply(Entry<String, PaperCard> entry) {
return entry.getKey().equals(entry.getValue().getName());
}
}).values();
} }
public Collection<PaperCard> getAllNonPromoCards() { public Collection<PaperCard> getAllNonPromoCards() {
@@ -623,7 +627,12 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
} }
public List<PaperCard> getAllCardsNoAlt(String cardName) { public List<PaperCard> getAllCardsNoAlt(String cardName) {
return allCardsByNameNoAlt.get(getName(cardName)); return Lists.newArrayList(Multimaps.filterEntries(allCardsByName, new Predicate<Entry<String, PaperCard>>() {
@Override
public boolean apply(Entry<String, PaperCard> entry) {
return entry.getKey().equals(entry.getValue().getName());
}
}).get(getName(cardName)));
} }
/** Returns a modifiable list of cards matching the given predicate */ /** Returns a modifiable list of cards matching the given predicate */
@@ -634,7 +643,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
/** Returns a modifiable list of cards matching the given predicate */ /** Returns a modifiable list of cards matching the given predicate */
public List<PaperCard> getAllCardsNoAlt(Predicate<PaperCard> predicate) { public List<PaperCard> getAllCardsNoAlt(Predicate<PaperCard> predicate) {
return Lists.newArrayList(Iterables.filter(this.roAllCardsNoAlt, predicate)); return Lists.newArrayList(Iterables.filter(getAllCardsNoAlt(), predicate));
} }
// Do I want a foiled version of these cards? // Do I want a foiled version of these cards?