external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break up files in nonsingleton folder into existing controller and view folders

Browse Source
This commit is contained in:
drdev
2013-11-24 21:16:23 +00:00
parent f35f6b3edd
commit 05751dbe1b
18 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.gitattributes vendored
View File

@@ -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

2
forge-gui/src/main/java/forge/control/FControl.java
View File

@@ -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;

4
forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
View File

@@ -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;

2
forge-gui/src/main/java/forge/gui/GuiUtils.java
View File

@@ -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;
/**

3
forge-gui/src/main/java/forge/gui/match/nonsingleton/CEmptyDoc.java → forge-gui/src/main/java/forge/gui/framework/CEmptyDoc.java
View File

@@ -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

1
forge-gui/src/main/java/forge/gui/framework/VEmptyDoc.java
View File

@@ -1,6 +1,5 @@
package forge.gui.framework;
import forge.gui.match.nonsingleton.CEmptyDoc;
/**
* An intentionally empty IVDoc to fill field slots unused

6
forge-gui/src/main/java/forge/gui/match/CMatchUI.java
View File

@@ -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;

2
forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java
View File

@@ -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;

8
forge-gui/src/main/java/forge/gui/match/VMatchUI.java
View File

@@ -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<VField> getFieldViews() {
return lstFields;
}

4
forge-gui/src/main/java/forge/gui/match/nonsingleton/ZoneAction.java → forge-gui/src/main/java/forge/gui/match/ZoneAction.java
View File

@@ -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;

7
forge-gui/src/main/java/forge/gui/match/nonsingleton/CCommand.java → forge-gui/src/main/java/forge/gui/match/controllers/CCommand.java
View File

@@ -15,11 +15,12 @@
* 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.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 &emsp; {@link forge.game.player.Player}
* @param v0 &emsp; {@link forge.gui.match.nonsingleton.VCommand}
* @param v0 &emsp; {@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;
}

10
forge-gui/src/main/java/forge/gui/match/nonsingleton/CField.java → forge-gui/src/main/java/forge/gui/match/controllers/CField.java
View File

@@ -15,13 +15,14 @@
* 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.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 &emsp; {@link forge.game.player.Player}
* @param v0 &emsp; {@link forge.gui.match.nonsingleton.VField}
* @param v0 &emsp; {@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;
}

6
forge-gui/src/main/java/forge/gui/match/nonsingleton/CHand.java → forge-gui/src/main/java/forge/gui/match/controllers/CHand.java
View File

@@ -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.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 &emsp; {@link forge.game.player.Player}
* @param v0 &emsp; {@link forge.gui.match.nonsingleton.VHand}
* @param v0 &emsp; {@link forge.gui.match.views.VHand}
*/
public CHand(final Player p0, final VHand v0) {
this.player = p0;

3
forge-gui/src/main/java/forge/gui/match/nonsingleton/package-info.java
View File

@@ -1,3 +0,0 @@
/** Forge Card Game. */
package forge.gui.match.nonsingleton;

4
forge-gui/src/main/java/forge/gui/match/nonsingleton/VCommand.java → forge-gui/src/main/java/forge/gui/match/views/VCommand.java
View File

@@ -15,10 +15,11 @@
* 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.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;

5
forge-gui/src/main/java/forge/gui/match/nonsingleton/VField.java → forge-gui/src/main/java/forge/gui/match/views/VField.java
View File

@@ -15,17 +15,19 @@
* 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.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;

3
forge-gui/src/main/java/forge/gui/match/nonsingleton/VHand.java → forge-gui/src/main/java/forge/gui/match/views/VHand.java
View File

@@ -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.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;
/**

2
forge-gui/src/main/java/forge/properties/ForgePreferences.java
View File

@@ -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<ForgePreferences.FPref> {