*Moved common functionality of Trigger and ReplacementEffect into base class.

forge-gui/src/main/java/forge/FThreads.java

@@ -1,12 +1,11 @@
 package forge;
 
+import forge.util.ThreadUtil;
+
+import javax.swing.*;
 import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 
-import javax.swing.SwingUtilities;
-
-import forge.util.ThreadUtil;
-
 /** 
  * TODO: Write javadoc for this type.
  *

forge-gui/src/main/java/forge/ImageCache.java

@@ -17,21 +17,10 @@
  */
 package forge;
 
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-
-import javax.imageio.ImageIO;
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
 import com.google.common.cache.LoadingCache;
 import com.mortennobel.imagescaling.ResampleOp;
-
 import forge.card.CardDb;
 import forge.card.CardRules;
 import forge.card.CardSplitType;
@@ -39,11 +28,20 @@ import forge.game.card.Card;
 import forge.game.player.IHasIcon;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinIcon;
-import forge.item.PaperCard;
 import forge.item.InventoryItem;
+import forge.item.PaperCard;
 import forge.properties.ForgePreferences.FPref;
 import forge.properties.NewConstants;
 import forge.util.Base64Coder;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
 
 /**
  * This class stores ALL card images in a cache with soft values. this means

forge-gui/src/main/java/forge/ImageLoader.java

@@ -1,18 +1,15 @@
 package forge;
 
+import com.google.common.cache.CacheLoader;
+import forge.error.BugReporter;
+import forge.properties.NewConstants;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 
-import javax.imageio.ImageIO;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.common.cache.CacheLoader;
-
-import forge.error.BugReporter;
-import forge.properties.NewConstants;
-
 final class ImageLoader extends CacheLoader<String, BufferedImage> {
     // image file extensions for various formats in order of likelihood
     // the last, empty, string is for keys that come in with an extension already in place

forge-gui/src/main/java/forge/control/FControl.java

@@ -17,25 +17,6 @@
  */
 package forge.control;
 
-import java.awt.Component;
-import java.awt.KeyEventDispatcher;
-import java.awt.KeyboardFocusManager;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.ImageIcon;
-import javax.swing.JLayeredPane;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.Constant.Preferences;
 import forge.FThreads;
 import forge.ImageCache;
@@ -48,19 +29,12 @@ import forge.game.Match;
 import forge.game.card.Card;
 import forge.game.player.LobbyPlayer;
 import forge.game.player.LobbyPlayerAi;
-import forge.gui.player.LobbyPlayerHuman;
 import forge.game.player.Player;
 import forge.game.player.RegisteredPlayer;
 import forge.gui.GuiDialog;
 import forge.gui.SOverlayUtils;
 import forge.gui.deckeditor.CDeckEditorUI;
-import forge.gui.framework.EDocID;
-import forge.gui.framework.FScreen;
-import forge.gui.framework.InvalidLayoutFileException;
-import forge.gui.framework.SDisplayUtil;
-import forge.gui.framework.SLayoutIO;
-import forge.gui.framework.SOverflowUtil;
-import forge.gui.framework.SResizingUtil;
+import forge.gui.framework.*;
 import forge.gui.home.settings.GamePlayerUtil;
 import forge.gui.match.CMatchUI;
 import forge.gui.match.VMatchUI;
@@ -71,6 +45,7 @@ import forge.gui.match.controllers.CStack;
 import forge.gui.match.views.VAntes;
 import forge.gui.match.views.VField;
 import forge.gui.menus.ForgeMenu;
+import forge.gui.player.LobbyPlayerHuman;
 import forge.gui.toolbox.FOptionPane;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.itemmanager.SItemManagerIO;
@@ -84,6 +59,14 @@ import forge.quest.io.QuestDataIO;
 import forge.sound.SoundSystem;
 import forge.view.FFrame;
 import forge.view.FView;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>

forge-gui/src/main/java/forge/control/FControlGameEventHandler.java

@@ -1,46 +1,10 @@
 package forge.control;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.Vector;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.commons.lang3.tuple.Pair;
-
 import com.google.common.eventbus.Subscribe;
-
 import forge.FThreads;
 import forge.game.Game;
 import forge.game.card.Card;
-import forge.game.event.GameEvent;
-import forge.game.event.GameEventAnteCardsSelected;
-import forge.game.event.GameEventAttackersDeclared;
-import forge.game.event.GameEventBlockersDeclared;
-import forge.game.event.GameEventCardAttachment;
-import forge.game.event.GameEventCardCounters;
-import forge.game.event.GameEventCardDamaged;
-import forge.game.event.GameEventCardPhased;
-import forge.game.event.GameEventCardStatsChanged;
-import forge.game.event.GameEventCardTapped;
-import forge.game.event.GameEventCombatEnded;
-import forge.game.event.GameEventGameFinished;
-import forge.game.event.GameEventGameOutcome;
-import forge.game.event.GameEventManaPool;
-import forge.game.event.GameEventPlayerControl;
-import forge.game.event.GameEventPlayerLivesChanged;
-import forge.game.event.GameEventPlayerPoisoned;
-import forge.game.event.GameEventPlayerPriority;
-import forge.game.event.GameEventSpellAbilityCast;
-import forge.game.event.GameEventSpellRemovedFromStack;
-import forge.game.event.GameEventSpellResolved;
-import forge.game.event.GameEventTurnBegan;
-import forge.game.event.GameEventTurnPhase;
-import forge.game.event.GameEventZone;
-import forge.game.event.IGameEventVisitor;
+import forge.game.event.*;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -62,6 +26,11 @@ import forge.gui.toolbox.special.PhaseLabel;
 import forge.net.FServer;
 import forge.util.Lang;
 import forge.util.maps.MapOfLists;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     private final FControl fc;

forge-gui/src/main/java/forge/control/FControlGamePlayback.java

@@ -1,25 +1,15 @@
 package forge.control;
 
+import com.google.common.eventbus.Subscribe;
+import forge.FThreads;
+import forge.game.event.*;
+import forge.gui.input.InputPlaybackControl;
+import forge.gui.match.CMatchUI;
+
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.google.common.eventbus.Subscribe;
-
-import forge.FThreads;
-import forge.game.event.GameEvent;
-import forge.game.event.GameEventBlockersDeclared;
-import forge.game.event.GameEventGameFinished;
-import forge.game.event.GameEventGameStarted;
-import forge.game.event.GameEventLandPlayed;
-import forge.game.event.GameEventPlayerPriority;
-import forge.game.event.GameEventSpellAbilityCast;
-import forge.game.event.GameEventSpellResolved;
-import forge.game.event.GameEventTurnPhase;
-import forge.game.event.IGameEventVisitor;
-import forge.gui.input.InputPlaybackControl;
-import forge.gui.match.CMatchUI;
-
 public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
     private final FControl fc;
 

forge-gui/src/main/java/forge/control/InputQueue.java

@@ -17,15 +17,15 @@
  */
 package forge.control;
 
-import java.util.Observable;
-import java.util.concurrent.BlockingDeque;
-import java.util.concurrent.LinkedBlockingDeque;
-
 import forge.game.Game;
 import forge.gui.input.Input;
 import forge.gui.input.InputLockUI;
 import forge.gui.input.InputSynchronized;
 
+import java.util.Observable;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.LinkedBlockingDeque;
+
 /**
  * <p>
  * InputControl class.

forge-gui/src/main/java/forge/control/KeyboardShortcuts.java

@@ -1,21 +1,5 @@
 package forge.control;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
-import javax.swing.KeyStroke;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.Singletons;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.FScreen;
@@ -24,6 +8,15 @@ import forge.gui.home.settings.VSubmenuPreferences.KeyboardShortcutField;
 import forge.gui.match.CMatchUI;
 import forge.gui.match.controllers.CDock;
 import forge.properties.ForgePreferences.FPref;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /** 
  * Consolidates keyboard shortcut assembly into one location

forge-gui/src/main/java/forge/control/RestartUtil.java

@@ -1,12 +1,12 @@
 package forge.control;
 
+import forge.Singletons;
+
 import java.io.File;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.util.List;
 
-import forge.Singletons;
-
 /** 
  * Restarts a java app.
  * Credit: http://leolewis.website.org/wordpress/2011/07/06/programmatically-restart-a-java-application/

forge-gui/src/main/java/forge/deck/io/DeckGroupSerializer.java

@@ -17,18 +17,16 @@
  */
 package forge.deck.io;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.collect.ImmutableList;
