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

parameterizing Comparator in CardFactroy_Sorceries.java

Browse Source
This commit is contained in:
jendave
2011-08-06 09:38:45 +00:00
parent 7cef6ebd4e
commit 7f04b29e0a
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/forge/CardFactory_Sorceries.java
View File

@@ -1847,8 +1847,6 @@ public class CardFactory_Sorceries {
private static final long serialVersionUID = 8127696608769903507L; private static final long serialVersionUID = 8127696608769903507L;
@Override @Override
@SuppressWarnings("unchecked")
// Comparator
public void resolve() { public void resolve() {
Player opponent = card.getController().getOpponent(); Player opponent = card.getController().getOpponent();
Card choice = null; Card choice = null;
@@ -1862,12 +1860,12 @@ public class CardFactory_Sorceries {
//human chooses //human chooses
if(opponent.equals(AllZone.ComputerPlayer)) { if(opponent.equals(AllZone.ComputerPlayer)) {
CardList all = AllZone.CardFactory.getAllCards(); CardList all = AllZone.CardFactory.getAllCards();
all.sort(new Comparator() { all.sort(new Comparator<Card>() {
public int compare(Object a1, Object b1) { public int compare(Card a1, Card b1) {
Card a = (Card) a1; //Card a = (Card) a1;
Card b = (Card) b1; // Card b = (Card) b1;
return a.getName().compareTo(b.getName()); return a1.getName().compareTo(b1.getName());
} }
}); });
choice = AllZone.Display.getChoice("Choose", removeLand(all.toArray())); choice = AllZone.Display.getChoice("Choose", removeLand(all.toArray()));
@@ -1877,7 +1875,7 @@ public class CardFactory_Sorceries {
Arrays.sort(showLibrary, com); Arrays.sort(showLibrary, com);
AllZone.Display.getChoiceOptional("Opponent's Library", showLibrary); AllZone.Display.getChoiceOptional("Opponent's Library", showLibrary);
AllZone.GameAction.shuffle(opponent); opponent.shuffle();
}//if }//if
else//computer chooses else//computer chooses
{ {
@@ -1898,7 +1896,7 @@ public class CardFactory_Sorceries {
}//else }//else
remove(choice, opponent); remove(choice, opponent);
AllZone.GameAction.shuffle(opponent); opponent.shuffle();
}//resolve() }//resolve()
void remove(Card c, Player player) { void remove(Card c, Player player) {