WinLose controller moved to forge.control.

WinLose view moved to forge.view.toolbox.
This commit is contained in:
Doublestrike
2011-11-26 00:54:54 +00:00
parent 640806bee9
commit b712905af9
5 changed files with 17 additions and 15 deletions

4
.gitattributes vendored
View File

@@ -10702,6 +10702,7 @@ src/main/java/forge/control/ControlAllUI.java -text
src/main/java/forge/control/ControlEditorUI.java -text src/main/java/forge/control/ControlEditorUI.java -text
src/main/java/forge/control/ControlHomeUI.java -text src/main/java/forge/control/ControlHomeUI.java -text
src/main/java/forge/control/ControlMatchUI.java -text src/main/java/forge/control/ControlMatchUI.java -text
src/main/java/forge/control/ControlWinLose.java -text
src/main/java/forge/control/match/ControlCardviewer.java -text src/main/java/forge/control/match/ControlCardviewer.java -text
src/main/java/forge/control/match/ControlDock.java -text src/main/java/forge/control/match/ControlDock.java -text
src/main/java/forge/control/match/ControlField.java -text src/main/java/forge/control/match/ControlField.java -text
@@ -10882,8 +10883,6 @@ src/main/java/forge/view/swing/ApplicationView.java svneol=native#text/plain
src/main/java/forge/view/swing/GuiHomeScreen.java svneol=native#text/plain src/main/java/forge/view/swing/GuiHomeScreen.java svneol=native#text/plain
src/main/java/forge/view/swing/Main.java svneol=native#text/plain src/main/java/forge/view/swing/Main.java svneol=native#text/plain
src/main/java/forge/view/swing/OldGuiNewGame.java svneol=native#text/plain src/main/java/forge/view/swing/OldGuiNewGame.java svneol=native#text/plain
src/main/java/forge/view/swing/WinLoseFrame.java -text
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/swing/package-info.java svneol=native#text/plain
src/main/java/forge/view/toolbox/CardDetailPanel.java -text src/main/java/forge/view/toolbox/CardDetailPanel.java -text
src/main/java/forge/view/toolbox/CardViewer.java -text src/main/java/forge/view/toolbox/CardViewer.java -text
@@ -10893,6 +10892,7 @@ src/main/java/forge/view/toolbox/FPanel.java -text
src/main/java/forge/view/toolbox/FRoundedPanel.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/FSkin.java -text
src/main/java/forge/view/toolbox/FVerticalTabPanel.java -text src/main/java/forge/view/toolbox/FVerticalTabPanel.java -text
src/main/java/forge/view/toolbox/WinLoseFrame.java -text
src/main/java/net/slightlymagic/braids/LICENSE.txt 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/ClumsyRunnable.java svneol=native#text/plain
src/main/java/net/slightlymagic/braids/util/ImmutableIterableFrom.java svneol=native#text/plain src/main/java/net/slightlymagic/braids/util/ImmutableIterableFrom.java svneol=native#text/plain

View File