-
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.util.IItemSerializer;
 import forge.util.storage.StorageReaderFolder;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.List;
 
 /**
  * TODO: Write javadoc for this type.

forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java

@@ -1,16 +1,5 @@
 package forge.deck.io;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.Map.Entry;
-
 import forge.ImageCache;
 import forge.deck.Deck;
 import forge.item.PaperCard;
@@ -20,6 +9,13 @@ import freemarker.template.DefaultObjectWrapper;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
+
 public class DeckHtmlSerializer {
         public static void writeDeckHtml(final Deck d, final File f) {
             try {

forge-gui/src/main/java/forge/deck/io/OldDeckParser.java

@@ -17,17 +17,6 @@
  */
 package forge.deck.io;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.TreeMap;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.MutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.gui.toolbox.FOptionPane;
@@ -35,6 +24,16 @@ import forge.properties.NewConstants;
 import forge.util.FileSection;
 import forge.util.FileUtil;
 import forge.util.storage.IStorage;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.MutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.TreeMap;
 
 /**
  * TODO: Write javadoc for this type.

forge-gui/src/main/java/forge/error/BugReporter.java

@@ -17,45 +17,25 @@
  */
 package forge.error;
 
-import java.awt.Desktop;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.Toolkit;
-import java.awt.datatransfer.StringSelection;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.KeyStroke;
-
-import net.miginfocom.swing.MigLayout;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.FThreads;
 import forge.gui.WrapLayout;
 import forge.gui.toolbox.FHyperlink;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FOptionPane;
 import forge.util.BuildInfo;
+import net.miginfocom.swing.MigLayout;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.io.*;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * The class ErrorViewer. Enables showing and saving error messages that

forge-gui/src/main/java/forge/error/ExceptionHandler.java

@@ -18,10 +18,10 @@
 
 package forge.error;
 
-import java.lang.Thread.UncaughtExceptionHandler;
-
 import com.esotericsoftware.minlog.Log;
 
+import java.lang.Thread.UncaughtExceptionHandler;
+
 /**
  * This class handles all exceptions that weren't caught by showing the error to
  * the user.

forge-gui/src/main/java/forge/gauntlet/GauntletData.java

@@ -1,15 +1,14 @@
 package forge.gauntlet;
 
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
+import forge.deck.Deck;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.thoughtworks.xstream.annotations.XStreamOmitField;
-
-import forge.deck.Deck;
-
 
 /**
  * Handles layout saving and loading.

forge-gui/src/main/java/forge/gauntlet/GauntletIO.java

@@ -1,31 +1,23 @@
 package forge.gauntlet;
 
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Map.Entry;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-
 import forge.Singletons;
 import forge.deck.CardPool;
 import forge.error.BugReporter;
 import forge.item.PaperCard;
 import forge.properties.NewConstants;
 import forge.util.IgnoringXStream;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.*;
+import java.util.Map.Entry;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 public class GauntletIO {
     /** Prompt in text field for new (unsaved) built gauntlets. */

forge-gui/src/main/java/forge/gui/CardDetailPanel.java

@@ -18,23 +18,6 @@
 
 package forge.gui;
 
-import java.awt.Color;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.EtchedBorder;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.Singletons;
 import forge.card.CardCharacteristicName;
 import forge.card.CardEdition;
@@ -46,17 +29,22 @@ import forge.game.card.CardUtil;
 import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
-import forge.gui.toolbox.FLabel;
-import forge.gui.toolbox.FPanel;
-import forge.gui.toolbox.FScrollPane;
-import forge.gui.toolbox.FSkin;
-import forge.gui.toolbox.FHtmlViewer;
+import forge.gui.toolbox.*;
 import forge.gui.toolbox.FSkin.SkinnedPanel;
 import forge.item.IPaperCard;
 import forge.item.InventoryItemFromSet;
-import forge.item.SealedProduct;
 import forge.item.PreconDeck;
+import forge.item.SealedProduct;
 import forge.util.Lang;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.EtchedBorder;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 /**
  * The class CardDetailPanel. Shows the details of a card.

forge-gui/src/main/java/forge/gui/CardListViewer.java

@@ -18,19 +18,6 @@
 
 package forge.gui;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowFocusListener;
-import java.util.Collections;
-import java.util.List;
-
-import javax.swing.AbstractListModel;
-import javax.swing.Icon;
-import javax.swing.JList;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
 import forge.game.card.Card;
 import forge.gui.toolbox.FButton;
 import forge.gui.toolbox.FLabel;
@@ -38,6 +25,16 @@ import forge.gui.toolbox.FScrollPane;
 import forge.item.PaperCard;
 import forge.view.FDialog;
 
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * A simple class that shows a list of cards in a dialog with preview in its
  * right part.

forge-gui/src/main/java/forge/gui/CardPicturePanel.java

@@ -18,11 +18,6 @@
 
 package forge.gui;
 
-import java.awt.BorderLayout;
-import java.awt.image.BufferedImage;
-
-import javax.swing.JPanel;
-
 import forge.ImageCache;
 import forge.ImageKeys;
 import forge.Singletons;
@@ -34,6 +29,10 @@ import forge.gui.toolbox.imaging.FImageUtil;
 import forge.item.InventoryItem;
 import forge.properties.ForgePreferences.FPref;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
 /**
  * Displays image associated with a card or inventory item.
  * 

forge-gui/src/main/java/forge/gui/CardPreferences.java

@@ -1,20 +1,15 @@
 package forge.gui;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-
-import javax.xml.stream.XMLEventFactory;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.*;
 import javax.xml.stream.events.Attribute;
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 /** 
  * Preferences associated with individual cards

forge-gui/src/main/java/forge/gui/DualListBox.java

@@ -1,38 +1,23 @@
 package forge.gui;
 
-import java.awt.BorderLayout;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JPanel;
-import javax.swing.ListModel;
-import javax.swing.SwingUtilities;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 import forge.gui.match.CMatchUI;
-import forge.gui.toolbox.FButton;
-import forge.gui.toolbox.FLabel;
-import forge.gui.toolbox.FList;
-import forge.gui.toolbox.FPanel;
-import forge.gui.toolbox.FScrollPane;
-import forge.item.PaperCard;
+import forge.gui.toolbox.*;
 import forge.item.IPaperCard;
+import forge.item.PaperCard;
 import forge.view.FDialog;
 
+import javax.swing.*;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.ArrayList;
+import java.util.List;
+
 // An input box for handling the order of choices.
 // Left box has the original choices
 // Right box has the final order

forge-gui/src/main/java/forge/gui/FNetOverlay.java

@@ -1,27 +1,20 @@
 package forge.gui;
 
-import java.awt.Graphics;
-import java.awt.Rectangle;
+import forge.control.ChatArea;
+import forge.gui.toolbox.*;
+import forge.gui.toolbox.FSkin.SkinnedPanel;
+import forge.net.FServer;
+import forge.net.Lobby;
+import net.miginfocom.swing.MigLayout;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.swing.ScrollPaneConstants;
-import org.apache.commons.lang3.StringUtils;
-
-import net.miginfocom.swing.MigLayout;
-import forge.control.ChatArea;
-import forge.gui.toolbox.FLabel;
-import forge.gui.toolbox.FScrollPane;
-import forge.gui.toolbox.FSkin;
-import forge.gui.toolbox.FSkin.SkinnedPanel;
-import forge.gui.toolbox.FTextArea;
-import forge.gui.toolbox.FTextField;
-import forge.gui.toolbox.SmartScroller;
-import forge.net.FServer;
-import forge.net.Lobby;
-
 /** 
  * TODO: Write javadoc for this type.
  *

forge-gui/src/main/java/forge/gui/ForgeAction.java

@@ -17,9 +17,7 @@
  */
 package forge.gui;
 
