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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-12-01 20:43:21 +00:00
parent c275def10d
commit 4b415ea611
11 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/gui/match/ViewWinLose.java
View File

@@ -58,7 +58,9 @@ public class ViewWinLose {
control = new QuestWinLose(this, match); control = new QuestWinLose(this, match);
break; break;
case Draft: case Draft:
if (!Singletons.getModel().getGauntletMini().isGauntletDraft()) break; if (!Singletons.getModel().getGauntletMini().isGauntletDraft()) {
break;
}
case Sealed: case Sealed:
control = new LimitedWinLose(this, match); control = new LimitedWinLose(this, match);
break; break;
@@ -68,8 +70,9 @@ public class ViewWinLose {
default: // will catch it after switch default: // will catch it after switch
break; break;
} }
if( null == control) if (null == control) {
control = new ControlWinLose(this, match); control = new ControlWinLose(this, match);
}
pnlLeft.setOpaque(false); pnlLeft.setOpaque(false);

4
src/main/java/forge/gui/match/controllers/CDock.java
View File

@@ -66,8 +66,8 @@ public enum CDock implements ICDoc {
private GameState game; private GameState game;
private Player player; private Player player;
public void onGameStarts(GameState game0, Player player0) public void onGameStarts(GameState game0, Player player0) {
{
game = game0; game = game0;
player = player0; player = player0;
} }

4
src/main/java/forge/gui/match/controllers/CPlayers.java
View File

@@ -36,9 +36,9 @@ public enum CPlayers implements ICDoc {
*/ */
@Override @Override
public void update() { public void update() {
for(Player p : Singletons.getModel().getGame().getRegisteredPlayers()) for (Player p : Singletons.getModel().getGame().getRegisteredPlayers()) {
VPlayers.SINGLETON_INSTANCE.updatePlayerLabels(p); VPlayers.SINGLETON_INSTANCE.updatePlayerLabels(p);
}
VPlayers.SINGLETON_INSTANCE.updateStormLabel(); VPlayers.SINGLETON_INSTANCE.updateStormLabel();
} }

2
src/main/java/forge/gui/match/nonsingleton/VCommand.java
View File

@@ -66,7 +66,7 @@ public class VCommand implements IVDoc<CCommand> {
// TODO player is hard-coded into tabletop...should be dynamic // TODO player is hard-coded into tabletop...should be dynamic
// (haven't looked into it too deeply). Doublestrike 12-04-12 // (haven't looked into it too deeply). Doublestrike 12-04-12
tabletop = new PlayArea(scroller, id0 == EDocID.COMMAND_0 ); tabletop = new PlayArea(scroller, id0 == EDocID.COMMAND_0);
control = new CCommand(player, this); control = new CCommand(player, this);

2
src/main/java/forge/gui/match/nonsingleton/VField.java
View File

@@ -121,7 +121,7 @@ public class VField implements IVDoc<CField> {
// TODO player is hard-coded into tabletop...should be dynamic // TODO player is hard-coded into tabletop...should be dynamic
// (haven't looked into it too deeply). Doublestrike 12-04-12 // (haven't looked into it too deeply). Doublestrike 12-04-12
tabletop = new PlayArea(scroller, id0 == EDocID.FIELD_1 ); tabletop = new PlayArea(scroller, id0 == EDocID.FIELD_1);
control = new CField(player, this); control = new CField(player, this);