- CheckStyle.

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 (fighter1 != null) {
-        if (fighter2 != null) fighterList.add(fighter2);
+            fighterList.add(fighter1);
+        }
+        if (fighter2 != null) {
+            fighterList.add(fighter2);
+        }
 
         return fighterList;
     }

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();

src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java

@@ -326,7 +326,7 @@ public class CEditorDraftingProcess extends ACEditorBase<CardPrinted, DeckGroup>
 
         //Re-rename buttons
         VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().setText(ccAddLabel);
-        
+
         //Re-add buttons
         VCardCatalog.SINGLETON_INSTANCE.getBtnAdd4().setVisible(true);
         VCurrentDeck.SINGLETON_INSTANCE.getBtnRemove().setVisible(true);

src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java

@@ -318,7 +318,7 @@ public final class EditorTableModel<T extends InventoryItem> extends AbstractTab
         @SuppressWarnings("unchecked")
         public void add(final TableColumnInfo<T> 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<T extends InventoryItem> extends AbstractTab
         }
 
         public TableSorterCascade<InventoryItem> getSorter() {
-            if ( this.sorter == null )
+            if (this.sorter == null) {
                 this.sorter = createSorter();
+            }
             return this.sorter;
         }
-        
+
-        private TableSorterCascade<InventoryItem> createSorter()
+        private TableSorterCascade<InventoryItem> createSorter() {
-        {
+
             final List<TableSorter<InventoryItem>> oneColSorters
                 = new ArrayList<TableSorter<InventoryItem>>(maxSortDepth);
 

src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java

@@ -197,7 +197,7 @@ public enum VEditorPreferences implements IVDoc<CEditorPreferences> {
     public JCheckBox getChbCatalogAI() {
         return chbCatalogAI;
     }
-    
+
     /** @return {@link javax.swing.JCheckBox} */
     public JCheckBox getChbCatalogPower() {
         return chbCatalogPower;
@@ -232,7 +232,7 @@ public enum VEditorPreferences implements IVDoc<CEditorPreferences> {
     public JCheckBox getChbDeckAI() {
         return chbDeckAI;
     }
-    
+
     /** @return {@link javax.swing.JCheckBox} */
     public JCheckBox getChbDeckPower() {
         return chbDeckPower;

src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java

@@ -92,8 +92,8 @@ public class GuiDownloadSetPicturesLQ extends GuiDownloader {
         // read token names and urls
         final ArrayList<DownloadObject> cList = new ArrayList<DownloadObject>();
 
-        Iterable<CardPrinted> allPrinted = Iterables.concat(CardDb.instance().getAllTraditionalCards(),CardDb.instance().getAllNonTraditionalCards());
+        Iterable<CardPrinted> 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)) {

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));
 

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), /** */

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