From aa054d0110189c7c2393852d87655a88e7b145bd Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Sat, 26 Nov 2011 00:32:42 +0000 Subject: [PATCH] Quick fix the first, and a quick reorganize. --- .gitattributes | 9 +++++---- src/main/java/forge/AllZone.java | 6 +++--- .../java/forge/view/editor/EditorTopLevel.java | 16 ++++++++++++++++ src/main/java/forge/view/home/HomeTopLevel.java | 2 +- .../forge/view/match/ViewAreaBattlefield.java | 2 +- .../java/forge/view/match/ViewAreaSidebar.java | 4 ++-- src/main/java/forge/view/match/ViewAreaUser.java | 2 +- .../java/forge/view/match/ViewCardviewer.java | 2 +- src/main/java/forge/view/match/ViewDock.java | 8 ++++---- src/main/java/forge/view/match/ViewField.java | 6 +++--- src/main/java/forge/view/match/ViewHand.java | 2 +- src/main/java/forge/view/match/ViewInput.java | 6 +++--- src/main/java/forge/view/match/ViewTabber.java | 4 ++-- src/main/java/forge/view/match/ViewTopLevel.java | 2 +- .../java/forge/view/swing/ApplicationView.java | 2 +- src/main/java/forge/view/swing/Main.java | 2 +- src/main/java/forge/view/swing/SplashFrame.java | 2 +- src/main/java/forge/view/swing/WinLoseFrame.java | 16 ++++++++-------- .../java/forge/view/toolbox/CardDetailPanel.java | 1 - .../{gui/skin => view/toolbox}/FButton.java | 2 +- .../forge/{gui/skin => view/toolbox}/FPanel.java | 2 +- .../skin => view/toolbox}/FRoundedPanel.java | 2 +- .../forge/{gui/skin => view/toolbox}/FSkin.java | 2 +- .../forge/view/toolbox/FVerticalTabPanel.java | 2 -- 24 files changed, 59 insertions(+), 45 deletions(-) create mode 100644 src/main/java/forge/view/editor/EditorTopLevel.java rename src/main/java/forge/{gui/skin => view/toolbox}/FButton.java (96%) rename src/main/java/forge/{gui/skin => view/toolbox}/FPanel.java (95%) rename src/main/java/forge/{gui/skin => view/toolbox}/FRoundedPanel.java (96%) rename src/main/java/forge/{gui/skin => view/toolbox}/FSkin.java (96%) diff --git a/.gitattributes b/.gitattributes index a8bdee7987c..80155ec40cb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10790,10 +10790,6 @@ src/main/java/forge/gui/input/InputPayManaCostAbility.java svneol=native#text/pl src/main/java/forge/gui/input/InputPayManaCostUtil.java svneol=native#text/plain src/main/java/forge/gui/input/package-info.java svneol=native#text/plain src/main/java/forge/gui/package-info.java svneol=native#text/plain -src/main/java/forge/gui/skin/FButton.java -text -src/main/java/forge/gui/skin/FPanel.java -text -src/main/java/forge/gui/skin/FRoundedPanel.java -text -src/main/java/forge/gui/skin/FSkin.java -text src/main/java/forge/gui/skin/package-info.java svneol=native#text/plain src/main/java/forge/item/BoosterPack.java -text src/main/java/forge/item/CardDb.java -text @@ -10867,6 +10863,7 @@ src/main/java/forge/quest/gui/package-info.java svneol=native#text/plain src/main/java/forge/quest/package-info.java svneol=native#text/plain src/main/java/forge/view/FView.java svneol=native#text/plain src/main/java/forge/view/GuiTopLevel.java -text +src/main/java/forge/view/editor/EditorTopLevel.java -text src/main/java/forge/view/home/HomeTopLevel.java -text src/main/java/forge/view/match/ViewAreaBattlefield.java -text src/main/java/forge/view/match/ViewAreaSidebar.java -text @@ -10891,7 +10888,11 @@ src/main/java/forge/view/swing/WinLoseModeHandler.java -text src/main/java/forge/view/swing/package-info.java svneol=native#text/plain src/main/java/forge/view/toolbox/CardDetailPanel.java -text src/main/java/forge/view/toolbox/CardViewer.java -text +src/main/java/forge/view/toolbox/FButton.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/FRoundedPanel.java -text +src/main/java/forge/view/toolbox/FSkin.java -text src/main/java/forge/view/toolbox/FVerticalTabPanel.java -text 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 diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java index 01cdff41e51..adf9f0250ec 100644 --- a/src/main/java/forge/AllZone.java +++ b/src/main/java/forge/AllZone.java @@ -12,7 +12,7 @@ import forge.deck.DeckManager; import forge.game.GameSummary; import forge.gui.input.InputControl; import forge.view.toolbox.FOverlay; -import forge.gui.skin.FSkin; +import forge.view.toolbox.FSkin; import forge.model.FGameState; import forge.properties.ForgeProps; import forge.properties.NewConstants; @@ -613,7 +613,7 @@ public final class AllZone { *

