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

(minor) Changed from ArrayList to List in a chain of booster generation

Browse Source
This commit is contained in:
Maxmtg
2011-09-12 15:31:21 +00:00
parent 145141f224
commit 69a95707c6
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/Quest_Assignment.java
View File

@@ -1,6 +1,7 @@
package forge;
import java.util.ArrayList;
import java.util.List;
import forge.card.CardPrinted;
@@ -30,7 +31,7 @@ public class Quest_Assignment {
// Other cards used in assignment: starting, and reward.
private CardList humanExtraCards = new CardList();
private CardList aiExtraCards = new CardList();
private ArrayList<CardPrinted> cardRewardList = new ArrayList<CardPrinted>();
private List<CardPrinted> cardRewardList = new ArrayList<CardPrinted>();
// No constructor required; fields are set dynamically.
@@ -81,7 +82,7 @@ public class Quest_Assignment {
*
* @return a {@link java.util.ArrayList} object.
*/
public void setCardRewardList(final ArrayList<CardPrinted> cp) {
public void setCardRewardList(final List<CardPrinted> cp) {
this.cardRewardList = cp;
}
@@ -91,7 +92,7 @@ public class Quest_Assignment {
*
* @return a {@link java.util.ArrayList} object.
*/
public final ArrayList<CardPrinted> getCardRewardList() {
public final List<CardPrinted> getCardRewardList() {
return cardRewardList;
}

24
src/main/java/forge/quest/data/QuestBoosterPack.java
View File

@@ -106,8 +106,18 @@ public final class QuestBoosterPack {
return result;
}
// Left if only for backwards compatibility
public List<CardPrinted> generateCards(final int num, final CardRarity rarity, final String color) {
Predicate<CardPrinted> whatYouWant = getPredicateForConditions(rarity, color);
return generateDistinctCards(CardDb.instance().getAllUniqueCards(), whatYouWant, num);
}
private static ArrayList<CardPrinted> generateDistinctCards(
public static List<CardPrinted> generateCards(final Predicate<CardPrinted> filter, int num, CardRarity rarity, String color) {
Predicate<CardPrinted> whatYouWant = Predicate.and(filter, getPredicateForConditions(rarity, color));
return generateDistinctCards(CardDb.instance().getAllUniqueCards(), whatYouWant, num);
}
private static List<CardPrinted> generateDistinctCards(
final Iterable<CardPrinted> source,
final Predicate<CardPrinted> filter,
final int cntNeeded)
@@ -131,18 +141,6 @@ public final class QuestBoosterPack {
return result;
}
// Left if only for backwards compatibility
public ArrayList<CardPrinted> generateCards(final int num, final CardRarity rarity, final String color) {
Predicate<CardPrinted> whatYouWant = getPredicateForConditions(rarity, color);
return generateDistinctCards(CardDb.instance().getAllUniqueCards(), whatYouWant, num);
}
public static ArrayList<CardPrinted> generateCards(final Predicate<CardPrinted> filter, int num, CardRarity rarity, String color) {
Predicate<CardPrinted> whatYouWant = Predicate.and(filter, getPredicateForConditions(rarity, color));
return generateDistinctCards(CardDb.instance().getAllUniqueCards(), whatYouWant, num);
}
private static Predicate<CardPrinted> getPredicateForConditions(final CardRarity rarity, final String color)
{
Predicate<CardPrinted> rFilter;

3
src/main/java/forge/quest/data/QuestUtil.java
View File

@@ -8,6 +8,7 @@ import forge.card.CardPrinted;
import forge.card.CardRarity;
import java.util.ArrayList;
import java.util.List;
/**
* <p>QuestUtil class.</p>
@@ -125,7 +126,7 @@ public class QuestUtil {
* @param s Properties string of reward (97 multicolor rares)
* @return CardList
*/
public static ArrayList<CardPrinted> generateCardRewardList(String s) {
public static List<CardPrinted> generateCardRewardList(String s) {
QuestBoosterPack pack = new QuestBoosterPack();
String[] temp = s.split(" ");