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

New method processCardList that generates the List of Pair per request.

Browse Source 
This method will be also re-used in Decks when inspecting the list of cards to add in a Deck Section.

This refactoring avoids code duplications, and improves modularization.
This commit is contained in:
leriomaggio
2021-07-27 17:58:49 +01:00
parent f3eb862737
commit c8052e00a8
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
forge-core/src/main/java/forge/deck/CardPool.java
View File

@@ -27,7 +27,9 @@ import forge.util.ItemPool;
import forge.util.ItemPoolSorter; import forge.util.ItemPoolSorter;
import forge.util.MyRandom; import forge.util.MyRandom;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -112,7 +114,7 @@ public class CardPool extends ItemPool<PaperCard> {
if (paperCard == null) { if (paperCard == null) {
// Attempt to load the card first // Attempt to load the card first
StaticData.instance().attemptToLoadCard(cardName, setCode); StaticData.instance().attemptToLoadCard(cardName);
// Now try again all the three available DBs // Now try again all the three available DBs
// we simply don't know which db the card has been added to (in case) // we simply don't know which db the card has been added to (in case)
// so we will try all of them again in this second round of attempt. // so we will try all of them again in this second round of attempt.
@@ -229,6 +231,20 @@ public class CardPool extends ItemPool<PaperCard> {
if (lines == null) { if (lines == null) {
return pool; return pool;
} }
List<Pair<String, Integer>> cardRequests = processCardList(lines);
for (Pair<String, Integer> pair : cardRequests) {
String cardRequest = pair.getLeft();
int count = pair.getRight();
pool.add(cardRequest, count);
}
return pool;
}
public static List<Pair<String, Integer>> processCardList(final Iterable<String> lines){
List<Pair<String, Integer>> cardRequests = new ArrayList<>();
if (lines == null)
return cardRequests; // empty list
for (String line : lines) { for (String line : lines) {
if (line.startsWith(";") || line.startsWith("#")) { if (line.startsWith(";") || line.startsWith("#")) {
continue; continue;
@@ -243,9 +259,9 @@ public class CardPool extends ItemPool<PaperCard> {
if (StringUtils.isBlank(cardRequest)) if (StringUtils.isBlank(cardRequest))
continue; continue;
final int count = sCnt == null ? 1 : Integer.parseInt(sCnt); final int count = sCnt == null ? 1 : Integer.parseInt(sCnt);
pool.add(cardRequest, count); cardRequests.add(Pair.of(cardRequest, count));
} }
return pool; return cardRequests;
} }
public String toCardList(String separator) { public String toCardList(String separator) {