From 444e426f6dc3a5dfb4ba12229a8dcd6c8d890edc Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 28 Mar 2012 14:03:43 +0000 Subject: [PATCH] - CheckStyle. --- src/main/java/forge/CombatUtil.java | 2 +- src/main/java/forge/Constant.java | 5 +- src/main/java/forge/card/trigger/Trigger.java | 2 +- .../forge/card/trigger/TriggerHandler.java | 7 +- .../java/forge/card/trigger/TriggerType.java | 13 ++- .../forge/control/match/ControlTabber.java | 7 +- .../deck/generate/Generate2ColorDeck.java | 4 +- .../deck/generate/Generate3ColorDeck.java | 2 +- .../deck/generate/Generate5ColorDeck.java | 2 +- .../forge/deck/generate/GenerateDeckUtil.java | 8 +- .../java/forge/game/limited/BoosterDraft.java | 4 +- .../java/forge/game/limited/SealedDeck.java | 2 +- src/main/java/forge/gui/layout/DragTab.java | 92 +++++++++---------- 13 files changed, 73 insertions(+), 77 deletions(-) diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index 5c31cf67ff7..c6c05a66ac9 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -1436,7 +1436,7 @@ public class CombatUtil { } TriggerType mode = trigger.getMode(); - if (mode == TriggerType.Attacks ) { + if (mode == TriggerType.Attacks) { willTrigger = true; if (attacker.isAttacking()) { return false; // The trigger should have triggered already diff --git a/src/main/java/forge/Constant.java b/src/main/java/forge/Constant.java index 4998ca55059..adf50f1adfc 100644 --- a/src/main/java/forge/Constant.java +++ b/src/main/java/forge/Constant.java @@ -204,8 +204,7 @@ public final class Constant { Sideboard(true), /** Ante. */ Ante(false); - - + private final boolean holdsHiddenInfo; private Zone(boolean holdsHidden) { holdsHiddenInfo = holdsHidden; @@ -255,7 +254,7 @@ public final class Constant { public boolean isKnown() { return !holdsHiddenInfo; - } + } } /** diff --git a/src/main/java/forge/card/trigger/Trigger.java b/src/main/java/forge/card/trigger/Trigger.java index 5615ff36efe..105311aaef7 100644 --- a/src/main/java/forge/card/trigger/Trigger.java +++ b/src/main/java/forge/card/trigger/Trigger.java @@ -124,7 +124,7 @@ public abstract class Trigger extends TriggerReplacementBase { /** The run params. */ private Map runParams; - + private TriggerType mode; /** The overriding ability. */ diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index 07255956cf4..b248ca977d4 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -203,7 +203,7 @@ public class TriggerHandler { // final String mode = mapParams.get("Mode"); final TriggerType type = TriggerType.smartValueOf(mapParams.get("Mode")); ret = type.createTrigger(mapParams, host, intrinsic); -// +// // if (mode.equals("AbilityCast")) { // ret = new TriggerSpellAbilityCast(mapParams, host, intrinsic); // } else if (mode.equals("Always")) { @@ -328,7 +328,7 @@ public class TriggerHandler { if (this.suppressedModes.contains(mode)) { return; } - + final Player playerAP = Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn(); if (playerAP == null) { // This should only happen outside of games, so it's safe to just @@ -418,8 +418,7 @@ public class TriggerHandler { */ private boolean runSingleTrigger(final Trigger regtrig, final TriggerType mode, final Map runParams) { final Map params = regtrig.getMapParams(); - - + if (regtrig.getMode() != mode) { return false; // Not the right mode. } diff --git a/src/main/java/forge/card/trigger/TriggerType.java b/src/main/java/forge/card/trigger/TriggerType.java index 44de330461c..1de9944162e 100644 --- a/src/main/java/forge/card/trigger/TriggerType.java +++ b/src/main/java/forge/card/trigger/TriggerType.java @@ -16,10 +16,9 @@ public enum TriggerType { Tapped(TriggerTaps.class), Untaps(TriggerUntaps.class), Taps(TriggerTaps.class), - + ChangesZone(TriggerChangesZone.class), - - + Clashed(TriggerClashed.class), TapsForMana(TriggerTapsForMana.class), CounterAdded(TriggerCounterAdded.class), @@ -48,7 +47,7 @@ public enum TriggerType { Discarded(TriggerDiscarded.class), Shuffled(TriggerShuffled.class), LandPlayed(TriggerLandPlayed.class); - + private final Class classTrigger; private TriggerType(Class clasz) { classTrigger = clasz; @@ -67,9 +66,9 @@ public enum TriggerType { } } - throw new RuntimeException("Element " + value + " not found in TriggerType enum" ); + throw new RuntimeException("Element " + value + " not found in TriggerType enum"); } - + /** * TODO: Write javadoc for this method. * @param mapParams @@ -82,7 +81,7 @@ public enum TriggerType { Constructor[] cc = (Constructor[]) classTrigger.getDeclaredConstructors(); for (Constructor c : cc) { Class[] pp = c.getParameterTypes(); - if ( pp[0] == HashMap.class ) { + if (pp[0] == HashMap.class) { try { Trigger res = c.newInstance(mapParams, host, intrinsic); res.setMode(this); diff --git a/src/main/java/forge/control/match/ControlTabber.java b/src/main/java/forge/control/match/ControlTabber.java index 2fb17dd622c..28b8cd66d93 100644 --- a/src/main/java/forge/control/match/ControlTabber.java +++ b/src/main/java/forge/control/match/ControlTabber.java @@ -106,8 +106,8 @@ public class ControlTabber extends MyObservable { madAddAnyCard = new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { - GuiDisplayUtil.devModeAddAnyCard(); } }; - + GuiDisplayUtil.devModeAddAnyCard(); } }; + madCounter = new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { GuiDisplayUtil.devModeAddCounter(); } }; @@ -155,10 +155,9 @@ public class ControlTabber extends MyObservable { // DevMode: Tutor for card this.view.getLblTutor().removeMouseListener(madTutor); this.view.getLblTutor().addMouseListener(madTutor); - + this.view.getAnyCard().removeMouseListener(madAddAnyCard); this.view.getAnyCard().addMouseListener(madAddAnyCard); - // DevMode: Add counter to permanent this.view.getLblCounterPermanent().removeMouseListener(madCounter); diff --git a/src/main/java/forge/deck/generate/Generate2ColorDeck.java b/src/main/java/forge/deck/generate/Generate2ColorDeck.java index 9f19725bae5..68494c20df7 100644 --- a/src/main/java/forge/deck/generate/Generate2ColorDeck.java +++ b/src/main/java/forge/deck/generate/Generate2ColorDeck.java @@ -134,10 +134,10 @@ public class Generate2ColorDeck { // start with all cards // remove cards that generated decks don't like - + Predicate toUse = pt == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay; CardList allCards = new CardList(toUse.select(AllZone.getCardFactory())); - + // reduce to cards that match the colors CardList cl1 = allCards.getColor(this.color1); if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) { diff --git a/src/main/java/forge/deck/generate/Generate3ColorDeck.java b/src/main/java/forge/deck/generate/Generate3ColorDeck.java index 7397b16fefa..f30d641362b 100644 --- a/src/main/java/forge/deck/generate/Generate3ColorDeck.java +++ b/src/main/java/forge/deck/generate/Generate3ColorDeck.java @@ -148,7 +148,7 @@ public class Generate3ColorDeck { // remove cards that generated decks don't like Predicate toUse = pt == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay; CardList allCards = new CardList(toUse.select(AllZone.getCardFactory())); - + // reduce to cards that match the colors CardList cl1 = allCards.getColor(this.color1); if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) { diff --git a/src/main/java/forge/deck/generate/Generate5ColorDeck.java b/src/main/java/forge/deck/generate/Generate5ColorDeck.java index ff72dbebfd9..a6dfd74fc39 100644 --- a/src/main/java/forge/deck/generate/Generate5ColorDeck.java +++ b/src/main/java/forge/deck/generate/Generate5ColorDeck.java @@ -146,7 +146,7 @@ public class Generate5ColorDeck { // remove cards that generated decks don't like Predicate toUse = playerType == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay; CardList allCards = new CardList(toUse.select(AllZone.getCardFactory())); - + // reduce to cards that match the colors CardList cardList1 = allCards.getColor(this.color1); if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) { diff --git a/src/main/java/forge/deck/generate/GenerateDeckUtil.java b/src/main/java/forge/deck/generate/GenerateDeckUtil.java index 02f518ead34..8054a27ca7f 100644 --- a/src/main/java/forge/deck/generate/GenerateDeckUtil.java +++ b/src/main/java/forge/deck/generate/GenerateDeckUtil.java @@ -32,19 +32,19 @@ import forge.util.Predicate; */ public class GenerateDeckUtil { - public static final Predicate aiCanPlay = new Predicate(){ + public static final Predicate aiCanPlay = new Predicate() { @Override public boolean isTrue(Card c) { return !c.getSVar("RemRandomDeck").equals("True") && !c.getSVar("RemAIDeck").equals("True"); } }; - - public static final Predicate humanCanPlay = new Predicate(){ + + public static final Predicate humanCanPlay = new Predicate() { @Override public boolean isTrue(Card c) { return !c.getSVar("RemRandomDeck").equals("True"); } - }; + }; /** * * Arrays of dual and tri-land cards. diff --git a/src/main/java/forge/game/limited/BoosterDraft.java b/src/main/java/forge/game/limited/BoosterDraft.java index 519bc8e72ab..ef8ac84edb9 100644 --- a/src/main/java/forge/game/limited/BoosterDraft.java +++ b/src/main/java/forge/game/limited/BoosterDraft.java @@ -93,11 +93,11 @@ public final class BoosterDraft implements IBoosterDraft { case Block: // Draft from cards by block or set List blocks = new ArrayList(); - for(CardBlock b : Singletons.getModel().getBlocks()) { + for (CardBlock b : Singletons.getModel().getBlocks()) { blocks.add(b); } final CardBlock block = GuiUtils.chooseOne("Choose Block", blocks); - + final CardEdition[] cardSets = block.getSets(); final String[] sets = new String[cardSets.length]; for (int k = cardSets.length - 1; k >= 0; --k) { diff --git a/src/main/java/forge/game/limited/SealedDeck.java b/src/main/java/forge/game/limited/SealedDeck.java index 56c3ce79a43..a87aa0ff5b1 100644 --- a/src/main/java/forge/game/limited/SealedDeck.java +++ b/src/main/java/forge/game/limited/SealedDeck.java @@ -79,7 +79,7 @@ public class SealedDeck { } else if (sealedType.equals("Block")) { List blocks = new ArrayList(); - for(CardBlock b : Singletons.getModel().getBlocks()) { + for (CardBlock b : Singletons.getModel().getBlocks()) { blocks.add(b); } final CardBlock block = GuiUtils.chooseOne("Choose Block", blocks); diff --git a/src/main/java/forge/gui/layout/DragTab.java b/src/main/java/forge/gui/layout/DragTab.java index 07f6ad71b81..b3b4f2e8c41 100644 --- a/src/main/java/forge/gui/layout/DragTab.java +++ b/src/main/java/forge/gui/layout/DragTab.java @@ -14,57 +14,57 @@ import javax.swing.border.EmptyBorder; */ @SuppressWarnings("serial") public final class DragTab extends JLabel implements ILocalRepaint { - private boolean selected = false; - private int priority = 10; - - public DragTab(final String title0) { - super(title0); - setToolTipText(title0); - setOpaque(false); - setSelected(false); - setBorder(new EmptyBorder(2, 5, 2, 5)); - - this.addMouseListener(SRearrangingUtil.getRearrangeClickEvent()); - this.addMouseMotionListener(SRearrangingUtil.getRearrangeDragEvent()); - } + private boolean selected = false; + private int priority = 10; - public void setSelected(final boolean isSelected0) { - selected = isSelected0; - repaintThis(); - } + public DragTab(final String title0) { + super(title0); + setToolTipText(title0); + setOpaque(false); + setSelected(false); + setBorder(new EmptyBorder(2, 5, 2, 5)); - public void priorityDecrease() { - priority++; - } + this.addMouseListener(SRearrangingUtil.getRearrangeClickEvent()); + this.addMouseMotionListener(SRearrangingUtil.getRearrangeDragEvent()); + } - public void priorityOne() { - priority = 1; - } - - public int getPriority() { - return priority; - } - - public void repaintThis() { + public void setSelected(final boolean isSelected0) { + selected = isSelected0; + repaintThis(); + } + + public void priorityDecrease() { + priority++; + } + + public void priorityOne() { + priority = 1; + } + + public int getPriority() { + return priority; + } + + public void repaintThis() { final Dimension d = DragTab.this.getSize(); repaint(0, 0, d.width, d.height); - } + } - @Override - public void paintComponent(final Graphics g) { - if(!selected) { - g.setColor(Color.white); - g.fillRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6); - g.setColor(Color.LIGHT_GRAY); - g.drawRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6); - } - else { - g.setColor(Color.orange); - g.fillRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6); - g.setColor(Color.red); - g.drawRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6); - } + @Override + public void paintComponent(final Graphics g) { + if (!selected) { + g.setColor(Color.white); + g.fillRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6); + g.setColor(Color.LIGHT_GRAY); + g.drawRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6); + } + else { + g.setColor(Color.orange); + g.fillRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6); + g.setColor(Color.red); + g.drawRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6); + } - super.paintComponent(g); - } + super.paintComponent(g); + } }