clean up a bunch of Java warnings

src/main/java/forge/BoosterDraft_1.java

@@ -9,7 +9,6 @@ import forge.gui.GuiUtils;
 import javax.swing.*;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 public class BoosterDraft_1 implements BoosterDraft {

src/main/java/forge/BoosterGenerator.java

@@ -11,7 +11,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Random;
 
 import net.slightlymagic.maxmtg.Predicate;
 

src/main/java/forge/GUI_DeckAnalysis.java

@@ -28,7 +28,6 @@ import javax.swing.border.BevelBorder;
 import javax.swing.event.MouseInputAdapter;
 import javax.swing.table.DefaultTableModel;
 
-import forge.card.CardManaCost;
 import forge.card.CardRules;
 import forge.card.CardPoolView;
 import forge.card.CardPrinted;

src/main/java/forge/ReadBoosterPack.java

@@ -7,10 +7,8 @@ package forge;
 
 import forge.card.CardRules;
 import forge.card.CardDb;
-import forge.card.CardRules.Predicates;
 import forge.card.CardPool;
 import forge.card.CardPoolView;
-import forge.card.CardRarity;
 import forge.card.CardPrinted;
 import forge.properties.NewConstants;
 

src/main/java/forge/card/CardDb.java

@@ -1,7 +1,6 @@
 package forge.card;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;

src/main/java/forge/gui/deckeditor/CardShop.java

@@ -1,16 +1,9 @@
 package forge.gui.deckeditor;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.GridLayout;
-import java.awt.Image;
-import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.text.DecimalFormat;
@@ -19,42 +12,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Random;
 
-import javax.swing.BorderFactory;
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.SwingUtilities;
-import javax.swing.border.Border;
-import javax.swing.border.EtchedBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.MouseInputAdapter;
-import javax.swing.event.MouseInputListener;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableCellRenderer;
 
 import net.slightlymagic.braids.util.lambda.Lambda1;
 
-import forge.Card;
-import forge.CardList;
 import forge.Command;
-import forge.ImageCache;
-import forge.ReadBoosterPack;
 import forge.ReadPriceList;
 import forge.card.CardPool;
 import forge.card.CardPoolView;
-import forge.card.CardRarity;
 import forge.card.CardPrinted;
 import forge.deck.Deck;
 import forge.error.ErrorViewer;
-import forge.gui.game.CardDetailPanel;
-import forge.gui.game.CardPicturePanel;
-import forge.properties.NewConstants;
 import forge.view.swing.OldGuiNewGame;
 
 /**

src/main/java/forge/gui/deckeditor/CardViewPanel.java

@@ -1,9 +1,5 @@
 package forge.gui.deckeditor;
 
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.LayoutManager2;
-import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;

src/main/java/forge/gui/deckeditor/CardViewPanelLite.java

@@ -1,33 +1,15 @@
 package forge.gui.deckeditor;
 
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.LayoutManager2;
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
 import java.io.File;
-import java.io.IOException;
 
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.filechooser.FileFilter;
 
 import net.miginfocom.swing.MigLayout;
 
-import arcane.ui.CardPanel;
-import arcane.ui.ViewPanel;
-
 import forge.Card;
-import forge.GuiDisplayUtil;
-import forge.ImagePreviewPanel;
 import forge.card.CardPrinted;
 import forge.gui.game.CardDetailPanel;
 import forge.gui.game.CardPicturePanel;
-import forge.properties.ForgeProps;
-import forge.properties.NewConstants;
-import forge.view.swing.OldGuiNewGame;
 
 /** 
  * This panel is to be placed in the right part of a deck editor

src/main/java/forge/gui/deckeditor/DeckDisplay.java

@@ -1,9 +1,6 @@
 package forge.gui.deckeditor;
 
-import forge.CardList;
-import forge.card.CardPool;
 import forge.card.CardPoolView;
-import forge.card.CardPrinted;
 
 /**
  * Created by IntelliJ IDEA.
@@ -20,7 +17,7 @@ public interface DeckDisplay {
      * @param top a {@link forge.CardList} object.
      * @param bottom a {@link forge.CardList} object.
      */
-    public void setDecks(CardPoolView top, CardPoolView bottom);
+    void setDecks(CardPoolView top, CardPoolView bottom);
 
     //top shows available card pool
     //if constructed, top shows all cards
@@ -31,7 +28,7 @@ public interface DeckDisplay {
      *
      * @return a {@link forge.CardList} object.
      */
-    public CardPoolView getTop();
+    CardPoolView getTop();
 
     //bottom shows cards that the user has chosen for his library
     /**
@@ -39,12 +36,12 @@ public interface DeckDisplay {
      *
      * @return a {@link forge.CardList} object.
      */
-    public CardPoolView getBottom();
+    CardPoolView getBottom();
 
     /**
      * <p>setTitle.</p>
      *
      * @param message a {@link java.lang.String} object.
      */
-    public void setTitle(String message);
+    void setTitle(String message);
 }

src/main/java/forge/gui/deckeditor/DeckEditor.java

@@ -5,12 +5,8 @@ import java.awt.Font;
 import java.awt.Frame;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
@@ -25,20 +21,16 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.event.UndoableEditEvent;
-import javax.swing.event.UndoableEditListener;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 
 import org.apache.commons.lang3.StringUtils;
-import org.eclipse.swt.widgets.Combo;
 
 import net.miginfocom.swing.MigLayout;
 import net.slightlymagic.maxmtg.Predicate;
 import net.slightlymagic.maxmtg.Predicate.StringOp;
 import forge.Command;
 import forge.Constant;
-import forge.Gui_ProgressBarWindow;
 import forge.SetInfoUtil;
 import forge.card.CardRules;
 import forge.card.CardDb;

src/main/java/forge/gui/deckeditor/DeckEditorBase.java

@@ -1,56 +1,29 @@
 package forge.gui.deckeditor;
 
 import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Image;
-import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
-import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-import javax.swing.SwingUtilities;
-import javax.swing.border.Border;
-import javax.swing.border.EtchedBorder;
 import javax.swing.border.TitledBorder;
-import javax.swing.event.MouseInputListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import javax.swing.filechooser.FileFilter;
-
-import arcane.ui.CardPanel;
 
 import net.slightlymagic.maxmtg.Predicate;
 
-import forge.Card;
 import forge.Constant;
 import forge.GUI_DeckAnalysis;
-import forge.GuiDisplayUtil;
-import forge.ImageCache;
-import forge.ImagePreviewPanel;
 import forge.card.CardPool;
 import forge.card.CardPrinted;
 import forge.card.CardRules;
 import forge.card.CardPoolView;
-import forge.gui.game.CardDetailPanel;
-import forge.gui.game.CardPicturePanel;
-import forge.properties.ForgeProps;
-import forge.properties.NewConstants;
 
 public abstract class DeckEditorBase extends JFrame implements DeckDisplay  {
     private static final long serialVersionUID = -401223933343539977L;

src/main/java/forge/gui/deckeditor/DeckEditorMenu.java

@@ -6,12 +6,9 @@ import forge.Card;
 import forge.CardList;
 import forge.Command;
 import forge.Constant;
-import forge.Constant.GameType;
-import forge.card.CardRules;
 import forge.card.CardDb;
 import forge.card.CardPool;
 import forge.card.CardPoolView;
-import forge.card.CardPrinted;
 import forge.deck.Deck;
 import forge.deck.DeckManager;
 import forge.deck.DownloadDeck;
@@ -33,12 +30,8 @@ import java.net.Proxy;
 import java.net.URL;
 import java.nio.channels.FileChannel;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-//import java.util.HashMap;
-//import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * <p>Gui_DeckEditor_Menu class.</p>

src/main/java/forge/gui/deckeditor/DeckEditorQuest.java

@@ -1,54 +1,22 @@
 package forge.gui.deckeditor;
 
 import forge.AllZone;
-import forge.Card;
-import forge.CardList;
 import forge.Command;
 import forge.Constant;
-import forge.GUI_DeckAnalysis;
-import forge.GuiDisplayUtil;
-import forge.ImageCache;
-import forge.ImagePreviewPanel;
-import forge.MyRandom;
-import forge.Constant.GameType;
-import forge.Constant.Runtime;
-import forge.card.CardRules;
-import forge.card.CardDb;
 import forge.card.CardPool;
 import forge.card.CardPoolView;
 import forge.card.CardPrinted;
 import forge.deck.Deck;
 import forge.error.ErrorViewer;
-import forge.gui.game.CardDetailPanel;
-import forge.gui.game.CardPicturePanel;
-import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.view.swing.OldGuiNewGame;
 
 import javax.swing.*;
-import javax.swing.border.Border;
-import javax.swing.border.EtchedBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.MouseInputAdapter;
-import javax.swing.event.MouseInputListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.filechooser.FileFilter;
-
-import net.slightlymagic.maxmtg.Predicate;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Map.Entry;
-import java.util.Random;
 
 //import forge.quest.data.QuestBoosterPack;
 

src/main/java/forge/gui/deckeditor/DeckEditorQuestMenu.java

@@ -4,11 +4,8 @@ package forge.gui.deckeditor;
 import forge.AllZone;
 import forge.Command;
 import forge.Constant;
-import forge.Constant.GameType;
-import forge.card.CardCoreType;
 import forge.card.CardRules;
 import forge.card.CardDb;
-import forge.card.CardRules.Predicates;
 import forge.card.CardPool;
 import forge.card.CardPoolView;
 import forge.card.CardPrinted;
@@ -17,15 +14,11 @@ import forge.deck.DeckManager;
 import forge.error.ErrorViewer;
 import forge.gui.GuiUtils;
 import forge.gui.ListChooser;
-import forge.quest.data.QuestBattleManager;
 
 import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import javax.swing.filechooser.FileFilter;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.tools.ant.taskdefs.PathConvert.MapEntry;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -38,7 +31,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Stack;
 
 
 //presumes AllZone.getQuestData() is not null
@@ -49,18 +41,18 @@ import java.util.Stack;
  * @version $Id$
  */
 public class DeckEditorQuestMenu extends JMenuBar {
-    /** Constant <code>serialVersionUID=-4052319220021158574L</code> */
+    /** Constant <code>serialVersionUID=-4052319220021158574L</code>. */
     private static final long serialVersionUID = -4052319220021158574L;
 
     //this should be false in the public version
     //if true, the Quest Deck editor will let you edit the computer's decks
     private final boolean canEditComputerDecks;
 
-    /** Constant <code>deckEditorName="Deck Editor"</code> */
+    /** Constant <code>deckEditorName="Deck Editor"</code>. */
     private static final String deckEditorName = "Deck Editor";
 
     //used for import and export, try to made the gui user friendly
-    /** Constant <code>previousDirectory</code> */
+    /** Constant <code>previousDirectory</code>. */
     private static File previousDirectory = null;
 
     private Command exitCommand;
@@ -77,13 +69,16 @@ public class DeckEditorQuestMenu extends JMenuBar {
      * @param d a {@link forge.gui.deckeditor.DeckDisplay} object.
      * @param exit a {@link forge.Command} object.
      */
-    public DeckEditorQuestMenu(DeckDisplay d, Command exit) {
+    public DeckEditorQuestMenu(final DeckDisplay d, final Command exit) {
         //is a file named "edit" in this directory
-        //lame but it works, I don't like 2 versions of MTG Forge floating around
+        //lame but it works, I don't like 2 versions of Forge floating around
         //one that lets you edit the AI decks and one that doesn't
         File f = new File("edit");
-        if (f.exists()) canEditComputerDecks = true;
+        if (f.exists()) {
-        else canEditComputerDecks = false;
+            canEditComputerDecks = true;
+        } else {
+            canEditComputerDecks = false;
+        }
 
         deckDisplay = d;
         d.setTitle(deckEditorName);
@@ -103,26 +98,26 @@ public class DeckEditorQuestMenu extends JMenuBar {
      * @param menu a {@link javax.swing.JMenu} object.
      * @param isHumanMenu a boolean.
      */
-    private void addImportExport(JMenu menu, final boolean isHumanMenu) {
+    private void addImportExport(final JMenu menu, final boolean isHumanMenu) {
         JMenuItem import2 = new JMenuItem("Import");
         JMenuItem export = new JMenuItem("Export");
 
         import2.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent a) {
+            public void actionPerformed(final ActionEvent a) {
-                importDeck();//importDeck(isHumanMenu);
+                importDeck(); //importDeck(isHumanMenu);
             }
-        });//import
+        }); //import
 
         export.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent a) {
+            public void actionPerformed(final ActionEvent a) {
                 exportDeck();
             }
-        });//export
+        }); //export
 
         menu.add(import2);
         menu.add(export);
 
-    }//addImportExport()
+    } //addImportExport()
 
     /**
      * <p>exportDeck.</p>
@@ -130,7 +125,9 @@ public class DeckEditorQuestMenu extends JMenuBar {
     private void exportDeck() {
         File filename = getExportFilename();
 
-        if (filename == null) return;
+        if (filename == null) {
+            return;
+        }
 
         //write is an Object variable because you might just
         //write one Deck object
@@ -151,7 +148,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
 
         exportDeckText(getExportDeckText(deck), filename.getAbsolutePath());
 
-    }//exportDeck()
+    } //exportDeck()
 
     /**
      * <p>exportDeckText.</p>
@@ -159,7 +156,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
      * @param deckText a {@link java.lang.String} object.
      * @param filename a {@link java.lang.String} object.
      */
