- CheckStyle.

This commit is contained in:
Chris
2012-03-28 14:03:43 +00:00
parent 1f67cbe218
commit 444e426f6d
13 changed files with 73 additions and 77 deletions

View File

@@ -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

View File

@@ -205,7 +205,6 @@ public final class Constant {
/** Ante. */
Ante(false);
private final boolean holdsHiddenInfo;
private Zone(boolean holdsHidden) {
holdsHiddenInfo = holdsHidden;

View File

@@ -419,7 +419,6 @@ public class TriggerHandler {
private boolean runSingleTrigger(final Trigger regtrig, final TriggerType mode, final Map<String, Object> runParams) {
final Map<String, String> params = regtrig.getMapParams();
if (regtrig.getMode() != mode) {
return false; // Not the right mode.
}

View File

@@ -19,7 +19,6 @@ public enum TriggerType {
ChangesZone(TriggerChangesZone.class),
Clashed(TriggerClashed.class),
TapsForMana(TriggerTapsForMana.class),
CounterAdded(TriggerCounterAdded.class),
@@ -67,7 +66,7 @@ public enum TriggerType {
}
}
throw new RuntimeException("Element " + value + " not found in TriggerType enum" );
throw new RuntimeException("Element " + value + " not found in TriggerType enum");
}
/**
@@ -82,7 +81,7 @@ public enum TriggerType {
Constructor<? extends Trigger>[] cc = (Constructor<? extends Trigger>[]) classTrigger.getDeclaredConstructors();
for (Constructor<? extends Trigger> 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);

View File

@@ -159,7 +159,6 @@ public class ControlTabber extends MyObservable {
this.view.getAnyCard().removeMouseListener(madAddAnyCard);
this.view.getAnyCard().addMouseListener(madAddAnyCard);
// DevMode: Add counter to permanent
this.view.getLblCounterPermanent().removeMouseListener(madCounter);
this.view.getLblCounterPermanent().addMouseListener(madCounter);

View File

@@ -32,14 +32,14 @@ import forge.util.Predicate;
*/
public class GenerateDeckUtil {
public static final Predicate<Card> aiCanPlay = new Predicate<Card>(){
public static final Predicate<Card> aiCanPlay = new Predicate<Card>() {
@Override
public boolean isTrue(Card c) {
return !c.getSVar("RemRandomDeck").equals("True") && !c.getSVar("RemAIDeck").equals("True");
}
};
public static final Predicate<Card> humanCanPlay = new Predicate<Card>(){
public static final Predicate<Card> humanCanPlay = new Predicate<Card>() {
@Override
public boolean isTrue(Card c) {
return !c.getSVar("RemRandomDeck").equals("True");

View File

@@ -93,7 +93,7 @@ public final class BoosterDraft implements IBoosterDraft {
case Block: // Draft from cards by block or set
List<CardBlock> blocks = new ArrayList<CardBlock>();
for(CardBlock b : Singletons.getModel().getBlocks()) {
for (CardBlock b : Singletons.getModel().getBlocks()) {
blocks.add(b);
}
final CardBlock block = GuiUtils.chooseOne("Choose Block", blocks);

View File

@@ -79,7 +79,7 @@ public class SealedDeck {
} else if (sealedType.equals("Block")) {
List<CardBlock> blocks = new ArrayList<CardBlock>();
for(CardBlock b : Singletons.getModel().getBlocks()) {
for (CardBlock b : Singletons.getModel().getBlocks()) {
blocks.add(b);
}
final CardBlock block = GuiUtils.chooseOne("Choose Block", blocks);

View File

@@ -52,7 +52,7 @@ public final class DragTab extends JLabel implements ILocalRepaint {
@Override
public void paintComponent(final Graphics g) {
if(!selected) {
if (!selected) {
g.setColor(Color.white);
g.fillRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6);
g.setColor(Color.LIGHT_GRAY);