From 2ba969dc1d820a111cd69c92f77a6c059e608b06 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 6 May 2013 03:28:42 +0000 Subject: [PATCH] renamed classes to make names reflect their purpose --- .gitattributes | 6 +++--- .../{BoosterDeck.java => BoosterDeckBuilder.java} | 4 ++-- src/main/java/forge/game/limited/BoosterDraftAI.java | 2 +- .../{LimitedDeck.java => LimitedDeckBuilder.java} | 6 +++--- .../{SealedDeck.java => SealedDeckBuilder.java} | 10 ++-------- .../java/forge/gui/home/sanctioned/CSubmenuSealed.java | 4 ++-- 6 files changed, 13 insertions(+), 19 deletions(-) rename src/main/java/forge/game/limited/{BoosterDeck.java => BoosterDeckBuilder.java} (66%) rename src/main/java/forge/game/limited/{LimitedDeck.java => LimitedDeckBuilder.java} (96%) rename src/main/java/forge/game/limited/{SealedDeck.java => SealedDeckBuilder.java} (94%) diff --git a/.gitattributes b/.gitattributes index cd2e29d69be..e6b04660506 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14194,7 +14194,7 @@ src/main/java/forge/game/event/ShuffleEvent.java -text src/main/java/forge/game/event/SpellResolvedEvent.java -text src/main/java/forge/game/event/TokenCreatedEvent.java -text src/main/java/forge/game/event/package-info.java -text -src/main/java/forge/game/limited/BoosterDeck.java -text +src/main/java/forge/game/limited/BoosterDeckBuilder.java -text src/main/java/forge/game/limited/BoosterDraft.java svneol=native#text/plain src/main/java/forge/game/limited/BoosterDraftAI.java svneol=native#text/plain src/main/java/forge/game/limited/CCnt.java svneol=native#text/plain @@ -14205,9 +14205,9 @@ src/main/java/forge/game/limited/DeckColors.java svneol=native#text/plain src/main/java/forge/game/limited/DraftRankCache.java -text src/main/java/forge/game/limited/GauntletMini.java -text src/main/java/forge/game/limited/IBoosterDraft.java svneol=native#text/plain -src/main/java/forge/game/limited/LimitedDeck.java -text +src/main/java/forge/game/limited/LimitedDeckBuilder.java -text src/main/java/forge/game/limited/ReadDraftRankings.java -text -src/main/java/forge/game/limited/SealedDeck.java svneol=native#text/plain +src/main/java/forge/game/limited/SealedDeckBuilder.java svneol=native#text/plain src/main/java/forge/game/limited/SealedDeckFormat.java svneol=native#text/plain src/main/java/forge/game/limited/package-info.java svneol=native#text/plain src/main/java/forge/game/package-info.java -text diff --git a/src/main/java/forge/game/limited/BoosterDeck.java b/src/main/java/forge/game/limited/BoosterDeckBuilder.java similarity index 66% rename from src/main/java/forge/game/limited/BoosterDeck.java rename to src/main/java/forge/game/limited/BoosterDeckBuilder.java index 8b95fa207ff..5acaad37e99 100644 --- a/src/main/java/forge/game/limited/BoosterDeck.java +++ b/src/main/java/forge/game/limited/BoosterDeckBuilder.java @@ -10,7 +10,7 @@ import forge.item.CardPrinted; * Deck built from a Booster Draft. * */ -public class BoosterDeck extends LimitedDeck { +public class BoosterDeckBuilder extends LimitedDeckBuilder { /** * Constructor. @@ -20,7 +20,7 @@ public class BoosterDeck extends LimitedDeck { * @param pClrs * colors */ - public BoosterDeck(List dList, DeckColors pClrs) { + public BoosterDeckBuilder(List dList, DeckColors pClrs) { super(dList, pClrs); } diff --git a/src/main/java/forge/game/limited/BoosterDraftAI.java b/src/main/java/forge/game/limited/BoosterDraftAI.java index d3b7949c9aa..dc1b7ff6aee 100644 --- a/src/main/java/forge/game/limited/BoosterDraftAI.java +++ b/src/main/java/forge/game/limited/BoosterDraftAI.java @@ -158,7 +158,7 @@ public class BoosterDraftAI { System.out.println("Deck[" + i + "]"); } - out[i] = new BoosterDeck(this.deck.get(i), this.playerColors.get(i)).buildDeck(); + out[i] = new BoosterDeckBuilder(this.deck.get(i), this.playerColors.get(i)).buildDeck(); } return out; } // getDecks() diff --git a/src/main/java/forge/game/limited/LimitedDeck.java b/src/main/java/forge/game/limited/LimitedDeckBuilder.java similarity index 96% rename from src/main/java/forge/game/limited/LimitedDeck.java rename to src/main/java/forge/game/limited/LimitedDeckBuilder.java index 577223037bf..2d4bca3394d 100644 --- a/src/main/java/forge/game/limited/LimitedDeck.java +++ b/src/main/java/forge/game/limited/LimitedDeckBuilder.java @@ -39,7 +39,7 @@ import forge.util.MyRandom; * Limited format deck. * */ -public class LimitedDeck { +public class LimitedDeckBuilder { private int numSpellsNeeded = 22; private int landsNeeded = 18; @@ -67,7 +67,7 @@ public class LimitedDeck { * @param pClrs * Chosen colors. */ - public LimitedDeck(List dList, DeckColors pClrs) { + public LimitedDeckBuilder(List dList, DeckColors pClrs) { this.availableList = dList; this.deckColors = pClrs; this.colors = pClrs.getChosenColors(); @@ -88,7 +88,7 @@ public class LimitedDeck { * @param list * Cards to build the deck from. */ - public LimitedDeck(List list) { + public LimitedDeckBuilder(List list) { this(list, new DeckColors()); } diff --git a/src/main/java/forge/game/limited/SealedDeck.java b/src/main/java/forge/game/limited/SealedDeckBuilder.java similarity index 94% rename from src/main/java/forge/game/limited/SealedDeck.java rename to src/main/java/forge/game/limited/SealedDeckBuilder.java index 48b62ad4984..272a709c50a 100644 --- a/src/main/java/forge/game/limited/SealedDeck.java +++ b/src/main/java/forge/game/limited/SealedDeckBuilder.java @@ -21,15 +21,9 @@ import forge.util.MyRandom; * Deck builder for Sealed Deck Format. * */ -public class SealedDeck extends LimitedDeck { +public class SealedDeckBuilder extends LimitedDeckBuilder { - /** - * Constructor. - * - * @param list - * list of cards available - */ - public SealedDeck(List list) { + public SealedDeckBuilder(List list) { super(list); this.setColors(chooseColors()); } diff --git a/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java b/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java index d310c61724a..9b32986bc26 100644 --- a/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java +++ b/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java @@ -24,7 +24,7 @@ import forge.deck.DeckGroup; import forge.deck.DeckSection; import forge.game.GameType; import forge.game.limited.ReadDraftRankings; -import forge.game.limited.SealedDeck; +import forge.game.limited.SealedDeckBuilder; import forge.game.limited.SealedDeckFormat; import forge.gui.GuiChoose; import forge.gui.deckeditor.CDeckEditorUI; @@ -229,7 +229,7 @@ public enum CSubmenuSealed implements ICDoc { // Re-randomize for AI decks beyond the first... aiDecks = sd.getCardpool(false); } - sealed.addAiDeck(new SealedDeck(aiDecks.toFlatList()).buildDeck()); + sealed.addAiDeck(new SealedDeckBuilder(aiDecks.toFlatList()).buildDeck()); } // Rank the AI decks