From 647f4d91eb514382c7a0855a8ec4f0c5535a213f Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 30 Nov 2012 19:51:25 +0000 Subject: [PATCH] - CheckStyle. --- .../gauntlet/CSubmenuGauntletContests.java | 6 +- .../home/gauntlet/CSubmenuGauntletLoad.java | 6 +- .../home/gauntlet/CSubmenuGauntletQuick.java | 8 +-- .../forge/gui/home/quest/CSubmenuDuels.java | 2 +- .../gui/home/quest/CSubmenuQuestData.java | 69 ++++++++++--------- .../gui/home/quest/DialogCustomFormat.java | 8 +-- .../forge/gui/home/quest/IVQuestStats.java | 2 +- .../gui/home/quest/SSubmenuQuestUtil.java | 10 +-- .../home/sanctioned/CSubmenuConstructed.java | 8 +-- .../home/sanctioned/VSubmenuConstructed.java | 8 +-- 10 files changed, 66 insertions(+), 61 deletions(-) diff --git a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java index cb7a8853318..abae56a7a2d 100644 --- a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java +++ b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java @@ -251,13 +251,13 @@ public enum CSubmenuGauntletContests implements ICDoc { public Object doInBackground() { final GauntletData gd = FModel.SINGLETON_INSTANCE.getGauntletData(); Deck aiDeck = gd.getDecks().get(gd.getCompleted()); - + MatchStartHelper starter = new MatchStartHelper(); Lobby lobby = Singletons.getControl().getLobby(); starter.addPlayer(lobby.findLocalPlayer(PlayerType.HUMAN), gd.getUserDeck()); starter.addPlayer(lobby.findLocalPlayer(PlayerType.COMPUTER), aiDeck); - - MatchController mc = Singletons.getModel().getMatch(); + + MatchController mc = Singletons.getModel().getMatch(); mc.initMatch(GameType.Gauntlet, starter.getPlayerMap()); mc.startRound(); return null; diff --git a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java index 6263ce5cf2d..5b1450625c5 100644 --- a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java +++ b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java @@ -105,13 +105,13 @@ public enum CSubmenuGauntletLoad implements ICDoc { public Object doInBackground() { final GauntletData gd = FModel.SINGLETON_INSTANCE.getGauntletData(); final Deck aiDeck = gd.getDecks().get(gd.getCompleted()); - + MatchStartHelper starter = new MatchStartHelper(); Lobby lobby = Singletons.getControl().getLobby(); starter.addPlayer(lobby.findLocalPlayer(PlayerType.HUMAN), gd.getUserDeck()); starter.addPlayer(lobby.findLocalPlayer(PlayerType.COMPUTER), aiDeck); - - MatchController mc = Singletons.getModel().getMatch(); + + MatchController mc = Singletons.getModel().getMatch(); mc.initMatch(GameType.Gauntlet, starter.getPlayerMap()); mc.startRound(); return null; diff --git a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java index df7186858d1..6fbacbf7fe9 100644 --- a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java +++ b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java @@ -294,15 +294,15 @@ public enum CSubmenuGauntletQuick implements ICDoc { public Object doInBackground() { final GauntletData gd = FModel.SINGLETON_INSTANCE.getGauntletData(); final Deck aiDeck = gd.getDecks().get(gd.getCompleted()); - + MatchStartHelper starter = new MatchStartHelper(); Lobby lobby = Singletons.getControl().getLobby(); starter.addPlayer(lobby.findLocalPlayer(PlayerType.HUMAN), gd.getUserDeck()); starter.addPlayer(lobby.findLocalPlayer(PlayerType.COMPUTER), aiDeck); - - MatchController mc = Singletons.getModel().getMatch(); + + MatchController mc = Singletons.getModel().getMatch(); mc.initMatch(GameType.Gauntlet, starter.getPlayerMap()); - mc.startRound(); + mc.startRound(); return null; } diff --git a/src/main/java/forge/gui/home/quest/CSubmenuDuels.java b/src/main/java/forge/gui/home/quest/CSubmenuDuels.java index a0e41e29c85..54bc21d7d84 100644 --- a/src/main/java/forge/gui/home/quest/CSubmenuDuels.java +++ b/src/main/java/forge/gui/home/quest/CSubmenuDuels.java @@ -43,7 +43,7 @@ public enum CSubmenuDuels implements ICDoc { view.getBtnUnlock().setCommand( new Command() { @Override - public void execute() { SSubmenuQuestUtil.chooseAndUnlockEdition(); CSubmenuDuels.this.update();} }); + public void execute() { SSubmenuQuestUtil.chooseAndUnlockEdition(); CSubmenuDuels.this.update(); } }); view.getBtnStart().addActionListener( new ActionListener() { @Override diff --git a/src/main/java/forge/gui/home/quest/CSubmenuQuestData.java b/src/main/java/forge/gui/home/quest/CSubmenuQuestData.java index 676ee98ec85..9f66a8c4be2 100644 --- a/src/main/java/forge/gui/home/quest/CSubmenuQuestData.java +++ b/src/main/java/forge/gui/home/quest/CSubmenuQuestData.java @@ -44,7 +44,7 @@ public enum CSubmenuQuestData implements ICDoc { private final VSubmenuQuestData view = VSubmenuQuestData.SINGLETON_INSTANCE; private final List customFormatCodes = new ArrayList(); private final List customPrizeFormatCodes = new ArrayList(); - + private final Command cmdQuestSelect = new Command() { @Override public void execute() { changeQuest(); } }; @@ -59,13 +59,13 @@ public enum CSubmenuQuestData implements ICDoc { view.getBtnEmbark().setCommand( new Command() { @Override public void execute() { newQuest(); } }); - view.getBtnCustomFormat().setCommand( new Command() { @Override public void execute() { + view.getBtnCustomFormat().setCommand(new Command() { @Override public void execute() { new DialogCustomFormat(customFormatCodes); - }}); - - view.getBtnPrizeCustomFormat().setCommand( new Command() { @Override public void execute() { + } }); + + view.getBtnPrizeCustomFormat().setCommand(new Command() { @Override public void execute() { new DialogCustomFormat(customPrizeFormatCodes); - }}); + } }); } /* (non-Javadoc) @@ -143,39 +143,40 @@ public enum CSubmenuQuestData implements ICDoc { case Rotating: fmtStartPool = view.getRotatingFormat(); break; - + case CustomFormat: - if ( customFormatCodes.isEmpty() ) - { + if (customFormatCodes.isEmpty()) { + int answer = JOptionPane.showConfirmDialog(null, "You have defined custom format as containing no sets.\nThis will start a game without restriction.\n\nContinue?"); - if ( JOptionPane.YES_OPTION != answer ) + if (JOptionPane.YES_OPTION != answer) { return; + } } fmtStartPool = customFormatCodes.isEmpty() ? null : new GameFormatQuest("Custom", customFormatCodes, null); // chosen sets and no banend cards break; case SealedDeck: dckStartPool = view.getSelectedDeck(); - if ( null == dckStartPool ) - { + if (null == dckStartPool) { + JOptionPane.showMessageDialog(null, "You have not selected a deck to start", "Cannot start a quest", JOptionPane.ERROR_MESSAGE); return; } break; - + case DraftDeck: dckStartPool = view.getSelectedDeck(); - if ( null == dckStartPool ) - { + if (null == dckStartPool) { + JOptionPane.showMessageDialog(null, "You have not selected a deck to start", "Cannot start a quest", JOptionPane.ERROR_MESSAGE); return; } break; - + case Precon: dckStartPool = QuestController.getPrecons().get(view.getSelectedPrecon()).getDeck(); break; - + case Complete: default: // leave everything as nulls @@ -184,43 +185,47 @@ public enum CSubmenuQuestData implements ICDoc { GameFormat fmtPrizes = null; StartingPoolType prizedPoolType = view.getPrizedPoolType(); - if ( null == prizedPoolType ) { + if (null == prizedPoolType) { fmtPrizes = fmtStartPool; - if ( null == fmtPrizes && dckStartPool != null) { // build it form deck + if (null == fmtPrizes && dckStartPool != null) { // build it form deck List sets = new ArrayList(); - for(Entry c : dckStartPool.getMain()) { + for (Entry c : dckStartPool.getMain()) { String edition = c.getKey().getEdition(); - if ( !sets.contains(edition) ) + if (!sets.contains(edition)) { sets.add(edition); + } } - for(Entry c : dckStartPool.getSideboard()) { + for (Entry c : dckStartPool.getSideboard()) { String edition = c.getKey().getEdition(); - if ( !sets.contains(edition) ) + if (!sets.contains(edition)) { sets.add(edition); + } } fmtPrizes = new GameFormat("From deck", sets, null); } - } else + } else { switch(prizedPoolType) { case Complete: fmtPrizes = null; break; case CustomFormat: - if ( customPrizeFormatCodes.isEmpty() ) - { + if (customPrizeFormatCodes.isEmpty()) { + int answer = JOptionPane.showConfirmDialog(null, "You have defined custom format as containing no sets.\nThis will choose all editions without restriction as prized.\n\nContinue?"); - if ( JOptionPane.YES_OPTION != answer ) + if (JOptionPane.YES_OPTION != answer) { return; + } } fmtPrizes = customPrizeFormatCodes.isEmpty() ? null : new GameFormat("Custom Prizes", customPrizeFormatCodes, null); // chosen sets and no banend cards break; case Rotating: fmtPrizes = view.getPrizedRotatingFormat(); break; - default: + default: throw new RuntimeException("Should not get this result"); } - + } + final Object o = JOptionPane.showInputDialog(null, "Poets will remember your quest as:", "Quest Name", JOptionPane.OK_CANCEL_OPTION); if (o == null) { return; } @@ -234,9 +239,9 @@ public enum CSubmenuQuestData implements ICDoc { - - QuestController qc = Singletons.getModel().getQuest(); - + + QuestController qc = Singletons.getModel().getQuest(); + qc.newGame(questName, difficulty, mode, fmtPrizes, view.isUnlockSetsAllowed(), dckStartPool, fmtStartPool); Singletons.getModel().getQuest().save(); diff --git a/src/main/java/forge/gui/home/quest/DialogCustomFormat.java b/src/main/java/forge/gui/home/quest/DialogCustomFormat.java index ad805401bb4..65316dfb61f 100644 --- a/src/main/java/forge/gui/home/quest/DialogCustomFormat.java +++ b/src/main/java/forge/gui/home/quest/DialogCustomFormat.java @@ -54,14 +54,14 @@ public class DialogCustomFormat extends JDialog { editions.add(ce); } } - + Collections.sort(editions); Collections.reverse(editions); final int numEditions = editions.size(); final int columns = 3; final int rows = numEditions / columns + (numEditions % columns == 0 ? 0 : 1); - + int getIdx = 0; @@ -73,7 +73,7 @@ public class DialogCustomFormat extends JDialog { for (int col = 0; col < columns; col++) { getIdx = row + (col * rows); JCheckBox box; - if ( getIdx < numEditions ) { + if (getIdx < numEditions) { CardEdition edition = getIdx < numEditions ? editions.get(getIdx) : null; box = new JCheckBox(edition.getName()); box.setName(edition.getCode()); @@ -128,7 +128,7 @@ public class DialogCustomFormat extends JDialog { * */ private boolean canChoose(final String setCode) { - if (setCode == null ) { + if (setCode == null) { return true; } return !setCode.equals("LEA") && !setCode.equals("LEB") && !"MBP".equals(setCode); diff --git a/src/main/java/forge/gui/home/quest/IVQuestStats.java b/src/main/java/forge/gui/home/quest/IVQuestStats.java index 311333c8663..e55c7416f53 100644 --- a/src/main/java/forge/gui/home/quest/IVQuestStats.java +++ b/src/main/java/forge/gui/home/quest/IVQuestStats.java @@ -17,7 +17,7 @@ public interface IVQuestStats { /** @return {@link forge.gui.toolbox.ExperimentalLabel} */ ExperimentalLabel getBtnUnlock(); - + /** @return {@link javax.swing.JLabel} */ JLabel getLblCredits(); diff --git a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java index 61aa6f691d7..08251befdf6 100644 --- a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java +++ b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java @@ -250,7 +250,7 @@ public class SSubmenuQuestUtil { if (toUnlock == null) { return; } - + CardEdition unlocked = toUnlock.left; qData.getAssets().subtractCredits(toUnlock.right); JOptionPane.showMessageDialog(null, "You have successfully unlocked " + unlocked.getName() + "!", @@ -288,7 +288,7 @@ public class SSubmenuQuestUtil { final SwingWorker worker = new SwingWorker() { @Override public Object doInBackground() { - + qData.getChallengesManager().randomizeOpponents(); qData.getDuelsManager().randomizeOpponents(); qData.setCurrentEvent(event); @@ -304,7 +304,7 @@ public class SSubmenuQuestUtil { }; worker.execute(); PlayerStartConditions humanStart = new PlayerStartConditions(SSubmenuQuestUtil.getCurrentDeck()); - PlayerStartConditions aiStart = new PlayerStartConditions(event.getEventDeck()); + PlayerStartConditions aiStart = new PlayerStartConditions(event.getEventDeck()); if (qData.getMode() == QuestMode.Fantasy) { int lifeAI = 20; @@ -328,11 +328,11 @@ public class SSubmenuQuestUtil { } // End isFantasy MatchStartHelper msh = new MatchStartHelper(); - msh.addPlayer( Singletons.getControl().getLobby().getQuestPlayer(), humanStart ); + msh.addPlayer(Singletons.getControl().getLobby().getQuestPlayer(), humanStart); LobbyPlayer aiPlayer = Singletons.getControl().getLobby().findLocalPlayer(PlayerType.COMPUTER, event.getName()); aiPlayer.setPicture(event.getIconFilename()); - msh.addPlayer( aiPlayer, aiStart ); + msh.addPlayer(aiPlayer, aiStart); Singletons.getModel().getMatch().initMatch(GameType.Quest, msh.getPlayerMap()); Singletons.getModel().getMatch().startRound(); diff --git a/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java b/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java index 049465966e4..7eef22f4989 100644 --- a/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java +++ b/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java @@ -89,7 +89,7 @@ public enum CSubmenuConstructed implements ICDoc { view.getCbRemoveSmall().setSelected(prefs.getPrefBoolean(FPref.DECKGEN_NOSMALL)); } - + /** @param lists0   {@link java.util.List}<{@link javax.swing.JList}> */ private void startGame() { @@ -111,11 +111,11 @@ public enum CSubmenuConstructed implements ICDoc { Lobby lobby = Singletons.getControl().getLobby(); starter.addPlayer(lobby.findLocalPlayer(PlayerType.HUMAN), humanDeck); starter.addPlayer(lobby.findLocalPlayer(PlayerType.COMPUTER), aiDeck); - - MatchController mc = Singletons.getModel().getMatch(); + + MatchController mc = Singletons.getModel().getMatch(); mc.initMatch(GameType.Constructed, starter.getPlayerMap()); mc.startRound(); - + return null; } diff --git a/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java index 26b3d25f2f9..31d6e5c9382 100644 --- a/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java +++ b/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java @@ -73,8 +73,8 @@ public enum VSubmenuConstructed implements IVSubmenu { public final FDeckChooser getDcAi() { return dcAi; } - - + + /* (non-Javadoc) * @see forge.gui.home.IVSubmenu#getMenuTitle() */ @@ -100,7 +100,7 @@ public enum VSubmenuConstructed implements IVSubmenu { VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().setLayout(new MigLayout("insets 0, gap 0, wrap 2, ax right")); VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(lblTitle, "w 80%!, h 40px!, gap 0 0 15px 15px, span 2, ax right"); - + dcAi.populate(); dcHuman.populate(); VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(dcAi, "w 44%!, gap 0 0 20px 20px, growy, pushy"); @@ -116,7 +116,7 @@ public enum VSubmenuConstructed implements IVSubmenu { public JButton getBtnStart() { return this.btnStart; } - + /** @return {@link javax.swing.JCheckBox} */ public JCheckBox getCbSingletons() {