* Gets current display skin. * - * @return a {@link forge.gui.skin.FSkin} object. + * @return a {@link forge.view.toolbox.FSkin} object. * @since 1.0.15 */ public static FSkin getSkin() { @@ -627,7 +627,7 @@ public final class AllZone { * Sets current display skin. * * @param fs - * a {@link forge.gui.skin.FSkin} object. + * a {@link forge.view.toolbox.FSkin} object. * @since 1.0.15 */ public static void setSkin(final FSkin fs) { diff --git a/src/main/java/forge/view/editor/EditorTopLevel.java b/src/main/java/forge/view/editor/EditorTopLevel.java new file mode 100644 index 00000000000..4db0a858b1d --- /dev/null +++ b/src/main/java/forge/view/editor/EditorTopLevel.java @@ -0,0 +1,16 @@ +package forge.view.editor; + +import forge.view.toolbox.FPanel; + +/** + * Lays out battle, sidebar, user areas in locked % vals and repaints + * as necessary. + * + */ + +@SuppressWarnings("serial") +public class EditorTopLevel extends FPanel { + public EditorTopLevel() { + super(); + } +} diff --git a/src/main/java/forge/view/home/HomeTopLevel.java b/src/main/java/forge/view/home/HomeTopLevel.java index a8157bfec8a..13f09b0b554 100644 --- a/src/main/java/forge/view/home/HomeTopLevel.java +++ b/src/main/java/forge/view/home/HomeTopLevel.java @@ -1,6 +1,6 @@ package forge.view.home; -import forge.gui.skin.FPanel; +import forge.view.toolbox.FPanel; /** * Lays out battle, sidebar, user areas in locked % vals and repaints diff --git a/src/main/java/forge/view/match/ViewAreaBattlefield.java b/src/main/java/forge/view/match/ViewAreaBattlefield.java index 8244527ecc8..6d4311822c6 100644 --- a/src/main/java/forge/view/match/ViewAreaBattlefield.java +++ b/src/main/java/forge/view/match/ViewAreaBattlefield.java @@ -5,7 +5,7 @@ import java.util.List; import net.miginfocom.swing.MigLayout; import forge.AllZone; -import forge.gui.skin.FPanel; +import forge.view.toolbox.FPanel; /** * Battlefield, assembles and contains instances of MatchPlayer. diff --git a/src/main/java/forge/view/match/ViewAreaSidebar.java b/src/main/java/forge/view/match/ViewAreaSidebar.java index dd9ddbbeba0..af3f83aff56 100644 --- a/src/main/java/forge/view/match/ViewAreaSidebar.java +++ b/src/main/java/forge/view/match/ViewAreaSidebar.java @@ -2,8 +2,8 @@ package forge.view.match; import net.miginfocom.swing.MigLayout; import forge.AllZone; -import forge.gui.skin.FPanel; -import forge.gui.skin.FRoundedPanel; +import forge.view.toolbox.FPanel; +import forge.view.toolbox.FRoundedPanel; /** * Handles display of child components of sidebar area in match UI. diff --git a/src/main/java/forge/view/match/ViewAreaUser.java b/src/main/java/forge/view/match/ViewAreaUser.java index 87fc14d15e0..08de1215b3a 100644 --- a/src/main/java/forge/view/match/ViewAreaUser.java +++ b/src/main/java/forge/view/match/ViewAreaUser.java @@ -3,7 +3,7 @@ package forge.view.match; import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; -import forge.gui.skin.FPanel; +import forge.view.toolbox.FPanel; /** * Parent panel for display of input, hand, and dock. diff --git a/src/main/java/forge/view/match/ViewCardviewer.java b/src/main/java/forge/view/match/ViewCardviewer.java index fb94b94a0f5..b5dc1c0beca 100644 --- a/src/main/java/forge/view/match/ViewCardviewer.java +++ b/src/main/java/forge/view/match/ViewCardviewer.java @@ -10,8 +10,8 @@ import javax.swing.JPanel; import forge.Card; import forge.ImageCache; import forge.control.match.ControlCardviewer; -import forge.gui.skin.FPanel; import forge.view.toolbox.CardDetailPanel; +import forge.view.toolbox.FPanel; import forge.view.toolbox.FVerticalTabPanel; /** diff --git a/src/main/java/forge/view/match/ViewDock.java b/src/main/java/forge/view/match/ViewDock.java index 50ca97a8df2..78bf5051184 100644 --- a/src/main/java/forge/view/match/ViewDock.java +++ b/src/main/java/forge/view/match/ViewDock.java @@ -31,12 +31,12 @@ import net.miginfocom.swing.MigLayout; import forge.AllZone; import forge.Singletons; import forge.control.match.ControlDock; -import forge.gui.skin.FButton; -import forge.gui.skin.FPanel; -import forge.gui.skin.FRoundedPanel; -import forge.gui.skin.FSkin; import forge.properties.ForgePreferences; +import forge.view.toolbox.FButton; import forge.view.toolbox.FOverlay; +import forge.view.toolbox.FPanel; +import forge.view.toolbox.FRoundedPanel; +import forge.view.toolbox.FSkin; /** * Swing component for button dock. diff --git a/src/main/java/forge/view/match/ViewField.java b/src/main/java/forge/view/match/ViewField.java index 18ad52bd011..00d7f64a738 100644 --- a/src/main/java/forge/view/match/ViewField.java +++ b/src/main/java/forge/view/match/ViewField.java @@ -29,9 +29,9 @@ import forge.Player; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; import forge.control.match.ControlField; -import forge.gui.skin.FPanel; -import forge.gui.skin.FRoundedPanel; -import forge.gui.skin.FSkin; +import forge.view.toolbox.FPanel; +import forge.view.toolbox.FRoundedPanel; +import forge.view.toolbox.FSkin; /** * Assembles Swing components of player field instance. diff --git a/src/main/java/forge/view/match/ViewHand.java b/src/main/java/forge/view/match/ViewHand.java index 8dd4b713fda..8f6643c4205 100644 --- a/src/main/java/forge/view/match/ViewHand.java +++ b/src/main/java/forge/view/match/ViewHand.java @@ -21,7 +21,7 @@ import forge.GuiDisplayUtil; import forge.ImageCache; import forge.control.match.ControlHand; -import forge.gui.skin.FRoundedPanel; +import forge.view.toolbox.FRoundedPanel; /** * VIEW - Swing components for user hand. diff --git a/src/main/java/forge/view/match/ViewInput.java b/src/main/java/forge/view/match/ViewInput.java index c7e0686816e..d56a35b00b6 100644 --- a/src/main/java/forge/view/match/ViewInput.java +++ b/src/main/java/forge/view/match/ViewInput.java @@ -8,9 +8,9 @@ import javax.swing.JTextArea; import net.miginfocom.swing.MigLayout; import forge.AllZone; import forge.control.match.ControlInput; -import forge.gui.skin.FButton; -import forge.gui.skin.FRoundedPanel; -import forge.gui.skin.FSkin; +import forge.view.toolbox.FButton; +import forge.view.toolbox.FRoundedPanel; +import forge.view.toolbox.FSkin; /** * Assembles Swing components of input area. diff --git a/src/main/java/forge/view/match/ViewTabber.java b/src/main/java/forge/view/match/ViewTabber.java index 92a88ab8407..747f7ad6345 100644 --- a/src/main/java/forge/view/match/ViewTabber.java +++ b/src/main/java/forge/view/match/ViewTabber.java @@ -27,8 +27,8 @@ import forge.Player; import forge.card.spellability.SpellAbilityStackInstance; import forge.control.match.ControlTabber; import forge.gui.MultiLineLabelUI; -import forge.gui.skin.FPanel; -import forge.gui.skin.FSkin; +import forge.view.toolbox.FPanel; +import forge.view.toolbox.FSkin; import forge.view.toolbox.FVerticalTabPanel; /** diff --git a/src/main/java/forge/view/match/ViewTopLevel.java b/src/main/java/forge/view/match/ViewTopLevel.java index a9dc949f574..cd5ca414cfd 100644 --- a/src/main/java/forge/view/match/ViewTopLevel.java +++ b/src/main/java/forge/view/match/ViewTopLevel.java @@ -21,8 +21,8 @@ import forge.control.match.ControlField; import forge.control.match.ControlHand; import forge.control.match.ControlInput; import forge.control.match.ControlTabber; -import forge.gui.skin.FPanel; import forge.properties.ForgePreferences; +import forge.view.toolbox.FPanel; /** * - Lays out battle, sidebar, user areas in locked % vals and repaints diff --git a/src/main/java/forge/view/swing/ApplicationView.java b/src/main/java/forge/view/swing/ApplicationView.java index b4911d38f39..46ea5a28440 100644 --- a/src/main/java/forge/view/swing/ApplicationView.java +++ b/src/main/java/forge/view/swing/ApplicationView.java @@ -16,13 +16,13 @@ import forge.Constant; import forge.ImageCache; import forge.error.ErrorViewer; import forge.game.GameType; -import forge.gui.skin.FSkin; import forge.model.FModel; import forge.properties.ForgePreferences; import forge.view.FView; import forge.view.swing.OldGuiNewGame.CardSizesAction; import forge.view.swing.OldGuiNewGame.CardStackAction; import forge.view.swing.OldGuiNewGame.CardStackOffsetAction; +import forge.view.toolbox.FSkin; /** * The main view for Forge: a java swing application. All view class instances diff --git a/src/main/java/forge/view/swing/Main.java b/src/main/java/forge/view/swing/Main.java index 645618ded29..a1013402797 100644 --- a/src/main/java/forge/view/swing/Main.java +++ b/src/main/java/forge/view/swing/Main.java @@ -4,9 +4,9 @@ import forge.AllZone; import forge.Singletons; import forge.error.ErrorViewer; import forge.error.ExceptionHandler; -import forge.gui.skin.FSkin; import forge.model.FModel; import forge.view.FView; +import forge.view.toolbox.FSkin; /** * Main class for Forge's swing application view. diff --git a/src/main/java/forge/view/swing/SplashFrame.java b/src/main/java/forge/view/swing/SplashFrame.java index 3c88feb4fc5..e238fed6bec 100644 --- a/src/main/java/forge/view/swing/SplashFrame.java +++ b/src/main/java/forge/view/swing/SplashFrame.java @@ -19,7 +19,7 @@ import javax.swing.UIManager; import javax.swing.border.LineBorder; import net.slightlymagic.braids.util.progress_monitor.BraidsProgressMonitor; -import forge.gui.skin.FSkin; +import forge.view.toolbox.FSkin; /** * Shows the splash frame as the application starts. diff --git a/src/main/java/forge/view/swing/WinLoseFrame.java b/src/main/java/forge/view/swing/WinLoseFrame.java index d3b622b3519..37fc30eecc6 100644 --- a/src/main/java/forge/view/swing/WinLoseFrame.java +++ b/src/main/java/forge/view/swing/WinLoseFrame.java @@ -20,12 +20,12 @@ import forge.AllZone; import forge.Constant; import forge.Phase; import forge.Player; -import forge.gui.skin.FButton; -import forge.gui.skin.FPanel; import forge.properties.ForgeProps; import forge.properties.NewConstants.Lang.WinLoseFrame.WinLoseText; import forge.quest.data.QuestMatchState; import forge.view.match.ViewTopLevel; +import forge.view.toolbox.FButton; +import forge.view.toolbox.FPanel; /** *

@@ -291,42 +291,42 @@ public class WinLoseFrame extends JFrame { } /** - * @return {@link forge.gui.skin.FButton} btnContinue + * @return {@link forge.view.toolbox.FButton} btnContinue */ public FButton getBtnContinue() { return this.btnContinue; } /** - * @param btnContinue {@link forge.gui.skin.FButton} + * @param btnContinue {@link forge.view.toolbox.FButton} */ public void setBtnContinue(final FButton btnContinue) { this.btnContinue = btnContinue; } /** - * @return {@link forge.gui.skin.FButton} btnRestart + * @return {@link forge.view.toolbox.FButton} btnRestart */ public FButton getBtnRestart() { return this.btnRestart; } /** - * @param btnRestart {@link forge.gui.skin.FButton} + * @param btnRestart {@link forge.view.toolbox.FButton} */ public void setBtnRestart(final FButton btnRestart) { this.btnRestart = btnRestart; } /** - * @return {@link forge.gui.skin.FButton} btnQuit + * @return {@link forge.view.toolbox.FButton} btnQuit */ public FButton getBtnQuit() { return this.btnQuit; } /** - * @param btnQuit {@link forge.gui.skin.FButton} + * @param btnQuit {@link forge.view.toolbox.FButton} */ public void setBtnQuit(final FButton btnQuit) { this.btnQuit = btnQuit; diff --git a/src/main/java/forge/view/toolbox/CardDetailPanel.java b/src/main/java/forge/view/toolbox/CardDetailPanel.java index 83cf97fb67e..eac7cdcb2f7 100644 --- a/src/main/java/forge/view/toolbox/CardDetailPanel.java +++ b/src/main/java/forge/view/toolbox/CardDetailPanel.java @@ -19,7 +19,6 @@ import forge.Constant.Zone; import forge.Counters; import forge.GameEntity; import forge.GuiDisplayUtil; -import forge.gui.skin.FSkin; /** Shows details of card if moused over. */ @SuppressWarnings("serial") diff --git a/src/main/java/forge/gui/skin/FButton.java b/src/main/java/forge/view/toolbox/FButton.java similarity index 96% rename from src/main/java/forge/gui/skin/FButton.java rename to src/main/java/forge/view/toolbox/FButton.java index 00c04bf4340..f5d25dca382 100644 --- a/src/main/java/forge/gui/skin/FButton.java +++ b/src/main/java/forge/view/toolbox/FButton.java @@ -1,4 +1,4 @@ -package forge.gui.skin; +package forge.view.toolbox; import java.awt.AlphaComposite; import java.awt.Color; diff --git a/src/main/java/forge/gui/skin/FPanel.java b/src/main/java/forge/view/toolbox/FPanel.java similarity index 95% rename from src/main/java/forge/gui/skin/FPanel.java rename to src/main/java/forge/view/toolbox/FPanel.java index 9fa4f7d4a0d..4eb723c4b6e 100644 --- a/src/main/java/forge/gui/skin/FPanel.java +++ b/src/main/java/forge/view/toolbox/FPanel.java @@ -1,4 +1,4 @@ -package forge.gui.skin; +package forge.view.toolbox; import java.awt.Dimension; import java.awt.Graphics; diff --git a/src/main/java/forge/gui/skin/FRoundedPanel.java b/src/main/java/forge/view/toolbox/FRoundedPanel.java similarity index 96% rename from src/main/java/forge/gui/skin/FRoundedPanel.java rename to src/main/java/forge/view/toolbox/FRoundedPanel.java index 29c1a85d61c..8f37650c51e 100644 --- a/src/main/java/forge/gui/skin/FRoundedPanel.java +++ b/src/main/java/forge/view/toolbox/FRoundedPanel.java @@ -1,4 +1,4 @@ -package forge.gui.skin; +package forge.view.toolbox; import java.awt.Color; import java.awt.Graphics; diff --git a/src/main/java/forge/gui/skin/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java similarity index 96% rename from src/main/java/forge/gui/skin/FSkin.java rename to src/main/java/forge/view/toolbox/FSkin.java index 530adfd9cf4..fe9e6bcb98a 100644 --- a/src/main/java/forge/gui/skin/FSkin.java +++ b/src/main/java/forge/view/toolbox/FSkin.java @@ -1,4 +1,4 @@ -package forge.gui.skin; +package forge.view.toolbox; import java.awt.Color; import java.awt.Font; diff --git a/src/main/java/forge/view/toolbox/FVerticalTabPanel.java b/src/main/java/forge/view/toolbox/FVerticalTabPanel.java index 2889288ba07..71a357578e9 100644 --- a/src/main/java/forge/view/toolbox/FVerticalTabPanel.java +++ b/src/main/java/forge/view/toolbox/FVerticalTabPanel.java @@ -17,8 +17,6 @@ import javax.swing.border.MatteBorder; import net.miginfocom.swing.MigLayout; import forge.AllZone; -import forge.gui.skin.FPanel; -import forge.gui.skin.FSkin; /** * TODO: Write javadoc for this type.