From 05751dbe1bf8133ece64ca6bec423546d211b2f2 Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 24 Nov 2013 21:16:23 +0000 Subject: [PATCH] Break up files in nonsingleton folder into existing controller and view folders --- .gitattributes | 17 ++++++++--------- .../src/main/java/forge/control/FControl.java | 2 +- .../forge/control/FControlGameEventHandler.java | 4 ++-- forge-gui/src/main/java/forge/gui/GuiUtils.java | 2 +- .../nonsingleton => framework}/CEmptyDoc.java | 3 +-- .../java/forge/gui/framework/VEmptyDoc.java | 1 - .../src/main/java/forge/gui/match/CMatchUI.java | 6 +++--- .../java/forge/gui/match/TargetingOverlay.java | 2 +- .../src/main/java/forge/gui/match/VMatchUI.java | 8 ++++---- .../match/{nonsingleton => }/ZoneAction.java | 4 ++-- .../{nonsingleton => controllers}/CCommand.java | 7 ++++--- .../{nonsingleton => controllers}/CField.java | 10 ++++++---- .../{nonsingleton => controllers}/CHand.java | 6 ++++-- .../gui/match/nonsingleton/package-info.java | 3 --- .../match/{nonsingleton => views}/VCommand.java | 4 +++- .../match/{nonsingleton => views}/VField.java | 5 ++++- .../match/{nonsingleton => views}/VHand.java | 3 ++- .../java/forge/properties/ForgePreferences.java | 2 +- 18 files changed, 47 insertions(+), 42 deletions(-) rename forge-gui/src/main/java/forge/gui/{match/nonsingleton => framework}/CEmptyDoc.java (85%) rename forge-gui/src/main/java/forge/gui/match/{nonsingleton => }/ZoneAction.java (93%) rename forge-gui/src/main/java/forge/gui/match/{nonsingleton => controllers}/CCommand.java (86%) rename forge-gui/src/main/java/forge/gui/match/{nonsingleton => controllers}/CField.java (93%) rename forge-gui/src/main/java/forge/gui/match/{nonsingleton => controllers}/CHand.java (93%) delete mode 100644 forge-gui/src/main/java/forge/gui/match/nonsingleton/package-info.java rename forge-gui/src/main/java/forge/gui/match/{nonsingleton => views}/VCommand.java (95%) rename forge-gui/src/main/java/forge/gui/match/{nonsingleton => views}/VField.java (95%) rename forge-gui/src/main/java/forge/gui/match/{nonsingleton => views}/VHand.java (94%) diff --git a/.gitattributes b/.gitattributes index 1730deae8fc..5e02e5af814 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15270,6 +15270,7 @@ forge-gui/src/main/java/forge/gui/events/IUiEventVisitor.java -text forge-gui/src/main/java/forge/gui/events/UiEvent.java -text forge-gui/src/main/java/forge/gui/events/UiEventAttackerDeclared.java -text forge-gui/src/main/java/forge/gui/events/UiEventBlockerAssigned.java -text +forge-gui/src/main/java/forge/gui/framework/CEmptyDoc.java -text forge-gui/src/main/java/forge/gui/framework/DragCell.java -text forge-gui/src/main/java/forge/gui/framework/DragTab.java -text forge-gui/src/main/java/forge/gui/framework/EDocID.java -text @@ -15386,11 +15387,15 @@ forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java -text forge-gui/src/main/java/forge/gui/match/VAssignDamage.java svneol=native#text/plain forge-gui/src/main/java/forge/gui/match/VMatchUI.java -text forge-gui/src/main/java/forge/gui/match/ViewWinLose.java -text +forge-gui/src/main/java/forge/gui/match/ZoneAction.java -text forge-gui/src/main/java/forge/gui/match/controllers/CAntes.java -text forge-gui/src/main/java/forge/gui/match/controllers/CCombat.java -text +forge-gui/src/main/java/forge/gui/match/controllers/CCommand.java -text forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java -text forge-gui/src/main/java/forge/gui/match/controllers/CDev.java -text forge-gui/src/main/java/forge/gui/match/controllers/CDock.java -text +forge-gui/src/main/java/forge/gui/match/controllers/CField.java -text +forge-gui/src/main/java/forge/gui/match/controllers/CHand.java -text forge-gui/src/main/java/forge/gui/match/controllers/CLog.java -text forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java -text forge-gui/src/main/java/forge/gui/match/controllers/CPicture.java -text @@ -15401,21 +15406,15 @@ forge-gui/src/main/java/forge/gui/match/menus/CMatchUIMenus.java -text forge-gui/src/main/java/forge/gui/match/menus/CardOverlaysMenu.java -text forge-gui/src/main/java/forge/gui/match/menus/DevModeMenu.java -text forge-gui/src/main/java/forge/gui/match/menus/GameMenu.java -text -forge-gui/src/main/java/forge/gui/match/nonsingleton/CCommand.java -text -forge-gui/src/main/java/forge/gui/match/nonsingleton/CEmptyDoc.java -text -forge-gui/src/main/java/forge/gui/match/nonsingleton/CField.java -text -forge-gui/src/main/java/forge/gui/match/nonsingleton/CHand.java -text -forge-gui/src/main/java/forge/gui/match/nonsingleton/VCommand.java -text -forge-gui/src/main/java/forge/gui/match/nonsingleton/VField.java -text -forge-gui/src/main/java/forge/gui/match/nonsingleton/VHand.java -text -forge-gui/src/main/java/forge/gui/match/nonsingleton/ZoneAction.java -text -forge-gui/src/main/java/forge/gui/match/nonsingleton/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/gui/match/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/gui/match/views/VAntes.java -text forge-gui/src/main/java/forge/gui/match/views/VCombat.java -text +forge-gui/src/main/java/forge/gui/match/views/VCommand.java -text forge-gui/src/main/java/forge/gui/match/views/VDetail.java -text forge-gui/src/main/java/forge/gui/match/views/VDev.java -text forge-gui/src/main/java/forge/gui/match/views/VDock.java -text +forge-gui/src/main/java/forge/gui/match/views/VField.java -text +forge-gui/src/main/java/forge/gui/match/views/VHand.java -text forge-gui/src/main/java/forge/gui/match/views/VLog.java -text forge-gui/src/main/java/forge/gui/match/views/VMessage.java -text forge-gui/src/main/java/forge/gui/match/views/VPicture.java -text diff --git a/forge-gui/src/main/java/forge/control/FControl.java b/forge-gui/src/main/java/forge/control/FControl.java index e63ee9bdd7d..5c3cd647d43 100644 --- a/forge-gui/src/main/java/forge/control/FControl.java +++ b/forge-gui/src/main/java/forge/control/FControl.java @@ -66,8 +66,8 @@ import forge.gui.match.controllers.CDock; import forge.gui.match.controllers.CLog; import forge.gui.match.controllers.CMessage; import forge.gui.match.controllers.CStack; -import forge.gui.match.nonsingleton.VField; import forge.gui.match.views.VAntes; +import forge.gui.match.views.VField; import forge.gui.menus.ForgeMenu; import forge.gui.menus.MenuUtil; import forge.gui.toolbox.FSkin; diff --git a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java index 4b869d3c015..e335b55e8aa 100644 --- a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java +++ b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java @@ -53,8 +53,8 @@ import forge.gui.match.VMatchUI; import forge.gui.match.ViewWinLose; import forge.gui.match.controllers.CMessage; import forge.gui.match.controllers.CStack; -import forge.gui.match.nonsingleton.VField; -import forge.gui.match.nonsingleton.VHand; +import forge.gui.match.views.VField; +import forge.gui.match.views.VHand; import forge.gui.toolbox.special.PhaseLabel; import forge.net.FServer; import forge.util.maps.MapOfLists; diff --git a/forge-gui/src/main/java/forge/gui/GuiUtils.java b/forge-gui/src/main/java/forge/gui/GuiUtils.java index d484f695e64..3e59a61c2e8 100644 --- a/forge-gui/src/main/java/forge/gui/GuiUtils.java +++ b/forge-gui/src/main/java/forge/gui/GuiUtils.java @@ -32,7 +32,7 @@ import javax.swing.KeyStroke; import forge.game.card.Card; import forge.gui.match.VMatchUI; -import forge.gui.match.nonsingleton.VField; +import forge.gui.match.views.VField; import forge.view.arcane.CardPanel; /** diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CEmptyDoc.java b/forge-gui/src/main/java/forge/gui/framework/CEmptyDoc.java similarity index 85% rename from forge-gui/src/main/java/forge/gui/match/nonsingleton/CEmptyDoc.java rename to forge-gui/src/main/java/forge/gui/framework/CEmptyDoc.java index 2956de00745..2ab0b28d03c 100644 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CEmptyDoc.java +++ b/forge-gui/src/main/java/forge/gui/framework/CEmptyDoc.java @@ -1,7 +1,6 @@ -package forge.gui.match.nonsingleton; +package forge.gui.framework; import forge.Command; -import forge.gui.framework.ICDoc; /** * An intentionally empty ICDoc to fill field slots unused diff --git a/forge-gui/src/main/java/forge/gui/framework/VEmptyDoc.java b/forge-gui/src/main/java/forge/gui/framework/VEmptyDoc.java index 52a8a8a2c01..4f85053506c 100644 --- a/forge-gui/src/main/java/forge/gui/framework/VEmptyDoc.java +++ b/forge-gui/src/main/java/forge/gui/framework/VEmptyDoc.java @@ -1,6 +1,5 @@ package forge.gui.framework; -import forge.gui.match.nonsingleton.CEmptyDoc; /** * An intentionally empty IVDoc to fill field slots unused diff --git a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java index 7c470aea942..b1069419afb 100644 --- a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java +++ b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java @@ -57,9 +57,9 @@ import forge.gui.match.controllers.CDetail; import forge.gui.match.controllers.CMessage; import forge.gui.match.controllers.CPicture; import forge.gui.match.menus.CMatchUIMenus; -import forge.gui.match.nonsingleton.VCommand; -import forge.gui.match.nonsingleton.VField; -import forge.gui.match.nonsingleton.VHand; +import forge.gui.match.views.VCommand; +import forge.gui.match.views.VField; +import forge.gui.match.views.VHand; import forge.gui.match.views.VPlayers; import forge.gui.menus.IMenuProvider; import forge.gui.menus.MenuUtil; diff --git a/forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java b/forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java index a0ed9c1f18d..647a1c41934 100644 --- a/forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java +++ b/forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java @@ -38,7 +38,7 @@ import forge.game.card.Card; import forge.game.combat.Combat; import forge.gui.framework.FScreen; import forge.gui.match.controllers.CDock; -import forge.gui.match.nonsingleton.VField; +import forge.gui.match.views.VField; import forge.gui.toolbox.FSkin; import forge.view.FView; import forge.view.arcane.CardPanel; diff --git a/forge-gui/src/main/java/forge/gui/match/VMatchUI.java b/forge-gui/src/main/java/forge/gui/match/VMatchUI.java index 343374a0938..198059c8646 100644 --- a/forge-gui/src/main/java/forge/gui/match/VMatchUI.java +++ b/forge-gui/src/main/java/forge/gui/match/VMatchUI.java @@ -13,10 +13,10 @@ import forge.gui.framework.FScreen; import forge.gui.framework.IVTopLevelUI; import forge.gui.framework.SRearrangingUtil; import forge.gui.framework.VEmptyDoc; -import forge.gui.match.nonsingleton.VCommand; -import forge.gui.match.nonsingleton.VField; -import forge.gui.match.nonsingleton.VHand; +import forge.gui.match.views.VCommand; import forge.gui.match.views.VDev; +import forge.gui.match.views.VField; +import forge.gui.match.views.VHand; import forge.gui.match.views.VMessage; import forge.properties.ForgePreferences.FPref; import forge.view.FView; @@ -134,7 +134,7 @@ public enum VMatchUI implements IVTopLevelUI { this.lstFields = lst0; } - /** @return {@link java.util.List}<{@link forge.gui.match.nonsigleton.VHand}> */ + /** @return {@link java.util.List}<{@link forge.gui.match.views.VHand}> */ public List getFieldViews() { return lstFields; } diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/ZoneAction.java b/forge-gui/src/main/java/forge/gui/match/ZoneAction.java similarity index 93% rename from forge-gui/src/main/java/forge/gui/match/nonsingleton/ZoneAction.java rename to forge-gui/src/main/java/forge/gui/match/ZoneAction.java index 7a3ce7a526d..c2cc1cac873 100644 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/ZoneAction.java +++ b/forge-gui/src/main/java/forge/gui/match/ZoneAction.java @@ -1,4 +1,4 @@ -package forge.gui.match.nonsingleton; +package forge.gui.match; import java.awt.event.ActionEvent; import java.util.ArrayList; @@ -17,7 +17,7 @@ import forge.gui.GuiChoose; * "zones" of a player field: hand, library, etc. * */ -class ZoneAction extends ForgeAction { +public class ZoneAction extends ForgeAction { private static final long serialVersionUID = -5822976087772388839L; private final PlayerZone zone; private final String title; diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CCommand.java b/forge-gui/src/main/java/forge/gui/match/controllers/CCommand.java similarity index 86% rename from forge-gui/src/main/java/forge/gui/match/nonsingleton/CCommand.java rename to forge-gui/src/main/java/forge/gui/match/controllers/CCommand.java index e1522edd782..7accb1cd0ec 100644 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CCommand.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CCommand.java @@ -15,11 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.match.nonsingleton; +package forge.gui.match.controllers; import forge.Command; import forge.game.player.Player; import forge.gui.framework.ICDoc; +import forge.gui.match.views.VCommand; /** * Controls Swing components of a player's command instance. */ @@ -31,7 +32,7 @@ public class CCommand implements ICDoc { * Controls Swing components of a player's command instance. * * @param p0   {@link forge.game.player.Player} - * @param v0   {@link forge.gui.match.nonsingleton.VCommand} + * @param v0   {@link forge.gui.match.views.VCommand} */ public CCommand(final Player p0, final VCommand v0) { this.player = p0; @@ -51,7 +52,7 @@ public class CCommand implements ICDoc { return this.player; } - /** @return {@link forge.gui.nonsingleton.VField} */ + /** @return {@link forge.gui.match.views.VField} */ public VCommand getView() { return this.view; } diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CField.java b/forge-gui/src/main/java/forge/gui/match/controllers/CField.java similarity index 93% rename from forge-gui/src/main/java/forge/gui/match/nonsingleton/CField.java rename to forge-gui/src/main/java/forge/gui/match/controllers/CField.java index d1b49afd16f..1cf5bd2e144 100644 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CField.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CField.java @@ -15,13 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.match.nonsingleton; +package forge.gui.match.controllers; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.util.List; + import com.google.common.base.Function; import forge.Command; @@ -38,7 +39,8 @@ import forge.gui.ForgeAction.MatchConstants; import forge.gui.framework.ICDoc; import forge.gui.input.Input; import forge.gui.input.InputPayMana; -import forge.gui.match.controllers.CMessage; +import forge.gui.match.ZoneAction; +import forge.gui.match.views.VField; /** * Controls Swing components of a player's field instance. @@ -59,7 +61,7 @@ public class CField implements ICDoc { * Controls Swing components of a player's field instance. * * @param p0   {@link forge.game.player.Player} - * @param v0   {@link forge.gui.match.nonsingleton.VField} + * @param v0   {@link forge.gui.match.views.VField} * @param playerViewer */ @SuppressWarnings("serial") @@ -154,7 +156,7 @@ public class CField implements ICDoc { return this.player; } - /** @return {@link forge.gui.nonsingleton.VField} */ + /** @return {@link forge.gui.match.views.VField} */ public VField getView() { return this.view; } diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CHand.java b/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java similarity index 93% rename from forge-gui/src/main/java/forge/gui/match/nonsingleton/CHand.java rename to forge-gui/src/main/java/forge/gui/match/controllers/CHand.java index fde846494fc..f77b2263332 100644 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CHand.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.match.nonsingleton; +package forge.gui.match.controllers; import java.awt.Point; import java.awt.Rectangle; @@ -34,6 +34,8 @@ import forge.game.player.Player; import forge.game.zone.ZoneType; import forge.gui.framework.ICDoc; import forge.gui.match.CMatchUI; +import forge.gui.match.views.VField; +import forge.gui.match.views.VHand; import forge.view.arcane.CardPanel; import forge.view.arcane.HandArea; import forge.view.arcane.util.Animation; @@ -51,7 +53,7 @@ public class CHand implements ICDoc { * Controls Swing components of a player's hand instance. * * @param p0   {@link forge.game.player.Player} - * @param v0   {@link forge.gui.match.nonsingleton.VHand} + * @param v0   {@link forge.gui.match.views.VHand} */ public CHand(final Player p0, final VHand v0) { this.player = p0; diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/package-info.java b/forge-gui/src/main/java/forge/gui/match/nonsingleton/package-info.java deleted file mode 100644 index 200f0b1b580..00000000000 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.gui.match.nonsingleton; - diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/VCommand.java b/forge-gui/src/main/java/forge/gui/match/views/VCommand.java similarity index 95% rename from forge-gui/src/main/java/forge/gui/match/nonsingleton/VCommand.java rename to forge-gui/src/main/java/forge/gui/match/views/VCommand.java index fee0fde087e..eb3cd51b087 100644 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/VCommand.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VCommand.java @@ -15,10 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.match.nonsingleton; +package forge.gui.match.views; import javax.swing.JPanel; import javax.swing.JScrollPane; + import net.miginfocom.swing.MigLayout; import forge.game.player.Player; import forge.game.zone.ZoneType; @@ -26,6 +27,7 @@ import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; +import forge.gui.match.controllers.CCommand; import forge.gui.toolbox.FSkin; import forge.view.arcane.PlayArea; diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/VField.java b/forge-gui/src/main/java/forge/gui/match/views/VField.java similarity index 95% rename from forge-gui/src/main/java/forge/gui/match/nonsingleton/VField.java rename to forge-gui/src/main/java/forge/gui/match/views/VField.java index 941823e662d..96203194925 100644 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/VField.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VField.java @@ -15,17 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.match.nonsingleton; +package forge.gui.match.views; import java.awt.Color; import java.awt.Font; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.SwingConstants; import javax.swing.border.Border; import javax.swing.border.LineBorder; + import net.miginfocom.swing.MigLayout; import forge.game.player.LobbyPlayer; import forge.game.player.Player; @@ -35,6 +37,7 @@ import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; import forge.gui.match.CMatchUI; +import forge.gui.match.controllers.CField; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.special.PhaseIndicator; diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/VHand.java b/forge-gui/src/main/java/forge/gui/match/views/VHand.java similarity index 94% rename from forge-gui/src/main/java/forge/gui/match/nonsingleton/VHand.java rename to forge-gui/src/main/java/forge/gui/match/views/VHand.java index 35f3787681a..9a7506bba03 100644 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/VHand.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VHand.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.match.nonsingleton; +package forge.gui.match.views; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -26,6 +26,7 @@ import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; +import forge.gui.match.controllers.CHand; import forge.view.arcane.HandArea; /** diff --git a/forge-gui/src/main/java/forge/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/properties/ForgePreferences.java index e4f68911db1..4f9af2a8f9b 100644 --- a/forge-gui/src/main/java/forge/properties/ForgePreferences.java +++ b/forge-gui/src/main/java/forge/properties/ForgePreferences.java @@ -26,8 +26,8 @@ import forge.control.FControl.CloseAction; import forge.game.GameLogEntryType; import forge.gui.home.EMenuItem; import forge.gui.match.VMatchUI; -import forge.gui.match.nonsingleton.VField; import forge.gui.match.views.VDev; +import forge.gui.match.views.VField; import forge.gui.toolbox.special.PhaseIndicator; public class ForgePreferences extends PreferencesStore {