From 15c3f3a409b72b4436c3f2a3588849f7491cf860 Mon Sep 17 00:00:00 2001 From: drdev Date: Tue, 5 Aug 2014 01:40:52 +0000 Subject: [PATCH] Sort quest booster reward by name then color then rarity --- .../forge/quest/QuestWinLoseController.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java index ac8661a585b..1ef0171e042 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java @@ -2,6 +2,7 @@ package forge.quest; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Map.Entry; @@ -562,6 +563,25 @@ public abstract class QuestWinLoseController { } if (cardsWon != null) { + //sort cards alphabetically so colors appear together and rares appear on top + Collections.sort(cardsWon, new Comparator() { + @Override + public int compare(PaperCard c1, PaperCard c2) { + return c1.getName().compareTo(c2.getName()); + } + }); + Collections.sort(cardsWon, new Comparator() { + @Override + public int compare(PaperCard c1, PaperCard c2) { + return c1.getRules().getColor().compareTo(c2.getRules().getColor()); + } + }); + Collections.sort(cardsWon, new Comparator() { + @Override + public int compare(PaperCard c1, PaperCard c2) { + return c2.getRarity().compareTo(c1.getRarity()); + } + }); showCards(title, cardsWon); } }