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

Renamed ViewTopLevel to more accurate MatchTopLevel.

Browse Source
This commit is contained in:
Doublestrike
2012-01-22 08:09:13 +00:00
parent a8fb5afb5d
commit 617e0833cb
11 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -11123,6 +11123,7 @@ src/main/java/forge/view/home/ViewSealed.java -text
src/main/java/forge/view/home/ViewSettings.java -text
src/main/java/forge/view/home/ViewUtilities.java -text
src/main/java/forge/view/home/package-info.java svneol=native#text/plain
src/main/java/forge/view/match/MatchTopLevel.java -text
src/main/java/forge/view/match/ViewBattlefield.java -text
src/main/java/forge/view/match/ViewDetail.java -text
src/main/java/forge/view/match/ViewDock.java -text
@@ -11131,7 +11132,6 @@ src/main/java/forge/view/match/ViewHand.java -text
src/main/java/forge/view/match/ViewInput.java -text
src/main/java/forge/view/match/ViewPicture.java -text
src/main/java/forge/view/match/ViewTabber.java -text
src/main/java/forge/view/match/ViewTopLevel.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

4
src/main/java/forge/PhaseUtil.java
View File

@@ -22,7 +22,7 @@ import java.util.HashMap;
import forge.Constant.Zone;
import forge.view.GuiTopLevel;
import forge.view.match.ViewField.PhaseLabel;
import forge.view.match.ViewTopLevel;
import forge.view.match.MatchTopLevel;
/**
* <p>
@@ -322,7 +322,7 @@ public class PhaseUtil {
public static void visuallyActivatePhase(final String s) {
PhaseLabel lbl = null;
final Player p = AllZone.getPhaseHandler().getPlayerTurn();
final ViewTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
int i; // Index of field; computer is 0, human is 1
if (p.isComputer()) {

4
src/main/java/forge/Player.java
View File

@@ -36,7 +36,7 @@ import forge.card.staticability.StaticAbility;
import forge.game.GameLossReason;
import forge.gui.GuiUtils;
import forge.view.GuiTopLevel;
import forge.view.match.ViewTopLevel;
import forge.view.match.MatchTopLevel;
/**
* <p>
@@ -1778,7 +1778,7 @@ public abstract class Player extends GameEntity {
*/
public final boolean canPlayLand() {
final ViewTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
if (t.getTabberController().getView().getLblUnlimitedLands().getEnabled() && this.isHuman() && Constant.Runtime.DEV_MODE[0]) {
return PhaseHandler.canCastSorcery(this);
}

12
src/main/java/forge/control/ControlMatchUI.java
View File

@@ -24,7 +24,7 @@ import forge.Constant.Zone;
import forge.ImageCache;
import forge.Player;
import forge.control.match.ControlField;
import forge.view.match.ViewTopLevel;
import forge.view.match.MatchTopLevel;
/**
* <p>
@@ -34,7 +34,7 @@ import forge.view.match.ViewTopLevel;
*
*/
public class ControlMatchUI {
private final ViewTopLevel view;
private final MatchTopLevel view;
/**
* <p>
@@ -51,9 +51,9 @@ public class ControlMatchUI {
* So, this class must be called after everything is already in place.
*
* @param v
* &emsp; A ViewTopLevel object
* &emsp; A MatchTopLevel object
*/
public ControlMatchUI(final ViewTopLevel v) {
public ControlMatchUI(final MatchTopLevel v) {
this.view = v;
}
@@ -122,8 +122,8 @@ public class ControlMatchUI {
}
}
/** @return ViewTopLevel */
public ViewTopLevel getView() {
/** @return MatchTopLevel */
public MatchTopLevel getView() {
return view;
}
}

12
src/main/java/forge/control/FControl.java
View File

@@ -32,7 +32,7 @@ import forge.quest.gui.bazaar.QuestBazaarPanel;
import forge.view.GuiTopLevel;
import forge.view.editor.EditorTopLevel;
import forge.view.home.HomeTopLevel;
import forge.view.match.ViewTopLevel;
import forge.view.match.MatchTopLevel;
/**
* <p>
@@ -49,7 +49,7 @@ public class FControl {
private int state;
private HomeTopLevel home = null;
private ViewTopLevel match = null;
private MatchTopLevel match = null;
private EditorTopLevel editor = null;
private WindowAdapter waDefault, waConcede, waLeaveBazaar;
private QuestBazaarPanel bazaar;
@@ -144,7 +144,7 @@ public class FControl {
break;
case MATCH_SCREEN:
this.match = new ViewTopLevel();
this.match = new MatchTopLevel();
this.display.add(this.match, JLayeredPane.DEFAULT_LAYER);
sizeChildren();
view.addWindowListener(waConcede);
@@ -170,9 +170,9 @@ public class FControl {
/**
* Gets the match view.
*
* @return ViewTopLevel
* @return MatchTopLevel
*/
public ViewTopLevel getMatchView() {
public MatchTopLevel getMatchView() {
return this.match;
}
@@ -193,7 +193,7 @@ public class FControl {
/**
* Gets the match view.
*
* @return ViewTopLevel
* @return MatchTopLevel
*/
public QuestBazaarPanel getBazaarView() {
return this.bazaar;

8
src/main/java/forge/control/match/ControlField.java
View File

@@ -56,7 +56,7 @@ import forge.properties.NewConstants.Lang.GuiDisplay.HumanHand;
import forge.properties.NewConstants.Lang.GuiDisplay.HumanLibrary;
import forge.view.GuiTopLevel;
import forge.view.match.ViewField;
import forge.view.match.ViewTopLevel;
import forge.view.match.MatchTopLevel;
/**
* Child controller, applied to single field in battlefield. Manages player view
@@ -423,7 +423,7 @@ public class ControlField {
maAvatar = new MouseAdapter() {
@Override
public void mousePressed(final MouseEvent e) {
final ViewTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
if (ControlField.this.player.isComputer()) {
t.getInputController().getInputControl().selectPlayer(AllZone.getComputerPlayer());
} else {
@@ -436,7 +436,7 @@ public class ControlField {
maCardOver = new MouseMotionAdapter() {
@Override
public void mouseMoved(final MouseEvent me) {
final ViewTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final Card c = ControlField.this.view.getTabletop().getCardFromMouseOverPanel();
if (c != null) {
t.getDetailController().showCard(c);
@@ -449,7 +449,7 @@ public class ControlField {
maCardClick = new MouseAdapter() {
@Override
public void mousePressed(final MouseEvent e) {
final ViewTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final Card c = t.getDetailController().getCurrentCard();
final Input input = t.getInputController().getInputControl().getInput();

6
src/main/java/forge/control/match/ControlHand.java
View File

@@ -40,7 +40,7 @@ import forge.Constant.Zone;
import forge.PlayerZone;
import forge.view.GuiTopLevel;
import forge.view.match.ViewHand;
import forge.view.match.ViewTopLevel;
import forge.view.match.MatchTopLevel;
/**
* Child controller - handles operations related to cards in user's hand and
@@ -68,7 +68,7 @@ public class ControlHand {
this.view = v;
this.cardsInPanel = new ArrayList<Card>();
final ViewTopLevel t = view.getTopLevel();
final MatchTopLevel t = view.getTopLevel();
maCardClick = new MouseAdapter() {
// Card click
@@ -184,7 +184,7 @@ public class ControlHand {
*/
public void addCardPanelListeners(final CardPanel c) {
// Grab top level controller to facilitate interaction between children
final ViewTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final Card cardobj = c.getCard();
// Sidebar pic/detail on card hover

22
src/main/java/forge/view/match/ViewTopLevel.java → src/main/java/forge/view/match/MatchTopLevel.java
View File

@@ -54,7 +54,7 @@ import forge.view.toolbox.FSkin;
*/
@SuppressWarnings("serial")
public class ViewTopLevel extends FPanel {
public class MatchTopLevel extends FPanel {
private ViewBattlefield battlefield;
private ViewDetail detail;
private ViewDock dock;
@@ -92,7 +92,7 @@ public class ViewTopLevel extends FPanel {
* - Implements Display interface used in singleton pattern
*
*/
public ViewTopLevel() {
public MatchTopLevel() {
super();
// Set properties
@@ -375,7 +375,7 @@ public class ViewTopLevel extends FPanel {
* @return ControlDetail
*/
public ControlDetail getDetailController() {
return ViewTopLevel.this.detail.getController();
return MatchTopLevel.this.detail.getController();
}
/**
@@ -384,7 +384,7 @@ public class ViewTopLevel extends FPanel {
* @return ControlPicture
*/
public ControlPicture getPictureController() {
return ViewTopLevel.this.picture.getController();
return MatchTopLevel.this.picture.getController();
}
/**
@@ -393,7 +393,7 @@ public class ViewTopLevel extends FPanel {
* @return ControlTabber
*/
public ControlTabber getTabberController() {
return ViewTopLevel.this.tabber.getController();
return MatchTopLevel.this.tabber.getController();
}
/**
@@ -402,7 +402,7 @@ public class ViewTopLevel extends FPanel {
* @return ControlInput
*/
public ControlInput getInputController() {
return ViewTopLevel.this.input.getController();
return MatchTopLevel.this.input.getController();
}
/**
@@ -411,7 +411,7 @@ public class ViewTopLevel extends FPanel {
* @return ControlHand
*/
public ControlHand getHandController() {
return ViewTopLevel.this.hand.getController();
return MatchTopLevel.this.hand.getController();
}
/**
@@ -420,7 +420,7 @@ public class ViewTopLevel extends FPanel {
* @return ControlDock
*/
public ControlDock getDockController() {
return ViewTopLevel.this.dock.getController();
return MatchTopLevel.this.dock.getController();
}
/**
@@ -445,7 +445,7 @@ public class ViewTopLevel extends FPanel {
* @return List<ViewField>
*/
public List<ViewField> getFieldViews() {
return ViewTopLevel.this.battlefield.getFields();
return MatchTopLevel.this.battlefield.getFields();
}
// ========== Input panel and human hand retrieval functions
@@ -458,7 +458,7 @@ public class ViewTopLevel extends FPanel {
* @return <b>JTextArea</b> Message area of input panel.
*/
public JTextArea getPnlMessage() {
return ViewTopLevel.this.input.getTarMessage();
return MatchTopLevel.this.input.getTarMessage();
}
/**
@@ -467,7 +467,7 @@ public class ViewTopLevel extends FPanel {
* @return <b>ViewHand</b> Retrieves player hand panel.
*/
public ViewHand getPnlHand() {
return ViewTopLevel.this.hand;
return MatchTopLevel.this.hand;
}
/**
* Gets the top level frame.

2
src/main/java/forge/view/match/ViewField.java
View File

@@ -346,7 +346,7 @@ public class ViewField extends FRoundedPanel {
*/
public void updateDetails(final Player p0) {
// "Players" panel update
final ViewTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
t.getTabberController().getView().updatePlayerLabels(p0);
// Poison/life

10
src/main/java/forge/view/match/ViewHand.java
View File

@@ -34,14 +34,14 @@ import forge.view.toolbox.FSkin;
public class ViewHand extends FRoundedPanel {
private ControlHand control;
private HandArea hand;
private ViewTopLevel topLevel;
private MatchTopLevel topLevel;
/**
* Swing components for user hand.
*
* @param v0 &emsp; The ViewTopLevel parent.
* @param v0 &emsp; The MatchTopLevel parent.
*/
public ViewHand(ViewTopLevel v0) {
public ViewHand(MatchTopLevel v0) {
final JScrollPane scroller = new JScrollPane();
ViewHand.this.hand = new HandArea(scroller);
ViewHand.this.setBackground(Singletons.getView().getSkin().getColor(FSkin.SkinProp.CLR_THEME));
@@ -78,8 +78,8 @@ public class ViewHand extends FRoundedPanel {
return ViewHand.this.hand;
}
/** @return ViewTopLevel */
public ViewTopLevel getTopLevel() {
/** @return MatchTopLevel */
public MatchTopLevel getTopLevel() {
return this.topLevel;
}
}

2
src/main/java/forge/view/match/ViewTabber.java
View File

@@ -228,7 +228,7 @@ public class ViewTabber extends FRoundedPanel {
*/
public void updateStack() {
final MagicStack stack = AllZone.getStack();
final ViewTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView();
int count = 1;
JTextArea tar;