diff --git a/src/main/java/forge/gui/match/ViewWinLose.java b/src/main/java/forge/gui/match/ViewWinLose.java index 5b8eb7c191e..caf8b89f62c 100644 --- a/src/main/java/forge/gui/match/ViewWinLose.java +++ b/src/main/java/forge/gui/match/ViewWinLose.java @@ -48,7 +48,7 @@ public class ViewWinLose { btnContinue = new FButton(); btnRestart = new FButton(); btnQuit = new FButton(); - + final LobbyPlayer human = Singletons.getControl().getPlayer().getLobbyPlayer(); // Control of the win/lose is handled differently for various game modes. @@ -58,7 +58,9 @@ public class ViewWinLose { control = new QuestWinLose(this, match); break; case Draft: - if (!Singletons.getModel().getGauntletMini().isGauntletDraft()) break; + if (!Singletons.getModel().getGauntletMini().isGauntletDraft()) { + break; + } case Sealed: control = new LimitedWinLose(this, match); break; @@ -68,9 +70,10 @@ public class ViewWinLose { default: // will catch it after switch break; } - if( null == control) + if (null == control) { control = new ControlWinLose(this, match); - + } + pnlLeft.setOpaque(false); pnlRight.setOpaque(false); @@ -103,7 +106,7 @@ public class ViewWinLose { } // Show Wins and Loses - + final int humanWins = match.getGamesWonBy(human); final int humanLosses = match.getPlayedGames().size() - humanWins; diff --git a/src/main/java/forge/gui/match/controllers/CDetail.java b/src/main/java/forge/gui/match/controllers/CDetail.java index 7aec16e83ff..581d2142d12 100644 --- a/src/main/java/forge/gui/match/controllers/CDetail.java +++ b/src/main/java/forge/gui/match/controllers/CDetail.java @@ -60,7 +60,7 @@ public enum CDetail implements ICDoc { VDetail.SINGLETON_INSTANCE.getPnlDetail().setCard(null); VDetail.SINGLETON_INSTANCE.getParentCell().repaintSelf(); } - + /** * Gets the current card. * diff --git a/src/main/java/forge/gui/match/controllers/CDev.java b/src/main/java/forge/gui/match/controllers/CDev.java index b605faddbbe..312a634a21c 100644 --- a/src/main/java/forge/gui/match/controllers/CDev.java +++ b/src/main/java/forge/gui/match/controllers/CDev.java @@ -75,8 +75,8 @@ public enum CDev implements ICDoc { private final MouseListener madCardToBattlefield = new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { GuiDisplayUtil.devModeCardToBattlefield(); } }; - - + + private final MouseListener madBreakpoint = new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { GuiDisplayUtil.devModeBreakpoint(); } }; @@ -110,7 +110,7 @@ public enum CDev implements ICDoc { VDev.SINGLETON_INSTANCE.getLblCardToBattlefield().addMouseListener(madCardToBattlefield); ForgePreferences prefs = Singletons.getModel().getPreferences(); - + VDev.SINGLETON_INSTANCE.getLblMilling().setEnabled(prefs.getPrefBoolean(FPref.DEV_MILLING_LOSS)); //VDev.SINGLETON_INSTANCE.getLblMilling().setEnabled(Constant.Runtime.MILL[0]); VDev.SINGLETON_INSTANCE.getLblUnlimitedLands().setEnabled(prefs.getPrefBoolean(FPref.DEV_UNLIMITED_LAND)); diff --git a/src/main/java/forge/gui/match/controllers/CDock.java b/src/main/java/forge/gui/match/controllers/CDock.java index 416d6d9b05b..5f111610a99 100644 --- a/src/main/java/forge/gui/match/controllers/CDock.java +++ b/src/main/java/forge/gui/match/controllers/CDock.java @@ -61,17 +61,17 @@ import forge.view.FView; public enum CDock implements ICDoc { /** */ SINGLETON_INSTANCE; - + private int arcState; private GameState game; private Player player; - public void onGameStarts(GameState game0, Player player0) - { + public void onGameStarts(GameState game0, Player player0) { + game = game0; player = player0; } - + /** Concede game, bring up WinLose UI. */ public void concede() { @@ -104,7 +104,7 @@ public enum CDock implements ICDoc { }; w.execute(); } - + private void saveLayout() { final SwingWorker w = new SwingWorker() { @Override diff --git a/src/main/java/forge/gui/match/controllers/CLog.java b/src/main/java/forge/gui/match/controllers/CLog.java index 57f972099ad..681fb47a311 100644 --- a/src/main/java/forge/gui/match/controllers/CLog.java +++ b/src/main/java/forge/gui/match/controllers/CLog.java @@ -30,9 +30,9 @@ public enum CLog implements ICDoc, Observer { */ @Override public void initialize() { - + } - + /* (non-Javadoc) * @see forge.gui.framework.ICDoc#update() */ diff --git a/src/main/java/forge/gui/match/controllers/CMessage.java b/src/main/java/forge/gui/match/controllers/CMessage.java index c790855891f..adda7e18c8c 100644 --- a/src/main/java/forge/gui/match/controllers/CMessage.java +++ b/src/main/java/forge/gui/match/controllers/CMessage.java @@ -76,8 +76,8 @@ public enum CMessage implements ICDoc { VMessage.SINGLETON_INSTANCE.getTarMessage().setText(s0); } - /** Updates counter label in message area. - * @param match + /** Updates counter label in message area. + * @param match * @param gameState */ public void updateGameInfo(MatchController match) { VMessage.SINGLETON_INSTANCE.getLblGames().setText( diff --git a/src/main/java/forge/gui/match/controllers/CPicture.java b/src/main/java/forge/gui/match/controllers/CPicture.java index 4516c868f65..5e781cc1832 100644 --- a/src/main/java/forge/gui/match/controllers/CPicture.java +++ b/src/main/java/forge/gui/match/controllers/CPicture.java @@ -49,7 +49,7 @@ public enum CPicture implements ICDoc { VPicture.SINGLETON_INSTANCE.getLblFlipcard().setVisible(c != null && c.isDoubleFaced() ? true : false); VPicture.SINGLETON_INSTANCE.getPnlPicture().setCard(c); } - + public void showCard(final InventoryItem item) { this.currentCard = null; VPicture.SINGLETON_INSTANCE.getLblFlipcard().setVisible(false); diff --git a/src/main/java/forge/gui/match/controllers/CPlayers.java b/src/main/java/forge/gui/match/controllers/CPlayers.java index 2a5f238d42a..9496d000c87 100644 --- a/src/main/java/forge/gui/match/controllers/CPlayers.java +++ b/src/main/java/forge/gui/match/controllers/CPlayers.java @@ -36,9 +36,9 @@ public enum CPlayers implements ICDoc { */ @Override 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.updateStormLabel(); } diff --git a/src/main/java/forge/gui/match/nonsingleton/CField.java b/src/main/java/forge/gui/match/nonsingleton/CField.java index 6d02032d6a3..c8ebc961786 100644 --- a/src/main/java/forge/gui/match/nonsingleton/CField.java +++ b/src/main/java/forge/gui/match/nonsingleton/CField.java @@ -468,7 +468,7 @@ public class CField implements ICDoc { //earlier it was enforced that cards must be in player zone //this can potentially break some other functionality //(tapping lands works ok but some custom cards may not...) - + //in weird case card has no controller revert to default behaviour input.selectCard(c); diff --git a/src/main/java/forge/gui/match/nonsingleton/VCommand.java b/src/main/java/forge/gui/match/nonsingleton/VCommand.java index 1f592651305..d901e4d8836 100644 --- a/src/main/java/forge/gui/match/nonsingleton/VCommand.java +++ b/src/main/java/forge/gui/match/nonsingleton/VCommand.java @@ -66,7 +66,7 @@ public class VCommand implements IVDoc { // TODO player is hard-coded into tabletop...should be dynamic // (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); diff --git a/src/main/java/forge/gui/match/nonsingleton/VField.java b/src/main/java/forge/gui/match/nonsingleton/VField.java index ddce9193226..71b56e3a8a9 100644 --- a/src/main/java/forge/gui/match/nonsingleton/VField.java +++ b/src/main/java/forge/gui/match/nonsingleton/VField.java @@ -121,7 +121,7 @@ public class VField implements IVDoc { // TODO player is hard-coded into tabletop...should be dynamic // (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);