From 8dc331ed145b47573ed8dffbac3444b20eccaa95 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sat, 16 Mar 2013 22:25:34 +0000 Subject: [PATCH] little polishing on QuestRewardCard classes --- src/main/java/forge/quest/QuestRewardCard.java | 4 +++- src/main/java/forge/quest/QuestRewardCardChooser.java | 1 + src/main/java/forge/quest/QuestRewardCardFiltered.java | 10 +--------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/forge/quest/QuestRewardCard.java b/src/main/java/forge/quest/QuestRewardCard.java index 3d08865acc1..1ce9004ea0b 100644 --- a/src/main/java/forge/quest/QuestRewardCard.java +++ b/src/main/java/forge/quest/QuestRewardCard.java @@ -16,7 +16,7 @@ import forge.item.InventoryItem; * TODO: Write javadoc for this type. * */ -public abstract class QuestRewardCard implements InventoryItem { +public abstract class QuestRewardCard implements InventoryItem, IQuestRewardCard { protected String buildDescription(final String [] input) { final String defaultDescription = "a card"; @@ -130,5 +130,7 @@ public abstract class QuestRewardCard implements InventoryItem { public String getImageFilename() { return ""; } + + public abstract List getChoices(); } \ No newline at end of file diff --git a/src/main/java/forge/quest/QuestRewardCardChooser.java b/src/main/java/forge/quest/QuestRewardCardChooser.java index 8f787742daa..67aefcd8307 100644 --- a/src/main/java/forge/quest/QuestRewardCardChooser.java +++ b/src/main/java/forge/quest/QuestRewardCardChooser.java @@ -90,6 +90,7 @@ public class QuestRewardCardChooser extends QuestRewardCard implements Inventory * * @return a List or null if could not create a list. */ + @Override public final List getChoices() { if (type == poolType.playerCards) { final ItemPool playerCards = Singletons.getModel().getQuest().getAssets().getCardPool(); diff --git a/src/main/java/forge/quest/QuestRewardCardFiltered.java b/src/main/java/forge/quest/QuestRewardCardFiltered.java index 5cee1b0ca3b..ba34b573027 100644 --- a/src/main/java/forge/quest/QuestRewardCardFiltered.java +++ b/src/main/java/forge/quest/QuestRewardCardFiltered.java @@ -39,15 +39,6 @@ public class QuestRewardCardFiltered extends QuestRewardCard implements IQuestRe return description; } - /** - * This class is a dynamic list of cards, hence no images. - * - * @return an empty string - */ - @Override - public String getImageFilename() { - return ""; - } /** * The item type. @@ -64,6 +55,7 @@ public class QuestRewardCardFiltered extends QuestRewardCard implements IQuestRe * * @return a List or null if could not create a list. */ + @Override public final List getChoices() { List cardChoices = new ArrayList(); for (final CardPrinted card : Iterables.filter(CardDb.instance().getAllCards(), predicates)) {