-import javax.swing.AbstractAction;
-import javax.swing.AbstractButton;
-import javax.swing.JMenuItem;
+import javax.swing.*;
 
 @SuppressWarnings("serial")
 public abstract class ForgeAction extends AbstractAction {

forge-gui/src/main/java/forge/gui/GuiChoose.java

@@ -1,30 +1,21 @@
 package forge.gui;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
-import javax.swing.JList;
-import javax.swing.WindowConstants;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
-
 import forge.FThreads;
 import forge.Singletons;
 import forge.game.card.Card;
 import forge.gui.match.CMatchUI;
 import forge.gui.toolbox.FOptionPane;
 import forge.item.InventoryItem;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
 
 /** 
  * TODO: Write javadoc for this type.

forge-gui/src/main/java/forge/gui/GuiDialog.java

@@ -1,16 +1,14 @@
 package forge.gui;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
-import javax.swing.UIManager;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.FThreads;
 import forge.game.card.Card;
 import forge.gui.match.CMatchUI;
 import forge.gui.toolbox.FOptionPane;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
 
 /** 
  * Holds player interactions using standard windows 

forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java

@@ -17,23 +17,8 @@
  */
 package forge.gui;
 
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.swing.JFileChooser;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
-
 import forge.Singletons;
 import forge.card.CardCharacteristicName;
 import forge.game.Game;
@@ -44,18 +29,23 @@ import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CounterType;
 import forge.game.phase.PhaseType;
-import forge.gui.player.HumanPlay;
-import forge.gui.toolbox.FOptionPane;
 import forge.game.player.Player;
 import forge.game.spellability.AbilityManaPart;
 import forge.game.spellability.SpellAbility;
 import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 import forge.gui.input.InputSelectCardsFromList;
+import forge.gui.player.HumanPlay;
+import forge.gui.toolbox.FOptionPane;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.properties.ForgePreferences.FPref;
 
+import javax.swing.*;
+import java.io.*;
+import java.util.*;
+import java.util.Map.Entry;
+
 public final class GuiDisplayUtil {
     private GuiDisplayUtil() {
         throw new AssertionError();

forge-gui/src/main/java/forge/gui/GuiProgressBarWindow.java

@@ -17,14 +17,12 @@
  */
 package forge.gui;
 
-import java.awt.Dimension;
-
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.border.EmptyBorder;
-
 import forge.view.FDialog;
 
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+
 /**
  * <p>
  * Gui_ProgressBarWindow class.

forge-gui/src/main/java/forge/gui/GuiUtils.java

@@ -17,26 +17,19 @@
  */
 package forge.gui;
 
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontFormatException;
+import forge.game.card.Card;
+import forge.gui.match.VMatchUI;
+import forge.gui.match.views.VField;
+import forge.view.arcane.CardPanel;
+
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.JSeparator;
-import javax.swing.KeyStroke;
-
-import forge.game.card.Card;
-import forge.gui.match.VMatchUI;
-import forge.gui.match.views.VField;
-import forge.view.arcane.CardPanel;
-
 /**
  * <p>
  * GuiUtils class.

forge-gui/src/main/java/forge/gui/ImportDialog.java

@@ -17,7 +17,22 @@
  */
 package forge.gui;
 
-import java.awt.Font;
+import forge.Command;
+import forge.error.BugReporter;
+import forge.gui.ImportSourceAnalyzer.OpType;
+import forge.gui.toolbox.*;
+import forge.properties.NewConstants;
+import net.miginfocom.swing.MigLayout;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
+import javax.swing.*;
+import javax.swing.Timer;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -25,52 +40,10 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.channels.FileChannel;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JScrollBar;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
-import javax.swing.Timer;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import net.miginfocom.swing.MigLayout;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
-import forge.Command;
-import forge.error.BugReporter;
-import forge.gui.ImportSourceAnalyzer.OpType;
-import forge.gui.toolbox.FButton;
-import forge.gui.toolbox.FCheckBox;
-import forge.gui.toolbox.FComboBoxWrapper;
-import forge.gui.toolbox.FLabel;
-import forge.gui.toolbox.FOptionPane;
-import forge.gui.toolbox.FOverlay;
-import forge.gui.toolbox.FPanel;
-import forge.gui.toolbox.FScrollPane;
-import forge.gui.toolbox.FSkin;
-import forge.gui.toolbox.FTextField;
-import forge.gui.toolbox.SmartScroller;
-import forge.properties.NewConstants;
-
 /**
  * This class implements an overlay-based dialog that imports data from a user-selected directory
  * into the correct locations in the user and cache directories.  There is a lot of I/O and data

forge-gui/src/main/java/forge/gui/ImportSourceAnalyzer.java

@@ -17,25 +17,24 @@
  */
 package forge.gui;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+import forge.ImageCache;
+import forge.Singletons;
+import forge.card.CardEdition;
+import forge.card.CardRules;
+import forge.item.IPaperCard;
+import forge.item.PaperCard;
+import forge.properties.NewConstants;
+import forge.util.FileUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-import forge.ImageCache;
-import forge.Singletons;
-import forge.card.CardEdition;
-import forge.card.CardRules;
-import forge.item.PaperCard;
-import forge.item.IPaperCard;
-import forge.properties.NewConstants;
-import forge.util.FileUtil;
 
 public class ImportSourceAnalyzer {
     public static enum OpType {

forge-gui/src/main/java/forge/gui/InputProxy.java

@@ -17,11 +17,6 @@
  */
 package forge.gui;
 
-import java.awt.event.MouseEvent;
-import java.util.Observable;
-import java.util.Observer;
-import java.util.concurrent.atomic.AtomicReference;
-
 import forge.FThreads;
 import forge.Singletons;
 import forge.game.Game;
@@ -32,6 +27,11 @@ import forge.gui.input.Input;
 import forge.gui.input.InputPassPriority;
 import forge.gui.toolbox.FOptionPane;
 
+import java.awt.event.MouseEvent;
+import java.util.Observable;
+import java.util.Observer;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * <p>
  * GuiInput class.

forge-gui/src/main/java/forge/gui/ListChooser.java

@@ -18,32 +18,24 @@
 
 package forge.gui;
 
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
-import java.util.Collection;
-import java.util.List;
-
-import javax.swing.AbstractListModel;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
-import javax.swing.ListCellRenderer;
-import javax.swing.ListSelectionModel;
-import javax.swing.WindowConstants;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
-
 import forge.FThreads;
 import forge.gui.toolbox.FList;
 import forge.gui.toolbox.FMouseAdapter;
 import forge.gui.toolbox.FOptionPane;
 import forge.gui.toolbox.FScrollPane;
 
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * A simple class that shows a list of choices in a dialog. Two properties
  * influence the behavior of a list chooser: minSelection and maxSelection.

forge-gui/src/main/java/forge/gui/MouseUtil.java

@@ -1,9 +1,9 @@
 package forge.gui;
 
-import java.awt.Cursor;
-
 import forge.view.FView;
 
+import java.awt.*;
+
 public final class MouseUtil {
     private MouseUtil() { }
 

forge-gui/src/main/java/forge/gui/MultiLineLabel.java

@@ -17,10 +17,8 @@
  */
 package forge.gui;
 
-import java.awt.Rectangle;
-
-import javax.swing.JLabel;
-import javax.swing.SwingConstants;
+import javax.swing.*;
+import java.awt.*;
 
 /**
  * A {@link JLabel} with support for multi-line text that wraps when the line

forge-gui/src/main/java/forge/gui/MultiLineLabelUI.java

@@ -17,11 +17,12 @@
  */
 package forge.gui;
 
-import java.awt.Dimension;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Insets;
-import java.awt.Rectangle;
+import javax.swing.*;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.LabelUI;
+import javax.swing.plaf.basic.BasicLabelUI;
+import javax.swing.text.*;
+import java.awt.*;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
 import java.beans.PropertyChangeEvent;
@@ -29,21 +30,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.SwingConstants;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.LabelUI;
-import javax.swing.plaf.basic.BasicLabelUI;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
-import javax.swing.text.Element;
-import javax.swing.text.PlainDocument;
-import javax.swing.text.Segment;
-import javax.swing.text.Utilities;
-import javax.swing.text.View;
-
 /**
  * Label UI delegate that supports multiple lines and line wrapping. Hard line
  * breaks (<code>\n</code>) are preserved. If the dimensions of the label is too

forge-gui/src/main/java/forge/gui/SOverlayUtils.java

@@ -1,17 +1,5 @@
 package forge.gui;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.FocusManager;
-import javax.swing.JPanel;
-import javax.swing.Timer;
-
-import net.miginfocom.swing.MigLayout;
 import forge.Singletons;
 import forge.gui.match.TargetingOverlay;
 import forge.gui.toolbox.FLabel;
@@ -20,6 +8,13 @@ import forge.gui.toolbox.FPanel;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinnedButton;
 import forge.gui.toolbox.FSkin.SkinnedLabel;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.FocusManager;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /** 
  * All overlay interaction is handled here.

forge-gui/src/main/java/forge/gui/UnsortedListModel.java

@@ -1,13 +1,11 @@
 package forge.gui;
 
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.swing.AbstractListModel;
-import javax.swing.ListModel;
-
 
 @SuppressWarnings("serial")
 public class UnsortedListModel<T> extends AbstractListModel<T> {

forge-gui/src/main/java/forge/gui/WrapLayout.java

@@ -1,13 +1,7 @@
 package forge.gui;
 
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Insets;
-
-import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
+import java.awt.*;
 
 /**
  *  FlowLayout subclass that fully supports wrapping of components.

forge-gui/src/main/java/forge/gui/bazaar/CBazaarUI.java

@@ -1,14 +1,13 @@
 package forge.gui.bazaar;
 
-import javax.swing.SwingUtilities;
-
 import com.google.common.collect.Iterables;
-
 import forge.Command;
 import forge.gui.framework.ICDoc;
 import forge.gui.toolbox.FLabel;
 import forge.quest.bazaar.QuestBazaarManager;
 
+import javax.swing.*;
+
 /** 
  * TODO: Write javadoc for this type.
  *

forge-gui/src/main/java/forge/gui/bazaar/VBazaarUI.java

@@ -1,11 +1,5 @@
 package forge.gui.bazaar;
 
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.border.Border;
-
-import net.miginfocom.swing.MigLayout;
 import forge.Command;
 import forge.Singletons;
 import forge.gui.framework.FScreen;
@@ -16,6 +10,10 @@ import forge.gui.toolbox.FSkin;
 import forge.quest.bazaar.QuestBazaarManager;
 import forge.quest.gui.ViewStall;
 import forge.view.FView;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import javax.swing.border.Border;
 
 
 /** Lays out containers and borders for resizeable layout and

forge-gui/src/main/java/forge/gui/deckchooser/DeckgenUtil.java

@@ -1,20 +1,12 @@
 package forge.gui.deckchooser;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
-
 import forge.Singletons;
 import forge.card.CardDb;
 import forge.deck.CardPool;
 import forge.deck.Deck;
-import forge.deck.generation.DeckGenerator2Color;
-import forge.deck.generation.DeckGenerator3Color;
-import forge.deck.generation.DeckGenerator5Color;
-import forge.deck.generation.DeckGeneratorBase;
-import forge.deck.generation.DeckGeneratorMonoColor;
+import forge.deck.generation.*;
 import forge.gui.toolbox.FOptionPane;
 import forge.gui.toolbox.itemmanager.DeckManager;
 import forge.item.PaperCard;
@@ -28,6 +20,10 @@ import forge.util.Lang;
 import forge.util.MyRandom;
 import forge.util.storage.IStorage;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /** 
  * Utility collection for various types of decks.
  * - Builders (builds or retrieves deck based on a selection)

forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBox.java

@@ -1,12 +1,5 @@
 package forge.gui.deckchooser;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.DefaultComboBoxModel;
-
 import forge.gui.MouseUtil;
 import forge.gui.MouseUtil.MouseCursor;
 import forge.gui.deckchooser.DecksComboBox.DeckType;
@@ -14,6 +7,12 @@ import forge.gui.toolbox.FComboBox.TextAlignment;
 import forge.gui.toolbox.FComboBoxWrapper;
 import forge.gui.toolbox.FSkin;
 
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
 public class DecksComboBox extends FComboBoxWrapper<DeckType> {
 
     public enum DeckType {

forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBoxEvent.java

@@ -1,9 +1,9 @@
 package forge.gui.deckchooser;
 
-import java.util.EventObject;
-
 import forge.gui.deckchooser.DecksComboBox.DeckType;
 
+import java.util.EventObject;
+
 @SuppressWarnings("serial")
 public class DecksComboBoxEvent extends EventObject {
 

forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java

@@ -1,15 +1,5 @@
 package forge.gui.deckchooser;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.JPanel;
-
-import net.miginfocom.swing.MigLayout;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.Command;
 import forge.Singletons;
 import forge.deck.Deck;
@@ -26,6 +16,13 @@ import forge.quest.QuestController;
 import forge.quest.QuestEvent;
 import forge.quest.QuestEventChallenge;
 import forge.quest.QuestUtil;
+import net.miginfocom.swing.MigLayout;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 @SuppressWarnings("serial")
 public class FDeckChooser extends JPanel implements IDecksComboBoxListener {

forge-gui/src/main/java/forge/gui/deckchooser/FDeckViewer.java

@@ -1,20 +1,5 @@
 package forge.gui.deckchooser;
 
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import java.awt.datatransfer.StringSelection;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.swing.JPanel;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import net.miginfocom.swing.MigLayout;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
@@ -26,13 +11,22 @@ import forge.gui.toolbox.FOptionPane;
 import forge.gui.toolbox.itemmanager.CardManager;
 import forge.gui.toolbox.itemmanager.ItemManagerContainer;
 import forge.gui.toolbox.itemmanager.ItemManagerModel;
-import forge.gui.toolbox.itemmanager.views.GroupDef;
-import forge.gui.toolbox.itemmanager.views.ImageView;
-import forge.gui.toolbox.itemmanager.views.ItemColumn;
-import forge.gui.toolbox.itemmanager.views.SColumnUtil;
-import forge.gui.toolbox.itemmanager.views.ColumnDef;
+import forge.gui.toolbox.itemmanager.views.*;
 import forge.item.PaperCard;
 import forge.view.FDialog;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 @SuppressWarnings("serial")
 public class FDeckViewer extends FDialog {

forge-gui/src/main/java/forge/gui/deckchooser/GenerateThemeDeck.java

@@ -17,11 +17,6 @@
  */
 package forge.gui.deckchooser;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 import forge.Singletons;
 import forge.deck.CardPool;
 import forge.deck.generation.DeckGeneratorBase;
@@ -29,6 +24,11 @@ import forge.error.BugReporter;
 import forge.util.FileUtil;
 import forge.util.MyRandom;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 /**
  * <p>
  * GenerateThemeDeck class.

forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java

@@ -17,23 +17,10 @@
  */
 package forge.gui.deckeditor;
 
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.util.HashMap;
-import java.util.Map.Entry;
-
-import javax.swing.SwingUtilities;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
 import forge.Command;
 import forge.Singletons;
 import forge.deck.DeckBase;
-import forge.gui.deckeditor.controllers.ACEditorBase;
-import forge.gui.deckeditor.controllers.CEditorConstructed;
-import forge.gui.deckeditor.controllers.CProbabilities;
-import forge.gui.deckeditor.controllers.CStatistics;
-import forge.gui.deckeditor.controllers.DeckController;
+import forge.gui.deckeditor.controllers.*;
 import forge.gui.deckeditor.views.VCardCatalog;
 import forge.gui.deckeditor.views.VCurrentDeck;
 import forge.gui.framework.FScreen;
@@ -44,6 +31,14 @@ import forge.gui.toolbox.itemmanager.ItemManager;
 import forge.item.InventoryItem;
 import forge.util.ItemPool;
 
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.util.HashMap;
+import java.util.Map.Entry;
+
 /**
  * Constructs instance of deck editor UI controller, used as a single point of
  * top-level control for child UIs. Tasks targeting the view of individual

forge-gui/src/main/java/forge/gui/deckeditor/DeckImport.java

@@ -17,23 +17,6 @@
  */
 package forge.gui.deckeditor;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.text.DateFormatSymbols;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Element;
-import javax.swing.text.ElementIterator;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.Singletons;
 import forge.deck.Deck;
 import forge.deck.DeckBase;
@@ -41,18 +24,25 @@ import forge.deck.DeckRecognizer;
 import forge.deck.DeckRecognizer.TokenType;
 import forge.deck.DeckSection;
 import forge.gui.deckeditor.controllers.ACEditorBase;
-import forge.gui.toolbox.FButton;
-import forge.gui.toolbox.FCheckBox;
-import forge.gui.toolbox.FComboBox;
-import forge.gui.toolbox.FHtmlViewer;
-import forge.gui.toolbox.FLabel;
-import forge.gui.toolbox.FOptionPane;
-import forge.gui.toolbox.FScrollPane;
-import forge.gui.toolbox.FSkin;
-import forge.gui.toolbox.FTextArea;
-import forge.item.PaperCard;
+import forge.gui.toolbox.*;
 import forge.item.InventoryItem;
+import forge.item.PaperCard;
 import forge.view.FDialog;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Element;
+import javax.swing.text.ElementIterator;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.text.DateFormatSymbols;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
 
 /**
  * 

forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java

@@ -1,14 +1,7 @@
 package forge.gui.deckeditor;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
-
 import forge.Singletons;
 import forge.StaticData;
 import forge.card.CardEdition;
@@ -30,6 +23,11 @@ import forge.quest.QuestEvent;
 import forge.util.IHasName;
 import forge.util.storage.IStorage;
 import forge.util.storage.StorageImmediatelySerialized;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
 
 // Adding a generic to this class creates compile problems in ItemManager (that I can not fix)
 public class DeckProxy implements InventoryItem {

forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java

@@ -1,7 +1,5 @@
 package forge.gui.deckeditor;
 
-import org.apache.commons.lang3.StringUtils;
-
 import forge.Singletons;
 import forge.gui.deckeditor.controllers.CAllDecks;
 import forge.gui.deckeditor.controllers.DeckController;
@@ -9,6 +7,7 @@ import forge.gui.deckeditor.views.VAllDecks;
 import forge.gui.deckeditor.views.VCurrentDeck;
 import forge.gui.framework.FScreen;
 import forge.gui.toolbox.FOptionPane;
+import org.apache.commons.lang3.StringUtils;
 
 /** 
  * Handles editor preferences saving and loading.

forge-gui/src/main/java/forge/gui/deckeditor/VDeckEditorUI.java

@@ -1,12 +1,12 @@
 package forge.gui.deckeditor;
 
-import javax.swing.SwingUtilities;
-
 import forge.Singletons;
 import forge.gui.deckeditor.views.VCardCatalog;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.IVTopLevelUI;
 
+import javax.swing.*;
+
 /** 
 /** 
  * Top level view class; instantiates and assembles

forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java

@@ -17,17 +17,6 @@
  */
 package forge.gui.deckeditor.controllers;
 
-import java.awt.Toolkit;
-import java.awt.event.KeyEvent;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map.Entry;
-
-import javax.swing.JMenu;
-import javax.swing.JPopupMenu;
-import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
-
 import forge.Command;
 import forge.Singletons;
 import forge.deck.Deck;
@@ -37,11 +26,7 @@ import forge.gui.GuiChoose;
 import forge.gui.GuiUtils;
 import forge.gui.deckeditor.CDeckEditorUI;
 import forge.gui.deckeditor.menus.CDeckEditorUIMenus;
-import forge.gui.framework.DragCell;
-import forge.gui.framework.FScreen;
-import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
-import forge.gui.framework.SRearrangingUtil;
+import forge.gui.framework.*;
 import forge.gui.menus.IMenuProvider;
 import forge.gui.toolbox.ContextMenuBuilder;
 import forge.gui.toolbox.FLabel;
@@ -54,6 +39,13 @@ import forge.properties.ForgePreferences.FPref;
 import forge.util.ItemPool;
 import forge.view.FView;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map.Entry;
+
 /**
  * Maintains a generically typed architecture for various editing
  * environments.  A basic editor instance requires a card catalog, the

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java

@@ -1,14 +1,5 @@
 package forge.gui.deckeditor.controllers;
 
-import java.awt.Dialog.ModalityType;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.io.File;
-
-import javax.swing.JFileChooser;
-import javax.swing.SwingUtilities;
-import javax.swing.filechooser.FileFilter;
-
 import forge.Command;
 import forge.Singletons;
 import forge.deck.Deck;
@@ -25,6 +16,13 @@ import forge.gui.framework.ICDoc;
 import forge.item.InventoryItem;
 import forge.properties.NewConstants;
 
+import javax.swing.*;
+import javax.swing.filechooser.FileFilter;
+import java.awt.Dialog.ModalityType;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.io.File;
+
 /** 
  * Controls the "current deck" panel in the deck editor UI.
  * 

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java

@@ -3,7 +3,6 @@ package forge.gui.deckeditor.controllers;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
-
 import forge.Command;
 import forge.Singletons;
 import forge.card.CardDb;
@@ -11,17 +10,13 @@ import forge.card.CardRulesPredicates;
 import forge.card.MagicColor;
 import forge.deck.Deck;
 import forge.deck.DeckBase;
-import forge.deck.generation.DeckGenerator2Color;
-import forge.deck.generation.DeckGenerator3Color;
-import forge.deck.generation.DeckGenerator5Color;
-import forge.deck.generation.DeckGeneratorBase;
-import forge.deck.generation.DeckGeneratorMonoColor;
+import forge.deck.generation.*;
 import forge.gui.deckeditor.CDeckEditorUI;
 import forge.gui.deckeditor.SEditorIO;
 import forge.gui.deckeditor.views.VDeckgen;
 import forge.gui.framework.ICDoc;
-import forge.item.PaperCard;
 import forge.item.InventoryItem;
+import forge.item.PaperCard;
 import forge.properties.ForgePreferences.FPref;
 import forge.util.Aggregates;
 

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java

@@ -17,14 +17,8 @@
  */
 package forge.gui.deckeditor.controllers;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.google.common.base.Predicates;
 import com.google.common.base.Supplier;
-
 import forge.Command;
 import forge.Singletons;
 import forge.card.CardRulesPredicates;
@@ -39,11 +33,16 @@ import forge.gui.toolbox.itemmanager.CardManager;
 import forge.gui.toolbox.itemmanager.SItemManagerUtil;
 import forge.gui.toolbox.itemmanager.views.ColumnDef;
 import forge.gui.toolbox.itemmanager.views.GroupDef;
-import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.gui.toolbox.itemmanager.views.ItemColumn;
+import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.item.PaperCard;
 import forge.util.ItemPool;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 /**
  * Child controller for constructed deck editor UI.
  * This is the least restrictive mode;

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java

@@ -17,14 +17,8 @@
  */
 package forge.gui.deckeditor.controllers;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.google.common.base.Predicates;
 import com.google.common.base.Supplier;
-
 import forge.Command;
 import forge.Singletons;
 import forge.card.CardRulesPredicates;
@@ -36,12 +30,17 @@ import forge.gui.toolbox.itemmanager.CardManager;
 import forge.gui.toolbox.itemmanager.SItemManagerUtil;
 import forge.gui.toolbox.itemmanager.views.ColumnDef;
 import forge.gui.toolbox.itemmanager.views.GroupDef;
-import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.gui.toolbox.itemmanager.views.ItemColumn;
+import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.item.PaperCard;
 import forge.properties.ForgePreferences.FPref;
 import forge.util.ItemPool;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 /**
  * Child controller for constructed deck editor UI.
  * This is the least restrictive mode;

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

@@ -17,9 +17,6 @@
  */
 package forge.gui.deckeditor.controllers;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
 import forge.Singletons;
 import forge.card.MagicColor;
 import forge.deck.Deck;
@@ -46,6 +43,9 @@ import forge.properties.ForgePreferences.FPref;
 import forge.util.ItemPool;
 import forge.util.MyRandom;
 
+import java.util.Map;
+import java.util.Map.Entry;
+
 /**
  * Updates the deck editor UI as necessary draft selection mode.
  * 

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java

@@ -17,10 +17,7 @@
  */
 package forge.gui.deckeditor.controllers;
 
-import java.util.Map.Entry;
-
 import com.google.common.base.Supplier;
-
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.deck.DeckSection;
@@ -40,6 +37,8 @@ import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.item.PaperCard;
 import forge.util.storage.IStorage;
 
+import java.util.Map.Entry;
+
 /**
  * Child controller for limited deck editor UI.
  * 

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorPreferences.java

@@ -1,14 +1,13 @@
 package forge.gui.deckeditor.controllers;
 
-import java.util.HashMap;
-
-import javax.swing.JCheckBox;
-
 import forge.Command;
 import forge.gui.deckeditor.views.VEditorPreferences;
 import forge.gui.framework.ICDoc;
 import forge.gui.toolbox.itemmanager.views.ColumnDef;
 
+import javax.swing.*;
+import java.util.HashMap;
+
 /** 
  * Controls the "analysis" panel in the deck editor UI.
  * 

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java

@@ -18,14 +18,9 @@
 package forge.gui.deckeditor.controllers;
 
 // import java.awt.Font;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
-
 import forge.Command;
 import forge.Singletons;
 import forge.deck.Deck;
@@ -41,15 +36,19 @@ import forge.gui.toolbox.itemmanager.CardManager;
 import forge.gui.toolbox.itemmanager.SItemManagerUtil;
 import forge.gui.toolbox.itemmanager.views.ColumnDef;
 import forge.gui.toolbox.itemmanager.views.GroupDef;
-import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.gui.toolbox.itemmanager.views.ItemColumn;
-import forge.item.PaperCard;
+import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.item.InventoryItem;
+import forge.item.PaperCard;
 import forge.properties.ForgePreferences.FPref;
 import forge.quest.QuestController;
 import forge.util.ItemPool;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 //import forge.quest.data.QuestBoosterPack;
 

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java

@@ -17,19 +17,7 @@
  */
 package forge.gui.deckeditor.controllers;
 
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.swing.JLabel;
-
-import org.apache.commons.lang3.tuple.Pair;
-
 import com.google.common.base.Function;
-
 import forge.Command;
 import forge.Singletons;
 import forge.deck.CardPool;
@@ -37,33 +25,31 @@ import forge.deck.Deck;
 import forge.deck.DeckBase;
 import forge.deck.DeckSection;
 import forge.gui.CardListViewer;
-import forge.gui.deckeditor.views.VAllDecks;
-import forge.gui.deckeditor.views.VCardCatalog;
-import forge.gui.deckeditor.views.VCurrentDeck;
-import forge.gui.deckeditor.views.VDeckgen;
-import forge.gui.deckeditor.views.VProbabilities;
+import forge.gui.deckeditor.views.*;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.FScreen;
 import forge.gui.home.quest.CSubmenuQuestDecks;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FOptionPane;
 import forge.gui.toolbox.FSkin;
-import forge.gui.toolbox.itemmanager.SpellShopManager;
 import forge.gui.toolbox.itemmanager.SItemManagerUtil;
+import forge.gui.toolbox.itemmanager.SpellShopManager;
 import forge.gui.toolbox.itemmanager.views.ColumnDef;
-import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.gui.toolbox.itemmanager.views.ItemColumn;
-import forge.item.BoosterPack;
-import forge.item.PaperCard;
-import forge.item.FatPack;
-import forge.item.IPaperCard;
-import forge.item.InventoryItem;
-import forge.item.SealedProduct;
-import forge.item.PreconDeck;
-import forge.item.TournamentPack;
+import forge.gui.toolbox.itemmanager.views.SColumnUtil;
+import forge.item.*;
 import forge.quest.QuestController;
 import forge.quest.io.ReadPriceList;
 import forge.util.ItemPool;
+import org.apache.commons.lang3.tuple.Pair;
+
+import javax.swing.*;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * Child controller for quest card shop UI.

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java

@@ -17,13 +17,9 @@
  */
 package forge.gui.deckeditor.controllers;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
 import com.google.common.collect.Iterables;
-
 import forge.Singletons;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
@@ -36,13 +32,16 @@ import forge.gui.toolbox.itemmanager.CardManager;
 import forge.gui.toolbox.itemmanager.SItemManagerUtil;
 import forge.gui.toolbox.itemmanager.views.ColumnDef;
 import forge.gui.toolbox.itemmanager.views.GroupDef;
-import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.gui.toolbox.itemmanager.views.ItemColumn;
+import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.item.PaperCard;
 import forge.properties.ForgePreferences.FPref;
 import forge.util.ItemPool;
 import forge.util.storage.IStorage;
 
+import java.util.Map;
+import java.util.Map.Entry;
+
 /**
  * Child controller for constructed deck editor UI.
  * This is the least restrictive mode;

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java

@@ -1,22 +1,17 @@
 package forge.gui.deckeditor.controllers;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import forge.Command;
 import forge.deck.DeckBase;
 import forge.gui.deckeditor.CDeckEditorUI;
 import forge.gui.deckeditor.views.VProbabilities;
 import forge.gui.framework.ICDoc;
-import forge.item.PaperCard;
 import forge.item.InventoryItem;
+import forge.item.PaperCard;
 import forge.util.ItemPool;
 import forge.util.MyRandom;
 
+import java.util.*;
+
 /** 
  * Controls the "analysis" panel in the deck editor UI.
  * 

forge-gui/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java

@@ -1,12 +1,7 @@
 package forge.gui.deckeditor.controllers;
 
-import java.util.Map.Entry;
-
-import javax.swing.JLabel;
-
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
-
 import forge.Command;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
@@ -16,10 +11,13 @@ import forge.gui.deckeditor.CDeckEditorUI;
 import forge.gui.deckeditor.views.VStatistics;
 import forge.gui.framework.ICDoc;
 import forge.gui.toolbox.itemmanager.SItemManagerUtil;
-import forge.item.PaperCard;
 import forge.item.InventoryItem;
+import forge.item.PaperCard;
 import forge.util.ItemPool;
 
+import javax.swing.*;
+import java.util.Map.Entry;
+
 
 /** 
  * Controls the "analysis" panel in the deck editor UI.

forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java

@@ -17,14 +17,12 @@
  */
 package forge.gui.deckeditor.controllers;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.base.Supplier;
-
 import forge.deck.DeckBase;
 import forge.gui.deckeditor.menus.DeckFileMenu;
 import forge.gui.deckeditor.views.VCurrentDeck;
 import forge.util.storage.IStorage;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * TODO: Write javadoc for this type.

forge-gui/src/main/java/forge/gui/deckeditor/menus/CDeckEditorUIMenus.java

@@ -1,10 +1,9 @@
 package forge.gui.deckeditor.menus;
 
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.JMenu;
-
 /**
  * Gets the menus associated with the Game screen.
  *

forge-gui/src/main/java/forge/gui/deckeditor/menus/DeckFileMenu.java

@@ -1,18 +1,16 @@
 package forge.gui.deckeditor.menus;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-
-import javax.swing.JMenu;
-import javax.swing.JSeparator;
-
 import forge.gui.deckeditor.CDeckEditorUI;
 import forge.gui.deckeditor.views.VCurrentDeck;
 import forge.gui.menus.MenuUtil;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinnedMenuItem;
 
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+
 /**
  * Returns a JMenu containing options associated with current game.
  * <p>

forge-gui/src/main/java/forge/gui/deckeditor/views/VAllDecks.java

@@ -1,8 +1,5 @@
 package forge.gui.deckeditor.views;
 
-import javax.swing.JPanel;
-
-import net.miginfocom.swing.MigLayout;
 import forge.game.GameType;
 import forge.gui.deckeditor.controllers.CAllDecks;
 import forge.gui.framework.DragCell;
@@ -11,6 +8,9 @@ import forge.gui.framework.EDocID;
 import forge.gui.framework.IVDoc;
 import forge.gui.toolbox.itemmanager.DeckManager;
 import forge.gui.toolbox.itemmanager.ItemManagerContainer;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
 
 /** 
  * Assembles Swing components of all deck viewer in deck editor.

forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java

@@ -1,8 +1,5 @@
 package forge.gui.deckeditor.views;
 
-import javax.swing.JPanel;
-import net.miginfocom.swing.MigLayout;
-
 import forge.gui.deckeditor.controllers.CCardCatalog;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
@@ -11,6 +8,9 @@ import forge.gui.framework.IVDoc;
 import forge.gui.toolbox.itemmanager.ItemManager;
 import forge.gui.toolbox.itemmanager.ItemManagerContainer;
 import forge.item.InventoryItem;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
 
 /** 
  * Assembles Swing components of card catalog in deck editor.

forge-gui/src/main/java/forge/gui/deckeditor/views/VCurrentDeck.java

@@ -1,8 +1,5 @@
 package forge.gui.deckeditor.views;
 
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import net.miginfocom.swing.MigLayout;
 import forge.gui.deckeditor.controllers.CCurrentDeck;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
@@ -14,6 +11,9 @@ import forge.gui.toolbox.FTextField;
 import forge.gui.toolbox.itemmanager.ItemManager;
 import forge.gui.toolbox.itemmanager.ItemManagerContainer;
 import forge.item.InventoryItem;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
 
 
 /** 

forge-gui/src/main/java/forge/gui/deckeditor/views/VDeckgen.java

@@ -1,12 +1,12 @@
 package forge.gui.deckeditor.views;
 
-import net.miginfocom.swing.MigLayout;
 import forge.gui.deckeditor.controllers.CDeckgen;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.IVDoc;
 import forge.gui.toolbox.FLabel;
+import net.miginfocom.swing.MigLayout;
 
 /** 
  * Assembles Swing components of deck editor analysis tab.

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

@@ -1,8 +1,5 @@
 package forge.gui.deckeditor.views;
 
-import javax.swing.JCheckBox;
-import javax.swing.JPanel;
-import net.miginfocom.swing.MigLayout;
 import forge.gui.deckeditor.controllers.CEditorPreferences;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
@@ -12,6 +9,9 @@ import forge.gui.toolbox.FCheckBox;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FScrollPane;
 import forge.gui.toolbox.FSkin;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
 
 /** 
  * Assembles Swing components of deck editor analysis tab.

forge-gui/src/main/java/forge/gui/deckeditor/views/VProbabilities.java

@@ -1,14 +1,5 @@
 package forge.gui.deckeditor.views;
 
-import java.awt.Font;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.List;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import net.miginfocom.swing.MigLayout;
 import forge.deck.DeckBase;
 import forge.gui.deckeditor.CDeckEditorUI;
 import forge.gui.deckeditor.controllers.ACEditorBase;
@@ -20,8 +11,15 @@ import forge.gui.framework.IVDoc;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FScrollPane;
 import forge.gui.toolbox.FSkin;
-import forge.item.PaperCard;
 import forge.item.InventoryItem;
+import forge.item.PaperCard;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.List;
 
 /** 
  * Assembles Swing components of deck editor analysis tab.

forge-gui/src/main/java/forge/gui/deckeditor/views/VStatistics.java

@@ -1,20 +1,19 @@
 package forge.gui.deckeditor.views;
 
-import java.awt.Font;
-
-import forge.gui.toolbox.FLabel;
-
-import javax.swing.JPanel;
-import net.miginfocom.swing.MigLayout;
 import forge.gui.deckeditor.controllers.CStatistics;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.IVDoc;
+import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FScrollPane;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinImage;
 import forge.gui.toolbox.itemmanager.SItemManagerUtil;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import java.awt.*;
 
 /** 
  * Assembles Swing components of deck editor analysis tab.

forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java

@@ -17,17 +17,16 @@
  */
 package forge.gui.download;
 
-import java.io.File;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.ImageCache;
 import forge.Singletons;
 import forge.card.CardRules;
 import forge.item.PaperCard;
 import forge.properties.NewConstants;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.util.Map;
+import java.util.TreeMap;
 
 @SuppressWarnings("serial")
 public class GuiDownloadPicturesLQ extends GuiDownloader {

forge-gui/src/main/java/forge/gui/download/GuiDownloadPrices.java

@@ -17,11 +17,11 @@
  */
 package forge.gui.download;
 
+import forge.properties.NewConstants;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import forge.properties.NewConstants;
-
 @SuppressWarnings("serial")
 public class GuiDownloadPrices extends GuiDownloader {
     public GuiDownloadPrices() {

forge-gui/src/main/java/forge/gui/download/GuiDownloadQuestImages.java

@@ -17,11 +17,11 @@
  */
 package forge.gui.download;
 
+import forge.properties.NewConstants;
+
 import java.util.Map;
 import java.util.TreeMap;
 
-import forge.properties.NewConstants;
-
 /** */
 @SuppressWarnings("serial")
 public class GuiDownloadQuestImages extends GuiDownloader {

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

@@ -17,19 +17,17 @@
  */
 package forge.gui.download;
 
-import java.io.File;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.collect.Iterables;
-
 import forge.ImageCache;
 import forge.Singletons;
 import forge.card.CardEdition;
 import forge.item.PaperCard;
 import forge.properties.NewConstants;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.util.Map;
+import java.util.TreeMap;
 
 @SuppressWarnings("serial")
 public class GuiDownloadSetPicturesLQ extends GuiDownloader {

forge-gui/src/main/java/forge/gui/download/GuiDownloader.java

@@ -17,57 +17,34 @@
  */
 package forge.gui.download;
 
-import java.awt.EventQueue;
+import com.esotericsoftware.minlog.Log;
+import forge.Command;
+import forge.ImageCache;
+import forge.error.BugReporter;
+import forge.gui.SOverlayUtils;
+import forge.gui.toolbox.*;
+import forge.util.FileUtil;
+import forge.util.MyRandom;
+import net.miginfocom.swing.MigLayout;
+import org.apache.commons.lang3.tuple.Pair;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.net.ConnectException;
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.MalformedURLException;
-import java.net.Proxy;
-import java.net.URL;
+import java.net.*;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
 
-import javax.swing.AbstractButton;
-import javax.swing.DefaultBoundedRangeModel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import net.miginfocom.swing.MigLayout;
-
-import org.apache.commons.lang3.tuple.Pair;
-
-import com.esotericsoftware.minlog.Log;
-
-import forge.Command;
-import forge.ImageCache;
-import forge.error.BugReporter;
-import forge.gui.SOverlayUtils;
-import forge.gui.toolbox.FButton;
-import forge.gui.toolbox.FLabel;
-import forge.gui.toolbox.FOverlay;
-import forge.gui.toolbox.FPanel;
-import forge.gui.toolbox.FProgressBar;
-import forge.gui.toolbox.FRadioButton;
-import forge.gui.toolbox.FSkin;
-import forge.gui.toolbox.JXButtonPanel;
-import forge.util.FileUtil;
-import forge.util.MyRandom;
-
 @SuppressWarnings("serial")
 public abstract class GuiDownloader extends DefaultBoundedRangeModel implements Runnable {
     public static final Proxy.Type[] TYPES = Proxy.Type.values();

forge-gui/src/main/java/forge/gui/framework/DragCell.java

@@ -1,22 +1,6 @@
 package forge.gui.framework;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-
-import net.miginfocom.swing.MigLayout;
-
 import com.google.common.collect.Lists;
-
 import forge.Singletons;
 import forge.gui.toolbox.FPanel;
 import forge.gui.toolbox.FSkin;
@@ -24,6 +8,14 @@ import forge.gui.toolbox.FSkin.SkinImage;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.view.FView;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Top-level container in drag layout.  A cell holds

forge-gui/src/main/java/forge/gui/framework/DragTab.java

@@ -1,13 +1,11 @@
 package forge.gui.framework;
 
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.swing.border.EmptyBorder;
-
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinnedLabel;
 
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+
 /**
  * The tab label object in drag layout.
  * No modification should be necessary to this object.

forge-gui/src/main/java/forge/gui/framework/EDocID.java

@@ -3,22 +3,12 @@
  */
 package forge.gui.framework;
 
-import forge.gui.deckeditor.views.VAllDecks;
-import forge.gui.deckeditor.views.VCardCatalog;
-import forge.gui.deckeditor.views.VCurrentDeck;
-import forge.gui.deckeditor.views.VDeckgen;
-import forge.gui.deckeditor.views.VEditorPreferences;
-import forge.gui.deckeditor.views.VProbabilities;
-import forge.gui.deckeditor.views.VStatistics;
+import forge.gui.deckeditor.views.*;
 import forge.gui.home.gauntlet.VSubmenuGauntletBuild;
 import forge.gui.home.gauntlet.VSubmenuGauntletContests;
 import forge.gui.home.gauntlet.VSubmenuGauntletLoad;
 import forge.gui.home.gauntlet.VSubmenuGauntletQuick;
-import forge.gui.home.quest.VSubmenuChallenges;
-import forge.gui.home.quest.VSubmenuDuels;
-import forge.gui.home.quest.VSubmenuQuestData;
-import forge.gui.home.quest.VSubmenuQuestDecks;
-import forge.gui.home.quest.VSubmenuQuestPrefs;
+import forge.gui.home.quest.*;
 import forge.gui.home.sanctioned.VSubmenuConstructed;
 import forge.gui.home.sanctioned.VSubmenuDraft;
 import forge.gui.home.sanctioned.VSubmenuSealed;
@@ -28,22 +18,14 @@ import forge.gui.home.settings.VSubmenuPreferences;
 import forge.gui.home.settings.VSubmenuReleaseNotes;
 import forge.gui.home.variant.VSubmenuArchenemy;
 import forge.gui.home.variant.VSubmenuCommander;
-//import forge.gui.home.variant.VSubmenuPlanechase;
-//import forge.gui.home.variant.VSubmenuVanguard;
-import forge.gui.match.views.VAntes;
-import forge.gui.match.views.VCombat;
-import forge.gui.match.views.VDetail;
-import forge.gui.match.views.VDev;
-import forge.gui.match.views.VDock;
-import forge.gui.match.views.VLog;
-import forge.gui.match.views.VPrompt;
-import forge.gui.match.views.VPicture;
-import forge.gui.match.views.VPlayers;
-import forge.gui.match.views.VStack;
+import forge.gui.match.views.*;
 import forge.gui.workshop.views.VCardDesigner;
 import forge.gui.workshop.views.VCardScript;
 import forge.gui.workshop.views.VWorkshopCatalog;
 
+//import forge.gui.home.variant.VSubmenuPlanechase;
+//import forge.gui.home.variant.VSubmenuVanguard;
+
 /**
  * These are the identifiers for tabs found in the drag layout.
  * These IDs are used in the save XML and card layouts.

forge-gui/src/main/java/forge/gui/framework/FScreen.java

@@ -1,7 +1,5 @@
 package forge.gui.framework;
 
-import java.io.File;
-
 import forge.Singletons;
 import forge.gui.bazaar.CBazaarUI;
 import forge.gui.bazaar.VBazaarUI;
@@ -19,6 +17,8 @@ import forge.gui.workshop.VWorkshopUI;
 import forge.properties.FileLocation;
 import forge.properties.NewConstants;
 
+import java.io.File;
+
 /** 
  * Definitions for Forge screens
  *

forge-gui/src/main/java/forge/gui/framework/IVTopLevelUI.java

@@ -1,8 +1,6 @@
 package forge.gui.framework;
 
-import forge.gui.framework.FScreen;
-
-/** 
+/**
  * This interface provides a unifying type for all top-level
  * UI components.
  * 

forge-gui/src/main/java/forge/gui/framework/SDisplayUtil.java

@@ -1,25 +1,13 @@
 package forge.gui.framework;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Insets;
-import java.awt.KeyboardFocusManager;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-
 import forge.FThreads;
 import forge.view.FFrame;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.Timer;
+import java.util.TimerTask;
+
 /** 
  * Experimental static factory for generic operations carried out
  * onto specific members of the framework. Doublestrike 11-04-12

forge-gui/src/main/java/forge/gui/framework/SLayoutIO.java

@@ -1,31 +1,5 @@
 package forge.gui.framework;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.swing.border.EmptyBorder;
-import javax.xml.stream.XMLEventFactory;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.events.Attribute;
-import javax.xml.stream.events.StartElement;
-import javax.xml.stream.events.XMLEvent;
-
 import forge.Singletons;
 import forge.gui.toolbox.FAbsolutePositioner;
 import forge.properties.FileLocation;
@@ -37,6 +11,19 @@ import forge.util.maps.MapOfLists;
 import forge.view.FFrame;
 import forge.view.FView;
 
+import javax.swing.border.EmptyBorder;
+import javax.xml.stream.*;
+import javax.xml.stream.events.Attribute;
+import javax.xml.stream.events.StartElement;
+import javax.xml.stream.events.XMLEvent;
+import java.awt.*;
+import java.io.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 
 /**
  * Handles layout saving and loading.

forge-gui/src/main/java/forge/gui/framework/SOverflowUtil.java

@@ -1,16 +1,13 @@
 package forge.gui.framework;
 
-import java.awt.Color;
-import java.awt.Dimension;
+import forge.view.FView;
+
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import forge.view.FView;
-
 /**
  * Package-private utilities for generic overflow behavior
  * in title bar for any cell in layout.

forge-gui/src/main/java/forge/gui/framework/SRearrangingUtil.java

@@ -1,22 +1,16 @@
 package forge.gui.framework;
 
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionAdapter;
-import java.awt.event.MouseMotionListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JPanel;
-
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinCursor;
 import forge.gui.toolbox.FSkin.SkinnedLayeredPane;
 import forge.view.FView;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Package-private utilities for rearranging drag behavior using
  * the draggable panels registered in FView.

forge-gui/src/main/java/forge/gui/framework/SResizingUtil.java

@@ -1,24 +1,5 @@
 package forge.gui.framework;
 
-import java.awt.Component;
-import java.awt.Cursor;
-import java.awt.Rectangle;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionAdapter;
-import java.awt.event.MouseMotionListener;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.JPanel;
-
 import forge.gui.FNetOverlay;
 import forge.gui.toolbox.FAbsolutePositioner;
 import forge.gui.toolbox.FOverlay;
@@ -27,6 +8,12 @@ import forge.view.FFrame;
 import forge.view.FNavigationBar;
 import forge.view.FView;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
+import java.util.List;
+
 /**
  * Package-private utilities for resizing drag behavior using
  * the draggable panels registered in FView.

forge-gui/src/main/java/forge/gui/home/CHomeUI.java

@@ -1,9 +1,5 @@
 package forge.gui.home;
 
-import java.util.List;
-
-import javax.swing.JMenu;
-
 import forge.Command;
 import forge.Singletons;
 import forge.gui.FNetOverlay;
@@ -19,6 +15,9 @@ import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.properties.NewConstants;
 
+import javax.swing.*;
+import java.util.List;
+
 /**
  * Assembles Swing components of exit submenu option singleton.
  *

forge-gui/src/main/java/forge/gui/home/LblGroup.java

@@ -1,12 +1,5 @@
 package forge.gui.home;
 
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
 import forge.Singletons;
 import forge.gui.framework.ILocalRepaint;
 import forge.gui.toolbox.FSkin;
@@ -14,6 +7,10 @@ import forge.gui.toolbox.FSkin.SkinColor;
 import forge.gui.toolbox.FSkin.SkinnedLabel;
 import forge.properties.ForgePreferences.FPref;
 
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
 /** 
  * Custom JLabel for title of menu item groups.
  * Handles repainting and listening for hover and click events.

forge-gui/src/main/java/forge/gui/home/LblHeader.java

@@ -1,14 +1,12 @@
 package forge.gui.home;
 
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-
-import javax.swing.border.EmptyBorder;
-
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinColor;
 import forge.gui.toolbox.FSkin.SkinnedLabel;
 
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+
 /** 
  * Standardized header label for top of menu display panel.
  */

forge-gui/src/main/java/forge/gui/home/LblMenuItem.java

@@ -1,17 +1,15 @@
 package forge.gui.home;
 
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.ILocalRepaint;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinColor;
 import forge.gui.toolbox.FSkin.SkinnedLabel;
 
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
 /** 
  * Custom JLabel for an item in the menu. Handles listening
  * and repainting for hover and select events.

forge-gui/src/main/java/forge/gui/home/PnlGroup.java

@@ -1,13 +1,12 @@
 package forge.gui.home;
 
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-
-import javax.swing.JLabel;
-import net.miginfocom.swing.MigLayout;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinColor;
 import forge.gui.toolbox.FSkin.SkinnedPanel;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import java.awt.*;
 
 /** 
  * Custom JPanel for containing LblMenuItem components.

forge-gui/src/main/java/forge/gui/home/StartButton.java

@@ -1,16 +1,15 @@
 package forge.gui.home;
 
+import forge.gui.toolbox.FSkin;
+import forge.gui.toolbox.FSkin.SkinnedButton;
+
+import javax.swing.*;
+import javax.swing.border.Border;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 
-import javax.swing.SwingUtilities;
-import javax.swing.border.Border;
-
-import forge.gui.toolbox.FSkin;
-import forge.gui.toolbox.FSkin.SkinnedButton;
-
 @SuppressWarnings("serial")
 public class StartButton extends SkinnedButton {
     public StartButton() {

forge-gui/src/main/java/forge/gui/home/VHomeUI.java

@@ -17,37 +17,13 @@
  */
 package forge.gui.home;
 
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingConstants;
-
-import net.miginfocom.swing.MigLayout;
 import forge.Singletons;
-import forge.gui.framework.EDocID;
-import forge.gui.framework.FScreen;
-import forge.gui.framework.ICDoc;
-import forge.gui.framework.ILocalRepaint;
-import forge.gui.framework.IVTopLevelUI;
+import forge.gui.framework.*;
 import forge.gui.home.gauntlet.VSubmenuGauntletBuild;
 import forge.gui.home.gauntlet.VSubmenuGauntletContests;
 import forge.gui.home.gauntlet.VSubmenuGauntletLoad;
 import forge.gui.home.gauntlet.VSubmenuGauntletQuick;
-import forge.gui.home.quest.VSubmenuChallenges;
-import forge.gui.home.quest.VSubmenuDuels;
-import forge.gui.home.quest.VSubmenuQuestData;
-import forge.gui.home.quest.VSubmenuQuestDecks;
-import forge.gui.home.quest.VSubmenuQuestPrefs;
+import forge.gui.home.quest.*;
 import forge.gui.home.sanctioned.VSubmenuConstructed;
 import forge.gui.home.sanctioned.VSubmenuDraft;
 import forge.gui.home.sanctioned.VSubmenuSealed;
@@ -57,16 +33,23 @@ import forge.gui.home.settings.VSubmenuPreferences;
 import forge.gui.home.settings.VSubmenuReleaseNotes;
 import forge.gui.home.variant.VSubmenuArchenemy;
 import forge.gui.home.variant.VSubmenuCommander;
-//import forge.gui.home.variant.VSubmenuPlanechase;
-//import forge.gui.home.variant.VSubmenuVanguard;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FScrollPanel;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinColor;
 import forge.gui.toolbox.FSkin.SkinnedPanel;
-import forge.properties.NewConstants;
 import forge.properties.ForgePreferences.FPref;
+import forge.properties.NewConstants;
 import forge.view.FView;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.*;
+import java.util.List;
+
+//import forge.gui.home.variant.VSubmenuPlanechase;
+//import forge.gui.home.variant.VSubmenuVanguard;
 
 /**
  * Top level view class for home UI drag layout.<br>

forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletBuild.java

@@ -1,16 +1,5 @@
 package forge.gui.home.gauntlet;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JFileChooser;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
-import javax.swing.filechooser.FileFilter;
-
-import org.apache.commons.lang3.ArrayUtils;
-
 import forge.Command;
 import forge.deck.Deck;
 import forge.gauntlet.GauntletData;
@@ -18,6 +7,13 @@ import forge.gauntlet.GauntletIO;
 import forge.gui.framework.ICDoc;
 import forge.gui.toolbox.FOptionPane;
 import forge.properties.NewConstants;
+import org.apache.commons.lang3.ArrayUtils;
+
+import javax.swing.*;
+import javax.swing.filechooser.FileFilter;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 /** 
  * Controls the "build gauntlet" submenu in the home UI.

forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java

@@ -1,13 +1,5 @@
 package forge.gui.home.gauntlet;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.SwingUtilities;
-
 import forge.Command;
 import forge.Singletons;
 import forge.deck.Deck;
@@ -20,6 +12,13 @@ import forge.gui.framework.ICDoc;
 import forge.net.FServer;
 import forge.net.Lobby;
 
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 /** 
  * Controls the "gauntlet contests" submenu in the home UI.
  * 

forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java

@@ -1,14 +1,5 @@
 package forge.gui.home.gauntlet;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.SwingUtilities;
-
 import forge.Command;
 import forge.Singletons;
 import forge.deck.Deck;
@@ -21,6 +12,13 @@ import forge.gui.framework.ICDoc;
 import forge.net.FServer;
 import forge.net.Lobby;
 
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 /** 
  * Controls the "quick gauntlet" submenu in the home UI.
  * 

forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java

@@ -1,15 +1,5 @@
 package forge.gui.home.gauntlet;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.SwingUtilities;
-
 import forge.Command;
 import forge.Singletons;
 import forge.deck.Deck;
@@ -24,6 +14,15 @@ import forge.gui.framework.ICDoc;
 import forge.net.FServer;
 import forge.net.Lobby;
 
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /** 
  * Controls the "quick gauntlet" submenu in the home UI.
  *