From ce5616b220c494df84de896b7926b682e09ed93d Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 23 Feb 2012 03:13:26 +0000 Subject: [PATCH] - CheckStyle. --- .../forge/gui/deckeditor/elements/TableModel.java | 4 ++-- .../java/forge/gui/deckeditor/elements/TableView.java | 6 ++---- src/main/java/forge/item/PreconDeck.java | 7 ++++--- src/main/java/forge/model/FModel.java | 11 ++++++----- src/main/java/forge/quest/SellRules.java | 2 +- src/main/java/forge/quest/data/QuestData.java | 10 +++++----- src/main/java/forge/quest/data/QuestDeckMap.java | 9 ++++----- src/main/java/forge/quest/data/QuestEventManager.java | 2 +- src/main/java/forge/util/StorageReaderFile.java | 2 +- src/main/java/forge/util/StorageReaderFolder.java | 6 +++--- .../java/forge/view/match/QuestWinLoseHandler.java | 2 +- src/main/java/forge/view/toolbox/DeckLister.java | 2 +- 12 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/main/java/forge/gui/deckeditor/elements/TableModel.java b/src/main/java/forge/gui/deckeditor/elements/TableModel.java index a85ba1263d4..3dcea4ed594 100644 --- a/src/main/java/forge/gui/deckeditor/elements/TableModel.java +++ b/src/main/java/forge/gui/deckeditor/elements/TableModel.java @@ -424,10 +424,10 @@ public final class TableModel extends AbstractTableMode @SuppressWarnings("unchecked") @Override public int compare(Entry o1, Entry o2) { - return sorter.compare((Entry)o1, (Entry)o2); + return sorter.compare((Entry) o1, (Entry) o2); } } - + /** * Resort. */ diff --git a/src/main/java/forge/gui/deckeditor/elements/TableView.java b/src/main/java/forge/gui/deckeditor/elements/TableView.java index 9eaed256523..b1d70159676 100644 --- a/src/main/java/forge/gui/deckeditor/elements/TableView.java +++ b/src/main/java/forge/gui/deckeditor/elements/TableView.java @@ -67,9 +67,8 @@ public final class TableView { /** The want unique. */ private boolean wantUnique = false; - private final Class genericType; - + // need this to allow users place its contents /** * @@ -128,7 +127,7 @@ public final class TableView { public TableView(final String title, final boolean showStats, final boolean forceUnique, Class cls) { // components genericType = cls; - + final Color gray = new Color(148, 145, 140); final TitledBorder titledBorder = new TitledBorder(BorderFactory.createEtchedBorder(Color.white, gray), title); @@ -277,7 +276,6 @@ public final class TableView { this.setDeckImpl(pool); } - /** * * setDeckImpl. diff --git a/src/main/java/forge/item/PreconDeck.java b/src/main/java/forge/item/PreconDeck.java index 9a8649bff85..ed1589fa4a3 100644 --- a/src/main/java/forge/item/PreconDeck.java +++ b/src/main/java/forge/item/PreconDeck.java @@ -85,11 +85,12 @@ public class PreconDeck implements InventoryItemFromSet { String setProxy = "n/a"; FileSection kv = FileSection.parse(sections.get("metadata"), "="); - + imageFilename = kv.get("Image"); description = kv.get("Description"); - if( AllZone.getEditions().getEditionByCode(kv.get("set").toUpperCase()) != null ) - { setProxy = kv.get("set"); } + if (AllZone.getEditions().getEditionByCode(kv.get("set").toUpperCase()) != null) { + setProxy = kv.get("set"); + } this.set = setProxy; this.recommendedDeals = new SellRules(sections.get("shop")); diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index 9adb78fbd69..9e052daabcb 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -75,8 +75,8 @@ public enum FModel { private final QuestEventManager questEventManager; private final GameState gameState; private final FMatchState matchState; - - // have to implement lazy initialization - at the moment of FModel.ctor() CardDb is not ready yet. + + // have to implement lazy initialization - at the moment of FModel.ctor() CardDb is not ready yet. private CardCollections decks; /** @@ -310,12 +310,13 @@ public enum FModel { } /** - * Returns all player's decks for constructed, sealed and whatever + * Returns all player's decks for constructed, sealed and whatever. * @return {@link forge.decks.CardCollections} */ public final CardCollections getDecks() { - if (decks == null) - this.decks = new CardCollections(ForgeProps.getFile(NewConstants.NEW_DECKS)); + if (decks == null) { + this.decks = new CardCollections(ForgeProps.getFile(NewConstants.NEW_DECKS)); + } return decks; } diff --git a/src/main/java/forge/quest/SellRules.java b/src/main/java/forge/quest/SellRules.java index 8bffe3dfe9a..d34a76605d2 100644 --- a/src/main/java/forge/quest/SellRules.java +++ b/src/main/java/forge/quest/SellRules.java @@ -42,7 +42,7 @@ public class SellRules { if (null == questShop || questShop.isEmpty()) { return; } - + FileSection section = FileSection.parse(questShop, "="); minWins = section.getInt("WinsToUnlock"); cost = section.getInt("Credits", 250); diff --git a/src/main/java/forge/quest/data/QuestData.java b/src/main/java/forge/quest/data/QuestData.java index 0b1f063cb76..a52f6c4c43c 100644 --- a/src/main/java/forge/quest/data/QuestData.java +++ b/src/main/java/forge/quest/data/QuestData.java @@ -117,7 +117,7 @@ public final class QuestData { // Decks collected by player /** The my decks. */ private final HashMap myDecks = new HashMap(); - + private transient IFolderMap decks; // Cards associated with quest @@ -199,8 +199,9 @@ public final class QuestData { this.initTransients(); this.setName(s0); - QuestPreferences prefs = Singletons.getModel().getQuestPreferences(); - ItemPoolView lands = QuestUtilCards.generateBasicLands( prefs.getPreferenceInt(QPref.STARTING_BASIC_LANDS), prefs.getPreferenceInt(QPref.STARTING_BASIC_LANDS) ); + QuestPreferences prefs = Singletons.getModel().getQuestPreferences(); + ItemPoolView lands = QuestUtilCards.generateBasicLands(prefs.getPreferenceInt(QPref.STARTING_BASIC_LANDS), + prefs.getPreferenceInt(QPref.STARTING_BASIC_LANDS)); this.getCardPool().addAll(lands); this.randomizeOpponents(); } @@ -210,8 +211,7 @@ public final class QuestData { this.decks = new QuestDeckMap(myDecks); this.myCards = new QuestUtilCards(this); - - + // to avoid NPE some pools will be created here if they are null if (null == this.getNewCardList()) { this.setNewCardList(new ItemPool(InventoryItem.class)); diff --git a/src/main/java/forge/quest/data/QuestDeckMap.java b/src/main/java/forge/quest/data/QuestDeckMap.java index c40c5807197..73c89478652 100644 --- a/src/main/java/forge/quest/data/QuestDeckMap.java +++ b/src/main/java/forge/quest/data/QuestDeckMap.java @@ -14,15 +14,14 @@ import forge.util.IFolderMap; */ public class QuestDeckMap implements IFolderMap { - public QuestDeckMap() { - map = new HashMap(); + map = new HashMap(); } - - public QuestDeckMap(Map inMap) { + + public QuestDeckMap(Map inMap) { map = inMap; } - + private final Map map; /* (non-Javadoc) * @see forge.util.IFolderMapView#get(java.lang.String) diff --git a/src/main/java/forge/quest/data/QuestEventManager.java b/src/main/java/forge/quest/data/QuestEventManager.java index 6484a290192..df577f23b72 100644 --- a/src/main/java/forge/quest/data/QuestEventManager.java +++ b/src/main/java/forge/quest/data/QuestEventManager.java @@ -58,7 +58,7 @@ public class QuestEventManager { /** The very hard a iduels. */ private final List veryHardAIduels = new ArrayList(); - + /** The all duels. */ private List allDuels = null; diff --git a/src/main/java/forge/util/StorageReaderFile.java b/src/main/java/forge/util/StorageReaderFile.java index f08a8bfe1d7..ce9a442e250 100644 --- a/src/main/java/forge/util/StorageReaderFile.java +++ b/src/main/java/forge/util/StorageReaderFile.java @@ -27,7 +27,7 @@ import javax.swing.JOptionPane; import org.apache.commons.lang3.StringUtils; /** - * This class treats every line of a given file as a source for a named object. + * This class treats every line of a given file as a source for a named object. * */ public abstract class StorageReaderFile implements IItemReader { diff --git a/src/main/java/forge/util/StorageReaderFolder.java b/src/main/java/forge/util/StorageReaderFolder.java index a20dfcc8212..494b0a76292 100644 --- a/src/main/java/forge/util/StorageReaderFolder.java +++ b/src/main/java/forge/util/StorageReaderFolder.java @@ -33,8 +33,8 @@ import org.apache.commons.lang3.StringUtils; import forge.error.ErrorViewer; /** - * This class treats every file in the given folder as a source for a named object. - * The descendant should implement read method to deserialize a single item. + * This class treats every file in the given folder as a source for a named object. + * The descendant should implement read method to deserialize a single item. * So that readAll will return a map of Name => Object as read from disk * */ @@ -102,7 +102,7 @@ public abstract class StorageReaderFolder implements IItemRe /** - * Read the object from file + * Read the object from file. * @param file * @return the object deserialized by inherited class */ diff --git a/src/main/java/forge/view/match/QuestWinLoseHandler.java b/src/main/java/forge/view/match/QuestWinLoseHandler.java index b057c0837b4..6b3e6180f9c 100644 --- a/src/main/java/forge/view/match/QuestWinLoseHandler.java +++ b/src/main/java/forge/view/match/QuestWinLoseHandler.java @@ -519,7 +519,7 @@ public class QuestWinLoseHandler extends ControlWinLose { */ private void awardBooster() { final GameFormat[] emptyFormatArray = {}; - final GameFormat[] formats = AllZone.getFormats().getFormats().toArray(emptyFormatArray) ; + final GameFormat[] formats = AllZone.getFormats().getFormats().toArray(emptyFormatArray); final ListChooser ch = new ListChooser("Choose bonus booster format", 1, formats); String prefferedFormat = Singletons.getModel().getQuestPreferences().getPreference(QPref.BOOSTER_FORMAT); diff --git a/src/main/java/forge/view/toolbox/DeckLister.java b/src/main/java/forge/view/toolbox/DeckLister.java index 1284eafe961..6ac6fcb6ae7 100644 --- a/src/main/java/forge/view/toolbox/DeckLister.java +++ b/src/main/java/forge/view/toolbox/DeckLister.java @@ -392,7 +392,7 @@ public class DeckLister extends JPanel { if (n == JOptionPane.NO_OPTION) { return; } - + final CardCollections deckManager = Singletons.getModel().getDecks(); if (gametype.equals(GameType.Draft)) {