forge.view.toolbox -> forge.gui.toolbox

.gitattributes

@@ -11475,6 +11475,24 @@ src/main/java/forge/gui/home/utilities/VSubmenuDeckEditor.java -text
 src/main/java/forge/gui/home/utilities/VSubmenuUtilities.java -text
 src/main/java/forge/gui/home/utilities/package-info.java svneol=native#text/plain
 src/main/java/forge/gui/package-info.java svneol=native#text/plain
+src/main/java/forge/gui/toolbox/CardFaceSymbols.java svneol=native#text/plain
+src/main/java/forge/gui/toolbox/CardViewer.java -text
+src/main/java/forge/gui/toolbox/DeckLister.java -text
+src/main/java/forge/gui/toolbox/FButton.java -text
+src/main/java/forge/gui/toolbox/FCheckBox.java -text
+src/main/java/forge/gui/toolbox/FLabel.java -text
+src/main/java/forge/gui/toolbox/FList.java -text
+src/main/java/forge/gui/toolbox/FOverlay.java -text
+src/main/java/forge/gui/toolbox/FPanel.java -text
+src/main/java/forge/gui/toolbox/FProgressBar.java -text
+src/main/java/forge/gui/toolbox/FRadioButton.java -text
+src/main/java/forge/gui/toolbox/FScrollPane.java -text
+src/main/java/forge/gui/toolbox/FSkin.java -text
+src/main/java/forge/gui/toolbox/FTextArea.java -text
+src/main/java/forge/gui/toolbox/FVerticalTabPanel.java -text
+src/main/java/forge/gui/toolbox/SubTab.java -text
+src/main/java/forge/gui/toolbox/WrapLayout.java -text
+src/main/java/forge/gui/toolbox/package-info.java svneol=native#text/plain
 src/main/java/forge/item/BoosterPack.java -text
 src/main/java/forge/item/CardDb.java -text
 src/main/java/forge/item/CardPrinted.java -text
@@ -11579,24 +11597,6 @@ src/main/java/forge/view/match/ViewTabber.java -text
 src/main/java/forge/view/match/ViewWinLose.java -text
 src/main/java/forge/view/match/package-info.java svneol=native#text/plain
 src/main/java/forge/view/package-info.java svneol=native#text/plain
-src/main/java/forge/view/toolbox/CardFaceSymbols.java svneol=native#text/plain
-src/main/java/forge/view/toolbox/CardViewer.java -text
-src/main/java/forge/view/toolbox/DeckLister.java -text
-src/main/java/forge/view/toolbox/FButton.java -text
-src/main/java/forge/view/toolbox/FCheckBox.java -text
-src/main/java/forge/view/toolbox/FLabel.java -text
-src/main/java/forge/view/toolbox/FList.java -text
-src/main/java/forge/view/toolbox/FOverlay.java -text
-src/main/java/forge/view/toolbox/FPanel.java -text
-src/main/java/forge/view/toolbox/FProgressBar.java -text
-src/main/java/forge/view/toolbox/FRadioButton.java -text
-src/main/java/forge/view/toolbox/FScrollPane.java -text
-src/main/java/forge/view/toolbox/FSkin.java -text
-src/main/java/forge/view/toolbox/FTextArea.java -text
-src/main/java/forge/view/toolbox/FVerticalTabPanel.java -text
-src/main/java/forge/view/toolbox/SubTab.java -text
-src/main/java/forge/view/toolbox/WrapLayout.java -text
-src/main/java/forge/view/toolbox/package-info.java svneol=native#text/plain
 src/main/java/net/slightlymagic/braids/LICENSE.txt svneol=native#text/plain
 src/main/java/net/slightlymagic/braids/util/ClumsyRunnable.java svneol=native#text/plain
 src/main/java/net/slightlymagic/braids/util/ImmutableIterableFrom.java svneol=native#text/plain

src/main/java/arcane/ui/CardPanel.java

@@ -45,8 +45,8 @@ import forge.CardContainer;
 import forge.Counters;
 import forge.ImageCache;
 import forge.Singletons;
+import forge.gui.toolbox.CardFaceSymbols;
 import forge.properties.ForgePreferences.FPref;