-    private void exportDeckText(String deckText, String filename) {
+    private void exportDeckText(final String deckText, String filename) {
 
         //remove ".deck" extension
         int cut = filename.indexOf(".");
@@ -176,8 +173,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
             throw new RuntimeException("Gui_Quest_DeckEditor_Menu : exportDeckText() error, " + ex.getMessage()
                     + " : " + Arrays.toString(ex.getStackTrace()));
         }
-    }//exportDeckText()
+    } //exportDeckText()
-
 
     /**
      * <p>getExportDeckText.</p>
@@ -185,11 +181,11 @@ public class DeckEditorQuestMenu extends JMenuBar {
      * @param aDeck a {@link forge.deck.Deck} object.
      * @return a {@link java.lang.String} object.
      */
-    private String getExportDeckText(Deck aDeck) {
+    private String getExportDeckText(final Deck aDeck) {
         //convert Deck into CardList
         CardPoolView all = aDeck.getMain();
         //sort by card name
-        Collections.sort( all.getOrderedList(), TableSorter.byNameThenSet );
+        Collections.sort(all.getOrderedList(), TableSorter.byNameThenSet);
 
         StringBuffer sb = new StringBuffer();
         String newLine = "\r\n";
@@ -217,8 +213,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
         sb.append(newLine);
 
         return sb.toString();
-    }//getExportDeckText
+    } //getExportDeckText
-    
 
     /**
      * <p>getFileFilter.</p>
@@ -228,7 +223,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
     private FileFilter getFileFilter() {
         FileFilter filter = new FileFilter() {
             @Override
-            public boolean accept(File f) {
+            public boolean accept(final File f) {
                 return f.getName().endsWith(".dck") || f.isDirectory();
             }
 
@@ -239,7 +234,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
         };
 
         return filter;
-    }//getFileFilter()
+    } //getFileFilter()
 
     /**
      * <p>getExportFilename.</p>
@@ -264,12 +259,15 @@ public class DeckEditorQuestMenu extends JMenuBar {
 
             previousDirectory = file.getParentFile();
 
-            if (check.endsWith(".deck")) return file;
+            if (check.endsWith(".deck")) {
-            else return new File(check + ".deck");
+                return file;
+            } else {
+                return new File(check + ".deck");
+            }
         }
 
         return null;
-    }//getExportFilename()
+    } //getExportFilename()
 
     /**
      * <p>importDeck.</p>
@@ -299,7 +297,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
             }
         }
 
-    }//importDeck()
+    } //importDeck()
 
     /**
      * <p>getImportFilename.</p>
@@ -319,7 +317,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
         }
 
         return null;
-    }//openFileDialog()
+    } //openFileDialog()
 
 
 
@@ -391,7 +389,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
     };
 
     private final ActionListener saveDeckActionListener = new ActionListener() {
-        public void actionPerformed(ActionEvent a) {
+        public void actionPerformed(final ActionEvent a) {
             String name = currentDeck.getName();
 
             //check to see if name is set
@@ -399,7 +397,9 @@ public class DeckEditorQuestMenu extends JMenuBar {
                 name = getUserInput_GetDeckName(questData.getDeckNames());
 
                 //check if user cancels
-                if (name.equals("")) return;
+                if (name.equals("")) {
+                    return;
+                }
             }
 
             setPlayerDeckName(name);
@@ -412,11 +412,13 @@ public class DeckEditorQuestMenu extends JMenuBar {
     };
 
     private final ActionListener copyDeckActionListener = new ActionListener() {
-        public void actionPerformed(ActionEvent a) {
+        public void actionPerformed(final ActionEvent a) {
             String name = getUserInput_GetDeckName(questData.getDeckNames());
 
             //check if user cancels
-            if (name.equals("")) return;
+            if (name.equals("")) {
+                return;
+            }
 
             setPlayerDeckName(name);
 
@@ -428,12 +430,16 @@ public class DeckEditorQuestMenu extends JMenuBar {
     };
 
     private final ActionListener deleteDeckActionListener = new ActionListener() {
-        public void actionPerformed(ActionEvent a) {
+        public void actionPerformed(final ActionEvent a) {
-            if (currentDeck.getName().equals("")) return;
+            if (currentDeck.getName().equals("")) {
+                return;
+            }
 
             int check = JOptionPane.showConfirmDialog(null, "Do you really want to delete this deck?",
                     "Delete", JOptionPane.YES_NO_OPTION);
-            if (check == JOptionPane.NO_OPTION) return; //stop here
+            if (check == JOptionPane.NO_OPTION) {
+                return; //stop here
+            }
 
             questData.removeDeck(currentDeck.getName());
 
@@ -519,7 +525,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
      *
      * @param deckName a {@link java.lang.String} object.
      */
