From 930e85d2a5cef326fff63a105bbecb459f1fb38f Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 25 Feb 2012 19:46:03 +0000 Subject: [PATCH] - CheckStyle. --- .../forge/card/abilityfactory/AbilityFactory.java | 14 +++++++------- .../card/abilityfactory/AbilityFactoryPump.java | 2 +- src/main/java/forge/deck/CardCollections.java | 2 +- src/main/java/forge/deck/Deck.java | 2 +- src/main/java/forge/deck/DeckGroup.java | 2 +- .../java/forge/deck/io/DeckGroupSerializer.java | 2 +- src/main/java/forge/game/GameFormat.java | 6 +++--- src/main/java/forge/game/limited/BoosterDraft.java | 2 +- src/main/java/forge/game/limited/SealedDeck.java | 4 ++-- src/main/java/forge/item/BoosterPack.java | 5 +---- src/main/java/forge/item/PreconDeck.java | 4 ++-- src/main/java/forge/model/FModel.java | 7 +++---- src/main/java/forge/quest/data/QuestDataIO.java | 10 +++++----- src/main/java/forge/quest/data/QuestUtilCards.java | 7 +++---- src/main/java/forge/util/FileSection.java | 8 ++++---- src/main/java/forge/util/IItemReader.java | 2 +- src/main/java/forge/util/IStorageView.java | 4 ++-- src/main/java/forge/util/StorageReaderFile.java | 9 ++++----- src/main/java/forge/util/StorageReaderFolder.java | 6 +++--- src/main/java/forge/util/StorageView.java | 4 ++-- 20 files changed, 48 insertions(+), 54 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java index 0a7369d9c2a..91baf233369 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java @@ -2326,8 +2326,8 @@ public class AbilityFactory { } // give Shroud to targeted creatures - if (saviourApi.equals("Pump") && tgt == null && saviourParams.containsKey("KW") - && (saviourParams.get("KW").endsWith("Shroud") + if (saviourApi.equals("Pump") && tgt == null && saviourParams.containsKey("KW") + && (saviourParams.get("KW").endsWith("Shroud") || saviourParams.get("KW").endsWith("Hexproof"))) { continue; } @@ -2372,8 +2372,8 @@ public class AbilityFactory { } // give Shroud to targeted creatures - if (saviourApi.equals("Pump") && tgt == null && saviourParams.containsKey("KW") - && (saviourParams.get("KW").endsWith("Shroud") + if (saviourApi.equals("Pump") && tgt == null && saviourParams.containsKey("KW") + && (saviourParams.get("KW").endsWith("Shroud") || saviourParams.get("KW").endsWith("Hexproof"))) { continue; } @@ -2394,15 +2394,15 @@ public class AbilityFactory { } // Exiling => bounce/shroud else if ((threatApi.equals("ChangeZone") || threatApi.equals("ChangeZoneAll")) - && (saviourApi.equals("ChangeZone") || saviourApi.equals("Pump")) + && (saviourApi.equals("ChangeZone") || saviourApi.equals("Pump")) && threatParams.containsKey("Destination") && threatParams.get("Destination").equals("Exile")) { for (final Object o : objects) { if (o instanceof Card) { final Card c = (Card) o; // give Shroud to targeted creatures - if (saviourApi.equals("Pump") && tgt == null && saviourParams.containsKey("KW") - && (saviourParams.get("KW").endsWith("Shroud") + if (saviourApi.equals("Pump") && tgt == null && saviourParams.containsKey("KW") + && (saviourParams.get("KW").endsWith("Shroud") || saviourParams.get("KW").endsWith("Hexproof"))) { continue; } diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java index 4ecb9dda80d..b19ef91c9cc 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java @@ -538,7 +538,7 @@ public class AbilityFactoryPump { if (!mandatory && !sa.isTrigger() && AllZone.getPhaseHandler().isAfter(Constant.Phase.COMBAT_DECLARE_BLOCKERS_INSTANT_ABILITY) - && !(this.abilityFactory.isCurse() && (defense < 0)) + && !(this.abilityFactory.isCurse() && (defense < 0)) && !this.containsCombatRelevantKeyword(this.keywords)) { return false; } diff --git a/src/main/java/forge/deck/CardCollections.java b/src/main/java/forge/deck/CardCollections.java index bc094c18613..e716a0046da 100644 --- a/src/main/java/forge/deck/CardCollections.java +++ b/src/main/java/forge/deck/CardCollections.java @@ -47,7 +47,7 @@ public class CardCollections { this.cube = new StorageImmediatelySerialized(new DeckSerializer(new File(file, "cube"))); System.out.printf("Read decks: %d constructed, %d sealed, %d draft, %d cubes.%n", constructed.getCount(), sealed.getCount(), draft.getCount(), cube.getCount()); - + // remove this after most people have been switched to new layout final OldDeckParser oldParser = new OldDeckParser(file, this.constructed, this.draft, this.sealed, this.cube); oldParser.tryParse(); diff --git a/src/main/java/forge/deck/Deck.java b/src/main/java/forge/deck/Deck.java index abc85896fa9..575bd0c61c3 100644 --- a/src/main/java/forge/deck/Deck.java +++ b/src/main/java/forge/deck/Deck.java @@ -271,7 +271,7 @@ public class Deck extends DeckBase implements Serializable { out.addAll(Deck.writeCardPool(this.getSideboard())); return out; } - + public final static Lambda1 FN_NAME_SELECTOR = new Lambda1() { @Override public String apply(Deck arg1) { diff --git a/src/main/java/forge/deck/DeckGroup.java b/src/main/java/forge/deck/DeckGroup.java index b2ef99c20af..ecd173cee3d 100644 --- a/src/main/java/forge/deck/DeckGroup.java +++ b/src/main/java/forge/deck/DeckGroup.java @@ -111,7 +111,7 @@ public class DeckGroup extends DeckBase { protected DeckBase newInstance(final String name0) { return new DeckGroup(name0); } - + public final static Lambda1 FN_NAME_SELECTOR = new Lambda1() { @Override public String apply(DeckGroup arg1) { diff --git a/src/main/java/forge/deck/io/DeckGroupSerializer.java b/src/main/java/forge/deck/io/DeckGroupSerializer.java index 9d7b67dedbd..29d851eb21b 100644 --- a/src/main/java/forge/deck/io/DeckGroupSerializer.java +++ b/src/main/java/forge/deck/io/DeckGroupSerializer.java @@ -128,7 +128,7 @@ public class DeckGroupSerializer extends StorageReaderFolder implemen final File testSubject = new File(dir, name); final boolean isVisibleFolder = testSubject.isDirectory() && !testSubject.isHidden(); final boolean hasGoodName = StringUtils.isNotEmpty(name) && !name.startsWith("."); - final File fileHumanDeck = new File(testSubject, DeckGroupSerializer.this.humanDeckFile); + final File fileHumanDeck = new File(testSubject, DeckGroupSerializer.this.humanDeckFile); return isVisibleFolder && hasGoodName && fileHumanDeck.exists(); } }; diff --git a/src/main/java/forge/game/GameFormat.java b/src/main/java/forge/game/GameFormat.java index 04d1472a2d5..f9add3029af 100644 --- a/src/main/java/forge/game/GameFormat.java +++ b/src/main/java/forge/game/GameFormat.java @@ -119,12 +119,12 @@ public final class GameFormat { public String toString() { return this.name + " (format)"; } - - public static final Lambda1 FN_GET_NAME = new Lambda1() { + + public static final Lambda1 FN_GET_NAME = new Lambda1() { @Override public String apply(GameFormat arg1) { return arg1.getName(); } - }; + }; } diff --git a/src/main/java/forge/game/limited/BoosterDraft.java b/src/main/java/forge/game/limited/BoosterDraft.java index 42ca57f3163..b76686e8cdc 100644 --- a/src/main/java/forge/game/limited/BoosterDraft.java +++ b/src/main/java/forge/game/limited/BoosterDraft.java @@ -126,7 +126,7 @@ public final class BoosterDraft implements IBoosterDraft { } } else { - final UnOpenedProduct product1 = new UnOpenedProduct(Singletons.getModel().getBoosters().get(sets[0])); + final UnOpenedProduct product1 = new UnOpenedProduct(Singletons.getModel().getBoosters().get(sets[0])); for (int i = 0; i < nPacks; i++) { this.product.add(product1); } diff --git a/src/main/java/forge/game/limited/SealedDeck.java b/src/main/java/forge/game/limited/SealedDeck.java index cceae1361ed..38b3b157a76 100644 --- a/src/main/java/forge/game/limited/SealedDeck.java +++ b/src/main/java/forge/game/limited/SealedDeck.java @@ -106,10 +106,10 @@ public class SealedDeck { final String[] pp = p.toString().split("/"); for (int i = 0; i < nPacks; i++) { - this.product.add(new UnOpenedProduct(Singletons.getModel().getBoosters().get(pp[i]))); + this.product.add(new UnOpenedProduct(Singletons.getModel().getBoosters().get(pp[i]))); } } else { - final UnOpenedProduct product1 = new UnOpenedProduct(Singletons.getModel().getBoosters().get(sets[0])); + final UnOpenedProduct product1 = new UnOpenedProduct(Singletons.getModel().getBoosters().get(sets[0])); for (int i = 0; i < nPacks; i++) { this.product.add(product1); } diff --git a/src/main/java/forge/item/BoosterPack.java b/src/main/java/forge/item/BoosterPack.java index 733f871dd81..0ccc37aa121 100644 --- a/src/main/java/forge/item/BoosterPack.java +++ b/src/main/java/forge/item/BoosterPack.java @@ -99,9 +99,6 @@ public class BoosterPack extends OpenablePack { return myCards; } - - - @Override public final String getType() { return "Booster Pack"; @@ -119,7 +116,7 @@ public class BoosterPack extends OpenablePack { */ @Override public final Object clone() { - return new BoosterPack(name, contents); + return new BoosterPack(name, contents); } diff --git a/src/main/java/forge/item/PreconDeck.java b/src/main/java/forge/item/PreconDeck.java index 3634e3b219b..0010ca90d1c 100644 --- a/src/main/java/forge/item/PreconDeck.java +++ b/src/main/java/forge/item/PreconDeck.java @@ -134,12 +134,12 @@ public class PreconDeck implements InventoryItemFromSet { public final String getDescription() { return this.description; } - + public final static Lambda1 FN_NAME_SELECTOR = new Lambda1() { @Override public String apply(PreconDeck arg1) { return arg1.getName(); } - }; + }; } diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index b95f5021429..ed049e3b564 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -88,7 +88,7 @@ public enum FModel { private final IStorageView boosters; private final IStorageView tournaments; private final StorageView blocks; - + // have to implement lazy initialization - at the moment of FModel.ctor() // CardDb is not ready yet. private CardCollections decks; @@ -132,14 +132,13 @@ public enum FModel { this.matchState = new FMatchState(); this.questPreferences = new QuestPreferences(); this.questEventManager = new QuestEventManager(); - + this.editions = new EditionCollection(); this.formats = new FormatCollection("res/blockdata/formats.txt"); this.boosters = new StorageView(new BoosterData.Reader("res/blockdata/boosters.txt")); this.tournaments = new StorageView(new BoosterData.Reader("res/blockdata/starters.txt")); this.blocks = new StorageView(new CardBlock.Reader("res/blockdata/blocks.txt", editions)); - - + // TODO this single setting from preferences should not be here, or, // it should be here with all the other settings at the same time. // Unfortunately, they're tied up in legacy code in the Display diff --git a/src/main/java/forge/quest/data/QuestDataIO.java b/src/main/java/forge/quest/data/QuestDataIO.java index 85333dfb5d2..2e239233941 100644 --- a/src/main/java/forge/quest/data/QuestDataIO.java +++ b/src/main/java/forge/quest/data/QuestDataIO.java @@ -306,8 +306,8 @@ public class QuestDataIO { writer.addAttribute("s", booster.getEdition()); writer.addAttribute("n", count.toString()); writer.endNode(); - } - + } + protected void write(final PreconDeck deck, final Integer count, final HierarchicalStreamWriter writer) { writer.startNode("precon"); writer.addAttribute("name", deck.getName()); @@ -327,7 +327,7 @@ public class QuestDataIO { } else if (item instanceof BoosterPack) { this.write((BoosterPack) item, count, writer); } else if (item instanceof TournamentPack) { - this.write((TournamentPack) item, count, writer); + this.write((TournamentPack) item, count, writer); } else if (item instanceof PreconDeck) { this.write((PreconDeck) item, count, writer); } @@ -351,7 +351,7 @@ public class QuestDataIO { } else if ("booster".equals(nodename)) { result.add(this.readBooster(reader), cnt); } else if ("tpack".equals(nodename)) { - result.add(this.readTournamentPack(reader), cnt); + result.add(this.readTournamentPack(reader), cnt); } else if ("precon".equals(nodename)) { final PreconDeck toAdd = this.readPreconDeck(reader); if (null != toAdd) { @@ -384,7 +384,7 @@ public class QuestDataIO { BoosterData bd = Singletons.getModel().getTournamentPacks().get(set); return new TournamentPack(ed.getName(), bd); } - + protected CardPrinted readCardPrinted(final HierarchicalStreamReader reader) { final String name = reader.getAttribute("c"); final String set = reader.getAttribute("s"); diff --git a/src/main/java/forge/quest/data/QuestUtilCards.java b/src/main/java/forge/quest/data/QuestUtilCards.java index 906618dd365..6dae3df719a 100644 --- a/src/main/java/forge/quest/data/QuestUtilCards.java +++ b/src/main/java/forge/quest/data/QuestUtilCards.java @@ -209,7 +209,6 @@ public final class QuestUtilCards { } } - /** * Buy precon deck. * @@ -357,9 +356,9 @@ public final class QuestUtilCards { */ public void generateTournamentsInShop(final int count) { Predicate hasTournament = CardEdition.Predicates.HAS_TOURNAMENT_PACK; - this.q.getShopList().addAllFlat( hasTournament.random(Singletons.getModel().getEditions(), count, TournamentPack.FN_FROM_SET)); - } - + this.q.getShopList().addAllFlat(hasTournament.random(Singletons.getModel().getEditions(), count, TournamentPack.FN_FROM_SET)); + } + /** * Generate precons in shop. * diff --git a/src/main/java/forge/util/FileSection.java b/src/main/java/forge/util/FileSection.java index 72f26f5d94c..c6d04662809 100644 --- a/src/main/java/forge/util/FileSection.java +++ b/src/main/java/forge/util/FileSection.java @@ -159,7 +159,7 @@ public class FileSection { final Map> result = new HashMap>(); String currentSection = ""; List currentList = null; - + for (final String s : source) { final String st = s.trim(); if (st.length() == 0) { @@ -173,7 +173,7 @@ public class FileSection { } result.put(currentSection, currentList); } - + final String newSection = st.substring(1, st.length() - 1); currentSection = newSection; currentList = null; @@ -184,7 +184,7 @@ public class FileSection { currentList.add(st); } } - + // save final block if ((currentList != null) && (currentList.size() > 0)) { final Object oldVal = result.get(currentSection); @@ -193,7 +193,7 @@ public class FileSection { } result.put(currentSection, currentList); } - + return result; } diff --git a/src/main/java/forge/util/IItemReader.java b/src/main/java/forge/util/IItemReader.java index 6f9e293c5bb..4934c64347c 100644 --- a/src/main/java/forge/util/IItemReader.java +++ b/src/main/java/forge/util/IItemReader.java @@ -33,6 +33,6 @@ public interface IItemReader { */ Map readAll(); // T read(File file); - + String getItemKey(T item); } diff --git a/src/main/java/forge/util/IStorageView.java b/src/main/java/forge/util/IStorageView.java index e414d24993c..213b2a1123f 100644 --- a/src/main/java/forge/util/IStorageView.java +++ b/src/main/java/forge/util/IStorageView.java @@ -42,8 +42,8 @@ public interface IStorageView extends Iterable { * @return a ArrayList */ Collection getNames(); - + boolean contains(final String name); int getCount(); - + } diff --git a/src/main/java/forge/util/StorageReaderFile.java b/src/main/java/forge/util/StorageReaderFile.java index 720faf8295d..9d8a4ce096c 100644 --- a/src/main/java/forge/util/StorageReaderFile.java +++ b/src/main/java/forge/util/StorageReaderFile.java @@ -36,19 +36,18 @@ import org.apache.commons.lang3.StringUtils; public abstract class StorageReaderFile implements IItemReader { private final File file; - private final Lambda1 keySelector; + private final Lambda1 keySelector; /** * Instantiates a new storage reader file. * * @param file0 the file0 */ - public StorageReaderFile(final String pathname, Lambda1 keySelector0) { + public StorageReaderFile(final String pathname, Lambda1 keySelector0) { this(new File(pathname), keySelector0); } - - public StorageReaderFile(final File file0, Lambda1 keySelector0) { + public StorageReaderFile(final File file0, Lambda1 keySelector0) { this.file = file0; keySelector = keySelector0; } @@ -94,7 +93,7 @@ public abstract class StorageReaderFile implements IItemReader { protected boolean lineContainsObject(final String line) { return !StringUtils.isBlank(line) && !line.trim().startsWith("#"); } - + @Override public String getItemKey(T item) { return keySelector.apply(item); diff --git a/src/main/java/forge/util/StorageReaderFolder.java b/src/main/java/forge/util/StorageReaderFolder.java index f3f6c5f9b62..31bfa7aa486 100644 --- a/src/main/java/forge/util/StorageReaderFolder.java +++ b/src/main/java/forge/util/StorageReaderFolder.java @@ -45,7 +45,7 @@ import forge.error.ErrorViewer; public abstract class StorageReaderFolder implements IItemReader { private final File directory; - private final Lambda1 keySelector; + private final Lambda1 keySelector; /** * Gets the directory. @@ -61,7 +61,7 @@ public abstract class StorageReaderFolder implements IItemReader { * * @param deckDir0 the deck dir0 */ - public StorageReaderFolder(final File deckDir0, Lambda1 keySelector0) { + public StorageReaderFolder(final File deckDir0, Lambda1 keySelector0) { this.directory = deckDir0; keySelector = keySelector0; @@ -143,7 +143,7 @@ public abstract class StorageReaderFolder implements IItemReader { * @return FilenameFilter to pick only relevant objects for deserialization */ protected abstract FilenameFilter getFileFilter(); - + public String getItemKey(T item) { return keySelector.apply(item); } diff --git a/src/main/java/forge/util/StorageView.java b/src/main/java/forge/util/StorageView.java index 75c4df57e87..05ba0616ec4 100644 --- a/src/main/java/forge/util/StorageView.java +++ b/src/main/java/forge/util/StorageView.java @@ -97,9 +97,9 @@ public class StorageView implements Iterable, IStorageView { public boolean contains(String name) { return this.map.containsKey(name); } - + @Override - public int getCount() { + public int getCount() { return this.map.size(); } }