external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- CheckStyle.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/CombatUtil.java
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

5
src/main/java/forge/Constant.java
View File

@@ -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;
}
}
}
/**

2
src/main/java/forge/card/trigger/Trigger.java
View File

@@ -124,7 +124,7 @@ public abstract class Trigger extends TriggerReplacementBase {
/** The run params. */
private Map<String, Object> runParams;
private TriggerType mode;
/** The overriding ability. */

7
src/main/java/forge/card/trigger/TriggerHandler.java
View File

@@ -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<String, Object> runParams) {
final Map<String, String> params = regtrig.getMapParams();
if (regtrig.getMode() != mode) {
return false; // Not the right mode.
}

13
src/main/java/forge/card/trigger/TriggerType.java
View File

@@ -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<? extends Trigger> classTrigger;
private TriggerType(Class<? extends Trigger> 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<? 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);

7
src/main/java/forge/control/match/ControlTabber.java
View File

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

4
src/main/java/forge/deck/generate/Generate2ColorDeck.java
View File

@@ -134,10 +134,10 @@ public class Generate2ColorDeck {
// start with all cards
// remove cards that generated decks don't like
Predicate<Card> 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)) {

2
src/main/java/forge/deck/generate/Generate3ColorDeck.java
View File

@@ -148,7 +148,7 @@ public class Generate3ColorDeck {
// remove cards that generated decks don't like
Predicate<Card> 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)) {

2
src/main/java/forge/deck/generate/Generate5ColorDeck.java
View File

@@ -146,7 +146,7 @@ public class Generate5ColorDeck {
// remove cards that generated decks don't like
Predicate<Card> 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)) {

8
src/main/java/forge/deck/generate/GenerateDeckUtil.java
View File

@@ -32,19 +32,19 @@ 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");
}
};
};
/**
*
* Arrays of dual and tri-land cards.

4
src/main/java/forge/game/limited/BoosterDraft.java
View File

@@ -93,11 +93,11 @@ 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);
final CardEdition[] cardSets = block.getSets();
final String[] sets = new String[cardSets.length];
for (int k = cardSets.length - 1; k >= 0; --k) {

2
src/main/java/forge/game/limited/SealedDeck.java
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);

92
src/main/java/forge/gui/layout/DragTab.java
View File

@@ -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);
}
}