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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-01-18 15:33:23 +00:00
parent a33162ebd3
commit dfbb478007
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/MagicStack.java
View File

@@ -1010,7 +1010,7 @@ public class MagicStack extends MyObservable {
final AbilityActivated trigAb = new AbilityActivated(source, "0") { final AbilityActivated trigAb = new AbilityActivated(source, "0") {
private static final long serialVersionUID = 7497175394128633122L; private static final long serialVersionUID = 7497175394128633122L;
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return true; return true;
@@ -1038,7 +1038,7 @@ public class MagicStack extends MyObservable {
if (!hasFoundPossibleSA) { if (!hasFoundPossibleSA) {
return; return;
} }
if(source.getOwner().isHuman()) { if (source.getOwner().isHuman()) {
AllZone.getGameAction().playCardNoCost(source); AllZone.getGameAction().playCardNoCost(source);
} else { } else {
System.out.println("rebound: " + source); System.out.println("rebound: " + source);
@@ -1051,7 +1051,7 @@ public class MagicStack extends MyObservable {
} }
} }
} }
} }
AllZone.getGameAction().moveToGraveyard(source); AllZone.getGameAction().moveToGraveyard(source);
} }

8
src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java
View File

@@ -133,7 +133,7 @@ public class AbilityFactoryAlterLife {
public void resolve() { public void resolve() {
AbilityFactoryAlterLife.gainLifeResolve(this.af, this); AbilityFactoryAlterLife.gainLifeResolve(this.af, this);
} }
@Override @Override
public boolean canPlayFromEffectAI(final boolean mandatory, final boolean withOutManaCost) { public boolean canPlayFromEffectAI(final boolean mandatory, final boolean withOutManaCost) {
if (withOutManaCost) { if (withOutManaCost) {
@@ -336,7 +336,7 @@ public class AbilityFactoryAlterLife {
return (randomReturn && chance); return (randomReturn && chance);
} }
/** /**
* <p> * <p>
* gainLifeDoTriggerAI. * gainLifeDoTriggerAI.
@@ -523,7 +523,7 @@ public class AbilityFactoryAlterLife {
public void resolve() { public void resolve() {
AbilityFactoryAlterLife.loseLifeResolve(this.af, this); AbilityFactoryAlterLife.loseLifeResolve(this.af, this);
} }
@Override @Override
public boolean canPlayFromEffectAI(final boolean mandatory, final boolean withOutManaCost) { public boolean canPlayFromEffectAI(final boolean mandatory, final boolean withOutManaCost) {
if (withOutManaCost) { if (withOutManaCost) {
@@ -722,7 +722,7 @@ public class AbilityFactoryAlterLife {
return (randomReturn && chance); return (randomReturn && chance);
} }
/** /**
* <p> * <p>
* loseLifeDoTriggerAI. * loseLifeDoTriggerAI.

2
src/main/java/forge/control/home/ControlSettings.java
View File

@@ -157,7 +157,7 @@ public class ControlSettings {
prefs.setSkin(name); prefs.setSkin(name);
Singletons.getView().setSkin(skin); Singletons.getView().setSkin(skin);
((GuiTopLevel) AllZone.getDisplay()).getController().changeState(0); ((GuiTopLevel) AllZone.getDisplay()).getController().changeState(0);
// changeState creates a new HomeTopLevel, so we can't just use the view object we already have. // changeState creates a new HomeTopLevel, so we can't just use the view object we already have.
((GuiTopLevel) AllZone.getDisplay()).getController().getHomeView().showSettingsMenu(); ((GuiTopLevel) AllZone.getDisplay()).getController().getHomeView().showSettingsMenu();

4
src/main/java/forge/view/match/ViewField.java
View File

@@ -765,12 +765,12 @@ public class ViewField extends FRoundedPanel {
super(txt); super(txt);
this.setHorizontalTextPosition(SwingConstants.CENTER); this.setHorizontalTextPosition(SwingConstants.CENTER);
this.setHorizontalAlignment(SwingConstants.CENTER); this.setHorizontalAlignment(SwingConstants.CENTER);
defaultBG = ViewField.this.skin.getColor("active"); defaultBG = ViewField.this.skin.getColor("active");
hoverBG = ViewField.this.skin.getColor("hover"); hoverBG = ViewField.this.skin.getColor("hover");
pressedBG = ViewField.this.skin.getColor("inactive"); pressedBG = ViewField.this.skin.getColor("inactive");
textColor = ViewField.this.skin.getColor("text"); textColor = ViewField.this.skin.getColor("text");
this.setForeground(textColor); this.setForeground(textColor);
this.addMouseListener(new MouseAdapter() { this.addMouseListener(new MouseAdapter() {