Fixed switch statements

This commit is contained in:
drdev
2015-04-20 12:55:59 +00:00
parent 594eb86bdd
commit 4b9fa55f05

View File

@@ -107,14 +107,19 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
switch (lstDecks.getGameType()) { switch (lstDecks.getGameType()) {
case Commander: case Commander:
decks = FModel.getDecks().getCommander(); decks = FModel.getDecks().getCommander();
break;
case TinyLeaders: case TinyLeaders:
decks = DeckFormat.TinyLeaders.getLegalDecks(FModel.getDecks().getCommander()); decks = DeckFormat.TinyLeaders.getLegalDecks(FModel.getDecks().getCommander());
break;
case Archenemy: case Archenemy:
decks = FModel.getDecks().getScheme(); decks = FModel.getDecks().getScheme();
break;
case Planechase: case Planechase:
decks = FModel.getDecks().getPlane(); decks = FModel.getDecks().getPlane();
break;
default: default:
decks = FModel.getDecks().getConstructed(); decks = FModel.getDecks().getConstructed();
break;
} }
if (Iterables.isEmpty(decks)) { if (Iterables.isEmpty(decks)) {
return getGeneratedDeck(); //fall back to generated deck if no decks in filtered list return getGeneratedDeck(); //fall back to generated deck if no decks in filtered list
@@ -127,6 +132,7 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
switch (lstDecks.getGameType()) { switch (lstDecks.getGameType()) {
case Commander: case Commander:
decks = DeckProxy.getAllCommanderDecks(); decks = DeckProxy.getAllCommanderDecks();
break;
case TinyLeaders: case TinyLeaders:
decks = Iterables.filter(DeckProxy.getAllCommanderDecks(), new Predicate<DeckProxy>() { decks = Iterables.filter(DeckProxy.getAllCommanderDecks(), new Predicate<DeckProxy>() {
@Override @Override
@@ -134,12 +140,16 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
return DeckFormat.TinyLeaders.getDeckConformanceProblem(deck.getDeck()) == null; return DeckFormat.TinyLeaders.getDeckConformanceProblem(deck.getDeck()) == null;
} }
}); });
break;
case Archenemy: case Archenemy:
decks = DeckProxy.getAllSchemeDecks(); decks = DeckProxy.getAllSchemeDecks();
break;
case Planechase: case Planechase:
decks = DeckProxy.getAllPlanarDecks(); decks = DeckProxy.getAllPlanarDecks();
break;
default: default:
decks = DeckProxy.getAllConstructedDecks(); decks = DeckProxy.getAllConstructedDecks();
break;
} }
decks = Iterables.filter(decks, new Predicate<DeckProxy>() { decks = Iterables.filter(decks, new Predicate<DeckProxy>() {
@Override @Override