From 5551bcd55f29ef9021ebfec2ccbdbcd6e5a88207 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 30 Nov 2012 19:27:09 +0000 Subject: [PATCH] - CheckStyle. --- .../card/abilityfactory/effects/FightEffect.java | 8 ++++++-- src/main/java/forge/control/FControl.java | 4 ++-- .../controllers/CEditorDraftingProcess.java | 2 +- .../forge/gui/deckeditor/tables/EditorTableModel.java | 11 ++++++----- .../gui/deckeditor/views/VEditorPreferences.java | 4 ++-- .../forge/gui/download/GuiDownloadSetPicturesLQ.java | 4 ++-- src/main/java/forge/gui/download/GuiDownloader.java | 8 ++++---- src/main/java/forge/gui/framework/EDocID.java | 2 +- src/main/java/forge/gui/home/VHomeUI.java | 2 +- 9 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/effects/FightEffect.java b/src/main/java/forge/card/abilityfactory/effects/FightEffect.java index 3763873589f..a1db2776853 100644 --- a/src/main/java/forge/card/abilityfactory/effects/FightEffect.java +++ b/src/main/java/forge/card/abilityfactory/effects/FightEffect.java @@ -78,8 +78,12 @@ public class FightEffect extends SpellEffect { fighter2 = tgts.get(1); } - if (fighter1 != null) fighterList.add(fighter1); - if (fighter2 != null) fighterList.add(fighter2); + if (fighter1 != null) { + fighterList.add(fighter1); + } + if (fighter2 != null) { + fighterList.add(fighter2); + } return fighterList; } diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java index c8b88887814..589ed4fe355 100644 --- a/src/main/java/forge/control/FControl.java +++ b/src/main/java/forge/control/FControl.java @@ -146,12 +146,12 @@ public enum FControl { public void initialize() { // Preloads skin components (using progress bar). FSkin.loadFull(); - + //This must be done here or at least between the skin being loaded and any FTabbedPanes being created. //Why,Swing? Why is this not a property of JTabbbedPane? UIManager.put("TabbedPane.selected", FSkin.getColor(FSkin.Colors.CLR_ACTIVE)); UIManager.put("TabbedPane.contentOpaque", FSkin.getColor(FSkin.Colors.CLR_THEME)); - UIManager.put("TabbedPane.unselectedBackground", FSkin.getColor(FSkin.Colors.CLR_THEME2)); + UIManager.put("TabbedPane.unselectedBackground", FSkin.getColor(FSkin.Colors.CLR_THEME2)); // Does not use progress bar, due to be deprecated with battlefield refactoring. CardFaceSymbols.loadImages(); diff --git a/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java b/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java index 3fe5659a151..a8660835213 100644 --- a/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java +++ b/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java @@ -326,7 +326,7 @@ public class CEditorDraftingProcess extends ACEditorBase //Re-rename buttons VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().setText(ccAddLabel); - + //Re-add buttons VCardCatalog.SINGLETON_INSTANCE.getBtnAdd4().setVisible(true); VCurrentDeck.SINGLETON_INSTANCE.getBtnRemove().setVisible(true); diff --git a/src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java b/src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java index d098f470604..2d9a0d0d5c1 100644 --- a/src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java +++ b/src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java @@ -318,7 +318,7 @@ public final class EditorTableModel extends AbstractTab @SuppressWarnings("unchecked") public void add(final TableColumnInfo col0) { this.sorter = null; - + // Found at top level, should invert if (colsToSort.size() > 0 && colsToSort.get(0).equals(col0)) { this.colsToSort.get(0).setSortState( @@ -357,13 +357,14 @@ public final class EditorTableModel extends AbstractTab } public TableSorterCascade getSorter() { - if ( this.sorter == null ) + if (this.sorter == null) { this.sorter = createSorter(); + } return this.sorter; } - - private TableSorterCascade createSorter() - { + + private TableSorterCascade createSorter() { + final List> oneColSorters = new ArrayList>(maxSortDepth); diff --git a/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java b/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java index 0c6acb83627..7230346a175 100644 --- a/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java +++ b/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java @@ -197,7 +197,7 @@ public enum VEditorPreferences implements IVDoc { public JCheckBox getChbCatalogAI() { return chbCatalogAI; } - + /** @return {@link javax.swing.JCheckBox} */ public JCheckBox getChbCatalogPower() { return chbCatalogPower; @@ -232,7 +232,7 @@ public enum VEditorPreferences implements IVDoc { public JCheckBox getChbDeckAI() { return chbDeckAI; } - + /** @return {@link javax.swing.JCheckBox} */ public JCheckBox getChbDeckPower() { return chbDeckPower; diff --git a/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java b/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java index 46965cc4020..77c5e1698f4 100644 --- a/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java +++ b/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java @@ -92,8 +92,8 @@ public class GuiDownloadSetPicturesLQ extends GuiDownloader { // read token names and urls final ArrayList cList = new ArrayList(); - Iterable allPrinted = Iterables.concat(CardDb.instance().getAllTraditionalCards(),CardDb.instance().getAllNonTraditionalCards()); - + Iterable allPrinted = Iterables.concat(CardDb.instance().getAllTraditionalCards(), CardDb.instance().getAllNonTraditionalCards()); + for (final CardPrinted c : allPrinted) { final String setCode3 = c.getEdition(); if (StringUtils.isBlank(setCode3) || "???".equals(setCode3)) { diff --git a/src/main/java/forge/gui/download/GuiDownloader.java b/src/main/java/forge/gui/download/GuiDownloader.java index f0e4a9893e4..0b21ebb1f01 100644 --- a/src/main/java/forge/gui/download/GuiDownloader.java +++ b/src/main/java/forge/gui/download/GuiDownloader.java @@ -352,18 +352,18 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements System.out.println("Can't create folder" + base.getAbsolutePath()); } // Don't allow redirections here! - + URL imageUrl = new URL(url); - HttpURLConnection conn = (HttpURLConnection)imageUrl.openConnection(); + HttpURLConnection conn = (HttpURLConnection) imageUrl.openConnection(); conn.setInstanceFollowRedirects(false); conn.connect(); - + if (conn.getResponseCode() != 200) { conn.disconnect(); System.out.println("Skipped Download for: " + fileDest.getPath()); continue; } - + in = new BufferedInputStream(conn.getInputStream()); out = new BufferedOutputStream(new FileOutputStream(fileDest)); diff --git a/src/main/java/forge/gui/framework/EDocID.java b/src/main/java/forge/gui/framework/EDocID.java index fe9e7c20851..9e458018c5f 100644 --- a/src/main/java/forge/gui/framework/EDocID.java +++ b/src/main/java/forge/gui/framework/EDocID.java @@ -101,7 +101,7 @@ public enum EDocID { /** */ HAND_1 (null), /** */ HAND_2 (null), /** */ HAND_3 (null), /** */ - + COMMAND_0 (null), /** */ COMMAND_1 (null), /** */ COMMAND_2 (null), /** */ diff --git a/src/main/java/forge/gui/home/VHomeUI.java b/src/main/java/forge/gui/home/VHomeUI.java index f2913f807d4..e240fc926bb 100644 --- a/src/main/java/forge/gui/home/VHomeUI.java +++ b/src/main/java/forge/gui/home/VHomeUI.java @@ -119,7 +119,7 @@ public enum VHomeUI implements IVTopLevelUI { //allSubmenus.add(VSubmenuExit.SINGLETON_INSTANCE); allSubmenus.add(VSubmenuArchenemy.SINGLETON_INSTANCE); - + allSubmenus.add(VSubmenuVanguard.SINGLETON_INSTANCE); // For each group: init its panel