@@ -43,7 +43,7 @@ import forge.properties.NewConstants.Lang.GameAction.GameActionText;
import forge.quest.gui.QuestWinLoseHandler; import forge.quest.gui.QuestWinLoseHandler;
import forge.quest.gui.main.QuestEvent; import forge.quest.gui.main.QuestEvent;
import forge.view.match.ViewTopLevel; import forge.view.match.ViewTopLevel;
import forge.view.swing.WinLoseFrame; import forge.view.toolbox.WinLoseFrame;
/** /**
* <p> * <p>

View File

@@ -1,11 +1,14 @@
package forge.view.swing; package forge.control;
import forge.AllZone; import forge.AllZone;
import forge.Constant; import forge.Constant;
import forge.view.swing.GuiHomeScreen;
import forge.view.swing.OldGuiNewGame;
import forge.view.toolbox.WinLoseFrame;
/** /**
* <p> * <p>
* WinLoseModeHandler. * ControlWinLose.
* </p> * </p>
* *
* Superclass of custom mode handling for win/lose UI. Can add swing components * Superclass of custom mode handling for win/lose UI. Can add swing components
@@ -13,7 +16,7 @@ import forge.Constant;
* extend this class. * extend this class.
* *
*/ */
public class WinLoseModeHandler { public class ControlWinLose {
/** The view. */ /** The view. */
private WinLoseFrame view; private WinLoseFrame view;

View File

@@ -17,6 +17,7 @@ import forge.Constant;
import forge.MyRandom; import forge.MyRandom;
import forge.Player; import forge.Player;
import forge.SetUtils; import forge.SetUtils;
import forge.control.ControlWinLose;
import forge.game.GameEndReason; import forge.game.GameEndReason;
import forge.game.GameFormat; import forge.game.GameFormat;
import forge.game.GameLossReason; import forge.game.GameLossReason;
@@ -31,7 +32,6 @@ import forge.quest.data.QuestPreferences;
import forge.quest.data.QuestUtil; import forge.quest.data.QuestUtil;
import forge.quest.gui.main.QuestChallenge; import forge.quest.gui.main.QuestChallenge;
import forge.quest.gui.main.QuestEvent; import forge.quest.gui.main.QuestEvent;
import forge.view.swing.WinLoseModeHandler;
/** /**
* <p> * <p>
@@ -42,7 +42,7 @@ import forge.view.swing.WinLoseModeHandler;
* WinLoseFrame should use MigLayout. * WinLoseFrame should use MigLayout.
* *
*/ */
public class QuestWinLoseHandler extends WinLoseModeHandler { public class QuestWinLoseHandler extends ControlWinLose {
private final boolean wonMatch; private final boolean wonMatch;
private ImageIcon icoTemp; private ImageIcon icoTemp;
private JLabel lblTemp1; private JLabel lblTemp1;

View File

@@ -1,4 +1,4 @@
package forge.view.swing; package forge.view.toolbox;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
@@ -20,12 +20,11 @@ import forge.AllZone;
import forge.Constant; import forge.Constant;
import forge.Phase; import forge.Phase;
import forge.Player; import forge.Player;
import forge.control.ControlWinLose;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
import forge.properties.NewConstants.Lang.WinLoseFrame.WinLoseText; import forge.properties.NewConstants.Lang.WinLoseFrame.WinLoseText;
import forge.quest.data.QuestMatchState; import forge.quest.data.QuestMatchState;
import forge.view.match.ViewTopLevel; import forge.view.match.ViewTopLevel;
import forge.view.toolbox.FButton;
import forge.view.toolbox.FPanel;
/** /**
* <p> * <p>
@@ -39,7 +38,7 @@ import forge.view.toolbox.FPanel;
public class WinLoseFrame extends JFrame { public class WinLoseFrame extends JFrame {
private final QuestMatchState matchState; private final QuestMatchState matchState;
private final WinLoseModeHandler modeHandler; private final ControlWinLose modeHandler;
/** The btn continue. */ /** The btn continue. */
private FButton btnContinue; private FButton btnContinue;
@@ -67,7 +66,7 @@ public class WinLoseFrame extends JFrame {
* *
*/ */
public WinLoseFrame() { public WinLoseFrame() {
this(new WinLoseModeHandler()); this(new ControlWinLose());
} }
/** /**
@@ -78,9 +77,9 @@ public class WinLoseFrame extends JFrame {
* modes (quest, puzzle, etc.) * modes (quest, puzzle, etc.)
* *
* @param mh * @param mh
* the mh {@link forge.view.swing.WinLoseModeHandler} * the mh {@link forge.control.ControlWinLose}
*/ */
public WinLoseFrame(final WinLoseModeHandler mh) { public WinLoseFrame(final ControlWinLose mh) {
super(); super();
// modeHandler handles the unique display for different game modes. // modeHandler handles the unique display for different game modes.