From 566fc930da46be9b8e81915d30f83acacc5cb0b4 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 22:49:41 +0000 Subject: [PATCH] Renamed *Booster* methods to *Draft*. (A booster is also a set of cards, using the word draft makes the code more precise) --- src/forge/Gui_BoosterDraft.java | 2 +- src/forge/Gui_DeckEditor_Menu.java | 18 ++++++------- src/forge/Gui_NewGame.java | 4 +-- src/forge/deck/DeckManager.java | 42 +++++++++++++++--------------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/forge/Gui_BoosterDraft.java b/src/forge/Gui_BoosterDraft.java index 4e7babf7b0c..b4b8f03c97f 100644 --- a/src/forge/Gui_BoosterDraft.java +++ b/src/forge/Gui_BoosterDraft.java @@ -559,7 +559,7 @@ public class Gui_BoosterDraft extends JFrame implements CardContainer, NewConsta human, computer[0], computer[1], computer[2], computer[3], computer[4], computer[5], computer[6]}; DeckManager deckManager = new DeckManager(ForgeProps.getFile(NEW_DECKS)); - deckManager.addBoosterDeck(all); + deckManager.addDraftDeck(all); //write file deckManager.close(); diff --git a/src/forge/Gui_DeckEditor_Menu.java b/src/forge/Gui_DeckEditor_Menu.java index e7e6312ed92..9f2c4c0486b 100644 --- a/src/forge/Gui_DeckEditor_Menu.java +++ b/src/forge/Gui_DeckEditor_Menu.java @@ -343,7 +343,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { currentGameType = Constant.GameType.Draft; //move all cards from deck main and sideboard to CardList - Deck deck = deckManager.getBoosterDeck(currentDeckName)[0]; + Deck deck = deckManager.getDraftDeck(currentDeckName)[0]; setDeckData("", false); CardList top = new CardList(); @@ -621,7 +621,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { //and the other 7 are the computer's deck if (currentGameType.equals(Constant.GameType.Draft)) { //read all draft decks - Deck d[] = deckManager.getBoosterDeck(currentDeckName); + Deck d[] = deckManager.getDraftDeck(currentDeckName); //replace your deck d[0] = deck; @@ -885,7 +885,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { currentGameType = Constant.GameType.Draft; newDraftItem.setEnabled(true); - Deck deck = deckManager.getBoosterDeck(name)[0]; + Deck deck = deckManager.getDraftDeck(name)[0]; showDraftDeck(deck); }//open draft @@ -928,9 +928,9 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { else if (currentGameType.equals(Constant.GameType.Draft)) { setDeckData(currentDeckName, true); //write booster deck - Deck[] all = deckManager.getBoosterDeck(currentDeckName); + Deck[] all = deckManager.getDraftDeck(currentDeckName); all[0] = getDeck(); - deckManager.addBoosterDeck(all); + deckManager.addDraftDeck(all); } else//constructed or sealed { @@ -952,7 +952,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { } else if (currentGameType.equals(Constant.GameType.Draft)) { //MUST copy array - Deck[] read = deckManager.getBoosterDeck(currentDeckName); + Deck[] read = deckManager.getDraftDeck(currentDeckName); Deck[] all = new Deck[read.length]; System.arraycopy(read, 0, all, 0, read.length); @@ -960,7 +960,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { setDeckData(name, true); all[0] = getDeck(); - deckManager.addBoosterDeck(all); + deckManager.addDraftDeck(all); } else//constructed and sealed { @@ -985,7 +985,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { } if (currentGameType.equals(Constant.GameType.Draft)) { - deckManager.deleteBoosterDeck(currentDeckName); + deckManager.deleteDraftDeck(currentDeckName); } else { deckManager.deleteDeck(currentDeckName); @@ -1093,7 +1093,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { //only get decks according to the Gui_NewGame screen option if (deckType.equals(Constant.GameType.Draft)) { - for (String s : deckManager.getBoosterDecks().keySet()) { + for (String s : deckManager.getDraftDecks().keySet()) { list.add(s); } } diff --git a/src/forge/Gui_NewGame.java b/src/forge/Gui_NewGame.java index 43d91b9c760..e3d970ec57e 100644 --- a/src/forge/Gui_NewGame.java +++ b/src/forge/Gui_NewGame.java @@ -538,7 +538,7 @@ public class Gui_NewGame extends JFrame implements NewConstants, NewConstants.LA return; } else//load old draft { - Deck[] deck = deckManager.getBoosterDeck(human); + Deck[] deck = deckManager.getDraftDeck(human); int index = Integer.parseInt(computer); Constant.Runtime.HumanDeck[0] = deck[0]; @@ -893,7 +893,7 @@ public class Gui_NewGame extends JFrame implements NewConstants, NewConstants.LA computerComboBox.removeAllItems(); humanComboBox.addItem("New Draft"); - Object[] key = deckManager.getBoosterDecks().keySet().toArray(); + Object[] key = deckManager.getDraftDecks().keySet().toArray(); Arrays.sort(key); for (Object aKey : key) { diff --git a/src/forge/deck/DeckManager.java b/src/forge/deck/DeckManager.java index 0090dfe2784..5a8cba64c29 100755 --- a/src/forge/deck/DeckManager.java +++ b/src/forge/deck/DeckManager.java @@ -32,7 +32,7 @@ public class DeckManager { private File deckDir; Map deckMap; - Map boosterMap; + Map draftMap; public DeckManager(File deckDir) { if (deckDir == null) { @@ -50,7 +50,7 @@ public class DeckManager { throw new IOException("Directory can't be created"); } this.deckMap = new HashMap(); - this.boosterMap = new HashMap(); + this.draftMap = new HashMap(); readAllDecks(); } } catch (IOException ex) { @@ -65,7 +65,7 @@ public class DeckManager { } public boolean isUniqueDraft(String deckName) { - return !boosterMap.keySet().contains(deckName); + return !draftMap.keySet().contains(deckName); } public Deck getDeck(String deckName) { @@ -86,34 +86,34 @@ public class DeckManager { deckMap.remove(deckName); } - public Deck[] getBoosterDeck(String deckName) { - if (!boosterMap.containsKey(deckName)) { + public Deck[] getDraftDeck(String deckName) { + if (!draftMap.containsKey(deckName)) { throw new RuntimeException( - "DeckManager : getBoosterDeck() error, deck name not found - " + deckName); + "DeckManager : getDraftDeck() error, deck name not found - " + deckName); } - return boosterMap.get(deckName); + return draftMap.get(deckName); } - public void addBoosterDeck(Deck[] deck) { - checkBoosterDeck(deck); + public void addDraftDeck(Deck[] deck) { + checkDraftDeck(deck); - boosterMap.put(deck[0].toString(), deck); + draftMap.put(deck[0].toString(), deck); } - public void deleteBoosterDeck(String deckName) { - if (!boosterMap.containsKey(deckName)) { + public void deleteDraftDeck(String deckName) { + if (!draftMap.containsKey(deckName)) { throw new RuntimeException( - "DeckManager : deleteBoosterDeck() error, deck name not found - " + deckName); + "DeckManager : deleteDraftDeck() error, deck name not found - " + deckName); } - boosterMap.remove(deckName); + draftMap.remove(deckName); } - private void checkBoosterDeck(Deck[] deck) { + private void checkDraftDeck(Deck[] deck) { if (deck == null || deck.length != 8 || deck[0].getName().equals("") || (!deck[0].getDeckType().equals(Constant.GameType.Draft))) { - throw new RuntimeException("DeckManager : checkBoosterDeck() error, invalid deck"); + throw new RuntimeException("DeckManager : checkDraftDeck() error, invalid deck"); } } @@ -122,8 +122,8 @@ public class DeckManager { return deckMap.values(); } - public Map getBoosterDecks() { - return new HashMap(boosterMap); + public Map getDraftDecks() { + return new HashMap(draftMap); } public void close() { @@ -133,7 +133,7 @@ public class DeckManager { public void readAllDecks() { deckMap.clear(); - boosterMap.clear(); + draftMap.clear(); File[] files; @@ -151,7 +151,7 @@ public class DeckManager { d[i] = readDeck(new File(file, i + ".dck")); } - boosterMap.put(d[0].getName(), d); + draftMap.put(d[0].getName(), d); } } @@ -290,7 +290,7 @@ public class DeckManager { files.addAll(asList(deckDir.listFiles(BDKFileFilter))); //save the files and remove them from the list - for (Entry e : boosterMap.entrySet()) { + for (Entry e : draftMap.entrySet()) { File f = new File(deckDir, deriveFileName(e.getValue()[0].getName()) + ".bdk"); f.mkdir(); for (int i = 0; i < e.getValue().length; i++) {