Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Added a new sort mode to editor that sorts by color detailed by color combinations.

Browse source
This commit is contained in:
LevelX2 2013-02-10 10:47:44 +01:00
parent 0bf9491aa1
commit 13e008f102
4 changed files with 87 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Mage.Client/src/main/java/mage/client/cards/CardGrid.java
View file

@ -48,6 +48,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.Map.Entry;
import mage.ObjectColor;
import mage.cards.MageCard;
import mage.client.constants.Constants.SortBy;
@ -132,6 +133,9 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
case COLOR:
Collections.sort(sortedCards, new CardColorComparator());
break;
case COLOR_DETAILED:
Collections.sort(sortedCards, new CardColorDetailedComparator());
break;
case CASTING_COST:
Collections.sort(sortedCards, new CardCostComparator());
break;
@ -160,6 +164,12 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
curRow = 0;
}
break;
case COLOR_DETAILED:
if (cardImg.getOriginal().getColor().hashCode() != lastCard.getOriginal().getColor().hashCode()) {
curColumn++;
curRow = 0;
}
break;
case CASTING_COST:
if (cardImg.getOriginal().getConvertedManaCost() != lastCard.getOriginal().getConvertedManaCost()) {
curColumn++;
@ -349,4 +359,19 @@ class CardColorComparator implements Comparator<MageCard> {
}
}
}
}
class CardColorDetailedComparator implements Comparator<MageCard> {
@Override
public int compare(MageCard o1, MageCard o2) {
int val = o1.getOriginal().getColor().hashCode() - o2.getOriginal().getColor().hashCode();
if (val == 0) {
return o1.getOriginal().getName().compareTo(o2.getOriginal().getName());
}
else {
return val;
}
}
}