-    public void setPlayerDeckName(String deckName) {
+    public final void setPlayerDeckName(final String deckName) {
         //the gui uses this, Gui_Quest_DeckEditor
         currentDeck = new Deck(Constant.GameType.Sealed);
         currentDeck.setName(deckName);
@@ -552,10 +558,12 @@ public class DeckEditorQuestMenu extends JMenuBar {
      * @param nameList a {@link java.util.List} object.
      * @return a {@link java.lang.String} object.
      */
-    private String getUserInput_GetDeckName(List<String> nameList) {
+    private String getUserInput_GetDeckName(final List<String> nameList) {
         Object o = JOptionPane.showInputDialog(null, "", "Deck Name", JOptionPane.OK_CANCEL_OPTION);
 
-        if (o == null) return "";
+        if (o == null) {
+            return "";
+        }
 
         String deckName = cleanString(o.toString());
 
@@ -565,7 +573,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
         }
 
         return deckName;
-    }//getUserInput_GetDeckName()
+    } //getUserInput_GetDeckName()
 
 
     //if user cancels, it will return ""
@@ -575,7 +583,7 @@ public class DeckEditorQuestMenu extends JMenuBar {
      * @param deckNameList a {@link java.util.List} object.
      * @return a {@link java.lang.String} object.
      */
-    private String getUserInput_OpenDeck(List<String> deckNameList) {
+    private String getUserInput_OpenDeck(final List<String> deckNameList) {
         List<String> choices = deckNameList;
         if (choices.size() == 0) {
             JOptionPane.showMessageDialog(null, "No decks found", "Open Deck", JOptionPane.PLAIN_MESSAGE);
@@ -586,16 +594,18 @@ public class DeckEditorQuestMenu extends JMenuBar {
         //        choices.toArray(), choices.toArray()[0]);
         Object o = GuiUtils.getChoiceOptional("Select Deck", choices.toArray());
 
-        if (o == null) return "";
+        if (o == null) {
+            return "";
+        }
 
         return o.toString();
-    }//getUserInput_OpenDeck()
+    } //getUserInput_OpenDeck()
 
     //used by Gui_Quest_DeckEditor
     /**
      * <p>close.</p>
      */
-    public void close() {
+    public final void close() {
         exitCommand.execute();
     }
 
@@ -605,10 +615,8 @@ public class DeckEditorQuestMenu extends JMenuBar {
      *
      * @return a {@link java.lang.String} object.
      */
-    public String getDeckName() {
+    public final String getDeckName() {
         return currentDeck.getName();
     }
 
-
-
 }

src/main/java/forge/gui/deckeditor/Gui_BoosterDraft.java

@@ -2,25 +2,19 @@ package forge.gui.deckeditor;
 
 import forge.AllZone;
 import forge.BoosterDraft;
-import forge.CardList;
 import forge.Constant;
 import forge.FileUtil;
 import forge.HttpUtil;
-import forge.Constant.GameType;
-import forge.Constant.Runtime;
 import forge.card.CardPoolView;
 import forge.card.CardPrinted;
 import forge.deck.Deck;
 import forge.deck.DeckManager;
 import forge.error.ErrorViewer;
-import forge.gui.game.CardDetailPanel;
-import forge.gui.game.CardPicturePanel;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.view.swing.OldGuiNewGame;
 
 import javax.swing.*;
-import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
@@ -28,7 +22,6 @@ import java.awt.*;
 import java.awt.event.*;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 
 /**

src/main/java/forge/gui/deckeditor/TableModel.java

@@ -11,8 +11,6 @@ import javax.swing.table.TableColumnModel;
 
 import net.slightlymagic.braids.util.lambda.Lambda1;
 
-import forge.Card;
-import forge.SetInfoUtil;
 import forge.card.CardPool;
 import forge.card.CardPoolView;
 import forge.card.CardPrinted;
@@ -21,7 +19,6 @@ import java.awt.event.*;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Stack;
 
 
 /**

src/main/java/forge/quest/data/QuestBoosterPack.java

@@ -1,7 +1,5 @@
 package forge.quest.data;
 
-import forge.Card;
-import forge.CardFilter;
 import forge.Constant;
 import forge.card.CardDb;
 import forge.card.CardPrinted;
@@ -10,18 +8,13 @@ import forge.card.CardRules;
 import forge.properties.NewConstants;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.NoSuchElementException;
 
 import org.apache.commons.lang3.StringUtils;
 
-import net.slightlymagic.braids.util.generator.GeneratorFunctions;
 import net.slightlymagic.maxmtg.Predicate;
 
-import com.google.code.jyield.Generator;
-
 // The BoosterPack generates cards for the Card Pool in Quest Mode
 /**
  * <p>QuestBoosterPack class.</p>
@@ -102,23 +95,20 @@ public class QuestBoosterPack implements NewConstants {
         return names;
     }
 
-    
-
     /**
      * Create the list of card names at random from the given pool.
      *
-     * @param allCards  the card pool to use
+     * @param source  an Iterable<CardPrinted>
-     * @param num  how many card names to add to the result
+     * @param filter  Predicate<CardPrinted>
-     * @param rarity  only allow cards of this rarity
+     * @param cntNeeded  an int
-     * @param color  may be null; if not null, only cards of this color may be added
+     * @param allowedColors a List<Predicate<CardRules>>
-     * @param colorOrder  we shuffle this as a side effect of calling this method
      * @return a list of card names
      */
-    public ArrayList<CardPrinted> generateDefinetlyColouredCards(
+    public final ArrayList<CardPrinted> generateDefinetlyColouredCards(
-            Iterable<CardPrinted> source,
+            final Iterable<CardPrinted> source,
-            Predicate<CardPrinted> filter,
+            final Predicate<CardPrinted> filter,
-            int cntNeeded,
+            final int cntNeeded,
-            List<Predicate<CardRules>> allowedColors)
+            final List<Predicate<CardRules>> allowedColors)
     {
         // If color is null, use colorOrder progression to grab cards
         ArrayList<CardPrinted> result = new ArrayList<CardPrinted>();
@@ -210,14 +200,23 @@ public class QuestBoosterPack implements NewConstants {
             colorFilter = Predicate.getTrue(CardRules.class);
         } else {
             String col = color.toLowerCase();
-            if (col.startsWith("wh")) colorFilter = CardRules.Predicates.Presets.isWhite;
+            if (col.startsWith("wh")) {
-            else if (col.startsWith("bla")) colorFilter = CardRules.Predicates.Presets.isBlack;
+                colorFilter = CardRules.Predicates.Presets.isWhite;
-            else if (col.startsWith("blu")) colorFilter = CardRules.Predicates.Presets.isBlue;
+            } else if (col.startsWith("bla")) {
-            else if (col.startsWith("re")) colorFilter = CardRules.Predicates.Presets.isRed;
+                colorFilter = CardRules.Predicates.Presets.isBlack;
-            else if (col.startsWith("col")) colorFilter = CardRules.Predicates.Presets.isColorless;
+            } else if (col.startsWith("blu")) {
-            else if (col.startsWith("gre")) colorFilter = CardRules.Predicates.Presets.isGreen;
+                colorFilter = CardRules.Predicates.Presets.isBlue;
-            else if (col.startsWith("mul")) colorFilter = CardRules.Predicates.Presets.isMulticolor;
+            } else if (col.startsWith("re")) {
-            else colorFilter = Predicate.getTrue(CardRules.class);
+                colorFilter = CardRules.Predicates.Presets.isRed;
+            } else if (col.startsWith("col")) {
+                colorFilter = CardRules.Predicates.Presets.isColorless;
+            } else if (col.startsWith("gre")) {
+                colorFilter = CardRules.Predicates.Presets.isGreen;
+            } else if (col.startsWith("mul")) {
+                colorFilter = CardRules.Predicates.Presets.isMulticolor;
+            } else {
+                colorFilter = Predicate.getTrue(CardRules.class);
+            }
         }
         return Predicate.and(rFilter, colorFilter, CardPrinted.fnGetRules);
     }

src/main/java/forge/quest/data/QuestData.java

@@ -22,13 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.ArrayUtils;
-
 import net.slightlymagic.maxmtg.Predicate;
 
-import com.google.code.jyield.Generator;
-import com.google.code.jyield.YieldUtils;
-
 
 //when you create QuestDataOld and AFTER you copy the AI decks over
 //you have to call one of these two methods below

src/main/java/forge/quest/data/QuestUtil.java

@@ -5,9 +5,6 @@ import forge.card.CardRarity;
 
 import java.util.ArrayList;
 
-import com.google.code.jyield.Generator;
-import com.google.code.jyield.YieldUtils;
-
 /**
  * <p>QuestUtil class.</p>
  *
@@ -22,7 +19,7 @@ public class QuestUtil {
      * @param qd a {@link forge.quest.data.QuestData} object.
      * @return a {@link forge.CardList} object.
      */
-    public static CardList getComputerCreatures(QuestData qd) {
+    public static CardList getComputerCreatures(final QuestData qd) {
         return new CardList();
     }
 
@@ -33,7 +30,7 @@ public class QuestUtil {
      * @param qa a {@link forge.Quest_Assignment} object.
      * @return a {@link forge.CardList} object.
      */
-    public static CardList getComputerCreatures(QuestData qd, Quest_Assignment qa) {
+    public static CardList getComputerCreatures(final QuestData qd, Quest_Assignment qa) {
         CardList list = new CardList();
         if (qa != null) {
             ArrayList<String> compCards = qa.getCompy();
@@ -56,7 +53,7 @@ public class QuestUtil {
      * @param qd a {@link forge.quest.data.QuestData} object.
      * @return a {@link forge.CardList} object.
      */
-    public static CardList getHumanPlantAndPet(QuestData qd) {
+    public static CardList getHumanPlantAndPet(final QuestData qd) {
         CardList list = new CardList();
 
         if (qd.getPetManager().shouldPetBeUsed()) {
@@ -77,11 +74,12 @@ public class QuestUtil {
      * @param qa a {@link forge.Quest_Assignment} object.
      * @return a {@link forge.CardList} object.
      */
-    public static CardList getHumanPlantAndPet(QuestData qd, Quest_Assignment qa) {
+    public static CardList getHumanPlantAndPet(final QuestData qd, Quest_Assignment qa) {
         CardList list = getHumanPlantAndPet(qd);
 
-        if (qa != null)
+        if (qa != null) {
             list.addAll(qa.getHuman());
+        }
 
         return list;
     }
@@ -340,7 +338,7 @@ public class QuestUtil {
         } else if (id == 16)  // Mines of Kazum Durl
         {
             CardList humanList = new CardList();
-            String humanSetupCards[] = {"Dwarven Demolition Team", "Dwarven Pony", "Dwarven Trader"};
+            String[] humanSetupCards = {"Dwarven Demolition Team", "Dwarven Pony", "Dwarven Trader"};
 
             for (int i = 0; i < 3; i++) {
                 Card c = AllZone.getCardFactory().getCard(humanSetupCards[i], AllZone.getHumanPlayer());
@@ -352,7 +350,7 @@ public class QuestUtil {
             }
             qa.setHuman(humanList);
 
-            String compySetupCards[] =
+            String[] compySetupCards =
                     {"Wall of Earth", "Wall of Air", "Wall of Ice", "Wall of Light", "Carrion Wall", "Steel Wall"};
 
             for (int i = 0; i < 6; i++) {
@@ -363,7 +361,7 @@ public class QuestUtil {
         } else if (id == 17)  // House Party
         {
             CardList humanList = new CardList();
-            String humanSetupCards[] = {"Hopping Automaton", "Honden of Life's Web", "Forbidden Orchard"};
+            String[] humanSetupCards = {"Hopping Automaton", "Honden of Life's Web", "Forbidden Orchard"};
 
             for (int i = 0; i < 3; i++) {
                 Card c = AllZone.getCardFactory().getCard(humanSetupCards[i], AllZone.getHumanPlayer());
@@ -375,7 +373,7 @@ public class QuestUtil {
             }
             qa.setHuman(humanList);
 
-            String compySetupCards[] = {"Honden of Infinite Rage", "Mikokoro, Center of the Sea", "Tidehollow Strix"};
+            String[] compySetupCards = {"Honden of Infinite Rage", "Mikokoro, Center of the Sea", "Tidehollow Strix"};
 
             for (int i = 0; i < 3; i++) {
                 qa.addCompy(compySetupCards[i]);
@@ -385,7 +383,7 @@ public class QuestUtil {
         } else if (id == 18)  // Crows in the Field
         {
             CardList humanList = new CardList();
-            String humanSetupCards[] = {"Straw Soldiers", "Femeref Archers", "Moonglove Extract"};
+            String[] humanSetupCards = {"Straw Soldiers", "Femeref Archers", "Moonglove Extract"};
 
             for (int i = 0; i < 3; i++) {
                 Card c = AllZone.getCardFactory().getCard(humanSetupCards[i], AllZone.getHumanPlayer());
@@ -397,7 +395,7 @@ public class QuestUtil {
             }
             qa.setHuman(humanList);
 
-            String compySetupCards[] = {"Defiant Falcon", "Soulcatcher", "Storm Crow", "Hypnotic Specter"};
+            String[] compySetupCards = {"Defiant Falcon", "Soulcatcher", "Storm Crow", "Hypnotic Specter"};
 
             for (int i = 0; i < 4; i++) {
                 qa.addCompy(compySetupCards[i]);
@@ -407,7 +405,7 @@ public class QuestUtil {
         } else if (id == 19)  // The Desert Caravan
         {
             CardList humanList = new CardList();
-            String humanSetupCards[] = {"Spidersilk Net", "Dromad Purebred"};
+            String[] humanSetupCards = {"Spidersilk Net", "Dromad Purebred"};
 
             for (int i = 0; i < 2; i++) {
                 Card c = AllZone.getCardFactory().getCard(humanSetupCards[i], AllZone.getHumanPlayer());
@@ -419,7 +417,7 @@ public class QuestUtil {
             }
             qa.setHuman(humanList);
 
-            String compySetupCards[] = {"Ambush Party", "Ambush Party", "Gnat Alley Creeper", "Ambush Party", "Ambush Party"};
+            String[] compySetupCards = {"Ambush Party", "Ambush Party", "Gnat Alley Creeper", "Ambush Party", "Ambush Party"};
 
             for (int i = 0; i < 5; i++) {
                 qa.addCompy(compySetupCards[i]);
@@ -429,7 +427,7 @@ public class QuestUtil {
         } else if (id == 20)  // Blood Oath
         {
             CardList humanList = new CardList();
-            String humanSetupCards[] = {"Counterbalance", "Hatching Plans", "Ley Druid"};
+            String[] humanSetupCards = {"Counterbalance", "Hatching Plans", "Ley Druid"};
 
             for (int i = 0; i < 3; i++) {
                 Card c = AllZone.getCardFactory().getCard(humanSetupCards[i], AllZone.getHumanPlayer());
@@ -441,7 +439,7 @@ public class QuestUtil {
             }
             qa.setHuman(humanList);
 
-            String compySetupCards[] = {"Ior Ruin Expedition", "Oversold Cemetery", "Trapjaw Kelpie"};
+            String[] compySetupCards = {"Ior Ruin Expedition", "Oversold Cemetery", "Trapjaw Kelpie"};
 
             for (int i = 0; i < 3; i++) {
                 qa.addCompy(compySetupCards[i]);
@@ -461,16 +459,17 @@ public class QuestUtil {
 
             qa.setHuman(humanList);
 
-            String compySetupCards[] = {"Plains", "Island", "Swamp", "Mountain", "Forest"};
+            String[] compySetupCards = {"Plains", "Island", "Swamp", "Mountain", "Forest"};
 
-            for (int i = 0; i < 5; i++)
+            for (int i = 0; i < 5; i++) {
                 qa.addCompy(compySetupCards[i]);
+            }
 
             qa.setCardRewardList(pack.generateCards(6, CardRarity.Rare, null));
         } else if (id == 22) // Pied Piper
         {
             CardList humanList = new CardList();
-            String humanSetupCards[] = {"Volunteer Militia", "Land Tax", "Elvish Farmer", "An-Havva Township"};
+            String[] humanSetupCards = {"Volunteer Militia", "Land Tax", "Elvish Farmer", "An-Havva Township"};
 
             for (int i = 0; i < 4; i++) {
                 Card c = AllZone.getCardFactory().getCard(humanSetupCards[i], AllZone.getHumanPlayer());
@@ -482,14 +481,15 @@ public class QuestUtil {
             }
             qa.setHuman(humanList);
 
-            String compySetupCards[] = {"Darksteel Citadel", "Relentless Rats"};
+            String[] compySetupCards = {"Darksteel Citadel", "Relentless Rats"};
 
-            for (int i = 0; i < 2; i++)
+            for (int i = 0; i < 2; i++) {
                 qa.addCompy(compySetupCards[i]);
+            }
 
             qa.setCardRewardList(pack.generateCards(3, CardRarity.Rare, null));
         }
 
     }
 
-}//QuestUtil
+} //QuestUtil

src/main/java/forge/view/swing/SplashFrame.java

@@ -4,7 +4,6 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;