-import forge.view.toolbox.CardFaceSymbols;
 
 /**
  * <p>

src/main/java/forge/CardReader.java

@@ -50,8 +50,8 @@ import forge.card.EditionInfo;
 import forge.card.replacement.ReplacementHandler;
 import forge.card.trigger.TriggerHandler;
 import forge.error.ErrorViewer;
+import forge.gui.toolbox.FProgressBar;
 import forge.view.SplashFrame;
-import forge.view.toolbox.FProgressBar;
 
 /**
  * <p>

src/main/java/forge/card/cardfactory/PreloadingCardFactory.java

@@ -30,11 +30,11 @@ import forge.CardReader;
 import forge.card.CardRules;
 import forge.error.ErrorViewer;
 import forge.gui.GuiUtils;
+import forge.gui.toolbox.FProgressBar;
 import forge.item.CardDb;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.view.SplashFrame;
-import forge.view.toolbox.FProgressBar;
 
 /**
  * <p>

src/main/java/forge/control/ControlBazaarUI.java

@@ -6,9 +6,9 @@ import java.awt.event.ComponentListener;
 
 import javax.swing.SwingUtilities;
 
+import forge.gui.toolbox.FLabel;
 import forge.quest.data.bazaar.QuestStallManager;
 import forge.view.ViewBazaarUI;
-import forge.view.toolbox.FLabel;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/control/ControlMatchUI.java

@@ -41,13 +41,13 @@ import forge.control.match.ControlMessage;
 import forge.control.match.ControlPicture;
 import forge.control.match.ControlTabber;
 import forge.game.GameType;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FSkin;
 import forge.properties.ForgePreferences.FPref;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.view.ViewMatchUI;
 import forge.view.match.ViewField;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>

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

@@ -32,9 +32,9 @@ import forge.AllZone;
 import forge.Singletons;
 import forge.control.KeyboardShortcuts.Shortcut;
 import forge.gui.home.quest.SubmenuQuestUtil;
+import forge.gui.toolbox.CardFaceSymbols;
+import forge.gui.toolbox.FSkin;
 import forge.view.ViewHomeUI;
-import forge.view.toolbox.CardFaceSymbols;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>

src/main/java/forge/control/match/ControlField.java

@@ -50,6 +50,7 @@ import forge.control.input.InputPayManaCost;
 import forge.control.input.InputPayManaCostAbility;
 import forge.gui.ForgeAction;
 import forge.gui.GuiUtils;
+import forge.gui.toolbox.FLabel;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.properties.NewConstants.Lang.GuiDisplay.ComputerHand;
@@ -57,7 +58,6 @@ import forge.properties.NewConstants.Lang.GuiDisplay.ComputerLibrary;
 import forge.properties.NewConstants.Lang.GuiDisplay.HumanHand;
 import forge.properties.NewConstants.Lang.GuiDisplay.HumanLibrary;
 import forge.view.match.ViewField;
-import forge.view.toolbox.FLabel;
 
 /**
  * Child controller, applied to single field in battlefield. Manages player view

src/main/java/forge/game/GameNew.java

@@ -22,13 +22,13 @@ import forge.Singletons;
 import forge.control.FControl;
 import forge.control.input.InputMulligan;
 import forge.deck.Deck;
+import forge.gui.toolbox.FLabel;
 import forge.item.CardPrinted;
 import forge.properties.ForgePreferences.FPref;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants.Lang.GameAction.GameActionText;
 import forge.util.MyRandom;
 import forge.view.match.ViewField;
-import forge.view.toolbox.FLabel;
 
 /** 
  * Methods for all things related to starting a new game.

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

@@ -48,12 +48,12 @@ import javax.swing.event.ListSelectionListener;
 import net.miginfocom.swing.MigLayout;
 import forge.Card;
 import forge.Singletons;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>
@@ -403,7 +403,7 @@ public final class GuiUtils {
         return ttf;
     }
 
-    /** @return {@forge.view.toolbox.FOverlay} */
+    /** @return {@forge.gui.toolbox.FOverlay} */
     public static FOverlay startGameOverlay() {
         final FOverlay overlay = GuiUtils.genericOverlay();
         final int w = overlay.getWidth();
@@ -431,7 +431,7 @@ public final class GuiUtils {
     }
 
     /** @param msg0 &emsp; {@link java.lang.String}
-        @return {@forge.view.toolbox.FOverlay} */
+        @return {@forge.gui.toolbox.FOverlay} */
     // NOTE: This animation happens on the EDT; if the EDT is tied up doing something
     // else, the animation is effectively frozen.  So, this needs some work.
     public static FOverlay loadingOverlay(final String msg0) {
@@ -467,7 +467,7 @@ public final class GuiUtils {
         return overlay;
     }
 
-    /** @return {@forge.view.toolbox.FOverlay} */
+    /** @return {@forge.gui.toolbox.FOverlay} */
     public static FOverlay genericOverlay() {
         final FOverlay overlay = Singletons.getView().getOverlay();
         final int w = overlay.getWidth();

src/main/java/forge/gui/deckeditor/elements/ManaCostRenderer.java

@@ -26,7 +26,7 @@ import javax.swing.table.DefaultTableCellRenderer;
 
 import forge.card.CardManaCost;
 import forge.card.CardManaCostShard;
-import forge.view.toolbox.CardFaceSymbols;
+import forge.gui.toolbox.CardFaceSymbols;
 
 /**
  * Displays mana cost as symbols.

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

@@ -2,7 +2,7 @@ package forge.gui.home;
 
 import javax.swing.JButton;
 
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FSkin;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/gui/home/limited/CSubmenuConstructed.java

@@ -34,16 +34,16 @@ import forge.deck.generate.Generate5ColorDeck;
 import forge.deck.generate.GenerateThemeDeck;
 import forge.game.GameNew;
 import forge.gui.home.ICSubmenu;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
 import forge.item.CardPrinted;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.quest.data.QuestEvent;
 import forge.quest.data.QuestEventManager;
 import forge.util.IStorage;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/gui/home/limited/CSubmenuDraft.java

@@ -21,8 +21,8 @@ import forge.game.limited.CardPoolLimitation;
 import forge.gui.GuiUtils;
 import forge.gui.deckeditor.DraftingProcess;
 import forge.gui.home.ICSubmenu;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FSkin;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/gui/home/limited/CSubmenuSealed.java

@@ -25,11 +25,11 @@ import forge.game.limited.SealedDeck;
 import forge.gui.GuiUtils;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.utilities.CSubmenuDeckEditor;
+import forge.gui.toolbox.FSkin;
 import forge.item.CardPrinted;
 import forge.item.ItemPool;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
-import forge.view.toolbox.FSkin;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/gui/home/limited/VSubmenuConstructed.java

@@ -17,11 +17,11 @@ import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
-import forge.view.toolbox.FCheckBox;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FList;
-import forge.view.toolbox.FRadioButton;
-import forge.view.toolbox.FScrollPane;
+import forge.gui.toolbox.FCheckBox;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FList;
+import forge.gui.toolbox.FRadioButton;
+import forge.gui.toolbox.FScrollPane;
 
 /** 
  * TODO: Write javadoc for this type.
@@ -200,12 +200,12 @@ public enum VSubmenuConstructed implements IVSubmenu {
         return this.btnStart;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnHumanRandom() {
         return this.btnHumanRandom;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnAIRandom() {
         return this.btnAIRandom;
     }

src/main/java/forge/gui/home/limited/VSubmenuDraft.java

@@ -23,14 +23,14 @@ import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
-import forge.view.toolbox.DeckLister;
-import forge.view.toolbox.FButton;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FList;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.DeckLister;
+import forge.gui.toolbox.FButton;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FList;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 
 /** 
  * Singleton instance of "Draft" submenu in "Constructed" group.
@@ -147,7 +147,7 @@ public enum VSubmenuDraft implements IVSubmenu {
         return lstAI;
     }
 
-    /** @return {@link forge.view.toolbox.DeckLister} */
+    /** @return {@link forge.gui.toolbox.DeckLister} */
     public DeckLister getLstHumanDecks() {
         return lstHumanDecks;
     }

src/main/java/forge/gui/home/limited/VSubmenuSealed.java

@@ -21,13 +21,13 @@ import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
-import forge.view.toolbox.DeckLister;
-import forge.view.toolbox.FButton;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.DeckLister;
+import forge.gui.toolbox.FButton;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 
 /** 
  * Singleton instance of "Draft" submenu in "Constructed" group.
@@ -126,7 +126,7 @@ public enum VSubmenuSealed implements IVSubmenu {
         return this.btnStart;
     }
 
-    /** @return {@link forge.view.toolbox.DeckLister} */
+    /** @return {@link forge.gui.toolbox.DeckLister} */
     public DeckLister getLstDecks() {
         return lstDecks;
     }

src/main/java/forge/gui/home/quest/CSubmenuChallenges.java

@@ -13,10 +13,10 @@ import forge.Command;
 import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.quest.SubmenuQuestUtil.SelectablePanel;
+import forge.gui.toolbox.FLabel;
 import forge.quest.data.QuestChallenge;
 import forge.quest.data.QuestEventManager;
 import forge.view.ViewHomeUI;
-import forge.view.toolbox.FLabel;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/gui/home/quest/IStatsAndPet.java

@@ -4,15 +4,15 @@ import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 
-import forge.view.toolbox.FLabel;
+import forge.gui.toolbox.FLabel;
 
 /** Dictates methods required for a panel with stats/pet display. */
 
 public interface IStatsAndPet {
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     FLabel getBtnBazaar();
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     FLabel getBtnSpellShop();
 
     /** @return {@link javax.swing.JLabel} */

src/main/java/forge/gui/home/quest/QuestFileLister.java

@@ -19,11 +19,11 @@ import javax.swing.border.MatteBorder;
 import net.miginfocom.swing.MigLayout;
 import forge.Command;
 import forge.gui.GuiUtils;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FSkin;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.quest.data.QuestData;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FSkin;
 
 /** 
  * Creates file list/table for quick deleting, editing, and basic info.

src/main/java/forge/gui/home/quest/QuestPreferencesHandler.java

@@ -14,10 +14,10 @@ import javax.swing.SwingConstants;
 
 import net.miginfocom.swing.MigLayout;
 import forge.Singletons;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.QuestPreferences;
 import forge.quest.data.QuestPreferences.QPref;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FSkin;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/gui/home/quest/SubmenuQuestUtil.java

@@ -15,6 +15,11 @@ import forge.deck.Deck;
 import forge.game.GameNew;
 import forge.game.GameType;
 import forge.gui.deckeditor.QuestCardShop;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
+import forge.gui.toolbox.FTextArea;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.quest.data.QuestChallenge;
@@ -24,11 +29,6 @@ import forge.quest.data.QuestPreferences.QPref;
 import forge.quest.data.QuestUtil;
 import forge.quest.data.item.QuestItemZeppelin;
 import forge.quest.data.pet.QuestPetAbstract;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
-import forge.view.toolbox.FTextArea;
 
 /** 
  * Utilities for the quest submenu, all over the MVC spectrum.

src/main/java/forge/gui/home/quest/VSubmenuChallenges.java

@@ -16,11 +16,11 @@ import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
-import forge.view.toolbox.FCheckBox;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FCheckBox;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 
 /**  */
 public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet {
@@ -159,12 +159,12 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet {
         return pnlTitle;
     }
 
-    /** @return {@link forge.view.toolbox.FPanel} */
+    /** @return {@link forge.gui.toolbox.FPanel} */
     public JPanel getPnlStats() {
         return pnlStats;
     }
 
-    /** @return {@link forge.view.toolbox.FPanel} */
+    /** @return {@link forge.gui.toolbox.FPanel} */
     public JPanel getPnlStart() {
         return pnlStart;
     }
@@ -204,7 +204,7 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet {
         return lblWinStreak;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnCurrentDeck() {
         return btnCurrentDeck;
     }

src/main/java/forge/gui/home/quest/VSubmenuDuels.java

@@ -16,11 +16,11 @@ import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
-import forge.view.toolbox.FCheckBox;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FCheckBox;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 
 /**  */
 public enum VSubmenuDuels implements IVSubmenu, IStatsAndPet {
@@ -159,12 +159,12 @@ public enum VSubmenuDuels implements IVSubmenu, IStatsAndPet {
         return pnlTitle;
     }
 
-    /** @return {@link forge.view.toolbox.FPanel} */
+    /** @return {@link forge.gui.toolbox.FPanel} */
     public JPanel getPnlStats() {
         return pnlStats;
     }
 
-    /** @return {@link forge.view.toolbox.FPanel} */
+    /** @return {@link forge.gui.toolbox.FPanel} */
     public JPanel getPnlStart() {
         return pnlStart;
     }
@@ -204,7 +204,7 @@ public enum VSubmenuDuels implements IVSubmenu, IStatsAndPet {
         return lblWinStreak;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnCurrentDeck() {
         return btnCurrentDeck;
     }

src/main/java/forge/gui/home/quest/VSubmenuQuestData.java

@@ -11,12 +11,12 @@ import forge.gui.home.EMenuGroup;
 import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
-import forge.view.toolbox.FCheckBox;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FRadioButton;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FCheckBox;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FRadioButton;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 
 /** 
  * Singleton instance of "Colors" submenu in "Constructed" group.
@@ -197,7 +197,7 @@ public enum VSubmenuQuestData implements IVSubmenu {
         return cbStandardStart;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnEmbark() {
         return btnEmbark;
     }

src/main/java/forge/gui/home/quest/VSubmenuQuestDecks.java

@@ -8,9 +8,9 @@ import forge.gui.home.EMenuGroup;
 import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
-import forge.view.toolbox.DeckLister;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FScrollPane;
+import forge.gui.toolbox.DeckLister;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FScrollPane;
 
 /** 
  * Singleton instance of "Colors" submenu in "Constructed" group.
@@ -88,12 +88,12 @@ public enum VSubmenuQuestDecks implements IVSubmenu {
         return CSubmenuQuestDecks.SINGLETON_INSTANCE;
     }
 
-    /** @return {@link forge.view.toolbox.DeckLister} */
+    /** @return {@link forge.gui.toolbox.DeckLister} */
     public DeckLister getLstDecks() {
         return this.lstDecks;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnNewDeck() {
         return this.btnNewDeck;
     }

src/main/java/forge/gui/home/quest/VSubmenuQuestPrefs.java

@@ -19,12 +19,12 @@ import forge.gui.home.EMenuGroup;
 import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.QuestPreferences;
 import forge.quest.data.QuestPreferences.QPref;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
 
 /** 
  * Singleton instance of "Colors" submenu in "Constructed" group.

src/main/java/forge/gui/home/settings/CSubmenuPreferences.java

@@ -12,9 +12,9 @@ import forge.Constant;
 import forge.Singletons;
 import forge.control.RestartUtil;
 import forge.gui.home.ICSubmenu;
+import forge.gui.toolbox.FSkin;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
-import forge.view.toolbox.FSkin;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/gui/home/settings/VSubmenuAvatars.java

@@ -15,11 +15,11 @@ import forge.gui.home.EMenuGroup;
 import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
+import forge.gui.toolbox.WrapLayout;
 import forge.properties.ForgePreferences.FPref;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
-import forge.view.toolbox.WrapLayout;
 
 /** 
  * Singleton instance of "Draft" submenu in "Constructed" group.

src/main/java/forge/gui/home/settings/VSubmenuPreferences.java

@@ -32,12 +32,12 @@ import forge.gui.home.EMenuGroup;
 import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FList;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants.Lang.OldGuiNewGame.NewGameText;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FList;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
 
 /** 
  * Singleton instance of "Draft" submenu in "Constructed" group.
@@ -375,7 +375,7 @@ public enum VSubmenuPreferences implements IVSubmenu {
         return cbDevMode;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnReset() {
         return btnReset;
     }

src/main/java/forge/gui/home/utilities/VSubmenuDeckEditor.java

@@ -7,7 +7,7 @@ import forge.gui.home.EMenuGroup;
 import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
-import forge.view.toolbox.FLabel;
+import forge.gui.toolbox.FLabel;
 
 /** 
  * Singleton instance of "Colors" submenu in "Constructed" group.

src/main/java/forge/gui/home/utilities/VSubmenuUtilities.java

@@ -23,14 +23,14 @@ import forge.gui.home.EMenuGroup;
 import forge.gui.home.EMenuItem;
 import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
+import forge.gui.toolbox.FButton;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants.Lang;
-import forge.view.toolbox.FButton;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
 
 /** 
  * Singleton instance of "Colors" submenu in "Constructed" group.
@@ -137,42 +137,42 @@ public enum VSubmenuUtilities implements IVSubmenu {
         return pnl;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnDownloadPics() {
         return btnDownloadPics;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnDownloadSetPics() {
         return btnDownloadSetPics;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnDownloadQuestImages() {
         return btnDownloadQuestImages;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnReportBug() {
         return btnReportBug;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnImportPictures() {
         return btnImportPictures;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnHowToPlay() {
         return btnHowToPlay;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnDownloadPrices() {
         return btnDownloadPrices;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnLicensing() {
         return btnLicensing;
     }

src/main/java/forge/gui/toolbox/CardFaceSymbols.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.Graphics;
 import java.awt.Image;

src/main/java/forge/gui/toolbox/CardViewer.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/forge/gui/toolbox/DeckLister.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.Color;
 import java.awt.Dimension;

src/main/java/forge/gui/toolbox/FButton.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;

src/main/java/forge/gui/toolbox/FCheckBox.java

@@ -1,4 +1,4 @@
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;

src/main/java/forge/gui/toolbox/FLabel.java

@@ -1,4 +1,4 @@
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
@@ -68,76 +68,76 @@ public class FLabel extends JLabel {
         private Command bldCmd;
 
         // Build!
-        /** @return {@link forge.view.toolbox.FLabel} */
+        /** @return {@link forge.gui.toolbox.FLabel} */
         public FLabel build() { return new FLabel(this); }
 
         // Begin builder methods.
         /**@param s0   {@link java.lang.String}
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder text(String s0) { this.bldText = s0; return this; }
 
         /**@param s0   {@link java.lang.String}
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder tooltip(String s0) { this.bldToolTip = s0; return this; }
 
         /**@param i0   {@link javax.swing.ImageIcon}
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder icon(ImageIcon i0) { this.bldIcon = i0; return this; }
 
         /**@param i0   SwingConstants.CENTER, .LEFT, or .RIGHT
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder fontAlign(int i0) { this.bldFontAlign = i0; return this; }
 
         /**@param b0   boolean
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder opaque(boolean b0) { this.bldOpaque = b0; return this; }
 
         /**@param b0   boolean
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder hoverable(boolean b0) { this.bldHoverable = b0; return this; }
 
         /**@param b0   boolean
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder selectable(boolean b0) { this.bldSelectable = b0; return this; }
 
         /**@param c0   {@link forge.Command} to execute if clicked
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder cmdClick(Command c0) { this.bldCmd = c0; return this; }
 
         /**@param i0   int
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder fontSize(int i0) { this.bldFontSize = i0; return this; }
 
         /**@param i0   Font.PLAIN, Font.BOLD, or Font.ITALIC
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder fontStyle(int i0) { this.bldFontStyle = i0; return this; }
 
         /**@param b0   boolean
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder fontScaleAuto(boolean b0) { this.bldFontScaleAuto = b0; return this; }
 
         /**@param d0   double between 0 and 1, 0.6 by default
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder fontScaleFactor(double d0) { this.bldFontScaleFactor = d0; return this; }
 
         /**@param i0   SwingConstants.HORIZONTAL or .VERTICAL
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder fontScaleBy(int i0) { this.bldFontScaleBy = i0; return this; }
 
         /**@param b0   boolean
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder iconScaleAuto(boolean b0) { this.bldIconScaleAuto = b0; return this; }
 
         /**@param d0   double between 0 and 1, 0.8 by default
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder iconScaleFactor(double d0) { this.bldIconScaleFactor = d0; return this; }
 
         /**@param b0   boolean, icon will be drawn independent of text
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder iconInBackground(boolean b0) { this.bldIconInBackground = b0; return this; }
 
         /**@param f0   0.0f - 1.0f. If icon is in background, this alpha is applied.
-         * @return {@link forge.view.toolbox.Builder} */
+         * @return {@link forge.gui.toolbox.Builder} */
         public Builder iconAlpha(float f0) { this.bldIconAlpha = f0; return this; }
     }
 

src/main/java/forge/gui/toolbox/FList.java

@@ -1,4 +1,4 @@
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.Component;
 

src/main/java/forge/gui/toolbox/FOverlay.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.Color;
 import java.awt.Graphics;

src/main/java/forge/gui/toolbox/FPanel.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.Color;
 import java.awt.FlowLayout;

src/main/java/forge/gui/toolbox/FProgressBar.java

@@ -1,4 +1,4 @@
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.util.Date;
 

src/main/java/forge/gui/toolbox/FRadioButton.java

@@ -1,4 +1,4 @@
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;

src/main/java/forge/gui/toolbox/FScrollPane.java

@@ -1,4 +1,4 @@
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.Component;
 

src/main/java/forge/gui/toolbox/FSkin.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.Color;
 import java.awt.Font;

src/main/java/forge/gui/toolbox/FTextArea.java

@@ -1,4 +1,4 @@
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import javax.swing.JTextArea;
 

src/main/java/forge/gui/toolbox/FVerticalTabPanel.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.CardLayout;
 import java.awt.Color;

src/main/java/forge/gui/toolbox/SubTab.java

@@ -1,4 +1,4 @@
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.Color;
 import java.awt.Cursor;

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

@@ -1,4 +1,4 @@
-package forge.view.toolbox;
+package forge.gui.toolbox;
 
 import java.awt.Component;
 import java.awt.Container;

src/main/java/forge/gui/toolbox/package-info.java

@@ -1,3 +1,3 @@
 /** Views (as in model-view-controller) for Forge. */
-package forge.view.toolbox;
+package forge.gui.toolbox;
 

src/main/java/forge/model/FModel.java

@@ -43,6 +43,7 @@ import forge.control.input.InputControl;
 import forge.deck.CardCollections;
 import forge.game.GameState;
 import forge.game.GameSummary;
+import forge.gui.toolbox.FSkin;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.properties.ForgeProps;
@@ -54,7 +55,6 @@ import forge.util.IStorageView;
 import forge.util.StorageView;
 import forge.view.match.ViewField;
 import forge.view.match.ViewTabber;
-import forge.view.toolbox.FSkin;
 
 /**
  * The default Model implementation for Forge.

src/main/java/forge/quest/data/bazaar/QuestStallManager.java

@@ -25,7 +25,7 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 
 import forge.AllZone;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FSkin;
 
 /**
  * <p>

src/main/java/forge/quest/data/item/QuestItemElixir.java

@@ -20,8 +20,8 @@ package forge.quest.data.item;
 import javax.swing.ImageIcon;
 
 import forge.AllZone;
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.bazaar.QuestStallManager;
-import forge.view.toolbox.FSkin;
 
 /**
  * This item has special coding.

src/main/java/forge/quest/data/item/QuestItemEstates.java

@@ -19,8 +19,8 @@ package forge.quest.data.item;
 
 import javax.swing.ImageIcon;
 
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.bazaar.QuestStallManager;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>

src/main/java/forge/quest/data/item/QuestItemLuckyCoin.java

@@ -19,8 +19,8 @@ package forge.quest.data.item;
 
 import javax.swing.ImageIcon;
 
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.bazaar.QuestStallManager;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>

src/main/java/forge/quest/data/item/QuestItemMap.java

@@ -19,8 +19,8 @@ package forge.quest.data.item;
 
 import javax.swing.ImageIcon;
 
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.bazaar.QuestStallManager;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>

src/main/java/forge/quest/data/item/QuestItemPoundFlesh.java

@@ -20,8 +20,8 @@ package forge.quest.data.item;
 import javax.swing.ImageIcon;
 
 import forge.AllZone;
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.bazaar.QuestStallManager;
-import forge.view.toolbox.FSkin;
 
 /**
  * This item has special coding.

src/main/java/forge/quest/data/item/QuestItemSleight.java

@@ -19,8 +19,8 @@ package forge.quest.data.item;
 
 import javax.swing.ImageIcon;
 
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.bazaar.QuestStallManager;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>

src/main/java/forge/quest/data/item/QuestItemZeppelin.java

@@ -20,8 +20,8 @@ package forge.quest.data.item;
 import javax.swing.ImageIcon;
 
 import forge.AllZone;
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.bazaar.QuestStallManager;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>

src/main/java/forge/view/FView.java

@@ -26,8 +26,8 @@ import javax.swing.SwingUtilities;
 
 import forge.Singletons;
 import forge.control.FControl;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FSkin;
 
 /**
  * The main view for Forge: a java swing application. All view class instances
@@ -100,7 +100,7 @@ public enum FView {
         return this.frame;
     }
 
-    /** @return {@link forge.view.toolbox.FOverlay} */
+    /** @return {@link forge.gui.toolbox.FOverlay} */
     public FOverlay getOverlay() {
         return FView.this.overlay;
     }

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

@@ -35,8 +35,8 @@ import javax.swing.KeyStroke;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 
-import forge.view.toolbox.FProgressBar;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FProgressBar;
+import forge.gui.toolbox.FSkin;
 
 /**
  * Shows the splash frame as the application starts.

src/main/java/forge/view/ViewBazaarUI.java

@@ -7,11 +7,11 @@ import javax.swing.SwingUtilities;
 import net.miginfocom.swing.MigLayout;
 import forge.Command;
 import forge.control.ControlBazaarUI;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.bazaar.QuestStallManager;
 import forge.view.bazaar.ViewStall;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
 
 
 /** Lays out containers and borders for resizeable layout and

src/main/java/forge/view/ViewEditorUI.java

@@ -17,7 +17,7 @@
  */
 package forge.view;
 
-import forge.view.toolbox.FPanel;
+import forge.gui.toolbox.FPanel;
 
 /**
  * Lays out battle, sidebar, user areas in locked % vals and repaints as

src/main/java/forge/view/ViewHomeUI.java

@@ -58,16 +58,16 @@ import forge.gui.home.settings.VSubmenuAvatars;
 import forge.gui.home.settings.VSubmenuPreferences;
 import forge.gui.home.utilities.VSubmenuDeckEditor;
 import forge.gui.home.utilities.VSubmenuUtilities;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.quest.data.QuestDataIO;
 import forge.quest.data.QuestPreferences.QPref;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
 
 /** Singleton instance of home screen UI.
  * Use "getPanel()" to work with the main container.

src/main/java/forge/view/ViewMatchUI.java

@@ -30,6 +30,8 @@ import javax.swing.JPanel;
 
 import net.miginfocom.swing.MigLayout;
 import forge.control.ControlMatchUI;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
 import forge.view.match.ViewBattlefield;
 import forge.view.match.ViewDetail;
 import forge.view.match.ViewDock;
@@ -38,8 +40,6 @@ import forge.view.match.ViewHand;
 import forge.view.match.ViewMessage;
 import forge.view.match.ViewPicture;
 import forge.view.match.ViewTabber;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
 
 /**
  * - Lays out containers and borders for resizeable layout.<br>

src/main/java/forge/view/bazaar/ViewItem.java

@@ -8,11 +8,11 @@ import net.miginfocom.swing.MigLayout;
 import forge.AllZone;
 import forge.Command;
 import forge.Singletons;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
+import forge.gui.toolbox.FTextArea;
 import forge.quest.data.bazaar.QuestStallPurchasable;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
-import forge.view.toolbox.FTextArea;
 
 /** An update-able panel instance representing a single item. */
 @SuppressWarnings("serial")

src/main/java/forge/view/bazaar/ViewStall.java

@@ -32,13 +32,13 @@ import javax.swing.text.StyledDocument;
 import net.miginfocom.swing.MigLayout;
 import forge.AllZone;
 import forge.control.bazaar.ControlStall;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 import forge.quest.data.bazaar.QuestStallDefinition;
 import forge.quest.data.bazaar.QuestStallManager;
 import forge.quest.data.bazaar.QuestStallPurchasable;
 import forge.view.ViewBazaarUI;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>
@@ -108,7 +108,7 @@ public class ViewStall extends JPanel {
         pnlInventory.add(lblEmpty, "w 90%!, h 30px!, gap 5% 0 50px 50px");
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getLblStallName() {
         return lblStallName;
     }
@@ -118,12 +118,12 @@ public class ViewStall extends JPanel {
         return tpnFluff;
     }
 
-    /** @return {@link forge.view.toolbox.FLabel} */
+    /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getLblStats() {
         return lblStats;
     }
 
-    /** @return {@link forge.view.toolbox.FScrollPane} */
+    /** @return {@link forge.gui.toolbox.FScrollPane} */
     public FScrollPane getScrInventory() {
         return scrInventory;
     }

src/main/java/forge/view/match/QuestWinLoseCardViewer.java

@@ -29,11 +29,11 @@ import net.miginfocom.swing.MigLayout;
 import forge.Card;
 import forge.gui.game.CardDetailPanel;
 import forge.gui.game.CardPicturePanel;
+import forge.gui.toolbox.FList;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
 import forge.item.CardPrinted;
-import forge.view.toolbox.FList;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
 
 /**
  * A simple JPanel that shows three columns: card list, pic, and description..

src/main/java/forge/view/match/QuestWinLoseHandler.java

@@ -44,6 +44,7 @@ import forge.game.GamePlayerRating;
 import forge.game.GameSummary;
 import forge.gui.GuiUtils;
 import forge.gui.ListChooser;
+import forge.gui.toolbox.FSkin;
 import forge.item.CardPrinted;
 import forge.model.FMatchState;
 import forge.properties.ForgePreferences.FPref;
@@ -53,7 +54,6 @@ import forge.quest.data.QuestEvent;
 import forge.quest.data.QuestPreferences.QPref;
 import forge.quest.data.QuestUtil;
 import forge.util.MyRandom;
-import forge.view.toolbox.FSkin;
 
 /**
  * <p>

src/main/java/forge/view/match/ViewDetail.java

@@ -20,8 +20,8 @@ package forge.view.match;
 import net.miginfocom.swing.MigLayout;
 import forge.control.match.ControlDetail;
 import forge.gui.game.CardDetailPanel;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/view/match/ViewDock.java

@@ -35,10 +35,10 @@ import javax.swing.JPanel;
 import net.miginfocom.swing.MigLayout;
 import forge.Singletons;
 import forge.control.match.ControlDock;
-import forge.view.toolbox.FButton;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FButton;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
 
 /**
  * Swing component for button dock.

src/main/java/forge/view/match/ViewField.java

@@ -42,10 +42,10 @@ import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.mana.ManaPool;
 import forge.control.match.ControlField;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
-import forge.view.toolbox.FSkin.SkinProp;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
+import forge.gui.toolbox.FSkin.SkinProp;
 
 /**
  * Assembles Swing components of player field instance.

src/main/java/forge/view/match/ViewHand.java

@@ -22,8 +22,8 @@ import javax.swing.JScrollPane;
 import net.miginfocom.swing.MigLayout;
 import arcane.ui.HandArea;
 import forge.control.match.ControlHand;
+import forge.gui.toolbox.FPanel;
 import forge.view.ViewMatchUI;
-import forge.view.toolbox.FPanel;
 
 /**
  * VIEW - Swing components for user hand.

src/main/java/forge/view/match/ViewMessage.java

@@ -32,9 +32,9 @@ import javax.swing.border.MatteBorder;
 
 import net.miginfocom.swing.MigLayout;
 import forge.control.match.ControlMessage;
-import forge.view.toolbox.FButton;
-import forge.view.toolbox.FPanel;
-import forge.view.toolbox.FSkin;
+import forge.gui.toolbox.FButton;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FSkin;
 
 /**
  * Assembles Swing components of input area.

src/main/java/forge/view/match/ViewPicture.java

@@ -20,7 +20,7 @@ package forge.view.match;
 import net.miginfocom.swing.MigLayout;
 import forge.control.match.ControlPicture;
 import forge.gui.game.CardPicturePanel;
-import forge.view.toolbox.FPanel;
+import forge.gui.toolbox.FPanel;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/view/match/ViewTabber.java

@@ -57,10 +57,10 @@ import forge.card.spellability.SpellAbilityStackInstance;
 import forge.control.match.ControlTabber;
 import forge.gui.ForgeAction;
 import forge.gui.MultiLineLabelUI;
+import forge.gui.toolbox.FSkin;
+import forge.gui.toolbox.FVerticalTabPanel;
 import forge.properties.ForgePreferences.FPref;
 import forge.properties.NewConstants;
-import forge.view.toolbox.FSkin;
-import forge.view.toolbox.FVerticalTabPanel;
 
 /**
  * Vertical tab panel for viewing stack, combat, etc. Unfortunately, cannot

src/main/java/forge/view/match/ViewWinLose.java

@@ -17,15 +17,15 @@ import forge.Player;
 import forge.Singletons;
 import forge.control.match.ControlWinLose;
 import forge.game.GameType;
+import forge.gui.toolbox.FButton;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
+import forge.gui.toolbox.FTextArea;
 import forge.model.FMatchState;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants.Lang.GuiWinLose.WinLoseText;
-import forge.view.toolbox.FButton;
-import forge.view.toolbox.FLabel;
-import forge.view.toolbox.FOverlay;
-import forge.view.toolbox.FScrollPane;
-import forge.view.toolbox.FSkin;
-import forge.view.toolbox.FTextArea;
 
 /** 
  * TODO: Write javadoc for this type.
@@ -160,17 +160,17 @@ public class ViewWinLose {
         overlay.showOverlay();
     }
 
-    /** @return {@link forge.view.toolbox.FButton} */
+    /** @return {@link forge.gui.toolbox.FButton} */
     public FButton getBtnContinue() {
         return this.btnContinue;
     }
 
-    /** @return {@link forge.view.toolbox.FButton} */
+    /** @return {@link forge.gui.toolbox.FButton} */
     public FButton getBtnRestart() {
         return this.btnRestart;
     }
 
-    /** @return {@link forge.view.toolbox.FButton} */
+    /** @return {@link forge.gui.toolbox.FButton} */
     public FButton getBtnQuit() {
         return this.btnQuit;
     }