From 668839a528cd63547902d8bbf8bad971e5eb82fb Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Mon, 13 Feb 2012 12:13:47 +0000 Subject: [PATCH] Massive removal of old UI code: Easy accessors added FView and FControl to various components throughout UI. Mishmash of methods in "Display" interface attached as appropriate to singletons. AllZone updated to remove display and one or two others in favor of singletons, for future deprecation. Some renaming for consistency. Skins folder moved out of "images", which will be deprecated soon. FControl refactored to reuse single instance of each UI state. --- .gitattributes | 66 ++- .gitignore | 1 - .project | 58 +-- res/gui/display_layout.xml | 288 ------------ res/gui/gui.properties | 3 - res/main.properties | 3 - .../skins/darkascension/bg_match.jpg | Bin .../skins/darkascension/bg_splash.png | Bin .../skins/darkascension/bg_texture.jpg | Bin .../skins/darkascension/font1.ttf | Bin .../skins/darkascension/sprite_icons.png | Bin res/{images => }/skins/default/bg_match.jpg | Bin res/{images => }/skins/default/bg_splash.png | Bin res/{images => }/skins/default/bg_texture.jpg | Bin res/{images => }/skins/default/font1.ttf | Bin res/{images => }/skins/default/grid_icons.png | Bin res/{images => }/skins/default/loader.gif | Bin .../skins/default/sprite_avatars.png | Bin .../skins/default/sprite_foils.png | Bin .../skins/default/sprite_icons.png | Bin res/{images => }/skins/rebel/bg_match.jpg | Bin res/{images => }/skins/rebel/bg_splash.png | Bin res/{images => }/skins/rebel/bg_texture.jpg | Bin res/{images => }/skins/rebel/font1.ttf | Bin res/{images => }/skins/rebel/sprite_icons.png | Bin res/{images => }/skins/smith/bg_match.jpg | Bin res/{images => }/skins/smith/bg_splash.png | Bin res/{images => }/skins/smith/bg_texture.jpg | Bin res/{images => }/skins/smith/font1.ttf | Bin res/{images => }/skins/smith/sprite_icons.png | Bin src/main/java/forge/AllZone.java | 58 +-- src/main/java/forge/ButtonUtil.java | 34 +- src/main/java/forge/CardReader.java | 3 +- src/main/java/forge/Combat.java | 4 +- src/main/java/forge/CombatUtil.java | 4 +- src/main/java/forge/Display.java | 145 ------ src/main/java/forge/GameAction.java | 7 +- src/main/java/forge/GameActionUtil.java | 4 +- src/main/java/forge/GuiMultipleBlockers.java | 9 +- src/main/java/forge/HumanPlayer.java | 2 +- src/main/java/forge/MagicStack.java | 6 +- src/main/java/forge/PhaseHandler.java | 9 +- src/main/java/forge/PhaseUtil.java | 36 +- src/main/java/forge/Player.java | 8 +- src/main/java/forge/PlayerUtil.java | 10 +- src/main/java/forge/Singletons.java | 21 + src/main/java/forge/Untap.java | 6 +- src/main/java/forge/Upkeep.java | 10 +- .../AbilityFactoryCounters.java | 3 +- .../card/cardfactory/AbstractCardFactory.java | 11 +- .../cardfactory/CardFactoryCreatures.java | 23 +- .../card/cardfactory/CardFactoryLands.java | 17 +- .../cardfactory/CardFactorySorceries.java | 23 +- .../card/cardfactory/CardFactoryUtil.java | 25 +- .../cardfactory/PreloadingCardFactory.java | 4 +- .../java/forge/card/cost/CostDiscard.java | 3 +- src/main/java/forge/card/cost/CostExile.java | 3 +- src/main/java/forge/card/cost/CostMana.java | 7 +- .../java/forge/card/cost/CostPutCounter.java | 4 +- src/main/java/forge/card/cost/CostReturn.java | 3 +- src/main/java/forge/card/cost/CostReveal.java | 3 +- .../java/forge/card/cost/CostSacrifice.java | 3 +- .../java/forge/card/cost/CostTapType.java | 4 +- .../card/spellability/TargetSelection.java | 5 +- .../java/forge/control/ControlHomeUI.java | 12 +- .../java/forge/control/ControlMatchUI.java | 228 ++++++++- src/main/java/forge/control/FControl.java | 156 +++--- .../java/forge/control/KeyboardShortcuts.java | 30 +- .../control/home/ControlConstructed.java | 7 +- .../java/forge/control/home/ControlDraft.java | 7 +- .../java/forge/control/home/ControlQuest.java | 18 +- .../forge/control/home/ControlSealed.java | 7 +- .../forge/control/home/ControlSettings.java | 8 +- .../forge/control/match/ControlField.java | 22 +- .../java/forge/control/match/ControlHand.java | 30 +- ...{ControlInput.java => ControlMessage.java} | 24 +- .../forge/control/match/ControlWinLose.java | 13 +- src/main/java/forge/gui/GuiUtils.java | 12 +- .../forge/gui/deckeditor/DeckEditorDraft.java | 11 +- src/main/java/forge/gui/input/Input.java | 3 +- .../java/forge/gui/input/InputAttack.java | 8 +- src/main/java/forge/gui/input/InputBlock.java | 8 +- .../java/forge/gui/input/InputCleanup.java | 3 +- .../java/forge/gui/input/InputControl.java | 3 +- .../java/forge/gui/input/InputMulligan.java | 26 +- .../forge/gui/input/InputPassPriority.java | 6 +- .../forge/gui/input/InputPayManaCost.java | 3 +- .../gui/input/InputPayManaCostAbility.java | 3 +- src/main/java/forge/model/FModel.java | 93 +++- src/main/java/forge/view/FView.java | 161 ++++--- src/main/java/forge/view/GuiTopLevel.java | 444 ------------------ src/main/java/forge/view/Main.java | 6 + .../forge/view/{home => }/SplashFrame.java | 18 +- .../BazaarTopLevel.java => ViewBazaarUI.java} | 7 +- .../EditorTopLevel.java => ViewEditorUI.java} | 6 +- .../HomeTopLevel.java => ViewHomeUI.java} | 16 +- .../MatchTopLevel.java => ViewMatchUI.java} | 197 +++----- src/main/java/forge/view/bazaar/ViewItem.java | 4 +- .../java/forge/view/bazaar/ViewStall.java | 11 +- .../java/forge/view/home/StartButton.java | 5 +- .../java/forge/view/home/ViewConstructed.java | 11 +- src/main/java/forge/view/home/ViewDraft.java | 25 +- src/main/java/forge/view/home/ViewQuest.java | 11 +- src/main/java/forge/view/home/ViewSealed.java | 11 +- .../java/forge/view/home/ViewSettings.java | 11 +- .../java/forge/view/home/ViewUtilities.java | 25 +- .../forge/view/match/QuestWinLoseHandler.java | 237 +++++----- .../java/forge/view/match/ViewDetail.java | 2 +- src/main/java/forge/view/match/ViewDock.java | 8 +- src/main/java/forge/view/match/ViewField.java | 7 +- src/main/java/forge/view/match/ViewHand.java | 13 +- .../{ViewInput.java => ViewMessage.java} | 16 +- .../java/forge/view/match/ViewPicture.java | 2 +- .../java/forge/view/match/ViewTabber.java | 10 +- .../java/forge/view/match/ViewWinLose.java | 3 +- .../java/forge/view/toolbox/DeckLister.java | 4 +- .../java/forge/view/toolbox/FOverlay.java | 2 + src/main/java/forge/view/toolbox/FSkin.java | 6 +- .../java/forge/GuiMultipleBlockers4Test.java | 2 +- 119 files changed, 1135 insertions(+), 1823 deletions(-) delete mode 100644 res/gui/display_layout.xml delete mode 100644 res/gui/gui.properties rename res/{images => }/skins/darkascension/bg_match.jpg (100%) rename res/{images => }/skins/darkascension/bg_splash.png (100%) rename res/{images => }/skins/darkascension/bg_texture.jpg (100%) rename res/{images => }/skins/darkascension/font1.ttf (100%) rename res/{images => }/skins/darkascension/sprite_icons.png (100%) rename res/{images => }/skins/default/bg_match.jpg (100%) rename res/{images => }/skins/default/bg_splash.png (100%) rename res/{images => }/skins/default/bg_texture.jpg (100%) rename res/{images => }/skins/default/font1.ttf (100%) rename res/{images => }/skins/default/grid_icons.png (100%) rename res/{images => }/skins/default/loader.gif (100%) rename res/{images => }/skins/default/sprite_avatars.png (100%) rename res/{images => }/skins/default/sprite_foils.png (100%) rename res/{images => }/skins/default/sprite_icons.png (100%) rename res/{images => }/skins/rebel/bg_match.jpg (100%) rename res/{images => }/skins/rebel/bg_splash.png (100%) rename res/{images => }/skins/rebel/bg_texture.jpg (100%) rename res/{images => }/skins/rebel/font1.ttf (100%) rename res/{images => }/skins/rebel/sprite_icons.png (100%) rename res/{images => }/skins/smith/bg_match.jpg (100%) rename res/{images => }/skins/smith/bg_splash.png (100%) rename res/{images => }/skins/smith/bg_texture.jpg (100%) rename res/{images => }/skins/smith/font1.ttf (100%) rename res/{images => }/skins/smith/sprite_icons.png (100%) delete mode 100644 src/main/java/forge/Display.java rename src/main/java/forge/control/match/{ControlInput.java => ControlMessage.java} (82%) delete mode 100644 src/main/java/forge/view/GuiTopLevel.java rename src/main/java/forge/view/{home => }/SplashFrame.java (90%) rename src/main/java/forge/view/{bazaar/BazaarTopLevel.java => ViewBazaarUI.java} (93%) rename src/main/java/forge/view/{editor/EditorTopLevel.java => ViewEditorUI.java} (87%) rename src/main/java/forge/view/{home/HomeTopLevel.java => ViewHomeUI.java} (93%) rename src/main/java/forge/view/{match/MatchTopLevel.java => ViewMatchUI.java} (74%) rename src/main/java/forge/view/match/{ViewInput.java => ViewMessage.java} (90%) diff --git a/.gitattributes b/.gitattributes index f7175be37bb..0ebd62c6dc9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10317,8 +10317,6 @@ res/draft/rare.txt svneol=native#text/plain res/draft/uncommon.txt svneol=native#text/plain res/gamedata/NonStackingKWList.txt svneol=native#text/plain res/gamedata/TypeLists.txt svneol=native#text/plain -res/gui/display_layout.xml svneol=native#text/xml -res/gui/gui.properties svneol=native#text/plain res/images/deckeditor/filter_artifact_n.png -text svneol=unset#image/png res/images/deckeditor/filter_artifact_y.png -text svneol=unset#image/png res/images/deckeditor/filter_black_n.png -text svneol=unset#image/png @@ -10345,30 +10343,6 @@ res/images/deckeditor/filter_sorcery_n.png -text svneol=unset#image/png res/images/deckeditor/filter_sorcery_y.png -text svneol=unset#image/png res/images/deckeditor/filter_white_n.png -text svneol=unset#image/png res/images/deckeditor/filter_white_y.png -text svneol=unset#image/png -res/images/skins/darkascension/bg_match.jpg -text -res/images/skins/darkascension/bg_splash.png -text -res/images/skins/darkascension/bg_texture.jpg -text -res/images/skins/darkascension/font1.ttf -text -res/images/skins/darkascension/sprite_icons.png -text -res/images/skins/default/bg_match.jpg -text -res/images/skins/default/bg_splash.png -text -res/images/skins/default/bg_texture.jpg -text -res/images/skins/default/font1.ttf -text -res/images/skins/default/grid_icons.png -text -res/images/skins/default/loader.gif -text -res/images/skins/default/sprite_avatars.png -text -res/images/skins/default/sprite_foils.png -text -res/images/skins/default/sprite_icons.png -text -res/images/skins/rebel/bg_match.jpg -text -res/images/skins/rebel/bg_splash.png -text -res/images/skins/rebel/bg_texture.jpg -text -res/images/skins/rebel/font1.ttf -text -res/images/skins/rebel/sprite_icons.png -text -res/images/skins/smith/bg_match.jpg -text -res/images/skins/smith/bg_splash.png -text -res/images/skins/smith/bg_texture.jpg -text -res/images/skins/smith/font1.ttf -text -res/images/skins/smith/sprite_icons.png -text res/lang/de.properties svneol=native#text/plain res/lang/en.properties svneol=native#text/plain res/lang/howTo/de.properties svneol=native#text/plain @@ -10853,6 +10827,30 @@ res/quest/themes/Zombies[!!-~]B.thm -text res/reprintSetInfo.py svneol=native#text/x-python res/sealed/juzamjedi.zsealed -text res/setInfoScript.py svneol=native#text/x-python +res/skins/darkascension/bg_match.jpg -text +res/skins/darkascension/bg_splash.png -text +res/skins/darkascension/bg_texture.jpg -text +res/skins/darkascension/font1.ttf -text +res/skins/darkascension/sprite_icons.png -text +res/skins/default/bg_match.jpg -text +res/skins/default/bg_splash.png -text +res/skins/default/bg_texture.jpg -text +res/skins/default/font1.ttf -text +res/skins/default/grid_icons.png -text +res/skins/default/loader.gif -text +res/skins/default/sprite_avatars.png -text +res/skins/default/sprite_foils.png -text +res/skins/default/sprite_icons.png -text +res/skins/rebel/bg_match.jpg -text +res/skins/rebel/bg_splash.png -text +res/skins/rebel/bg_texture.jpg -text +res/skins/rebel/font1.ttf -text +res/skins/rebel/sprite_icons.png -text +res/skins/smith/bg_match.jpg -text +res/skins/smith/bg_splash.png -text +res/skins/smith/bg_texture.jpg -text +res/skins/smith/font1.ttf -text +res/skins/smith/sprite_icons.png -text res/sound/tap.mp3 -text svneol=unset#audio/mpeg res/token-images.txt -text src/main/config/Forge.icns -text @@ -10913,7 +10911,6 @@ src/main/java/forge/Constant.java svneol=native#text/plain src/main/java/forge/ConstantStringArrayList.java svneol=native#text/plain src/main/java/forge/Counters.java svneol=native#text/plain src/main/java/forge/DefaultPlayerZone.java svneol=native#text/plain -src/main/java/forge/Display.java svneol=native#text/plain src/main/java/forge/EndOfCombat.java svneol=native#text/plain src/main/java/forge/EndOfTurn.java svneol=native#text/plain src/main/java/forge/ExternalPanel.java svneol=native#text/plain @@ -11139,7 +11136,7 @@ src/main/java/forge/control/match/ControlDetail.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/ControlHand.java -text -src/main/java/forge/control/match/ControlInput.java -text +src/main/java/forge/control/match/ControlMessage.java -text src/main/java/forge/control/match/ControlPicture.java -text src/main/java/forge/control/match/ControlTabber.java -text src/main/java/forge/control/match/ControlWinLose.java -text @@ -11297,18 +11294,18 @@ src/main/java/forge/util/MyRandom.java svneol=native#text/plain src/main/java/forge/util/SectionUtil.java -text src/main/java/forge/util/package-info.java -text src/main/java/forge/view/FView.java svneol=native#text/plain -src/main/java/forge/view/GuiTopLevel.java -text src/main/java/forge/view/Main.java -text -src/main/java/forge/view/bazaar/BazaarTopLevel.java -text +src/main/java/forge/view/SplashFrame.java -text +src/main/java/forge/view/ViewBazaarUI.java -text +src/main/java/forge/view/ViewEditorUI.java -text +src/main/java/forge/view/ViewHomeUI.java -text +src/main/java/forge/view/ViewMatchUI.java -text src/main/java/forge/view/bazaar/ViewItem.java -text src/main/java/forge/view/bazaar/ViewStall.java svneol=native#text/plain src/main/java/forge/view/bazaar/package-info.java svneol=native#text/plain -src/main/java/forge/view/editor/EditorTopLevel.java -text src/main/java/forge/view/editor/package-info.java svneol=native#text/plain -src/main/java/forge/view/home/HomeTopLevel.java -text src/main/java/forge/view/home/QuestFileLister.java -text src/main/java/forge/view/home/QuestPreferencesHandler.java -text -src/main/java/forge/view/home/SplashFrame.java -text src/main/java/forge/view/home/StartButton.java -text src/main/java/forge/view/home/ViewConstructed.java -text src/main/java/forge/view/home/ViewDraft.java -text @@ -11317,7 +11314,6 @@ 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/QuestWinLoseCardViewer.java -text src/main/java/forge/view/match/QuestWinLoseHandler.java -text src/main/java/forge/view/match/ViewBattlefield.java -text @@ -11325,7 +11321,7 @@ src/main/java/forge/view/match/ViewDetail.java -text src/main/java/forge/view/match/ViewDock.java -text src/main/java/forge/view/match/ViewField.java -text src/main/java/forge/view/match/ViewHand.java -text -src/main/java/forge/view/match/ViewInput.java -text +src/main/java/forge/view/match/ViewMessage.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/ViewWinLose.java -text diff --git a/.gitignore b/.gitignore index 71145c1e4d6..69ace27c8a9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ res/PerSetTrackingResults res/cardsfolder/cardsfolder.zip res/decks/AI_o1.dck res/decks/o1.bdk -res/gui/display_new_layout.xml res/images/themes res/oracleScript.log res/pics diff --git a/.project b/.project index 7622eeda226..5af90efe210 100644 --- a/.project +++ b/.project @@ -1,29 +1,29 @@ - - - Forge - - - - - - org.eclipse.jdt.core.javabuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - net.sf.eclipsecs.core.CheckstyleNature - - + + + ForgeLocal + + + + + + org.eclipse.jdt.core.javabuilder + + + + + net.sf.eclipsecs.core.CheckstyleBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature + + diff --git a/res/gui/display_layout.xml b/res/gui/display_layout.xml deleted file mode 100644 index 5c4d17b28f1..00000000000 --- a/res/gui/display_layout.xml +++ /dev/null @@ -1,288 +0,0 @@ - - - - 0 - 0 - 0 - 0 - - 0.0 - true - - - - true - - - 0 - 0 - 1024 - 687 - - 0.0 - true - - - - - 0 - 0 - 197 - 687 - - 0.0 - true - - - - - 0 - 0 - 197 - 126 - - 0.2 - true - info - - - - - 0 - 126 - 197 - 5 - - 0.0 - true - - - - - 0 - 131 - 197 - 142 - - 0.2 - true - compy - - - - - 0 - 273 - 197 - 5 - - 0.0 - true - - - - - 0 - 278 - 197 - 115 - - 0.2 - true - stack - - - - - 0 - 393 - 197 - 5 - - 0.0 - true - - - - - 0 - 398 - 197 - 137 - - 0.2 - true - combat - - - - - 0 - 535 - 197 - 5 - - 0.0 - true - - - - - 0 - 540 - 197 - 147 - - 0.2 - true - human - - - false - - - - - 197 - 0 - 5 - 687 - - 0.0 - true - - - - - 202 - 0 - 678 - 687 - - 1.0 - true - - - - - 202 - 0 - 678 - 281 - - 0.4 - true - compyPlay - - - - - 202 - 281 - 678 - 5 - - 0.0 - true - - - - - 202 - 286 - 678 - 313 - - 0.4 - true - humanPlay - - - - - 202 - 599 - 678 - 5 - - 0.0 - true - - - - - 202 - 604 - 678 - 83 - - 0.2 - true - humanHand - - - false - - - - - 880 - 0 - 5 - 687 - - 0.0 - true - - - - - 885 - 0 - 139 - 687 - - 0.0 - true - - - - - 885 - 0 - 139 - 496 - - 0.5 - true - detail - - - - - 885 - 496 - 139 - 5 - - 0.0 - true - - - - - 885 - 501 - 139 - 186 - - 0.5 - true - picture - - - false - - - true - \ No newline at end of file diff --git a/res/gui/gui.properties b/res/gui/gui.properties deleted file mode 100644 index 5234e618edb..00000000000 --- a/res/gui/gui.properties +++ /dev/null @@ -1,3 +0,0 @@ -Display--file=display_layout.xml -Display/new--file=display_new_layout.xml -DeckEditor--file=deck_editor_layout.xml \ No newline at end of file diff --git a/res/main.properties b/res/main.properties index e51b8b51b90..64664ebae0d 100644 --- a/res/main.properties +++ b/res/main.properties @@ -53,7 +53,6 @@ regular/rare--file=rare.txt name-mutator--file=name-mutator.txt -gui--properties=gui/gui.properties quest--properties=quest/quest.properties draft--properties=draft/draft.properties @@ -64,8 +63,6 @@ image/token--file=pics/tokens image/icon--file=images/icons pics/booster--file=pics/booster pics/booster/images--file=quest/booster-images.txt -symbols/small--file=images/symbols-13 -sound/base--file=sound quest/opponent/icons--file=quest/quest-opponent-icons.txt quest/pet/icons--file=quest/quest-pet-shop-icons.txt diff --git a/res/images/skins/darkascension/bg_match.jpg b/res/skins/darkascension/bg_match.jpg similarity index 100% rename from res/images/skins/darkascension/bg_match.jpg rename to res/skins/darkascension/bg_match.jpg diff --git a/res/images/skins/darkascension/bg_splash.png b/res/skins/darkascension/bg_splash.png similarity index 100% rename from res/images/skins/darkascension/bg_splash.png rename to res/skins/darkascension/bg_splash.png diff --git a/res/images/skins/darkascension/bg_texture.jpg b/res/skins/darkascension/bg_texture.jpg similarity index 100% rename from res/images/skins/darkascension/bg_texture.jpg rename to res/skins/darkascension/bg_texture.jpg diff --git a/res/images/skins/darkascension/font1.ttf b/res/skins/darkascension/font1.ttf similarity index 100% rename from res/images/skins/darkascension/font1.ttf rename to res/skins/darkascension/font1.ttf diff --git a/res/images/skins/darkascension/sprite_icons.png b/res/skins/darkascension/sprite_icons.png similarity index 100% rename from res/images/skins/darkascension/sprite_icons.png rename to res/skins/darkascension/sprite_icons.png diff --git a/res/images/skins/default/bg_match.jpg b/res/skins/default/bg_match.jpg similarity index 100% rename from res/images/skins/default/bg_match.jpg rename to res/skins/default/bg_match.jpg diff --git a/res/images/skins/default/bg_splash.png b/res/skins/default/bg_splash.png similarity index 100% rename from res/images/skins/default/bg_splash.png rename to res/skins/default/bg_splash.png diff --git a/res/images/skins/default/bg_texture.jpg b/res/skins/default/bg_texture.jpg similarity index 100% rename from res/images/skins/default/bg_texture.jpg rename to res/skins/default/bg_texture.jpg diff --git a/res/images/skins/default/font1.ttf b/res/skins/default/font1.ttf similarity index 100% rename from res/images/skins/default/font1.ttf rename to res/skins/default/font1.ttf diff --git a/res/images/skins/default/grid_icons.png b/res/skins/default/grid_icons.png similarity index 100% rename from res/images/skins/default/grid_icons.png rename to res/skins/default/grid_icons.png diff --git a/res/images/skins/default/loader.gif b/res/skins/default/loader.gif similarity index 100% rename from res/images/skins/default/loader.gif rename to res/skins/default/loader.gif diff --git a/res/images/skins/default/sprite_avatars.png b/res/skins/default/sprite_avatars.png similarity index 100% rename from res/images/skins/default/sprite_avatars.png rename to res/skins/default/sprite_avatars.png diff --git a/res/images/skins/default/sprite_foils.png b/res/skins/default/sprite_foils.png similarity index 100% rename from res/images/skins/default/sprite_foils.png rename to res/skins/default/sprite_foils.png diff --git a/res/images/skins/default/sprite_icons.png b/res/skins/default/sprite_icons.png similarity index 100% rename from res/images/skins/default/sprite_icons.png rename to res/skins/default/sprite_icons.png diff --git a/res/images/skins/rebel/bg_match.jpg b/res/skins/rebel/bg_match.jpg similarity index 100% rename from res/images/skins/rebel/bg_match.jpg rename to res/skins/rebel/bg_match.jpg diff --git a/res/images/skins/rebel/bg_splash.png b/res/skins/rebel/bg_splash.png similarity index 100% rename from res/images/skins/rebel/bg_splash.png rename to res/skins/rebel/bg_splash.png diff --git a/res/images/skins/rebel/bg_texture.jpg b/res/skins/rebel/bg_texture.jpg similarity index 100% rename from res/images/skins/rebel/bg_texture.jpg rename to res/skins/rebel/bg_texture.jpg diff --git a/res/images/skins/rebel/font1.ttf b/res/skins/rebel/font1.ttf similarity index 100% rename from res/images/skins/rebel/font1.ttf rename to res/skins/rebel/font1.ttf diff --git a/res/images/skins/rebel/sprite_icons.png b/res/skins/rebel/sprite_icons.png similarity index 100% rename from res/images/skins/rebel/sprite_icons.png rename to res/skins/rebel/sprite_icons.png diff --git a/res/images/skins/smith/bg_match.jpg b/res/skins/smith/bg_match.jpg similarity index 100% rename from res/images/skins/smith/bg_match.jpg rename to res/skins/smith/bg_match.jpg diff --git a/res/images/skins/smith/bg_splash.png b/res/skins/smith/bg_splash.png similarity index 100% rename from res/images/skins/smith/bg_splash.png rename to res/skins/smith/bg_splash.png diff --git a/res/images/skins/smith/bg_texture.jpg b/res/skins/smith/bg_texture.jpg similarity index 100% rename from res/images/skins/smith/bg_texture.jpg rename to res/skins/smith/bg_texture.jpg diff --git a/res/images/skins/smith/font1.ttf b/res/skins/smith/font1.ttf similarity index 100% rename from res/images/skins/smith/font1.ttf rename to res/skins/smith/font1.ttf diff --git a/res/images/skins/smith/sprite_icons.png b/res/skins/smith/sprite_icons.png similarity index 100% rename from res/images/skins/smith/sprite_icons.png rename to res/skins/smith/sprite_icons.png diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java index 007e574f82b..b9640bcde2f 100644 --- a/src/main/java/forge/AllZone.java +++ b/src/main/java/forge/AllZone.java @@ -36,8 +36,6 @@ import forge.properties.NewConstants; import forge.quest.data.QuestData; import forge.quest.data.QuestEvent; import forge.quest.data.QuestEventManager; -import forge.view.GuiTopLevel; -import forge.view.toolbox.FOverlay; /** * Please use public getters and setters instead of direct field access. @@ -88,12 +86,6 @@ public final class AllZone { // shared between Input_Attack, Input_Block, Input_CombatDamage , // InputState_Computer - /** Global display. */ - private static Display display; - - /** Global overlay. */ - private static FOverlay overlay; - /** Constant DECK_MGR. */ private static DeckManager deckManager; @@ -493,31 +485,6 @@ public final class AllZone { return Singletons.getModel().getGameState().getStackZone(); } - /** - *

- * getDisplay. - *

- * - * @return a {@link forge.Display} object. - * @since 1.0.15 - */ - public static Display getDisplay() { - return AllZone.display; - } - - /** - *

- * setDisplay. - *

- * - * @param display0 - * a {@link forge.Display} object. - * @since 1.0.15 - */ - public static void setDisplay(final Display display0) { - AllZone.display = display0; - } - /** *

* getZone. @@ -630,11 +597,11 @@ public final class AllZone { public static void newGameCleanup() { Singletons.getModel().getGameState().newGameCleanup(); - AllZone.getDisplay().showCombat(""); - AllZone.getDisplay().loadPrefs(); + Singletons.getControl().getMatchControl().showCombat(""); + Singletons.getModel().loadPrefs(); AllZone.getInputControl().clearInput(); AllZone.getColorChanger().reset(); - ((GuiTopLevel) AllZone.getDisplay()).showStack(); + Singletons.getControl().getMatchControl().showStack(); } /** @@ -655,25 +622,6 @@ public final class AllZone { return AllZone.COLOR_CHANGER; } - /** - * Gets the overlay. - * - * @return overlay - */ - public static FOverlay getOverlay() { - return AllZone.overlay; - } - - /** - * Sets the overlay. - * - * @param overlay0 - *   Overlay panel - */ - public static void setOverlay(final FOverlay overlay0) { - AllZone.overlay = overlay0; - } - /** * Gets the CardRatings object. * diff --git a/src/main/java/forge/ButtonUtil.java b/src/main/java/forge/ButtonUtil.java index e78229d1fd9..3ebd9199fb0 100644 --- a/src/main/java/forge/ButtonUtil.java +++ b/src/main/java/forge/ButtonUtil.java @@ -17,6 +17,8 @@ */ package forge; +import javax.swing.JButton; + /** *

* ButtonUtil class. @@ -35,8 +37,8 @@ public class ButtonUtil { ButtonUtil.getOK().setText("OK"); ButtonUtil.getCancel().setText("Cancel"); - ButtonUtil.getOK().setSelectable(false); - ButtonUtil.getCancel().setSelectable(false); + ButtonUtil.getOK().setEnabled(false); + ButtonUtil.getCancel().setEnabled(false); } /** @@ -45,8 +47,8 @@ public class ButtonUtil { *

*/ public static void enableOnlyOK() { - ButtonUtil.getOK().setSelectable(true); - ButtonUtil.getCancel().setSelectable(false); + ButtonUtil.getOK().setEnabled(true); + ButtonUtil.getCancel().setEnabled(false); } /** @@ -55,8 +57,8 @@ public class ButtonUtil { *

*/ public static void enableOnlyCancel() { - ButtonUtil.getOK().setSelectable(false); - ButtonUtil.getCancel().setSelectable(true); + ButtonUtil.getOK().setEnabled(false); + ButtonUtil.getCancel().setEnabled(true); } /** @@ -65,8 +67,8 @@ public class ButtonUtil { *

*/ public static void disableAll() { - ButtonUtil.getOK().setSelectable(false); - ButtonUtil.getCancel().setSelectable(false); + ButtonUtil.getOK().setEnabled(false); + ButtonUtil.getCancel().setEnabled(false); } /** @@ -75,8 +77,8 @@ public class ButtonUtil { *

*/ public static void enableAll() { - ButtonUtil.getOK().setSelectable(true); - ButtonUtil.getCancel().setSelectable(true); + ButtonUtil.getOK().setEnabled(true); + ButtonUtil.getCancel().setEnabled(true); } /** @@ -85,7 +87,7 @@ public class ButtonUtil { *

*/ public static void disableOK() { - ButtonUtil.getOK().setSelectable(false); + ButtonUtil.getOK().setEnabled(false); } /** @@ -94,7 +96,7 @@ public class ButtonUtil { *

*/ public static void disableCancel() { - ButtonUtil.getCancel().setSelectable(false); + ButtonUtil.getCancel().setEnabled(false); } /** @@ -104,8 +106,8 @@ public class ButtonUtil { * * @return a {@link forge.MyButton} object. */ - private static MyButton getOK() { - return AllZone.getDisplay().getButtonOK(); + private static JButton getOK() { + return Singletons.getView().getMatchView().getBtnOK(); } /** @@ -115,7 +117,7 @@ public class ButtonUtil { * * @return a {@link forge.MyButton} object. */ - private static MyButton getCancel() { - return AllZone.getDisplay().getButtonCancel(); + private static JButton getCancel() { + return Singletons.getView().getMatchView().getBtnCancel(); } } diff --git a/src/main/java/forge/CardReader.java b/src/main/java/forge/CardReader.java index ed9bad3a935..489805badd7 100644 --- a/src/main/java/forge/CardReader.java +++ b/src/main/java/forge/CardReader.java @@ -49,6 +49,7 @@ import forge.card.CardRulesReader; import forge.card.replacement.ReplacementHandler; import forge.card.trigger.TriggerHandler; import forge.error.ErrorViewer; +import forge.view.SplashFrame; import forge.view.toolbox.FProgressBar; /** @@ -262,7 +263,7 @@ public class CardReader implements Runnable { */ protected final Card loadCardsUntilYouFind(final String cardName) { Card result = null; - final FProgressBar barProgress = Singletons.getView().getProgressBar(); + final FProgressBar barProgress = SplashFrame.PROGRESS_BAR; // Iterate through txt files or zip archive. // Report relevant numbers to progress monitor model. diff --git a/src/main/java/forge/Combat.java b/src/main/java/forge/Combat.java index cb3a05a9a3f..92f50baf64d 100644 --- a/src/main/java/forge/Combat.java +++ b/src/main/java/forge/Combat.java @@ -716,7 +716,7 @@ public class Combat { this.addDefendingDamage(damageDealt, attacker); } else { if (attacker.hasKeyword("Trample") || (block.size() > 1)) { - AllZone.getDisplay().assignDamage(attacker, block, damageDealt); + Singletons.getControl().getMatchControl().assignDamage(attacker, block, damageDealt); } else { block.get(0).addAssignedDamage(damageDealt, attacking.get(i)); } @@ -768,7 +768,7 @@ public class Combat { this.addDefendingDamage(damageDealt, attacker); } else { if (attacker.hasKeyword("Trample") || (block.size() > 1)) { - AllZone.getDisplay().assignDamage(attacker, block, damageDealt); + Singletons.getControl().getMatchControl().assignDamage(attacker, block, damageDealt); } else { block.get(0).addAssignedDamage(damageDealt, attacking.get(i)); } diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index 9377bb4cb78..a474ada2120 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -2264,7 +2264,7 @@ public class CombatUtil { *

*/ public static void showCombat() { - AllZone.getDisplay().showCombat(""); + Singletons.getControl().getMatchControl().showCombat(""); Card[] defend = null; final StringBuilder display = new StringBuilder(); @@ -2304,7 +2304,7 @@ public class CombatUtil { } } // loop through attackers } - AllZone.getDisplay().showCombat(display.toString().trim()); + Singletons.getControl().getMatchControl().showCombat(display.toString().trim()); } // showBlockers() diff --git a/src/main/java/forge/Display.java b/src/main/java/forge/Display.java deleted file mode 100644 index f608c9e5f0f..00000000000 --- a/src/main/java/forge/Display.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Forge: Play Magic: the Gathering. - * Copyright (C) 2011 Forge Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package forge; - -/** - *

- * Display interface. - *

- * - * @author Forge - * @version $Id$ - */ -public interface Display { - /** - *

- * showMessage. - *

- * - * @param s - * a {@link java.lang.String} object. - */ - void showMessage(String s); - - /** - *

- * getButtonOK. - *

- * - * @return a {@link forge.MyButton} object. - */ - MyButton getButtonOK(); - - /** - *

- * getButtonCancel. - *

- * - * @return a {@link forge.MyButton} object. - */ - MyButton getButtonCancel(); - - // public void showStatus(String message); - /** - *

- * showCombat. - *

- * - * @param message - * a {@link java.lang.String} object. - */ - void showCombat(String message); - - /** - *

- * setVisible. - *

- * - * @param b - * a boolean. - */ - void setVisible(boolean b); - - // assigns combat damage, used by Combat.setAssignedDamage() - /** - *

- * assignDamage. - *

- * - * @param attacker - * a {@link forge.Card} object. - * @param blockers - * a {@link forge.CardList} object. - * @param damage - * a int. - */ - void assignDamage(Card attacker, CardList blockers, int damage); - - // public void addAssignDamage(Card attacker, Card blocker, int damage); - // public void addAssignDamage(Card attacker, int damage); - - /** - *

- * stopAtPhase. - *

- * - * @param turn - * a {@link forge.Player} object. - * @param phase - * a {@link java.lang.String} object. - * @return a boolean. - */ - boolean stopAtPhase(Player turn, String phase); - - /** - *

- * loadPrefs. - *

- * - * @return a boolean. - */ - boolean loadPrefs(); - - /** - *

- * savePrefs. - *

- * - * @return a boolean. - */ - boolean savePrefs(); - - /** - *

- * canLoseByDecking. - *

- * - * @return a boolean. - */ - boolean canLoseByDecking(); - - /** - *

- * setCard. - *

- * - * @param c - * a {@link forge.Card} object. - */ - void setCard(Card c); -} diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 556e8f30ed4..9b334c80347 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -60,7 +60,6 @@ import forge.properties.ForgePreferences.FPref; import forge.properties.ForgeProps; import forge.properties.NewConstants.Lang.GameAction.GameActionText; import forge.util.MyRandom; -import forge.view.GuiTopLevel; import forge.view.match.ViewWinLose; /** @@ -896,7 +895,7 @@ public class GameAction { final boolean refreeze = AllZone.getStack().isFrozen(); AllZone.getStack().setFrozen(true); - final JFrame frame = (JFrame) AllZone.getDisplay(); + final JFrame frame = Singletons.getView(); if (!frame.isDisplayable()) { return; } @@ -1637,8 +1636,8 @@ public class GameAction { AllZone.getComputerPlayer().drawCard(); } - AllZone.getDisplay().setCard(AllZone.getHumanPlayer().getCardsIn(Zone.Hand).get(0)); - ((GuiTopLevel) (AllZone.getDisplay())).getController().getMatchView().getInputController().updateGameCount(); + Singletons.getControl().getMatchControl().setCard(AllZone.getHumanPlayer().getCardsIn(Zone.Hand).get(0)); + Singletons.getControl().getMatchControl().getMessageControl().updateGameCount(); AllZone.getInputControl().setInput(new InputMulligan()); PhaseHandler.setGameBegins(1); diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index dde47a3c53a..1d7fc8ef5c5 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -375,7 +375,7 @@ public final class GameActionUtil { * @return a boolean. */ public static boolean showYesNoDialog(final Card c, String question, final boolean defaultNo) { - AllZone.getDisplay().setCard(c); + Singletons.getControl().getMatchControl().setCard(c); final StringBuilder title = new StringBuilder(); title.append(c.getName()).append(" - Ability"); @@ -461,7 +461,7 @@ public final class GameActionUtil { * @return a boolean. */ private static boolean showLandfallDialog(final Card c) { - AllZone.getDisplay().setCard(c); + Singletons.getControl().getMatchControl().setCard(c); final String[] choices = { "Yes", "No" }; Object q = null; diff --git a/src/main/java/forge/GuiMultipleBlockers.java b/src/main/java/forge/GuiMultipleBlockers.java index 5899346778a..23069ec7e24 100644 --- a/src/main/java/forge/GuiMultipleBlockers.java +++ b/src/main/java/forge/GuiMultipleBlockers.java @@ -71,14 +71,11 @@ public class GuiMultipleBlockers extends JFrame { * a {@link forge.CardList} object. * @param damage * a int. - * @param display - * a {@link forge.CardContainer} object. */ - public GuiMultipleBlockers(final Card attacker, final CardList creatureList, final int damage, final CardContainer display) { + public GuiMultipleBlockers(final Card attacker, final CardList creatureList, final int damage) { this(); this.assignDamage = damage; this.updateDamageLabel(); // update user message about assigning damage - this.guiDisplay = display; this.att = attacker; this.blockers = creatureList; @@ -241,9 +238,7 @@ public class GuiMultipleBlockers extends JFrame { final CardContainer cardPanel = (CardContainer) o; final Card c = cardPanel.getCard(); - if (this.guiDisplay != null) { - this.guiDisplay.setCard(c); - } + Singletons.getControl().getMatchControl().setCard(c); } } } diff --git a/src/main/java/forge/HumanPlayer.java b/src/main/java/forge/HumanPlayer.java index 2c8560f2380..2c8fb9efdb7 100644 --- a/src/main/java/forge/HumanPlayer.java +++ b/src/main/java/forge/HumanPlayer.java @@ -245,7 +245,7 @@ public class HumanPlayer extends Player { protected final void clashMoveToTopOrBottom(final Card c) { String choice = ""; final String[] choices = { "top", "bottom" }; - AllZone.getDisplay().setCard(c); + Singletons.getControl().getMatchControl().setCard(c); choice = GuiUtils.getChoice(c.getName() + " - Top or bottom of Library", choices); if (choice.equals("bottom")) { diff --git a/src/main/java/forge/MagicStack.java b/src/main/java/forge/MagicStack.java index 329ed752f02..7ec74439bdc 100644 --- a/src/main/java/forge/MagicStack.java +++ b/src/main/java/forge/MagicStack.java @@ -746,7 +746,7 @@ public class MagicStack extends MyObservable { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Mana Vortex - select a land to sacrifice"); + Singletons.getControl().getMatchControl().showMessage("Mana Vortex - select a land to sacrifice"); ButtonUtil.enableOnlyCancel(); } @@ -938,7 +938,7 @@ public class MagicStack extends MyObservable { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Choose target creature to haunt."); + Singletons.getControl().getMatchControl().showMessage("Choose target creature to haunt."); ButtonUtil.disableAll(); } @@ -952,7 +952,7 @@ public class MagicStack extends MyObservable { MagicStack.this.add(haunterDiesWork); this.stop(); } else { - AllZone.getDisplay().showMessage("Cannot target this card (Shroud? Protection?)."); + Singletons.getControl().getMatchControl().showMessage("Cannot target this card (Shroud? Protection?)."); } } }; diff --git a/src/main/java/forge/PhaseHandler.java b/src/main/java/forge/PhaseHandler.java index 08cd8b4dfa1..6e4df0f00ac 100644 --- a/src/main/java/forge/PhaseHandler.java +++ b/src/main/java/forge/PhaseHandler.java @@ -24,7 +24,6 @@ import java.util.Stack; import com.esotericsoftware.minlog.Log; import forge.Constant.Zone; -import forge.view.GuiTopLevel; /** *

@@ -319,7 +318,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { // UNTAP if (phase.equals(Constant.Phase.UNTAP)) { - ((GuiTopLevel) AllZone.getDisplay()).showStack(); + Singletons.getControl().getMatchControl().showStack(); PhaseUtil.handleUntap(); } // UPKEEP @@ -411,11 +410,11 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { AllZone.getEndOfCombat().executeUntil(); AllZone.getEndOfCombat().executeAt(); CombatUtil.showCombat(); - ((GuiTopLevel) AllZone.getDisplay()).showStack(); + Singletons.getControl().getMatchControl().showStack(); } else if (phase.equals(Constant.Phase.MAIN2)) { CombatUtil.showCombat(); - ((GuiTopLevel) AllZone.getDisplay()).showStack(); + Singletons.getControl().getMatchControl().showStack(); } // END_OF_TURN else if (phase.equals(Constant.Phase.END_OF_TURN)) { @@ -526,7 +525,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { } if (this.getPhase().equals(Constant.Phase.COMBAT_END)) { - ((GuiTopLevel) (AllZone.getDisplay())).showStack(); + Singletons.getControl().getMatchControl().showStack(); AllZone.getCombat().reset(); this.resetAttackedThisCombat(this.getPlayerTurn()); this.bCombat = false; diff --git a/src/main/java/forge/PhaseUtil.java b/src/main/java/forge/PhaseUtil.java index 96b6f444b14..0f42864da57 100644 --- a/src/main/java/forge/PhaseUtil.java +++ b/src/main/java/forge/PhaseUtil.java @@ -20,8 +20,7 @@ package forge; import java.util.HashMap; import forge.Constant.Zone; -import forge.view.GuiTopLevel; -import forge.view.match.MatchTopLevel; +import forge.control.ControlMatchUI; import forge.view.match.ViewField.PhaseLabel; /** @@ -382,7 +381,7 @@ public class PhaseUtil { public static void visuallyActivatePhase(final String s) { PhaseLabel lbl = null; final Player p = AllZone.getPhaseHandler().getPlayerTurn(); - final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView(); + final ControlMatchUI t = Singletons.getControl().getMatchControl(); int i; // Index of field; computer is 0, human is 1 if (p.isComputer()) { @@ -392,38 +391,35 @@ public class PhaseUtil { } if (s.equals(Constant.Phase.UPKEEP)) { - lbl = t.getFieldControllers().get(i).getView().getLblUpkeep(); + lbl = t.getFieldControls().get(i).getView().getLblUpkeep(); } else if (s.equals(Constant.Phase.DRAW)) { - lbl = t.getFieldControllers().get(i).getView().getLblDraw(); + lbl = t.getFieldControls().get(i).getView().getLblDraw(); } else if (s.equals(Constant.Phase.MAIN1)) { - lbl = t.getFieldControllers().get(i).getView().getLblMain1(); + lbl = t.getFieldControls().get(i).getView().getLblMain1(); } else if (s.equals(Constant.Phase.COMBAT_BEGIN)) { - lbl = t.getFieldControllers().get(i).getView().getLblBeginCombat(); + lbl = t.getFieldControls().get(i).getView().getLblBeginCombat(); } else if (s.equals(Constant.Phase.COMBAT_DECLARE_ATTACKERS)) { - lbl = t.getFieldControllers().get(i).getView().getLblDeclareAttackers(); + lbl = t.getFieldControls().get(i).getView().getLblDeclareAttackers(); } else if (s.equals(Constant.Phase.COMBAT_DECLARE_BLOCKERS)) { - lbl = t.getFieldControllers().get(i).getView().getLblDeclareBlockers(); + lbl = t.getFieldControls().get(i).getView().getLblDeclareBlockers(); } else if (s.equals(Constant.Phase.COMBAT_DAMAGE)) { - lbl = t.getFieldControllers().get(i).getView().getLblCombatDamage(); + lbl = t.getFieldControls().get(i).getView().getLblCombatDamage(); } else if (s.equals(Constant.Phase.COMBAT_FIRST_STRIKE_DAMAGE)) { - lbl = t.getFieldControllers().get(i).getView().getLblFirstStrike(); + lbl = t.getFieldControls().get(i).getView().getLblFirstStrike(); } else if (s.equals(Constant.Phase.COMBAT_END)) { - lbl = t.getFieldControllers().get(i).getView().getLblEndCombat(); + lbl = t.getFieldControls().get(i).getView().getLblEndCombat(); } else if (s.equals(Constant.Phase.MAIN2)) { - lbl = t.getFieldControllers().get(i).getView().getLblMain2(); + lbl = t.getFieldControls().get(i).getView().getLblMain2(); } else if (s.equals(Constant.Phase.END_OF_TURN)) { - lbl = t.getFieldControllers().get(i).getView().getLblEndTurn(); + lbl = t.getFieldControls().get(i).getView().getLblEndTurn(); } else if (s.equals(Constant.Phase.CLEANUP)) { - lbl = t.getFieldControllers().get(i).getView().getLblCleanup(); + lbl = t.getFieldControls().get(i).getView().getLblCleanup(); } else { return; } - t.getController().resetAllPhaseButtons(); - // Could be a potential recursion bug here, but I checked and hopefully there isn't. - // Please remove this comments if > 1 week and no problems. Doublestrike 12-01-11 - t.repaint(); - // End potential recursion bug + t.resetAllPhaseButtons(); + Singletons.getView().getMatchView().repaint(); lbl.setActive(true); } } diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index 87d8db80292..84256f8fb0e 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -36,8 +36,6 @@ import forge.card.staticability.StaticAbility; import forge.game.GameLossReason; import forge.gui.GuiUtils; import forge.util.MyRandom; -import forge.view.GuiTopLevel; -import forge.view.match.MatchTopLevel; /** *

@@ -1284,7 +1282,7 @@ public abstract class Player extends GameEntity { AllZone.getTriggerHandler().runTrigger("Drawn", runParams); } // lose: - else if (!Constant.Runtime.DEV_MODE[0] || AllZone.getDisplay().canLoseByDecking()) { + else if (!Constant.Runtime.DEV_MODE[0] || Constant.Runtime.MILL[0]) { // if devMode is off, or canLoseByDecking is Enabled, run Lose // Condition if (!this.cantLose()) { @@ -1812,9 +1810,7 @@ public abstract class Player extends GameEntity { * @return a boolean. */ public final boolean canPlayLand() { - - final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView(); - if (t.getTabberController().getView().getLblUnlimitedLands().getEnabled() && this.isHuman() && Constant.Runtime.DEV_MODE[0]) { + if (Singletons.getView().getMatchView().getViewTabber().getLblUnlimitedLands().getEnabled() && this.isHuman() && Constant.Runtime.DEV_MODE[0]) { return PhaseHandler.canCastSorcery(this); } diff --git a/src/main/java/forge/PlayerUtil.java b/src/main/java/forge/PlayerUtil.java index 37d2a4a90b1..224c7c9e397 100644 --- a/src/main/java/forge/PlayerUtil.java +++ b/src/main/java/forge/PlayerUtil.java @@ -84,7 +84,7 @@ public final class PlayerUtil { if (AllZone.getHumanPlayer().getZone(Zone.Hand).size() == 0) { this.stop(); } - AllZone.getDisplay().showMessage( + Singletons.getControl().getMatchControl().showMessage( "Select " + (nCards - this.n) + " cards to discard, unless you discard a " + uType + "."); ButtonUtil.disableAll(); } @@ -144,7 +144,7 @@ public final class PlayerUtil { this.stop(); } - AllZone.getDisplay().showMessage("Select a card to discard"); + Singletons.getControl().getMatchControl().showMessage("Select a card to discard"); ButtonUtil.disableAll(); } @@ -183,7 +183,7 @@ public final class PlayerUtil { this.stop(); } - AllZone.getDisplay().showMessage("Chains of Mephistopheles:\n" + "Select a card to discard"); + Singletons.getControl().getMatchControl().showMessage("Chains of Mephistopheles:\n" + "Select a card to discard"); ButtonUtil.disableAll(); } @@ -281,7 +281,7 @@ public final class PlayerUtil { return; } - AllZone.getDisplay().showMessage(message + " (" + (nCards - this.n) + " left)"); + Singletons.getControl().getMatchControl().showMessage(message + " (" + (nCards - this.n) + " left)"); ButtonUtil.disableAll(); } @@ -324,7 +324,7 @@ public final class PlayerUtil { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Select a card to put on the " + topOrBottom + " of your library."); + Singletons.getControl().getMatchControl().showMessage("Select a card to put on the " + topOrBottom + " of your library."); ButtonUtil.disableAll(); if ((this.n == num) || (AllZone.getHumanPlayer().getZone(Zone.Hand).size() == 0)) { diff --git a/src/main/java/forge/Singletons.java b/src/main/java/forge/Singletons.java index e2665de9901..d87508ea2ec 100644 --- a/src/main/java/forge/Singletons.java +++ b/src/main/java/forge/Singletons.java @@ -17,6 +17,7 @@ */ package forge; +import forge.control.FControl; import forge.model.FModel; import forge.view.FView; @@ -29,6 +30,8 @@ public final class Singletons { private static FView view = null; + private static FControl control = null; + /** * Do not instantiate. */ @@ -74,4 +77,22 @@ public final class Singletons { Singletons.view = theView; } + /** + * Gets the control. + * + * @return the view + */ + public static FControl getControl() { + return Singletons.control; + } + + /** + * Sets the control. + * + * @param theControl + * the view to set + */ + public static void setControl(final FControl theControl) { + Singletons.control = theControl; + } } diff --git a/src/main/java/forge/Untap.java b/src/main/java/forge/Untap.java index 8b389790f10..54386e81e85 100644 --- a/src/main/java/forge/Untap.java +++ b/src/main/java/forge/Untap.java @@ -196,7 +196,7 @@ public class Untap extends Phase implements java.io.Serializable { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Select one tapped land to untap"); + Singletons.getControl().getMatchControl().showMessage("Select one tapped land to untap"); ButtonUtil.enableOnlyCancel(); } @@ -244,7 +244,7 @@ public class Untap extends Phase implements java.io.Serializable { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Select one tapped artifact to untap"); + Singletons.getControl().getMatchControl().showMessage("Select one tapped artifact to untap"); ButtonUtil.enableOnlyCancel(); } @@ -293,7 +293,7 @@ public class Untap extends Phase implements java.io.Serializable { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Select one creature to untap"); + Singletons.getControl().getMatchControl().showMessage("Select one creature to untap"); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/Upkeep.java b/src/main/java/forge/Upkeep.java index 4ad6a9a3b11..fc7c59a7886 100644 --- a/src/main/java/forge/Upkeep.java +++ b/src/main/java/forge/Upkeep.java @@ -486,7 +486,7 @@ public class Upkeep extends Phase implements java.io.Serializable { @Override public void showMessage() { - AllZone.getDisplay().showMessage( + Singletons.getControl().getMatchControl().showMessage( abyss.getName() + " - Select one nonartifact creature to destroy"); ButtonUtil.disableAll(); } @@ -554,7 +554,7 @@ public class Upkeep extends Phase implements java.io.Serializable { @Override public void showMessage() { - AllZone.getDisplay().showMessage( + Singletons.getControl().getMatchControl().showMessage( "Yawgmoth Demon - Select one artifact to sacrifice or be dealt 2 damage"); ButtonUtil.enableOnlyCancel(); } @@ -2303,7 +2303,7 @@ public class Upkeep extends Phase implements java.io.Serializable { @Override public void showMessage() { - AllZone.getDisplay().showMessage( + Singletons.getControl().getMatchControl().showMessage( c.getName() + " - Select new target creature. (Click Cancel to remain as is.)"); ButtonUtil.enableOnlyCancel(); } @@ -2375,7 +2375,7 @@ public class Upkeep extends Phase implements java.io.Serializable { this.stop(); return; } - AllZone.getDisplay().showMessage( + Singletons.getControl().getMatchControl().showMessage( source.getName() + " - Select " + num + " untapped artifact(s), creature(s), or land(s) you control"); ButtonUtil.disableAll(); @@ -2424,7 +2424,7 @@ public class Upkeep extends Phase implements java.io.Serializable { @Override public void showMessage() { - AllZone.getDisplay().showMessage(crd + " - Discard a card from your hand"); + Singletons.getControl().getMatchControl().showMessage(crd + " - Discard a card from your hand"); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java index 4e35915c60a..92f33ec9f6a 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java @@ -36,6 +36,7 @@ import forge.Counters; import forge.PhaseHandler; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; @@ -1384,7 +1385,7 @@ public class AbilityFactoryCounters { @Override public void showMessage() { ButtonUtil.enableOnlyCancel(); - AllZone.getDisplay().showMessage("Proliferate: Choose permanents and/or players"); + Singletons.getControl().getMatchControl().showMessage("Proliferate: Choose permanents and/or players"); } @Override diff --git a/src/main/java/forge/card/cardfactory/AbstractCardFactory.java b/src/main/java/forge/card/cardfactory/AbstractCardFactory.java index 236c5f2cb1e..543e4d12cee 100644 --- a/src/main/java/forge/card/cardfactory/AbstractCardFactory.java +++ b/src/main/java/forge/card/cardfactory/AbstractCardFactory.java @@ -43,6 +43,7 @@ import forge.Counters; import forge.GameActionUtil; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.cost.Cost; import forge.card.spellability.Ability; import forge.card.spellability.AbilityActivated; @@ -851,7 +852,7 @@ public abstract class AbstractCardFactory implements CardFactoryInterface { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Discard a land card (or select Mox Diamond to sacrifice it)"); + Singletons.getControl().getMatchControl().showMessage("Discard a land card (or select Mox Diamond to sacrifice it)"); ButtonUtil.enableOnlyCancel(); } @@ -1223,7 +1224,7 @@ public abstract class AbstractCardFactory implements CardFactoryInterface { final StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - Exile cards from hand. Currently, "); sb.append(this.exiled.size()).append(" selected. (Press OK when done.)"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyOK(); } @@ -1258,7 +1259,7 @@ public abstract class AbstractCardFactory implements CardFactoryInterface { final StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - Returning cards to top of library."); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); // Then look at the exiled cards and put them on // top of your library in any order. @@ -1585,7 +1586,7 @@ public abstract class AbstractCardFactory implements CardFactoryInterface { public void showMessage() { final StringBuilder sb = new StringBuilder(); sb.append(cardName).append(" - Select an artifact on the battlefield"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } @@ -1637,7 +1638,7 @@ public abstract class AbstractCardFactory implements CardFactoryInterface { if (AllZone.getHumanPlayer().getZone(Constant.Zone.Hand).size() == 0) { this.stop(); } - AllZone.getDisplay().showMessage(prompt); + Singletons.getControl().getMatchControl().showMessage(prompt); ButtonUtil.disableAll(); } diff --git a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java index fd3183bbaa8..de109b8660b 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java @@ -39,6 +39,7 @@ import forge.Counters; import forge.GameActionUtil; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.spellability.Ability; @@ -372,7 +373,7 @@ public class CardFactoryCreatures { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Select an artifact you control"); + Singletons.getControl().getMatchControl().showMessage("Select an artifact you control"); ButtonUtil.disableAll(); } @@ -502,7 +503,7 @@ public class CardFactoryCreatures { @Override public void showMessage() { ButtonUtil.disableAll(); - AllZone.getDisplay().showMessage("Exile a nonland card from your hand."); + Singletons.getControl().getMatchControl().showMessage("Exile a nonland card from your hand."); } @Override @@ -555,9 +556,9 @@ public class CardFactoryCreatures { @Override public void showMessage() { if (index[0] == 0) { - AllZone.getDisplay().showMessage("Select target land you control."); + Singletons.getControl().getMatchControl().showMessage("Select target land you control."); } else { - AllZone.getDisplay().showMessage("Select target land opponent controls."); + Singletons.getControl().getMatchControl().showMessage("Select target land opponent controls."); } ButtonUtil.enableOnlyCancel(); @@ -1249,7 +1250,7 @@ public class CardFactoryCreatures { @Override public void showMessage() { - AllZone.getDisplay().showMessage(msg); + Singletons.getControl().getMatchControl().showMessage(msg); ButtonUtil.enableOnlyOK(); } @@ -1665,7 +1666,7 @@ public class CardFactoryCreatures { final StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - Reveal an artifact. Revealed "); sb.append(this.revealed.size()).append(" so far. Click OK when done."); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyOK(); } @@ -1780,7 +1781,7 @@ public class CardFactoryCreatures { final StringBuilder sb = new StringBuilder(); sb.append("Select up to 5 target permanents. Selected ("); sb.append(targetPerms.size()).append(") so far. Click OK when done."); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyOK(); } @@ -1819,7 +1820,7 @@ public class CardFactoryCreatures { public void showMessage() { final StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - Select target player"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } @@ -1877,7 +1878,7 @@ public class CardFactoryCreatures { toDisplay += "Currently, (" + toSac.size() + ") selected with a total power of: " + getTotalPower(); toDisplay += " Click OK when Done."; - AllZone.getDisplay().showMessage(toDisplay); + Singletons.getControl().getMatchControl().showMessage(toDisplay); ButtonUtil.enableAll(); } @@ -2095,7 +2096,7 @@ public class CardFactoryCreatures { message += "or artifact "; } message += "on the battlefield"; - AllZone.getDisplay().showMessage(cardName + " - " + message); + Singletons.getControl().getMatchControl().showMessage(cardName + " - " + message); ButtonUtil.enableOnlyCancel(); } @@ -2335,7 +2336,7 @@ public class CardFactoryCreatures { @Override public void showMessage() { - AllZone.getDisplay().showMessage(card + " - Select an artifact you control"); + Singletons.getControl().getMatchControl().showMessage(card + " - Select an artifact you control"); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java index 3fabf3e1bf8..bf933a96011 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java @@ -32,6 +32,7 @@ import forge.Counters; import forge.GameActionUtil; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.cost.Cost; import forge.card.spellability.Ability; import forge.card.spellability.AbilityActivated; @@ -208,7 +209,7 @@ class CardFactoryLands { public void showMessage() { final StringBuilder sb = new StringBuilder(); sb.append(cardName).append(" - Select an untapped land to sacrifice"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } @@ -226,7 +227,7 @@ class CardFactoryLands { paid[0]++; final StringBuilder sb = new StringBuilder(); sb.append(cardName).append(" - Select an untapped land to sacrifice"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); } else { this.stop(); } @@ -297,7 +298,7 @@ class CardFactoryLands { @Override public void showMessage() { - AllZone.getDisplay().showMessage( + Singletons.getControl().getMatchControl().showMessage( cardName + " - Select one " + type[0] + " to sacrifice"); ButtonUtil.enableOnlyCancel(); } @@ -390,7 +391,7 @@ class CardFactoryLands { @Override public void showMessage() { - AllZone.getDisplay().showMessage( + Singletons.getControl().getMatchControl().showMessage( "Scorched Ruins - Select an untapped land to sacrifice"); ButtonUtil.enableOnlyCancel(); } @@ -407,7 +408,7 @@ class CardFactoryLands { AllZone.getGameAction().sacrifice(c); if (paid[0] < 1) { paid[0]++; - AllZone.getDisplay().showMessage( + Singletons.getControl().getMatchControl().showMessage( "Scorched Ruins - Select an untapped land to sacrifice"); } else { this.stop(); @@ -485,7 +486,7 @@ class CardFactoryLands { public void showMessage() { final StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - Reveal a card."); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } @@ -671,7 +672,7 @@ class CardFactoryLands { final StringBuilder sb = new StringBuilder(); sb.append(cardName); sb.append(" - Select one non-Lair land to return to your hand"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } @@ -740,7 +741,7 @@ class CardFactoryLands { final StringBuilder sb = new StringBuilder(); sb.append(card).append(" - Select one untapped "); sb.append(type[0]).append(" to return"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java index 5909e073540..3f4318ff169 100644 --- a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java +++ b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java @@ -42,6 +42,7 @@ import forge.HandSizeOp; import forge.Player; import forge.PlayerUtil; import forge.PlayerZone; +import forge.Singletons; import forge.card.cost.Cost; import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; @@ -116,9 +117,9 @@ public class CardFactorySorceries { @Override public void showMessage() { if (index[0] == 0) { - AllZone.getDisplay().showMessage("Select target land you control."); + Singletons.getControl().getMatchControl().showMessage("Select target land you control."); } else { - AllZone.getDisplay().showMessage("Select target land opponent controls."); + Singletons.getControl().getMatchControl().showMessage("Select target land opponent controls."); } ButtonUtil.enableOnlyCancel(); @@ -608,7 +609,7 @@ public class CardFactorySorceries { final StringBuilder sb = new StringBuilder(); sb.append("Select target ").append(humanBasic.get(this.count)); sb.append(" land to not sacrifice"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } } @@ -1068,7 +1069,7 @@ public class CardFactorySorceries { final StringBuilder sb = new StringBuilder(); sb.append("Select target creatures and/or players. Currently, "); sb.append(this.getNumTargets()).append(" targets. Click OK when done."); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); } private int getNumTargets() { @@ -1102,11 +1103,11 @@ public class CardFactorySorceries { @Override public void selectCard(final Card c, final PlayerZone zone) { if (!c.canBeTargetedBy(spell)) { - AllZone.getDisplay().showMessage("Cannot target this card."); + Singletons.getControl().getMatchControl().showMessage("Cannot target this card."); return; // cannot target } if (targets.contains(c)) { - AllZone.getDisplay().showMessage("You have already selected this target."); + Singletons.getControl().getMatchControl().showMessage("You have already selected this target."); return; // cannot target the same creature twice. } @@ -1119,11 +1120,11 @@ public class CardFactorySorceries { @Override public void selectPlayer(final Player player) { if (!player.canBeTargetedBy(spell)) { - AllZone.getDisplay().showMessage("Cannot target this player."); + Singletons.getControl().getMatchControl().showMessage("Cannot target this player."); return; // cannot target } if (targetPlayers.contains(player)) { - AllZone.getDisplay().showMessage("You have already selected this player."); + Singletons.getControl().getMatchControl().showMessage("You have already selected this player."); return; // cannot target the same player twice. } targetPlayers.add(player); @@ -1656,7 +1657,7 @@ public class CardFactorySorceries { final StringBuilder sb = new StringBuilder(); sb.append(cardName).append(" - Select a target creature to gain Fear (up to "); sb.append(this.stop - this.count).append(" more)"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableAll(); } @@ -1698,7 +1699,7 @@ public class CardFactorySorceries { public void showMessage() { final StringBuilder sb = new StringBuilder(); sb.append(cardName).append(" - Select target creature to get -X/-X"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } @@ -1779,7 +1780,7 @@ public class CardFactorySorceries { public void showMessage() { final StringBuilder sb = new StringBuilder(); sb.append(cardName).append(" - Select target player to lose life"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 5bd05f4d9f3..3c2d7c1315e 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -48,6 +48,7 @@ import forge.HandSizeOp; import forge.PhaseHandler; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.mana.ManaCost; @@ -807,7 +808,7 @@ public class CardFactoryUtil { if (spell.getTargetCard() != null) { this.stop(); } - AllZone.getDisplay().showMessage("Select target Spell: "); + Singletons.getControl().getMatchControl().showMessage("Select target Spell: "); final Card choice = GuiUtils.getChoiceOptional("Choose a Spell", choices.toArray()); if (choice != null) { spell.setTargetCard(choice); @@ -855,7 +856,7 @@ public class CardFactoryUtil { @Override public void showMessage() { - AllZone.getDisplay().showMessage(message); + Singletons.getControl().getMatchControl().showMessage(message); ButtonUtil.disableAll(); } @@ -1750,7 +1751,7 @@ public class CardFactoryUtil { @Override public void showMessage() { - AllZone.getDisplay().showMessage(message); + Singletons.getControl().getMatchControl().showMessage(message); ButtonUtil.enableOnlyCancel(); } @@ -1762,7 +1763,7 @@ public class CardFactoryUtil { @Override public void selectCard(final Card card, final PlayerZone zone) { if (targeted && !card.canBeTargetedBy(spell)) { - AllZone.getDisplay().showMessage("Cannot target this card (Shroud? Protection?)."); + Singletons.getControl().getMatchControl().showMessage("Cannot target this card (Shroud? Protection?)."); } else if (choices.contains(card)) { spell.setTargetCard(card); if (spell.getManaCost().equals("0") || free) { @@ -1807,7 +1808,7 @@ public class CardFactoryUtil { @Override public void showMessage() { - AllZone.getDisplay().showMessage(message); + Singletons.getControl().getMatchControl().showMessage(message); ButtonUtil.enableOnlyCancel(); } @@ -1889,7 +1890,7 @@ public class CardFactoryUtil { this.stop(); } - AllZone.getDisplay().showMessage("Select a card to discard"); + Singletons.getControl().getMatchControl().showMessage("Select a card to discard"); ButtonUtil.disableAll(); } @@ -1909,7 +1910,7 @@ public class CardFactoryUtil { } void done() { - AllZone.getDisplay().showMessage("Returning cards to hand."); + Singletons.getControl().getMatchControl().showMessage("Returning cards to hand."); AllZone.getGameAction().exile(recall); final CardList grave = AllZone.getHumanPlayer().getCardsIn(Zone.Graveyard); for (int i = 1; i <= this.n; i++) { @@ -1951,7 +1952,7 @@ public class CardFactoryUtil { public void showMessage() { final StringBuilder sb = new StringBuilder(); sb.append("Select target wolf to damage for ").append(spell.getSourceCard()); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } @@ -1993,7 +1994,7 @@ public class CardFactoryUtil { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Select target artifact creature"); + Singletons.getControl().getMatchControl().showMessage("Select target artifact creature"); ButtonUtil.enableOnlyCancel(); } @@ -3504,7 +3505,7 @@ public class CardFactoryUtil { public void showMessage() { final StringBuilder sb = new StringBuilder(); sb.append("Select a ").append(type).append(" to untap"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } @@ -4724,7 +4725,7 @@ public class CardFactoryUtil { @Override public void showMessage() { - AllZone.getDisplay().showMessage("Choose target creature to haunt."); + Singletons.getControl().getMatchControl().showMessage("Choose target creature to haunt."); ButtonUtil.disableAll(); } @@ -4738,7 +4739,7 @@ public class CardFactoryUtil { AllZone.getStack().add(haunterDiesWork); this.stop(); } else { - AllZone.getDisplay().showMessage("Cannot target this card (Shroud? Protection?)."); + Singletons.getControl().getMatchControl().showMessage("Cannot target this card (Shroud? Protection?)."); } } }; diff --git a/src/main/java/forge/card/cardfactory/PreloadingCardFactory.java b/src/main/java/forge/card/cardfactory/PreloadingCardFactory.java index 6240ac81eca..592603d8484 100644 --- a/src/main/java/forge/card/cardfactory/PreloadingCardFactory.java +++ b/src/main/java/forge/card/cardfactory/PreloadingCardFactory.java @@ -27,13 +27,13 @@ import javax.swing.SwingUtilities; import forge.AllZone; import forge.Card; import forge.CardReader; -import forge.Singletons; import forge.card.CardRules; import forge.error.ErrorViewer; import forge.gui.GuiUtils; import forge.item.CardDb; import forge.properties.ForgeProps; import forge.properties.NewConstants; +import forge.view.SplashFrame; import forge.view.toolbox.FProgressBar; /** @@ -82,7 +82,7 @@ public class PreloadingCardFactory extends AbstractCardFactory { try { this.readCards(file); - final FProgressBar barProgress = Singletons.getView().getProgressBar(); + final FProgressBar barProgress = SplashFrame.PROGRESS_BAR; if (barProgress != null) { SwingUtilities.invokeAndWait(new Runnable() { @Override diff --git a/src/main/java/forge/card/cost/CostDiscard.java b/src/main/java/forge/card/cost/CostDiscard.java index 6b55c436996..7c46fffc99f 100644 --- a/src/main/java/forge/card/cost/CostDiscard.java +++ b/src/main/java/forge/card/cost/CostDiscard.java @@ -27,6 +27,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; @@ -325,7 +326,7 @@ public class CostDiscard extends CostPartWithList { sb.append(nNeeded - this.nDiscard); sb.append(" remaining."); } - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/cost/CostExile.java b/src/main/java/forge/card/cost/CostExile.java index c9290bf0a02..72f2ba50f39 100644 --- a/src/main/java/forge/card/cost/CostExile.java +++ b/src/main/java/forge/card/cost/CostExile.java @@ -31,6 +31,7 @@ import forge.Constant.Zone; import forge.GameActionUtil; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; @@ -400,7 +401,7 @@ public class CostExile extends CostPartWithList { this.typeList = sa.getActivatingPlayer().getCardsIn(part.getFrom()); this.typeList = this.typeList.getValidCards(type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard()); - AllZone.getDisplay().showMessage(msg.toString()); + Singletons.getControl().getMatchControl().showMessage(msg.toString()); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/cost/CostMana.java b/src/main/java/forge/card/cost/CostMana.java index e79e54a6922..8386fdf5da9 100644 --- a/src/main/java/forge/card/cost/CostMana.java +++ b/src/main/java/forge/card/cost/CostMana.java @@ -27,6 +27,7 @@ import forge.Constant.Zone; import forge.PhaseHandler; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.mana.ManaCost; import forge.card.spellability.SpellAbility; @@ -275,7 +276,7 @@ public class CostMana extends CostPart { ButtonUtil.enableOnlyCancel(); } - AllZone.getDisplay().showMessage( + Singletons.getControl().getMatchControl().showMessage( "Pay X Mana Cost for " + sa.getSourceCard().getName() + "\n" + this.xPaid + " Paid so far."); } @@ -472,7 +473,7 @@ public class CostMana extends CostPart { public void showMessage() { ButtonUtil.enableOnlyCancel(); final String displayMana = this.mana.toString().replace("X", "").trim(); - AllZone.getDisplay().showMessage("Pay Mana Cost: " + displayMana); + Singletons.getControl().getMatchControl().showMessage("Pay Mana Cost: " + displayMana); final StringBuilder msg = new StringBuilder("Pay Mana Cost: " + displayMana); if (this.phyLifeToLose > 0) { @@ -485,7 +486,7 @@ public class CostMana extends CostPart { msg.append("\n(Click on your life total to pay life for phyrexian mana.)"); } - AllZone.getDisplay().showMessage(msg.toString()); + Singletons.getControl().getMatchControl().showMessage(msg.toString()); if (this.mana.isPaid()) { this.done(); } diff --git a/src/main/java/forge/card/cost/CostPutCounter.java b/src/main/java/forge/card/cost/CostPutCounter.java index d738f589225..6c39df3578e 100644 --- a/src/main/java/forge/card/cost/CostPutCounter.java +++ b/src/main/java/forge/card/cost/CostPutCounter.java @@ -17,7 +17,6 @@ */ package forge.card.cost; -import forge.AllZone; import forge.ButtonUtil; import forge.Card; import forge.CardList; @@ -25,6 +24,7 @@ import forge.Constant.Zone; import forge.Counters; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; @@ -271,7 +271,7 @@ public class CostPutCounter extends CostPartWithList { this.typeList = sa.getActivatingPlayer().getCardsIn(Zone.Battlefield); this.typeList = this.typeList.getValidCards(type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard()); - AllZone.getDisplay().showMessage(msg.toString()); + Singletons.getControl().getMatchControl().showMessage(msg.toString()); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/cost/CostReturn.java b/src/main/java/forge/card/cost/CostReturn.java index e0ab7b044b3..d9667462bbf 100644 --- a/src/main/java/forge/card/cost/CostReturn.java +++ b/src/main/java/forge/card/cost/CostReturn.java @@ -28,6 +28,7 @@ import forge.ComputerUtil; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; @@ -231,7 +232,7 @@ public class CostReturn extends CostPartWithList { this.typeList = sa.getActivatingPlayer().getCardsIn(Zone.Battlefield); this.typeList = this.typeList.getValidCards(type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard()); - AllZone.getDisplay().showMessage(msg.toString()); + Singletons.getControl().getMatchControl().showMessage(msg.toString()); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/cost/CostReveal.java b/src/main/java/forge/card/cost/CostReveal.java index 33e2c863f6d..61c428f714e 100644 --- a/src/main/java/forge/card/cost/CostReveal.java +++ b/src/main/java/forge/card/cost/CostReveal.java @@ -26,6 +26,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; @@ -256,7 +257,7 @@ public class CostReveal extends CostPartWithList { sb.append(nNeeded - this.nReveal); sb.append(" remaining."); } - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/cost/CostSacrifice.java b/src/main/java/forge/card/cost/CostSacrifice.java index bd317635e97..db97bbf2935 100644 --- a/src/main/java/forge/card/cost/CostSacrifice.java +++ b/src/main/java/forge/card/cost/CostSacrifice.java @@ -28,6 +28,7 @@ import forge.ComputerUtil; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; @@ -273,7 +274,7 @@ public class CostSacrifice extends CostPartWithList { msg.append("s"); } - AllZone.getDisplay().showMessage(msg.toString()); + Singletons.getControl().getMatchControl().showMessage(msg.toString()); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/cost/CostTapType.java b/src/main/java/forge/card/cost/CostTapType.java index c03f9b9a03c..22cf98ea9d1 100644 --- a/src/main/java/forge/card/cost/CostTapType.java +++ b/src/main/java/forge/card/cost/CostTapType.java @@ -17,7 +17,6 @@ */ package forge.card.cost; -import forge.AllZone; import forge.ButtonUtil; import forge.Card; import forge.CardList; @@ -27,6 +26,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; @@ -243,7 +243,7 @@ public class CostTapType extends CostPartWithList { } final int left = nCards - this.nTapped; - AllZone.getDisplay() + Singletons.getControl().getMatchControl() .showMessage("Select a " + tapType.getDescription() + " to tap (" + left + " left)"); ButtonUtil.enableOnlyCancel(); } diff --git a/src/main/java/forge/card/spellability/TargetSelection.java b/src/main/java/forge/card/spellability/TargetSelection.java index 4952ebed6da..7540b2a7d46 100644 --- a/src/main/java/forge/card/spellability/TargetSelection.java +++ b/src/main/java/forge/card/spellability/TargetSelection.java @@ -30,6 +30,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.gui.GuiUtils; import forge.gui.input.Input; @@ -329,7 +330,7 @@ public class TargetSelection { sb.append("\n"); sb.append(tgt.getVTSelection()); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); // If reached Minimum targets, enable OK button if (!tgt.isMinTargetsChosen(sa.getSourceCard(), sa)) { @@ -361,7 +362,7 @@ public class TargetSelection { // leave this in temporarily, there some seriously wrong things // going on here if (targeted && !card.canBeTargetedBy(sa)) { - AllZone.getDisplay().showMessage("Cannot target this card (Shroud? Protection? Restrictions?)."); + Singletons.getControl().getMatchControl().showMessage("Cannot target this card (Shroud? Protection? Restrictions?)."); } else if (choices.contains(card)) { tgt.addTarget(card); this.done(); diff --git a/src/main/java/forge/control/ControlHomeUI.java b/src/main/java/forge/control/ControlHomeUI.java index c479bb3c15c..7bee95869dc 100644 --- a/src/main/java/forge/control/ControlHomeUI.java +++ b/src/main/java/forge/control/ControlHomeUI.java @@ -1,16 +1,16 @@ package forge.control; -import forge.view.home.HomeTopLevel; +import forge.view.ViewHomeUI; /** * TODO: Write javadoc for this type. * */ public class ControlHomeUI { - private HomeTopLevel view; + private ViewHomeUI view; - /** @param v0   HomeTopLevel */ - public ControlHomeUI(HomeTopLevel v0) { + /** @param v0   ViewHomeUI */ + public ControlHomeUI(ViewHomeUI v0) { view = v0; } @@ -19,8 +19,8 @@ public class ControlHomeUI { System.exit(0); } - /** @return HomeTopLevel */ - public HomeTopLevel getView() { + /** @return ViewHomeUI */ + public ViewHomeUI getView() { return view; } } diff --git a/src/main/java/forge/control/ControlMatchUI.java b/src/main/java/forge/control/ControlMatchUI.java index 25356a756b4..23978fbd150 100644 --- a/src/main/java/forge/control/ControlMatchUI.java +++ b/src/main/java/forge/control/ControlMatchUI.java @@ -17,24 +17,38 @@ */ package forge.control; +import java.util.ArrayList; import java.util.List; import forge.AllZone; +import forge.Card; +import forge.CardContainer; +import forge.CardList; +import forge.Constant; import forge.Constant.Zone; +import forge.GuiMultipleBlockers; import forge.ImageCache; import forge.Player; +import forge.Singletons; +import forge.control.match.ControlDetail; +import forge.control.match.ControlDock; import forge.control.match.ControlField; -import forge.view.match.MatchTopLevel; +import forge.control.match.ControlHand; +import forge.control.match.ControlMessage; +import forge.control.match.ControlPicture; +import forge.control.match.ControlTabber; +import forge.view.ViewMatchUI; +import forge.view.match.ViewField; /** *

* ControlMatchUI *

- * Top-level controller for matches. Implements Display. + * Top-level controller for matches. * */ -public class ControlMatchUI { - private final MatchTopLevel view; +public class ControlMatchUI implements CardContainer { + private final ViewMatchUI view; /** *

@@ -51,9 +65,9 @@ public class ControlMatchUI { * So, this class must be called after everything is already in place. * * @param v - *   A MatchTopLevel object + *   A ViewMatchUI object */ - public ControlMatchUI(final MatchTopLevel v) { + public ControlMatchUI(final ViewMatchUI v) { this.view = v; } @@ -64,17 +78,16 @@ public class ControlMatchUI { public void initMatch() { // All child components have been assembled; observers and listeners can // be added safely. - this.view.getTabberController().addObservers(); - this.view.getTabberController().addListeners(); + ControlMatchUI.this.getTabberControl().addObservers(); + ControlMatchUI.this.getTabberControl().addListeners(); - this.view.getInputController().addListeners(); + ControlMatchUI.this.getMessageControl().addListeners(); - this.view.getHandController().addObservers(); - this.view.getHandController().addListeners(); + ControlMatchUI.this.getHandControl().addObservers(); + ControlMatchUI.this.getHandControl().addListeners(); // Update all observers with values for start of match. - final List fieldControllers = this.view.getFieldControllers(); - for (final ControlField f : fieldControllers) { + for (final ControlField f : ControlMatchUI.this.getFieldControls()) { f.addObservers(); f.addListeners(); f.getPlayer().updateObservers(); @@ -85,7 +98,7 @@ public class ControlMatchUI { AllZone.getStack().updateObservers(); AllZone.getHumanPlayer().getZone(Zone.Battlefield).updateObservers(); AllZone.getInputControl().updateObservers(); - this.view.getTabberController().updateObservers(); + ControlMatchUI.this.getTabberControl().updateObservers(); } /** @@ -115,15 +128,190 @@ public class ControlMatchUI { // This method is in the top-level controller because it affects ALL fields // (not just one). public void resetAllPhaseButtons() { - final List fieldControllers = this.view.getFieldControllers(); - - for (final ControlField c : fieldControllers) { + for (final ControlField c : ControlMatchUI.this.getFieldControls()) { c.resetPhaseButtons(); } } - /** @return MatchTopLevel */ - public MatchTopLevel getView() { - return view; + /** @param s0   {@link java.lang.String} */ + public void showMessage(final String s0) { + getMessageControl().setMessage(s0); + } + + /** */ + public void showStack() { + ControlMatchUI.this.getTabberControl().showPnlStack(); + } + + /** @param s0   {@link java.lang.String} */ + public void showCombat(final String s0) { + ControlMatchUI.this.getTabberControl().getView().updateCombat(s0); + } + + /** + * Gets the detail controller. + * + * @return ControlDetail + */ + public ControlDetail getDetailControl() { + return view.getViewDetail().getControl(); + } + + /** + * Gets the picture controller. + * + * @return ControlPicture + */ + public ControlPicture getPictureControl() { + return view.getViewPicture().getControl(); + } + + /** + * Gets the tabber controller. + * + * @return ControlTabber + */ + public ControlTabber getTabberControl() { + return view.getViewTabber().getControl(); + } + + /** + * Gets the input controller. + * + * @return ControlMessage + */ + public ControlMessage getMessageControl() { + return view.getViewMessage().getControl(); + } + + /** + * Gets the hand controller. + * + * @return ControlHand + */ + public ControlHand getHandControl() { + return view.getViewHand().getControl(); + } + + /** + * Gets the dock controller. + * + * @return ControlDock + */ + public ControlDock getDockControl() { + return view.getDockView().getControl(); + } + + /** + * Gets the field controllers. + * + * @return List + */ + public List getFieldControls() { + final List fields = view.getViewBattlefield().getFields(); + final List controllers = new ArrayList(); + + for (final ViewField f : fields) { + controllers.add(f.getControl()); + } + + return controllers; + } + + /** + * Fires up trample dialog. Very old code, due for refactoring with new UI. + * Could possibly move to view. + * + * @param attacker   {@link forge.Card} + * @param blockers   {@link forge.CardList} + * @param damage   int + */ + public void assignDamage(final Card attacker, final CardList blockers, final int damage) { + if (damage <= 0) { + return; + } + + new GuiMultipleBlockers(attacker, blockers, damage); + } + + /** + * + * Checks if game control should stop at a phase, for either + * a forced programmatic stop, or a user-induced phase toggle. + * @param turn   {@link forge.Player} + * @param phase   {@link java.lang.String} + * @return boolean + */ + public final boolean stopAtPhase(final Player turn, final String phase) { + final List fieldControllers = ControlMatchUI.this.getFieldControls(); + + // AI field is at index [0] + if (turn.isComputer()) { + if (phase.equals(Constant.Phase.UPKEEP)) { + return fieldControllers.get(0).getView().getLblUpkeep().getEnabled(); + } else if (phase.equals(Constant.Phase.DRAW)) { + return fieldControllers.get(0).getView().getLblDraw().getEnabled(); + } else if (phase.equals(Constant.Phase.MAIN1)) { + return fieldControllers.get(0).getView().getLblMain1().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_BEGIN)) { + return fieldControllers.get(0).getView().getLblBeginCombat().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_DECLARE_ATTACKERS)) { + return fieldControllers.get(0).getView().getLblDeclareAttackers().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_DECLARE_BLOCKERS)) { + return fieldControllers.get(0).getView().getLblDeclareBlockers().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_FIRST_STRIKE_DAMAGE)) { + return fieldControllers.get(0).getView().getLblFirstStrike().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_DAMAGE)) { + return fieldControllers.get(0).getView().getLblCombatDamage().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_END)) { + return fieldControllers.get(0).getView().getLblEndCombat().getEnabled(); + } else if (phase.equals(Constant.Phase.MAIN2)) { + return fieldControllers.get(0).getView().getLblMain2().getEnabled(); + } else if (phase.equals(Constant.Phase.END_OF_TURN)) { + return fieldControllers.get(0).getView().getLblEndTurn().getEnabled(); + } else if (phase.equals(Constant.Phase.DRAW)) { + return fieldControllers.get(0).getView().getLblDraw().getEnabled(); + } + } + // Human field is at index [1] + else { + if (phase.equals(Constant.Phase.UPKEEP)) { + return fieldControllers.get(1).getView().getLblUpkeep().getEnabled(); + } else if (phase.equals(Constant.Phase.DRAW)) { + return fieldControllers.get(1).getView().getLblDraw().getEnabled(); + } else if (phase.equals(Constant.Phase.MAIN1)) { + return fieldControllers.get(1).getView().getLblMain1().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_BEGIN)) { + return fieldControllers.get(1).getView().getLblBeginCombat().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_DECLARE_ATTACKERS)) { + return fieldControllers.get(1).getView().getLblDeclareAttackers().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_DECLARE_BLOCKERS)) { + return fieldControllers.get(1).getView().getLblDeclareBlockers().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_FIRST_STRIKE_DAMAGE)) { + return fieldControllers.get(1).getView().getLblFirstStrike().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_DAMAGE)) { + return fieldControllers.get(1).getView().getLblCombatDamage().getEnabled(); + } else if (phase.equals(Constant.Phase.COMBAT_END)) { + return fieldControllers.get(1).getView().getLblEndCombat().getEnabled(); + } else if (phase.equals(Constant.Phase.MAIN2)) { + return fieldControllers.get(1).getView().getLblMain2().getEnabled(); + } else if (phase.equals(Constant.Phase.END_OF_TURN)) { + return fieldControllers.get(1).getView().getLblEndTurn().getEnabled(); + } else if (phase.equals(Constant.Phase.DRAW)) { + return fieldControllers.get(1).getView().getLblDraw().getEnabled(); + } + } + return true; + } + + @Override + public void setCard(final Card c) { + Singletons.getControl().getMatchControl().getDetailControl().showCard(c); + Singletons.getControl().getMatchControl().getPictureControl().showCard(c); + } + + @Override + public Card getCard() { + return Singletons.getControl().getMatchControl().getDetailControl().getCurrentCard(); } } diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java index 6cff09adb06..be3d1017a30 100644 --- a/src/main/java/forge/control/FControl.java +++ b/src/main/java/forge/control/FControl.java @@ -22,17 +22,14 @@ import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; import java.util.List; import javax.swing.JLayeredPane; import javax.swing.WindowConstants; +import forge.Singletons; import forge.control.KeyboardShortcuts.Shortcut; -import forge.view.GuiTopLevel; -import forge.view.bazaar.BazaarTopLevel; -import forge.view.editor.EditorTopLevel; -import forge.view.home.HomeTopLevel; -import forge.view.match.MatchTopLevel; /** *

@@ -42,17 +39,12 @@ import forge.view.match.MatchTopLevel; * between various display states in that JFrame. Controllers are instantiated * separately by each state's top level view class. */ -public class FControl { - private final JLayeredPane display; - private final GuiTopLevel view; +public final class FControl { private List shortcuts; + private JLayeredPane display; private int state; - private HomeTopLevel home = null; - private MatchTopLevel match = null; - private EditorTopLevel editor = null; - private WindowAdapter waDefault, waConcede, waLeaveBazaar; - private BazaarTopLevel bazaar; + private WindowListener waDefault, waConcede, waLeaveBazaar; /** */ public static final int HOME_SCREEN = 0; @@ -70,21 +62,14 @@ public class FControl { * Controls all Forge UI functionality inside one JFrame. This class * switches between various display states in that JFrame. Controllers are * instantiated separately by each state's top level view class. - * - * @param v0   GuiTopLevel */ - public FControl(GuiTopLevel v0) { - this.view = v0; - - this.display = (JLayeredPane) this.view.getContentPane(); - this.shortcuts = KeyboardShortcuts.attachKeyboardShortcuts(this.view); - + public FControl() { // "Close" button override during match this.waConcede = new WindowAdapter() { @Override public void windowClosing(final WindowEvent e) { - view.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); - getMatchView().getDockController().concede(); + Singletons.getView().setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + Singletons.getControl().getMatchControl().getDockControl().concede(); } }; @@ -92,25 +77,31 @@ public class FControl { this.waLeaveBazaar = new WindowAdapter() { @Override public void windowClosing(final WindowEvent e) { - view.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + Singletons.getView().setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); changeState(0); - getHomeView().showQuestMenu(); + Singletons.getView().getHomeView().showQuestMenu(); } }; // Default action on window close this.waDefault = new WindowAdapter() { public void windowClosing(WindowEvent e) { - view.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + Singletons.getView().setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); } }; + } - // Handles resizing in null layouts of layers in JLayeredPane. - view.addComponentListener(new ComponentAdapter() { - @Override - public void componentResized(final ComponentEvent e) { - sizeChildren(); - } + /** After view and model have been initialized, control can start. */ + public void initialize() { + this.shortcuts = KeyboardShortcuts.attachKeyboardShortcuts(); + this.display = Singletons.getView().getLayeredContentPane(); + + // Handles resizing in null layouts of layers in JLayeredPane. + Singletons.getView().addComponentListener(new ComponentAdapter() { + @Override + public void componentResized(final ComponentEvent e) { + sizeChildren(); + } }); } @@ -124,84 +115,61 @@ public class FControl { *   State index: 0 for home, 1 for match, etc. */ public void changeState(final int i0) { - this.home = null; - this.match = null; - this.editor = null; + clearChildren(JLayeredPane.DEFAULT_LAYER); this.state = i0; - this.display.removeAll(); - this.view.removeWindowListener(waConcede); - this.view.removeWindowListener(waLeaveBazaar); - this.view.addWindowListener(waDefault); - this.view.addOverlay(); + /// out out out ghandi asdf + Singletons.getView().removeWindowListener(waConcede); + Singletons.getView().removeWindowListener(waLeaveBazaar); + Singletons.getView().addWindowListener(waDefault); + //////////////// // Fire up new state switch (i0) { case HOME_SCREEN: - this.home = new HomeTopLevel(); - this.display.add(this.home, JLayeredPane.DEFAULT_LAYER); + display.add(Singletons.getView().getHomeView(), JLayeredPane.DEFAULT_LAYER); sizeChildren(); break; case MATCH_SCREEN: - this.match = new MatchTopLevel(); - this.display.add(this.match, JLayeredPane.DEFAULT_LAYER); + display.add(Singletons.getView().getMatchView(), JLayeredPane.DEFAULT_LAYER); sizeChildren(); - view.addWindowListener(waConcede); + Singletons.getView().addWindowListener(waConcede); break; case DEFAULT_EDITOR: - this.editor = new EditorTopLevel(); - this.display.add(this.editor); + display.add(Singletons.getView().getEditorView(), JLayeredPane.DEFAULT_LAYER); break; case QUEST_BAZAAR: - this.bazaar = new BazaarTopLevel(); - this.display.add(bazaar, JLayeredPane.DEFAULT_LAYER); + display.add(Singletons.getView().getBazaarView(), JLayeredPane.DEFAULT_LAYER); sizeChildren(); - view.addWindowListener(waLeaveBazaar); + Singletons.getView().addWindowListener(waLeaveBazaar); break; default: - break; } } - /** - * Gets the match view. - * - * @return MatchTopLevel + /** Gets the match controller. + * @return {@link forge.control.match.ControlMatchUI} */ - public MatchTopLevel getMatchView() { - return this.match; + public ControlMatchUI getMatchControl() { + if (getState() != FControl.MATCH_SCREEN) { + throw new IllegalArgumentException("FControl$getMatchControl\n" + + "may only be called while the match UI is showing."); + } + return Singletons.getView().getMatchView().getControl(); } - /** - * Gets the match controller. - * - * @return ControlMatchUI - */ - public ControlMatchUI getMatchController() { - return this.match.getController(); - } - - /** @return HomeTopLevel */ - public HomeTopLevel getHomeView() { - return this.home; - } - - /** @return HomeTopLevel */ - public ControlHomeUI getHomeController() { - return this.home.getController(); - } - - /** - * Gets the match view. - * - * @return MatchTopLevel - */ - public BazaarTopLevel getBazaarView() { - return this.bazaar; + /** Gets the home controller. + * @return {@link forge.control.home.ControlHomeUI} */ + public ControlHomeUI getHomeControl() { + if (getState() != FControl.HOME_SCREEN) { + throw new IllegalArgumentException("FControl$getHomeControl\n" + + "may only be called while the home UI is showing."); + } + return Singletons.getView().getHomeView().getControl(); } /** @@ -219,16 +187,24 @@ public class FControl { return this.shortcuts; } + /** Remove all children from a specified layer. */ + private void clearChildren(final int layer0) { + final Component[] children = Singletons.getView() + .getLayeredContentPane().getComponentsInLayer(layer0); + + for (Component c : children) { + display.remove(c); + } + } + /** Sizes children of JLayeredPane to fully fit their layers. */ private void sizeChildren() { - Component[] children; - children = FControl.this.display.getComponentsInLayer(JLayeredPane.DEFAULT_LAYER); - + Component[] children = display.getComponentsInLayer(JLayeredPane.DEFAULT_LAYER); if (children.length == 0) { return; } + children[0].setSize(display.getSize()); - children[0].setSize(FControl.this.display.getSize()); - - children = FControl.this.display.getComponentsInLayer(JLayeredPane.MODAL_LAYER); - children[0].setSize(FControl.this.display.getSize()); + children = display.getComponentsInLayer(JLayeredPane.MODAL_LAYER); + if (children.length == 0) { return; } + children[0].setSize(display.getSize()); } } diff --git a/src/main/java/forge/control/KeyboardShortcuts.java b/src/main/java/forge/control/KeyboardShortcuts.java index f919faf9bbb..83ab853b3ac 100644 --- a/src/main/java/forge/control/KeyboardShortcuts.java +++ b/src/main/java/forge/control/KeyboardShortcuts.java @@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils; import forge.Singletons; import forge.properties.ForgePreferences.FPref; -import forge.view.GuiTopLevel; import forge.view.home.ViewSettings.KeyboardShortcutField; /** @@ -32,12 +31,11 @@ public class KeyboardShortcuts { * Attaches all keyboard shortcuts for match UI, * and returns a list of shortcuts with necessary properties for later access. * - * @param frame GuiTopLevel (must be passed here since AllZone hasn't been set yet). * @return List Shortcut objects */ @SuppressWarnings("serial") - public static List attachKeyboardShortcuts(final GuiTopLevel frame) { - final JComponent c = (JComponent) frame.getContentPane(); + public static List attachKeyboardShortcuts() { + final JComponent c = (JComponent) Singletons.getView().getContentPane(); final InputMap im = c.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); final ActionMap am = c.getActionMap(); @@ -50,8 +48,8 @@ public class KeyboardShortcuts { final Action actShowStack = new AbstractAction() { @Override public void actionPerformed(final ActionEvent e) { - if (frame.getController().getState() != 1) { return; } - frame.getController().getMatchController().getView().getTabberController().showPnlStack(); + if (Singletons.getControl().getState() != 1) { return; } + Singletons.getControl().getMatchControl().getTabberControl().showPnlStack(); } }; @@ -59,8 +57,8 @@ public class KeyboardShortcuts { final Action actShowCombat = new AbstractAction() { @Override public void actionPerformed(final ActionEvent e) { - if (frame.getController().getState() != 1) { return; } - frame.getController().getMatchController().getView().getTabberController().showPnlCombat(); + if (Singletons.getControl().getState() != 1) { return; } + Singletons.getControl().getMatchControl().getTabberControl().showPnlCombat(); } }; @@ -68,8 +66,8 @@ public class KeyboardShortcuts { final Action actShowConsole = new AbstractAction() { @Override public void actionPerformed(final ActionEvent e) { - if (frame.getController().getState() != 1) { return; } - frame.getController().getMatchController().getView().getTabberController().showPnlGameLog(); + if (Singletons.getControl().getState() != 1) { return; } + Singletons.getControl().getMatchControl().getTabberControl().showPnlGameLog(); } }; @@ -77,8 +75,8 @@ public class KeyboardShortcuts { final Action actShowPlayers = new AbstractAction() { @Override public void actionPerformed(final ActionEvent e) { - if (frame.getController().getState() != 1) { return; } - frame.getController().getMatchController().getView().getTabberController().showPnlPlayers(); + if (Singletons.getControl().getState() != 1) { return; } + Singletons.getControl().getMatchControl().getTabberControl().showPnlPlayers(); } }; @@ -86,8 +84,8 @@ public class KeyboardShortcuts { final Action actShowDev = new AbstractAction() { @Override public void actionPerformed(final ActionEvent e) { - if (frame.getController().getState() != 1) { return; } - frame.getController().getMatchController().getView().getTabberController().showPnlDev(); + if (Singletons.getControl().getState() != 1) { return; } + Singletons.getControl().getMatchControl().getTabberControl().showPnlDev(); } }; @@ -95,8 +93,8 @@ public class KeyboardShortcuts { final Action actConcede = new AbstractAction() { @Override public void actionPerformed(final ActionEvent e) { - if (frame.getController().getState() != 1) { return; } - frame.getController().getMatchController().getView().getDockController().concede(); + if (Singletons.getControl().getState() != 1) { return; } + Singletons.getControl().getMatchControl().getDockControl().concede(); } }; diff --git a/src/main/java/forge/control/home/ControlConstructed.java b/src/main/java/forge/control/home/ControlConstructed.java index 7b530527eb3..71ad74a54a5 100644 --- a/src/main/java/forge/control/home/ControlConstructed.java +++ b/src/main/java/forge/control/home/ControlConstructed.java @@ -25,6 +25,7 @@ import forge.CardList; import forge.Command; import forge.Constant; import forge.PlayerType; +import forge.Singletons; import forge.control.FControl; import forge.deck.Deck; import forge.deck.generate.Generate2ColorDeck; @@ -33,7 +34,6 @@ import forge.deck.generate.Generate5ColorDeck; import forge.deck.generate.GenerateThemeDeck; import forge.game.GameType; import forge.item.CardPrinted; -import forge.view.GuiTopLevel; import forge.view.home.ViewConstructed; /** @@ -534,9 +534,8 @@ public class ControlConstructed { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - GuiTopLevel g = ((GuiTopLevel) AllZone.getDisplay()); - g.getController().changeState(FControl.MATCH_SCREEN); - g.getController().getMatchController().initMatch(); + Singletons.getControl().changeState(FControl.MATCH_SCREEN); + Singletons.getControl().getMatchControl().initMatch(); AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]); } diff --git a/src/main/java/forge/control/home/ControlDraft.java b/src/main/java/forge/control/home/ControlDraft.java index 6410ccd4c7c..0e890cf2e41 100644 --- a/src/main/java/forge/control/home/ControlDraft.java +++ b/src/main/java/forge/control/home/ControlDraft.java @@ -12,6 +12,7 @@ import javax.swing.SwingUtilities; import forge.AllZone; import forge.Constant; +import forge.Singletons; import forge.control.FControl; import forge.deck.Deck; import forge.game.GameType; @@ -19,7 +20,6 @@ import forge.game.limited.BoosterDraft; import forge.game.limited.CardPoolLimitation; import forge.gui.GuiUtils; import forge.gui.deckeditor.DeckEditorDraft; -import forge.view.GuiTopLevel; import forge.view.home.ViewDraft; import forge.view.toolbox.FSkin; @@ -144,9 +144,8 @@ public class ControlDraft { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - GuiTopLevel g = (GuiTopLevel) AllZone.getDisplay(); - g.getController().changeState(FControl.MATCH_SCREEN); - g.getController().getMatchController().initMatch(); + Singletons.getControl().changeState(FControl.MATCH_SCREEN); + Singletons.getControl().getMatchControl().initMatch(); AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]); } }); diff --git a/src/main/java/forge/control/home/ControlQuest.java b/src/main/java/forge/control/home/ControlQuest.java index 87e6fd0fd83..8c4435aaba9 100644 --- a/src/main/java/forge/control/home/ControlQuest.java +++ b/src/main/java/forge/control/home/ControlQuest.java @@ -37,7 +37,6 @@ import forge.quest.data.QuestPreferences.QPref; import forge.quest.data.QuestUtil; import forge.quest.data.item.QuestItemZeppelin; import forge.quest.data.pet.QuestPetAbstract; -import forge.view.GuiTopLevel; import forge.view.home.ViewQuest; /** @@ -163,8 +162,7 @@ public class ControlQuest { public void execute() { AllZone.getQuestData().saveData(); refreshDecks(); - GuiTopLevel g = ((GuiTopLevel) AllZone.getDisplay()); - g.getController().getHomeView().getBtnQuest().grabFocus(); + Singletons.getView().getHomeView().getBtnQuest().grabFocus(); } }; @@ -499,10 +497,8 @@ public class ControlQuest { /** */ private void showBazaar() { - GuiTopLevel g = ((GuiTopLevel) AllZone.getDisplay()); - - g.getController().changeState(FControl.QUEST_BAZAAR); - g.validate(); + Singletons.getControl().changeState(FControl.QUEST_BAZAAR); + Singletons.getView().validate(); } /** */ @@ -565,9 +561,11 @@ public class ControlQuest { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - GuiTopLevel g = (GuiTopLevel) AllZone.getDisplay(); - g.getController().changeState(FControl.MATCH_SCREEN); - g.getController().getMatchController().initMatch(); + view.getBarProgress().setVisible(false); + view.getBtnStart().setVisible(true); + + Singletons.getControl().changeState(FControl.MATCH_SCREEN); + Singletons.getControl().getMatchControl().initMatch(); AllZone.getMatchState().reset(); if (event.getEventType().equals("challenge")) { diff --git a/src/main/java/forge/control/home/ControlSealed.java b/src/main/java/forge/control/home/ControlSealed.java index c0ea051df46..b19d9e9730f 100644 --- a/src/main/java/forge/control/home/ControlSealed.java +++ b/src/main/java/forge/control/home/ControlSealed.java @@ -16,6 +16,7 @@ import forge.AllZone; import forge.Command; import forge.Constant; import forge.PlayerType; +import forge.Singletons; import forge.control.FControl; import forge.deck.Deck; import forge.deck.DeckIO; @@ -27,7 +28,6 @@ import forge.item.CardPrinted; import forge.item.ItemPool; import forge.properties.ForgeProps; import forge.properties.NewConstants; -import forge.view.GuiTopLevel; import forge.view.home.ViewSealed; /** @@ -122,9 +122,8 @@ public class ControlSealed { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - GuiTopLevel g = ((GuiTopLevel) AllZone.getDisplay()); - g.getController().changeState(FControl.MATCH_SCREEN); - g.getController().getMatchController().initMatch(); + Singletons.getControl().changeState(FControl.MATCH_SCREEN); + Singletons.getControl().getMatchControl().initMatch(); AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]); } diff --git a/src/main/java/forge/control/home/ControlSettings.java b/src/main/java/forge/control/home/ControlSettings.java index 851cdfd4c3d..db33b9ad8f0 100644 --- a/src/main/java/forge/control/home/ControlSettings.java +++ b/src/main/java/forge/control/home/ControlSettings.java @@ -12,13 +12,11 @@ import javax.swing.SwingWorker; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import forge.AllZone; import forge.Command; import forge.Constant; import forge.Singletons; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; -import forge.view.GuiTopLevel; import forge.view.home.ViewSettings; import forge.view.toolbox.FSkin; @@ -222,10 +220,8 @@ public class ControlSettings { view.getLblTitleSkin().setIcon(null); view.getLblTitleSkin().setText("Choose Skin"); - // Must create a new HomeTopLevel to reset all color/image/icon - // values in components. - ((GuiTopLevel) AllZone.getDisplay()).getController().changeState(0); - ((GuiTopLevel) AllZone.getDisplay()).getController().getHomeView().showSettingsMenu(); + Singletons.getControl().changeState(0); + Singletons.getView().getHomeView().showSettingsMenu(); } }; w.execute(); diff --git a/src/main/java/forge/control/match/ControlField.java b/src/main/java/forge/control/match/ControlField.java index 732be2fe280..0a3eca4762d 100644 --- a/src/main/java/forge/control/match/ControlField.java +++ b/src/main/java/forge/control/match/ControlField.java @@ -41,6 +41,7 @@ import forge.Constant.Zone; import forge.GuiDisplayUtil; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.cardfactory.CardFactoryUtil; import forge.gui.ForgeAction; import forge.gui.GuiUtils; @@ -56,9 +57,7 @@ import forge.properties.NewConstants.Lang.GuiDisplay.ComputerHand; import forge.properties.NewConstants.Lang.GuiDisplay.ComputerLibrary; 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.MatchTopLevel; import forge.view.toolbox.FLabel; /** @@ -443,11 +442,12 @@ public class ControlField { maAvatar = new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { - final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView(); if (ControlField.this.player.isComputer()) { - t.getInputController().getInputControl().selectPlayer(AllZone.getComputerPlayer()); + Singletons.getControl().getMatchControl().getMessageControl() + .getInputControl().selectPlayer(AllZone.getComputerPlayer()); } else { - t.getInputController().getInputControl().selectPlayer(AllZone.getHumanPlayer()); + Singletons.getControl().getMatchControl().getMessageControl() + .getInputControl().selectPlayer(AllZone.getHumanPlayer()); } } }; @@ -456,11 +456,9 @@ public class ControlField { maCardOver = new MouseMotionAdapter() { @Override public void mouseMoved(final MouseEvent me) { - final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView(); final Card c = ControlField.this.view.getTabletop().getCardFromMouseOverPanel(); if (c != null) { - t.getDetailController().showCard(c); - t.getPictureController().showCard(c); + Singletons.getControl().getMatchControl().setCard(c); } } }; @@ -469,14 +467,13 @@ public class ControlField { maCardClick = new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { - final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView(); // original version: // final Card c = t.getDetailController().getCurrentCard(); // Roujin's bug fix version dated 2-12-2012 final Card c = ControlField.this.view.getTabletop().getCardFromMouseOverPanel(); - final Input input = t.getInputController().getInputControl().getInput(); + final Input input = Singletons.getControl().getMatchControl().getMessageControl().getInputControl().getInput(); if (c != null && c.isInZone(Zone.Battlefield)) { if (c.isTapped() @@ -514,8 +511,9 @@ public class ControlField { ((InputBlock) input).removeFromAllBlocking(c); } } else { - t.getInputController().getInputControl() - .selectCard(c, AllZone.getHumanPlayer().getZone(Zone.Battlefield)); + Singletons.getControl().getMatchControl().getMessageControl() + .getInputControl().selectCard(c, + AllZone.getHumanPlayer().getZone(Zone.Battlefield)); } } } diff --git a/src/main/java/forge/control/match/ControlHand.java b/src/main/java/forge/control/match/ControlHand.java index 423c5f10760..cb346cccf93 100644 --- a/src/main/java/forge/control/match/ControlHand.java +++ b/src/main/java/forge/control/match/ControlHand.java @@ -40,8 +40,7 @@ import forge.AllZone; import forge.Card; import forge.Constant.Zone; import forge.PlayerZone; -import forge.view.GuiTopLevel; -import forge.view.match.MatchTopLevel; +import forge.Singletons; import forge.view.match.ViewHand; /** @@ -70,8 +69,6 @@ public class ControlHand { this.view = v; this.cardsInPanel = new ArrayList(); - final MatchTopLevel t = view.getTopLevel(); - maCardClick = new MouseAdapter() { // Card click @Override @@ -81,8 +78,8 @@ public class ControlHand { } final Card c = view.getHandArea().getCardFromMouseOverPanel(); if (c != null) { - view.getTopLevel().getInputController().getInputControl().selectCard(c, AllZone.getHumanPlayer().getZone(Zone.Hand)); - view.getTopLevel().getInputController().getView().getBtnOK().requestFocusInWindow(); + Singletons.getControl().getMatchControl().getMessageControl().getInputControl().selectCard(c, AllZone.getHumanPlayer().getZone(Zone.Hand)); + Singletons.getView().getMatchView().getBtnOK().requestFocusInWindow(); } } }; @@ -93,7 +90,7 @@ public class ControlHand { public void mouseMoved(final MouseEvent me) { final Card c = view.getHandArea().getCardFromMouseOverPanel(); if (c != null) { - ((GuiTopLevel) AllZone.getDisplay()).setCard(c); + Singletons.getControl().getMatchControl().setCard(c); } } }; @@ -103,7 +100,9 @@ public class ControlHand { public void update(final Observable a, final Object b) { final PlayerZone pZone = (PlayerZone) a; final HandArea p = view.getHandArea(); - final Rectangle rctLibraryLabel = t.getFieldControllers().get(1).getView().getLblLibrary().getBounds(); + final Rectangle rctLibraryLabel = Singletons.getControl() + .getMatchControl().getFieldControls().get(1) + .getView().getLblLibrary().getBounds(); final Card[] c = pZone.getCards(); // Animation starts from the library label. @@ -129,10 +128,12 @@ public class ControlHand { diff = new ArrayList(Arrays.asList(c)); diff.removeAll(tmp); - JLayeredPane layeredPane = SwingUtilities.getRootPane(t.getTopLevelFrame()).getLayeredPane(); + JLayeredPane layeredPane = Singletons.getView().getLayeredPane(); int fromZoneX = 0, fromZoneY = 0; - final Point zoneLocation = SwingUtilities.convertPoint(t.getFieldControllers().get(1).getView().getLblLibrary(), + final Point zoneLocation = SwingUtilities.convertPoint(Singletons + .getControl().getMatchControl().getFieldControls() + .get(1).getView().getLblLibrary(), Math.round(rctLibraryLabel.width / 2.0f), Math.round(rctLibraryLabel.height / 2.0f), layeredPane); fromZoneX = zoneLocation.x; fromZoneY = zoneLocation.y; @@ -152,7 +153,7 @@ public class ControlHand { endX = toPos.x; endY = toPos.y; final arcane.ui.CardPanel animationPanel = new arcane.ui.CardPanel(card); - if (t.getTopLevelFrame().isShowing()) { + if (Singletons.getView().isShowing()) { Animation.moveCard(startX, startY, startWidth, endX, endY, endWidth, animationPanel, toPanel, layeredPane, 500); } else { @@ -186,15 +187,14 @@ public class ControlHand { */ public void addCardPanelListeners(final CardPanel c) { // Grab top level controller to facilitate interaction between children - final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView(); final Card cardobj = c.getCard(); // Sidebar pic/detail on card hover c.addMouseListener(new MouseAdapter() { @Override public void mouseEntered(final MouseEvent e) { - t.getDetailController().showCard(cardobj); - t.getPictureController().showCard(cardobj); + Singletons.getControl().getMatchControl().getDetailControl().showCard(cardobj); + Singletons.getControl().getMatchControl().getPictureControl().showCard(cardobj); } }); @@ -207,7 +207,7 @@ public class ControlHand { return; } - t.getInputController().getInputControl() + Singletons.getControl().getMatchControl().getMessageControl().getInputControl() .selectCard(cardobj, AllZone.getHumanPlayer().getZone(Zone.Hand)); } }); diff --git a/src/main/java/forge/control/match/ControlInput.java b/src/main/java/forge/control/match/ControlMessage.java similarity index 82% rename from src/main/java/forge/control/match/ControlInput.java rename to src/main/java/forge/control/match/ControlMessage.java index 67ca7ab05ec..39556855d11 100644 --- a/src/main/java/forge/control/match/ControlInput.java +++ b/src/main/java/forge/control/match/ControlMessage.java @@ -23,14 +23,14 @@ import java.awt.event.ActionListener; import forge.AllZone; import forge.Constant; import forge.GuiInput; -import forge.view.match.ViewInput; +import forge.view.match.ViewMessage; /** - * Child controller - handles operations related to input panel. + * Child controller - handles operations related to message panel. * */ -public class ControlInput { - private final ViewInput view; +public class ControlMessage { + private final ViewMessage view; private final GuiInput inputControl; @@ -42,29 +42,29 @@ public class ControlInput { * @param v *   The Swing component for the input area */ - public ControlInput(final ViewInput v) { + public ControlMessage(final ViewMessage v) { this.view = v; this.inputControl = new GuiInput(); this.alOK = new ActionListener() { @Override public void actionPerformed(final ActionEvent evt) { - ControlInput.this.btnOKActionPerformed(evt); + ControlMessage.this.btnOKActionPerformed(evt); if (AllZone.getPhaseHandler().isNeedToNextPhase()) { // moves to next turn AllZone.getPhaseHandler().setNeedToNextPhase(false); AllZone.getPhaseHandler().nextPhase(); } - ControlInput.this.view.getBtnOK().requestFocusInWindow(); + ControlMessage.this.view.getBtnOK().requestFocusInWindow(); } }; this.alCancel = new ActionListener() { @Override public void actionPerformed(final ActionEvent evt) { - ControlInput.this.btnCancelActionPerformed(evt); - ControlInput.this.view.getBtnOK().requestFocusInWindow(); + ControlMessage.this.btnCancelActionPerformed(evt); + ControlMessage.this.view.getBtnOK().requestFocusInWindow(); } }; } @@ -114,9 +114,9 @@ public class ControlInput { return this.inputControl; } - /** @return ViewInput */ - public ViewInput getView() { - return view; + /** @param s0   {@link java.lang.String} */ + public void setMessage(String s0) { + view.getTarMessage().setText(s0); } /** Updates count label in input area. */ diff --git a/src/main/java/forge/control/match/ControlWinLose.java b/src/main/java/forge/control/match/ControlWinLose.java index fd2295c3527..73bcbb8ce0b 100644 --- a/src/main/java/forge/control/match/ControlWinLose.java +++ b/src/main/java/forge/control/match/ControlWinLose.java @@ -8,8 +8,8 @@ import forge.AllZone; import forge.Card; import forge.CardList; import forge.Constant; -import forge.Singletons; import forge.Constant.Zone; +import forge.Singletons; import forge.control.FControl; import forge.deck.Deck; import forge.game.GameType; @@ -17,7 +17,6 @@ import forge.gui.GuiUtils; import forge.item.CardDb; import forge.item.CardPrinted; import forge.properties.ForgePreferences.FPref; -import forge.view.GuiTopLevel; import forge.view.match.ViewWinLose; /** @@ -75,10 +74,10 @@ public class ControlWinLose { /** Action performed when "quit" button is pressed in default win/lose UI. */ public void actionOnQuit() { AllZone.getMatchState().reset(); - AllZone.getDisplay().savePrefs(); - FControl g = ((GuiTopLevel) AllZone.getDisplay()).getController(); - g.getMatchController().deinitMatch(); - g.changeState(FControl.HOME_SCREEN); + Singletons.getModel().savePrefs(); + Singletons.getControl().getMatchControl().deinitMatch(); + Singletons.getControl().changeState(FControl.HOME_SCREEN); + GuiUtils.closeOverlay(); } /** @@ -122,7 +121,7 @@ public class ControlWinLose { Constant.Runtime.HUMAN_DECK[0] = hDeck; } } - AllZone.getDisplay().savePrefs(); + Singletons.getModel().savePrefs(); AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]); } diff --git a/src/main/java/forge/gui/GuiUtils.java b/src/main/java/forge/gui/GuiUtils.java index 1faced72847..83949cc8518 100644 --- a/src/main/java/forge/gui/GuiUtils.java +++ b/src/main/java/forge/gui/GuiUtils.java @@ -40,11 +40,10 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import net.slightlymagic.braids.util.UtilFunctions; -import forge.AllZone; import forge.Card; +import forge.Singletons; import forge.properties.ForgeProps; import forge.properties.NewConstants; -import forge.view.toolbox.FOverlay; /** *

@@ -357,8 +356,8 @@ public final class GuiUtils { list.addListSelectionListener(new ListSelectionListener() { @Override public void valueChanged(final ListSelectionEvent ev) { - if ((list.getSelectedValue() instanceof Card) && (AllZone.getDisplay() != null)) { - AllZone.getDisplay().setCard((Card) list.getSelectedValue()); + if (list.getSelectedValue() instanceof Card) { + Singletons.getControl().getMatchControl().setCard((Card) list.getSelectedValue()); } } }); @@ -406,9 +405,8 @@ public final class GuiUtils { /** Removes child components and closes overlay. */ public static void closeOverlay() { - final FOverlay overlay = AllZone.getOverlay(); - overlay.removeAll(); - overlay.hideOverlay(); + Singletons.getView().getOverlay().removeAll(); + Singletons.getView().getOverlay().hideOverlay(); } /** Duplicate in DeckEditorQuestMenu and diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java b/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java index c48e7dde59c..54cb69a3529 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java @@ -39,7 +39,7 @@ import javax.swing.WindowConstants; import net.slightlymagic.maxmtg.Predicate; import forge.AllZone; import forge.Constant; -import forge.control.FControl; +import forge.Singletons; import forge.deck.Deck; import forge.deck.DeckIO; import forge.deck.DeckManager; @@ -53,7 +53,6 @@ import forge.item.InventoryItem; import forge.item.ItemPoolView; import forge.properties.ForgeProps; import forge.properties.NewConstants.Lang.GuiBoosterDraft; -import forge.view.GuiTopLevel; /** *

@@ -133,8 +132,8 @@ public class DeckEditorDraft extends DeckEditorBase { ForgeProps.getLocalized(GuiBoosterDraft.CLOSE_MESSAGE), "", JOptionPane.YES_NO_OPTION); if (n == JOptionPane.YES_OPTION) { DeckEditorDraft.this.dispose(); - FControl g = ((GuiTopLevel) AllZone.getDisplay()).getController(); - g.getHomeView().getDraftController().updateHumanDecks(); +// ghandi why is draft controller in a view + Singletons.getView().getHomeView().getDraftController().updateHumanDecks(); } } // windowClosing() }); @@ -351,8 +350,8 @@ public class DeckEditorDraft extends DeckEditorBase { // close and open next screen this.dispose(); - FControl g = ((GuiTopLevel) AllZone.getDisplay()).getController(); - g.getHomeView().getDraftController().updateHumanDecks(); +// ghandi here is is again + Singletons.getView().getHomeView().getDraftController().updateHumanDecks(); } /* saveDraft() */ diff --git a/src/main/java/forge/gui/input/Input.java b/src/main/java/forge/gui/input/Input.java index e3db6a17aeb..77f14ce9867 100644 --- a/src/main/java/forge/gui/input/Input.java +++ b/src/main/java/forge/gui/input/Input.java @@ -21,6 +21,7 @@ import forge.AllZone; import forge.Card; import forge.Player; import forge.PlayerZone; +import forge.Singletons; /** *

@@ -43,7 +44,7 @@ public abstract class Input implements java.io.Serializable { *

*/ public void showMessage() { - AllZone.getDisplay().showMessage("Blank Input"); + Singletons.getControl().getMatchControl().showMessage("Blank Input"); } /** diff --git a/src/main/java/forge/gui/input/InputAttack.java b/src/main/java/forge/gui/input/InputAttack.java index a1b75079d90..3392a11a687 100644 --- a/src/main/java/forge/gui/input/InputAttack.java +++ b/src/main/java/forge/gui/input/InputAttack.java @@ -27,11 +27,11 @@ import forge.Constant; import forge.Constant.Zone; import forge.GameActionUtil; import forge.PlayerZone; -import forge.view.GuiTopLevel; +import forge.Singletons; /** *

- * Input_Attack class. + * InputAttack class. *

* * @author Forge @@ -57,7 +57,7 @@ public class InputAttack extends Input { sb.append("Declare Attackers: Select Creatures to Attack "); sb.append(o.toString()); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); if (AllZone.getCombat().getRemainingDefenders() == 0) { // Nothing left to attack, has to attack this defender @@ -117,7 +117,7 @@ public class InputAttack extends Input { CombatUtil.showCombat(); } else { - ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView().getInputController().remind(); + Singletons.getControl().getMatchControl().getMessageControl().remind(); } } // selectCard() diff --git a/src/main/java/forge/gui/input/InputBlock.java b/src/main/java/forge/gui/input/InputBlock.java index 4c86f2554d4..30ba33e70ab 100644 --- a/src/main/java/forge/gui/input/InputBlock.java +++ b/src/main/java/forge/gui/input/InputBlock.java @@ -28,7 +28,7 @@ import forge.Command; import forge.Constant; import forge.GameActionUtil; import forge.PlayerZone; -import forge.view.GuiTopLevel; +import forge.Singletons; /** *

@@ -74,14 +74,14 @@ public class InputBlock extends Input { final StringBuilder sb = new StringBuilder(); sb.append("To Block, click on your Opponents attacker first, then your blocker(s). "); sb.append("To cancel a block right-click on your blocker"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); } else { final String attackerName = this.currentAttacker.isFaceDown() ? "Morph" : this.currentAttacker.getName(); final StringBuilder sb = new StringBuilder(); sb.append("Select a creature to block ").append(attackerName).append(" ("); sb.append(this.currentAttacker.getUniqueNumber()).append("). "); sb.append("To cancel a block right-click on your blocker"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); } CombatUtil.showCombat(); @@ -112,7 +112,7 @@ public class InputBlock extends Input { } } else { - ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView().getInputController().remind(); + Singletons.getControl().getMatchControl().getMessageControl().remind(); } this.showMessage(); } // selectCard() diff --git a/src/main/java/forge/gui/input/InputCleanup.java b/src/main/java/forge/gui/input/InputCleanup.java index 1e6958e426c..063e39330a6 100644 --- a/src/main/java/forge/gui/input/InputCleanup.java +++ b/src/main/java/forge/gui/input/InputCleanup.java @@ -24,6 +24,7 @@ import forge.CombatUtil; import forge.Constant; import forge.Constant.Zone; import forge.PlayerZone; +import forge.Singletons; /** *

@@ -53,7 +54,7 @@ public class InputCleanup extends Input { final StringBuffer sb = new StringBuffer(); sb.append("Cleanup Phase: You can only have a maximum of ").append(AllZone.getHumanPlayer().getMaxHandSize()); sb.append(" cards, you currently have ").append(n).append(" cards in your hand - select a card to discard"); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); // goes to the next phase if ((n <= AllZone.getHumanPlayer().getMaxHandSize()) || (AllZone.getHumanPlayer().getMaxHandSize() == -1)) { diff --git a/src/main/java/forge/gui/input/InputControl.java b/src/main/java/forge/gui/input/InputControl.java index bd09f795e3a..3cba3c82561 100644 --- a/src/main/java/forge/gui/input/InputControl.java +++ b/src/main/java/forge/gui/input/InputControl.java @@ -25,6 +25,7 @@ import forge.Constant; import forge.MyObservable; import forge.PhaseHandler; import forge.Player; +import forge.Singletons; import forge.model.FModel; /** @@ -246,7 +247,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { final boolean skip = this.model.getGameState().getPhaseHandler().doSkipPhase(); this.model.getGameState().getPhaseHandler().setSkipPhase(false); if ((this.model.getGameState().getStack().size() == 0) - && !forge.AllZone.getDisplay().stopAtPhase(playerTurn, phase) && skip) { + && !Singletons.getControl().getMatchControl().stopAtPhase(playerTurn, phase) && skip) { this.model.getGameState().getPhaseHandler().passPriority(); return null; } else { diff --git a/src/main/java/forge/gui/input/InputMulligan.java b/src/main/java/forge/gui/input/InputMulligan.java index 48f5e0be95c..1ffb31bc2af 100644 --- a/src/main/java/forge/gui/input/InputMulligan.java +++ b/src/main/java/forge/gui/input/InputMulligan.java @@ -37,16 +37,14 @@ import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.game.GamePlayerRating; import forge.quest.data.QuestData; -import forge.view.GuiTopLevel; - -/** - *

- * Input_Mulligan class. - *

- * - * @author Forge - * @version $Id$ - */ + /** + *

+ * InputMulligan class. + *

+ * + * @author Forge + * @version $Id$ + */ public class InputMulligan extends Input { /** Constant serialVersionUID=-8112954303001155622L. */ private static final long serialVersionUID = -8112954303001155622L; @@ -58,9 +56,9 @@ public class InputMulligan extends Input { @Override public final void showMessage() { ButtonUtil.enableAll(); - AllZone.getDisplay().getButtonOK().setText("No"); - AllZone.getDisplay().getButtonCancel().setText("Yes"); - AllZone.getDisplay().showMessage("Do you want to Mulligan?"); + Singletons.getView().getMatchView().getBtnOK().setText("No"); + Singletons.getView().getMatchView().getBtnCancel().setText("Yes"); + Singletons.getControl().getMatchControl().showMessage("Do you want to Mulligan?"); } /** {@inheritDoc} */ @@ -225,7 +223,7 @@ public class InputMulligan extends Input { c0.getController().drawCards(hand.size()); } } else { - ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView().getInputController().remind(); + Singletons.getControl().getMatchControl().getMessageControl().remind(); } } } diff --git a/src/main/java/forge/gui/input/InputPassPriority.java b/src/main/java/forge/gui/input/InputPassPriority.java index 0390f3ac7f9..086b8ab013d 100644 --- a/src/main/java/forge/gui/input/InputPassPriority.java +++ b/src/main/java/forge/gui/input/InputPassPriority.java @@ -23,7 +23,7 @@ import forge.Card; import forge.GuiDisplayUtil; import forge.Player; import forge.PlayerZone; -import forge.view.GuiTopLevel; +import forge.Singletons; /** *

@@ -63,7 +63,7 @@ public class InputPassPriority extends Input implements java.io.Serializable { sb.append("\n"); sb.append("Priority: ").append(player); - AllZone.getDisplay().showMessage(sb.toString()); + Singletons.getControl().getMatchControl().showMessage(sb.toString()); } /** {@inheritDoc} */ @@ -85,7 +85,7 @@ public class InputPassPriority extends Input implements java.io.Serializable { AllZone.getPhaseHandler().setPriority(AllZone.getHumanPlayer()); } else { - ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView().getInputController().remind(); + Singletons.getControl().getMatchControl().getMessageControl().remind(); } } // selectCard() } diff --git a/src/main/java/forge/gui/input/InputPayManaCost.java b/src/main/java/forge/gui/input/InputPayManaCost.java index cebff0db534..9cb4efb4777 100644 --- a/src/main/java/forge/gui/input/InputPayManaCost.java +++ b/src/main/java/forge/gui/input/InputPayManaCost.java @@ -24,6 +24,7 @@ import forge.Constant.Zone; import forge.PhaseHandler; import forge.Player; import forge.PlayerZone; +import forge.Singletons; import forge.card.mana.ManaCost; import forge.card.spellability.SpellAbility; @@ -287,7 +288,7 @@ public class InputPayManaCost extends InputMana { msg.append("\n(Click on your life total to pay life for phyrexian mana.)"); } - AllZone.getDisplay().showMessage(msg.toString()); + Singletons.getControl().getMatchControl().showMessage(msg.toString()); if (this.manaCost.isPaid() && !new ManaCost(this.originalManaCost).isPaid()) { this.originalCard.setSunburstValue(this.manaCost.getSunburst()); this.done(); diff --git a/src/main/java/forge/gui/input/InputPayManaCostAbility.java b/src/main/java/forge/gui/input/InputPayManaCostAbility.java index af0ac935adc..6a46100a355 100644 --- a/src/main/java/forge/gui/input/InputPayManaCostAbility.java +++ b/src/main/java/forge/gui/input/InputPayManaCostAbility.java @@ -22,6 +22,7 @@ import forge.ButtonUtil; import forge.Card; import forge.Command; import forge.PlayerZone; +import forge.Singletons; import forge.card.mana.ManaCost; import forge.card.spellability.SpellAbility; @@ -188,7 +189,7 @@ public class InputPayManaCostAbility extends InputMana { if (this.showOnlyOKButton) { ButtonUtil.enableOnlyOK(); } - AllZone.getDisplay().showMessage(this.message + "Pay Mana Cost: \r\n" + this.manaCost.toString()); + Singletons.getControl().getMatchControl().showMessage(this.message + "Pay Mana Cost: \r\n" + this.manaCost.toString()); } /* (non-Javadoc) diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index 6b8caafcabd..f4e27d9a709 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; import java.util.ArrayList; +import java.util.List; import arcane.util.MultiplexOutputStream; import forge.AllZone; @@ -31,15 +32,18 @@ import forge.ComputerAIGeneral; import forge.ComputerAIInput; import forge.Constant; import forge.ConstantStringArrayList; +import forge.Singletons; import forge.game.GameSummary; import forge.gui.input.InputControl; import forge.properties.ForgePreferences; +import forge.properties.ForgePreferences.FPref; import forge.properties.ForgeProps; import forge.properties.NewConstants; -import forge.properties.ForgePreferences.FPref; import forge.quest.data.QuestPreferences; import forge.util.FileUtil; import forge.util.HttpUtil; +import forge.view.match.ViewField; +import forge.view.match.ViewTabber; import forge.view.toolbox.FSkin; /** @@ -306,4 +310,91 @@ public class FModel { return this.gameState; } + /** TODO: Needs to be reworked for efficiency with rest of prefs saves in codebase. */ + public final boolean savePrefs() { + final ForgePreferences fp = preferences; + final List fieldViews = Singletons.getView().getMatchView().getFieldViews(); + + // AI field is at index [0] + fp.setPref(FPref.PHASE_AI_UPKEEP, String.valueOf(fieldViews.get(0).getLblUpkeep().getEnabled())); + fp.setPref(FPref.PHASE_AI_DRAW, String.valueOf(fieldViews.get(0).getLblDraw().getEnabled())); + fp.setPref(FPref.PHASE_AI_MAIN1, String.valueOf(fieldViews.get(0).getLblMain1().getEnabled())); + fp.setPref(FPref.PHASE_AI_BEGINCOMBAT, String.valueOf(fieldViews.get(0).getLblBeginCombat().getEnabled())); + fp.setPref(FPref.PHASE_AI_DECLAREATTACKERS, String.valueOf(fieldViews.get(0).getLblDeclareAttackers().getEnabled())); + fp.setPref(FPref.PHASE_AI_DECLAREBLOCKERS, String.valueOf(fieldViews.get(0).getLblDeclareBlockers().getEnabled())); + fp.setPref(FPref.PHASE_AI_FIRSTSTRIKE, String.valueOf(fieldViews.get(0).getLblFirstStrike().getEnabled())); + fp.setPref(FPref.PHASE_AI_COMBATDAMAGE, String.valueOf(fieldViews.get(0).getLblCombatDamage().getEnabled())); + fp.setPref(FPref.PHASE_AI_ENDCOMBAT, String.valueOf(fieldViews.get(0).getLblEndCombat().getEnabled())); + fp.setPref(FPref.PHASE_AI_MAIN2, String.valueOf(fieldViews.get(0).getLblMain2().getEnabled())); + fp.setPref(FPref.PHASE_AI_EOT, String.valueOf(fieldViews.get(0).getLblEndTurn().getEnabled())); + fp.setPref(FPref.PHASE_AI_CLEANUP, String.valueOf(fieldViews.get(0).getLblCleanup().getEnabled())); + + // Human field is at index [1] + fp.setPref(FPref.PHASE_HUMAN_UPKEEP, String.valueOf(fieldViews.get(1).getLblUpkeep().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_DRAW, String.valueOf(fieldViews.get(1).getLblDraw().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_MAIN1, String.valueOf(fieldViews.get(1).getLblMain1().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_BEGINCOMBAT, String.valueOf(fieldViews.get(1).getLblBeginCombat().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_DECLAREATTACKERS, String.valueOf(fieldViews.get(1).getLblDeclareAttackers().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_DECLAREBLOCKERS, String.valueOf(fieldViews.get(1).getLblDeclareBlockers().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_FIRSTSTRIKE, String.valueOf(fieldViews.get(1).getLblFirstStrike().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_COMBATDAMAGE, String.valueOf(fieldViews.get(1).getLblCombatDamage().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_ENDCOMBAT, String.valueOf(fieldViews.get(1).getLblEndCombat().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_MAIN2, String.valueOf(fieldViews.get(1).getLblMain2().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_EOT, String.valueOf(fieldViews.get(1).getLblEndTurn().getEnabled())); + fp.setPref(FPref.PHASE_HUMAN_CLEANUP, String.valueOf(fieldViews.get(1).getLblCleanup().getEnabled())); + + ViewTabber v = Singletons.getView().getMatchView().getViewTabber(); + Constant.Runtime.MILL[0] = v.getLblMilling().getEnabled(); + + fp.setPref(FPref.DEV_MILLING_LOSS, String.valueOf(Constant.Runtime.MILL[0])); + fp.setPref(FPref.UI_LAYOUT_PARAMS, String.valueOf(Singletons.getView().getMatchView().getLayoutParams())); + fp.setPref(FPref.DEV_UNLIMITED_LAND, String.valueOf(v.getLblUnlimitedLands().getEnabled())); + + fp.save(); + return true; + } + + /** TODO: Needs to be reworked for efficiency with rest of prefs loads in codebase. */ + public final boolean loadPrefs() { + final ForgePreferences fp = Singletons.getModel().getPreferences(); + final List fieldViews = Singletons.getView().getMatchView().getFieldViews(); + + Constant.Runtime.MILL[0] = fp.getPrefBoolean(FPref.DEV_MILLING_LOSS); + Constant.Runtime.DEV_MODE[0] = fp.getPrefBoolean(FPref.DEV_MODE_ENABLED); + Constant.Runtime.UPLOAD_DRAFT[0] = fp.getPrefBoolean(FPref.UI_UPLOAD_DRAFT); + Constant.Runtime.RANDOM_FOIL[0] = fp.getPrefBoolean(FPref.UI_RANDOM_FOIL); + Constant.Runtime.UPLOAD_DRAFT[0] = + (Constant.Runtime.NET_CONN[0] ? fp.getPrefBoolean(FPref.UI_UPLOAD_DRAFT) : false); + + // AI field is at index [0] + fieldViews.get(0).getLblUpkeep().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_UPKEEP)); + fieldViews.get(0).getLblDraw().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_DRAW)); + fieldViews.get(0).getLblMain1().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_MAIN1)); + fieldViews.get(0).getLblBeginCombat().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_BEGINCOMBAT)); + fieldViews.get(0).getLblDeclareAttackers().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_DECLAREATTACKERS)); + fieldViews.get(0).getLblDeclareBlockers().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_DECLAREBLOCKERS)); + fieldViews.get(0).getLblFirstStrike().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_FIRSTSTRIKE)); + fieldViews.get(0).getLblCombatDamage().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_COMBATDAMAGE)); + fieldViews.get(0).getLblEndCombat().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_ENDCOMBAT)); + fieldViews.get(0).getLblMain2().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_MAIN2)); + fieldViews.get(0).getLblEndTurn().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_EOT)); + fieldViews.get(0).getLblCleanup().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_CLEANUP)); + + // Human field is at index [1] + fieldViews.get(1).getLblUpkeep().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_UPKEEP)); + fieldViews.get(1).getLblDraw().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_DRAW)); + fieldViews.get(1).getLblMain1().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_MAIN1)); + fieldViews.get(1).getLblBeginCombat().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_BEGINCOMBAT)); + fieldViews.get(1).getLblDeclareAttackers().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_DECLAREATTACKERS)); + fieldViews.get(1).getLblDeclareBlockers().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_DECLAREBLOCKERS)); + fieldViews.get(1).getLblFirstStrike().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_FIRSTSTRIKE)); + fieldViews.get(1).getLblCombatDamage().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_COMBATDAMAGE)); + fieldViews.get(1).getLblEndCombat().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_ENDCOMBAT)); + fieldViews.get(1).getLblMain2().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_MAIN2)); + fieldViews.get(1).getLblEndTurn().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_EOT)); + fieldViews.get(1).getLblCleanup().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_CLEANUP)); + + Singletons.getView().getMatchView().setLayoutParams(fp.getPref(FPref.UI_LAYOUT_PARAMS)); + return true; + } } diff --git a/src/main/java/forge/view/FView.java b/src/main/java/forge/view/FView.java index 77f71e852d6..f8f3996fcaf 100644 --- a/src/main/java/forge/view/FView.java +++ b/src/main/java/forge/view/FView.java @@ -17,78 +17,58 @@ */ package forge.view; +import java.awt.Dimension; +import java.awt.Frame; + +import javax.swing.JFrame; +import javax.swing.JLayeredPane; import javax.swing.SwingUtilities; -import net.slightlymagic.braids.util.UtilFunctions; import forge.AllZone; import forge.Singletons; import forge.control.FControl; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; -import forge.view.home.SplashFrame; import forge.view.toolbox.CardFaceSymbols; -import forge.view.toolbox.FProgressBar; +import forge.view.toolbox.FOverlay; import forge.view.toolbox.FSkin; /** * The main view for Forge: a java swing application. All view class instances * should be accessible from here. */ -public class FView { +@SuppressWarnings("serial") +public final class FView extends JFrame { + private final JLayeredPane lpnContent = new JLayeredPane(); + private final FOverlay overlay = new FOverlay(); - private transient SplashFrame splashFrame; - private FProgressBar barProgress = null; + private SplashFrame splash; + private ViewHomeUI home = null; + private ViewMatchUI match = null; + private ViewEditorUI editor = null; + private ViewBazaarUI bazaar = null; - /** - * The splashFrame field is guaranteed to exist when this constructor exits. - * - */ + //private static final JLayeredPane lpnContent; + //private static final FControl control; + + /** The splash frame is guaranteed to exist when this constructor exits. */ public FView() { - // We must use invokeAndWait here to fulfill the constructor's - // contract. NOPMD by Braids on 8/18/11 11:37 PM - UtilFunctions.invokeInEventDispatchThreadAndWait(new Runnable() { - @Override - public void run() { - try { - FView.this.splashFrame = new SplashFrame(); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); + super(); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - FView.this.splashFrame.setVisible(true); + try { splash = new SplashFrame(); } + catch (Exception e) { e.printStackTrace(); } } }); } - /** - * Allows singleton (global) access to a progress bar (which must be set first). - * - * @return {@link forge.view.toolbox.FProgressBar} - */ - public final FProgressBar getProgressBar() { - return this.barProgress; - } - - /** - * Sets a progress bar so it can be accessed via singletons. - * - * @param bar0   {@link forge.view.toolbox.FProgressBar} - */ - public final void setProgressBar(FProgressBar bar0) { - this.barProgress = bar0; - } - /** * Tell the view that the model has been bootstrapped, the initial stuff * for the skin is in place, and data is ready for initial display. */ - public final void initialize() { - this.setProgressBar(splashFrame.getProgressBar()); + public void initialize() { // Preloads all cards (using progress bar). AllZone.getCardFactory(); @@ -102,16 +82,37 @@ public class FView { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - barProgress.setDescription("Creating display components."); - final GuiTopLevel g = new GuiTopLevel(); - AllZone.setDisplay(g); - g.getController().changeState(FControl.HOME_SCREEN); + SplashFrame.PROGRESS_BAR.setDescription("Creating display components."); - FView.this.splashFrame.dispose(); - FView.this.splashFrame = null; + // Frame styling + FView.this.setMinimumSize(new Dimension(800, 600)); + FView.this.setLocationRelativeTo(null); + FView.this.setExtendedState(FView.this.getExtendedState() | Frame.MAXIMIZED_BOTH); + FView.this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + FView.this.setIconImage(FSkin.getIcon(FSkin.ForgeIcons.ICO_FAVICON).getImage()); + FView.this.setTitle("Forge: " + Singletons.getModel().getBuildInfo().getVersion()); - barProgress.setDescription("Forge is ready to launch."); - g.setVisible(true); + // Content pane + FView.this.lpnContent.setOpaque(true); + FView.this.setContentPane(FView.this.lpnContent); + + // Overlay + overlay.setBounds(0, 0, FView.this.getWidth(), FView.this.getHeight()); + FView.this.lpnContent.add(overlay, JLayeredPane.MODAL_LAYER); + + // Instantiate all different state screens + FView.this.home = new ViewHomeUI(); + FView.this.match = new ViewMatchUI(); + FView.this.editor = new ViewEditorUI(); + FView.this.bazaar = new ViewBazaarUI(); + + // All is ready to go - fire up home screen and discard splash frame. + Singletons.getControl().changeState(FControl.HOME_SCREEN); + + FView.this.splash.dispose(); + FView.this.splash = null; + + FView.this.setVisible(true); // Open previous menu on first run, or constructed. // Focus is reset when the frame becomes visible, @@ -120,15 +121,61 @@ public class FView { ForgePreferences.HomeMenus.valueOf(Singletons.getModel().getPreferences().getPref(FPref.UI_HOMEMENU)); switch(lastMenu) { - case constructed: g.getHomeView().getBtnConstructed().grabFocus(); break; - case draft: g.getHomeView().getBtnDraft().grabFocus(); break; - case sealed: g.getHomeView().getBtnSealed().grabFocus(); break; - case quest: g.getHomeView().getBtnQuest().grabFocus(); break; - case settings: g.getHomeView().getBtnSettings().grabFocus(); break; - case utilities: g.getHomeView().getBtnUtilities().grabFocus(); break; + case constructed: FView.this.getHomeView().getBtnConstructed().grabFocus(); break; + case draft: FView.this.getHomeView().getBtnDraft().grabFocus(); break; + case sealed: FView.this.getHomeView().getBtnSealed().grabFocus(); break; + case quest: FView.this.getHomeView().getBtnQuest().grabFocus(); break; + case settings: FView.this.getHomeView().getBtnSettings().grabFocus(); break; + case utilities: FView.this.getHomeView().getBtnUtilities().grabFocus(); break; default: } } }); } // End FView() + + /** @return {@link javax.swing.JLayeredPane} */ + public JLayeredPane getLayeredContentPane() { + return FView.this.lpnContent; + } + + /** @return {@link forge.view.toolbox.FOverlay} */ + public FOverlay getOverlay() { + return FView.this.overlay; + } + + /** @return {@link forge.view.ViewHomeUI} */ + public ViewHomeUI getHomeView() { + if (Singletons.getControl().getState() != FControl.HOME_SCREEN) { + throw new IllegalArgumentException("FView$getHomeView\n" + + "may only be called while the home UI is showing."); + } + return FView.this.home; + } + + /** @return {@link forge.view.ViewMatchUI} */ + public ViewMatchUI getMatchView() { + if (Singletons.getControl().getState() != FControl.MATCH_SCREEN) { + throw new IllegalArgumentException("FView$getMatchView\n" + + "may only be called while the match UI is showing."); + } + return FView.this.match; + } + + /** @return {@link forge.view.ViewEditorUI} */ + public ViewEditorUI getEditorView() { + if (Singletons.getControl().getState() != FControl.DEFAULT_EDITOR) { + throw new IllegalArgumentException("FView$getEditorView\n" + + "may only be called while the editor UI is showing."); + } + return FView.this.editor; + } + + /** @return {@link forge.view.ViewBazaarUI} */ + public ViewBazaarUI getBazaarView() { + if (Singletons.getControl().getState() != FControl.QUEST_BAZAAR) { + throw new IllegalArgumentException("FView$getBazaarView\n" + + "may only be called while the bazaar UI is showing."); + } + return FView.this.bazaar; + } } diff --git a/src/main/java/forge/view/GuiTopLevel.java b/src/main/java/forge/view/GuiTopLevel.java deleted file mode 100644 index 227e642de51..00000000000 --- a/src/main/java/forge/view/GuiTopLevel.java +++ /dev/null @@ -1,444 +0,0 @@ -/* - * Forge: Play Magic: the Gathering. - * Copyright (C) 2011 Forge Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package forge.view; - -import java.awt.Dimension; -import java.awt.Frame; -import java.util.List; - -import javax.swing.JFrame; -import javax.swing.JLayeredPane; - -import forge.AllZone; -import forge.Card; -import forge.CardContainer; -import forge.CardList; -import forge.Constant; -import forge.Display; -import forge.GuiMultipleBlockers; -import forge.MyButton; -import forge.Player; -import forge.Singletons; -import forge.control.FControl; -import forge.control.match.ControlField; -import forge.properties.ForgePreferences; -import forge.properties.ForgePreferences.FPref; -import forge.view.home.HomeTopLevel; -import forge.view.match.ViewField; -import forge.view.match.ViewTabber; -import forge.view.toolbox.FOverlay; -import forge.view.toolbox.FSkin; - -/** - * Parent JFrame for Forge UI. - * - */ -@SuppressWarnings("serial") -public class GuiTopLevel extends JFrame implements Display, CardContainer { - private final JLayeredPane lpnContent; - private final FControl control; - - /** - * Parent JFrame for Forge UI. - */ - public GuiTopLevel() { - super(); - this.setMinimumSize(new Dimension(800, 600)); - this.setLocationRelativeTo(null); - this.setExtendedState(this.getExtendedState() | Frame.MAXIMIZED_BOTH); - - this.lpnContent = new JLayeredPane(); - this.lpnContent.setOpaque(true); - this.setContentPane(this.lpnContent); - this.addOverlay(); - this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - this.setIconImage(FSkin.getIcon(FSkin.ForgeIcons.ICO_FAVICON).getImage()); - this.setTitle("Forge: " + Singletons.getModel().getBuildInfo().getVersion()); - - // Init controller - this.control = new FControl(this); - } - - /** - * Adds overlay panel to modal layer. Used when removeAll() has been called - * on the JLayeredPane parent. - */ - public void addOverlay() { - final FOverlay pnlOverlay = new FOverlay(); - AllZone.setOverlay(pnlOverlay); - pnlOverlay.setOpaque(false); - pnlOverlay.setVisible(false); - pnlOverlay.setBounds(0, 0, this.getWidth(), this.getHeight()); - this.lpnContent.add(pnlOverlay, JLayeredPane.MODAL_LAYER); - } - - /** - * Gets the controller. - * - * @return FControl - */ - public FControl getController() { - return this.control; - } - - /** @return {@link forge.view.home.HomeTopLevel} */ - public HomeTopLevel getHomeView() { - return control.getHomeController().getView(); - } - - /* - * ======================================================== - * - * WILL BE DEPRECATED SOON WITH DISPLAY INTERFACE UPDATE!!! - * - * ======================================================== - */ - - /* - * (non-Javadoc) - * - * @see forge.Display#showMessage(java.lang.String) - */ - @Override - public void showMessage(final String s) { - control.getMatchController().getView().getPnlMessage().setText(s); - } - - /* - * (non-Javadoc) - * - * @see forge.Display#getButtonOK() - */ - @Override - public MyButton getButtonOK() { - final MyButton ok = new MyButton() { - @Override - public void select() { - control.getMatchController().getView().getInputController().getInputControl().selectButtonOK(); - } - - @Override - public boolean isSelectable() { - return control.getMatchController().getView().getInputController().getView().getBtnOK().isEnabled(); - } - - @Override - public void setSelectable(final boolean b) { - control.getMatchController().getView().getInputController().getView().getBtnOK().setEnabled(b); - } - - @Override - public String getText() { - return control.getMatchController().getView().getInputController().getView().getBtnOK().getText(); - } - - @Override - public void setText(final String text) { - control.getMatchController().getView().getInputController().getView().getBtnOK().setText(text); - } - - @Override - public void reset() { - control.getMatchController().getView().getInputController().getView().getBtnOK().setText("OK"); - } - }; - - return ok; - } - - /* - * (non-Javadoc) - * - * @see forge.Display#getButtonCancel() - */ - @Override - public MyButton getButtonCancel() { - final MyButton cancel = new MyButton() { - @Override - public void select() { - control.getMatchController().getView().getInputController().getInputControl().selectButtonCancel(); - } - - @Override - public boolean isSelectable() { - return control.getMatchController().getView().getInputController().getView().getBtnCancel().isEnabled(); - } - - @Override - public void setSelectable(final boolean b) { - control.getMatchController().getView().getInputController().getView().getBtnCancel().setEnabled(b); - } - - @Override - public String getText() { - return control.getMatchController().getView().getInputController().getView().getBtnCancel().getText(); - } - - @Override - public void setText(final String text) { - control.getMatchController().getView().getInputController().getView().getBtnCancel().setText(text); - } - - @Override - public void reset() { - control.getMatchController().getView().getInputController().getView().getBtnCancel().setText("Cancel"); - } - }; - return cancel; - } - - /* - * (non-Javadoc) - * - * @see forge.Display#showCombat(java.lang.String) - */ - @Override - public void showCombat(final String s0) { - control.getMatchController().getView().getTabberController().getView().updateCombat(s0); - } - - /** */ - public void showStack() { - control.getMatchController().getView().getTabberController().showPnlStack(); - } - - /* - * (non-Javadoc) - * - * @see forge.Display#assignDamage(forge.Card, forge.CardList, int) - */ - @Override - public void assignDamage(final Card attacker, final CardList blockers, final int damage) { - if (damage <= 0) { - return; - } - - new GuiMultipleBlockers(attacker, blockers, damage, this); - } - - /* - * (non-Javadoc) - * - * @see forge.Display#stopAtPhase(forge.Player, java.lang.String) - */ - @Override - public final boolean stopAtPhase(final Player turn, final String phase) { - final List fieldControllers = control.getMatchView().getFieldControllers(); - - // AI field is at index [0] - if (turn.isComputer()) { - if (phase.equals(Constant.Phase.UPKEEP)) { - return fieldControllers.get(0).getView().getLblUpkeep().getEnabled(); - } else if (phase.equals(Constant.Phase.DRAW)) { - return fieldControllers.get(0).getView().getLblDraw().getEnabled(); - } else if (phase.equals(Constant.Phase.MAIN1)) { - return fieldControllers.get(0).getView().getLblMain1().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_BEGIN)) { - return fieldControllers.get(0).getView().getLblBeginCombat().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_DECLARE_ATTACKERS)) { - return fieldControllers.get(0).getView().getLblDeclareAttackers().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_DECLARE_BLOCKERS)) { - return fieldControllers.get(0).getView().getLblDeclareBlockers().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_FIRST_STRIKE_DAMAGE)) { - return fieldControllers.get(0).getView().getLblFirstStrike().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_DAMAGE)) { - return fieldControllers.get(0).getView().getLblCombatDamage().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_END)) { - return fieldControllers.get(0).getView().getLblEndCombat().getEnabled(); - } else if (phase.equals(Constant.Phase.MAIN2)) { - return fieldControllers.get(0).getView().getLblMain2().getEnabled(); - } else if (phase.equals(Constant.Phase.END_OF_TURN)) { - return fieldControllers.get(0).getView().getLblEndTurn().getEnabled(); - } else if (phase.equals(Constant.Phase.DRAW)) { - return fieldControllers.get(0).getView().getLblDraw().getEnabled(); - } - } - // Human field is at index [1] - else { - if (phase.equals(Constant.Phase.UPKEEP)) { - return fieldControllers.get(1).getView().getLblUpkeep().getEnabled(); - } else if (phase.equals(Constant.Phase.DRAW)) { - return fieldControllers.get(1).getView().getLblDraw().getEnabled(); - } else if (phase.equals(Constant.Phase.MAIN1)) { - return fieldControllers.get(1).getView().getLblMain1().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_BEGIN)) { - return fieldControllers.get(1).getView().getLblBeginCombat().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_DECLARE_ATTACKERS)) { - return fieldControllers.get(1).getView().getLblDeclareAttackers().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_DECLARE_BLOCKERS)) { - return fieldControllers.get(1).getView().getLblDeclareBlockers().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_FIRST_STRIKE_DAMAGE)) { - return fieldControllers.get(1).getView().getLblFirstStrike().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_DAMAGE)) { - return fieldControllers.get(1).getView().getLblCombatDamage().getEnabled(); - } else if (phase.equals(Constant.Phase.COMBAT_END)) { - return fieldControllers.get(1).getView().getLblEndCombat().getEnabled(); - } else if (phase.equals(Constant.Phase.MAIN2)) { - return fieldControllers.get(1).getView().getLblMain2().getEnabled(); - } else if (phase.equals(Constant.Phase.END_OF_TURN)) { - return fieldControllers.get(1).getView().getLblEndTurn().getEnabled(); - } else if (phase.equals(Constant.Phase.DRAW)) { - return fieldControllers.get(1).getView().getLblDraw().getEnabled(); - } - } - return true; - } - - /** - * Required by Display interface. Due to be deprecated: should be handled by - * a control class, and poorly named; "decking" == "milling" in preferences, - * same terminology should be used throughout project for obvious reasons. - * Unless "decking" is already the correct terminology, in which case, - * everything else is poorly named. - * - * @return boolean - */ - @Override - public boolean canLoseByDecking() { - return Constant.Runtime.MILL[0]; - } - - /** - *

- * loadPrefs. - *

- * Required by Display interface. Due to be deprecated: will be handled by - * ControlMatchUI. - * - * - * @return boolean. - */ - @Override - public final boolean loadPrefs() { - final ForgePreferences fp = Singletons.getModel().getPreferences(); - final List fieldViews = this.control.getMatchController().getView().getFieldViews(); - - Constant.Runtime.MILL[0] = fp.getPrefBoolean(FPref.DEV_MILLING_LOSS); - Constant.Runtime.DEV_MODE[0] = fp.getPrefBoolean(FPref.DEV_MODE_ENABLED); - Constant.Runtime.UPLOAD_DRAFT[0] = fp.getPrefBoolean(FPref.UI_UPLOAD_DRAFT); - Constant.Runtime.RANDOM_FOIL[0] = fp.getPrefBoolean(FPref.UI_RANDOM_FOIL); - Constant.Runtime.UPLOAD_DRAFT[0] = - (Constant.Runtime.NET_CONN[0] ? fp.getPrefBoolean(FPref.UI_UPLOAD_DRAFT) : false); - - // AI field is at index [0] - fieldViews.get(0).getLblUpkeep().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_UPKEEP)); - fieldViews.get(0).getLblDraw().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_DRAW)); - fieldViews.get(0).getLblMain1().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_MAIN1)); - fieldViews.get(0).getLblBeginCombat().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_BEGINCOMBAT)); - fieldViews.get(0).getLblDeclareAttackers().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_DECLAREATTACKERS)); - fieldViews.get(0).getLblDeclareBlockers().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_DECLAREBLOCKERS)); - fieldViews.get(0).getLblFirstStrike().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_FIRSTSTRIKE)); - fieldViews.get(0).getLblCombatDamage().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_COMBATDAMAGE)); - fieldViews.get(0).getLblEndCombat().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_ENDCOMBAT)); - fieldViews.get(0).getLblMain2().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_MAIN2)); - fieldViews.get(0).getLblEndTurn().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_EOT)); - fieldViews.get(0).getLblCleanup().setEnabled(fp.getPrefBoolean(FPref.PHASE_AI_CLEANUP)); - - // Human field is at index [1] - fieldViews.get(1).getLblUpkeep().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_UPKEEP)); - fieldViews.get(1).getLblDraw().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_DRAW)); - fieldViews.get(1).getLblMain1().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_MAIN1)); - fieldViews.get(1).getLblBeginCombat().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_BEGINCOMBAT)); - fieldViews.get(1).getLblDeclareAttackers().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_DECLAREATTACKERS)); - fieldViews.get(1).getLblDeclareBlockers().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_DECLAREBLOCKERS)); - fieldViews.get(1).getLblFirstStrike().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_FIRSTSTRIKE)); - fieldViews.get(1).getLblCombatDamage().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_COMBATDAMAGE)); - fieldViews.get(1).getLblEndCombat().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_ENDCOMBAT)); - fieldViews.get(1).getLblMain2().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_MAIN2)); - fieldViews.get(1).getLblEndTurn().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_EOT)); - fieldViews.get(1).getLblCleanup().setEnabled(fp.getPrefBoolean(FPref.PHASE_HUMAN_CLEANUP)); - - this.control.getMatchController().getView().setLayoutParams(fp.getPref(FPref.UI_LAYOUT_PARAMS)); - return true; - } - - /** - *

- * savePrefs. - *

- * Required by Display interface. Due to be deprecated: should be in FModel. - * Also, this functionality is already performed elsewhere - * in the code base. - * - * @return a boolean. - */ - @Override - public final boolean savePrefs() { - final ForgePreferences fp = Singletons.getModel().getPreferences(); - final List fieldViews = this.control.getMatchController().getView().getFieldViews(); - - // AI field is at index [0] - fp.setPref(FPref.PHASE_AI_UPKEEP, String.valueOf(fieldViews.get(0).getLblUpkeep().getEnabled())); - fp.setPref(FPref.PHASE_AI_DRAW, String.valueOf(fieldViews.get(0).getLblDraw().getEnabled())); - fp.setPref(FPref.PHASE_AI_MAIN1, String.valueOf(fieldViews.get(0).getLblMain1().getEnabled())); - fp.setPref(FPref.PHASE_AI_BEGINCOMBAT, String.valueOf(fieldViews.get(0).getLblBeginCombat().getEnabled())); - fp.setPref(FPref.PHASE_AI_DECLAREATTACKERS, String.valueOf(fieldViews.get(0).getLblDeclareAttackers().getEnabled())); - fp.setPref(FPref.PHASE_AI_DECLAREBLOCKERS, String.valueOf(fieldViews.get(0).getLblDeclareBlockers().getEnabled())); - fp.setPref(FPref.PHASE_AI_FIRSTSTRIKE, String.valueOf(fieldViews.get(0).getLblFirstStrike().getEnabled())); - fp.setPref(FPref.PHASE_AI_COMBATDAMAGE, String.valueOf(fieldViews.get(0).getLblCombatDamage().getEnabled())); - fp.setPref(FPref.PHASE_AI_ENDCOMBAT, String.valueOf(fieldViews.get(0).getLblEndCombat().getEnabled())); - fp.setPref(FPref.PHASE_AI_MAIN2, String.valueOf(fieldViews.get(0).getLblMain2().getEnabled())); - fp.setPref(FPref.PHASE_AI_EOT, String.valueOf(fieldViews.get(0).getLblEndTurn().getEnabled())); - fp.setPref(FPref.PHASE_AI_CLEANUP, String.valueOf(fieldViews.get(0).getLblCleanup().getEnabled())); - - // Human field is at index [1] - fp.setPref(FPref.PHASE_HUMAN_UPKEEP, String.valueOf(fieldViews.get(1).getLblUpkeep().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_DRAW, String.valueOf(fieldViews.get(1).getLblDraw().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_MAIN1, String.valueOf(fieldViews.get(1).getLblMain1().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_BEGINCOMBAT, String.valueOf(fieldViews.get(1).getLblBeginCombat().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_DECLAREATTACKERS, String.valueOf(fieldViews.get(1).getLblDeclareAttackers().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_DECLAREBLOCKERS, String.valueOf(fieldViews.get(1).getLblDeclareBlockers().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_FIRSTSTRIKE, String.valueOf(fieldViews.get(1).getLblFirstStrike().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_COMBATDAMAGE, String.valueOf(fieldViews.get(1).getLblCombatDamage().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_ENDCOMBAT, String.valueOf(fieldViews.get(1).getLblEndCombat().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_MAIN2, String.valueOf(fieldViews.get(1).getLblMain2().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_EOT, String.valueOf(fieldViews.get(1).getLblEndTurn().getEnabled())); - fp.setPref(FPref.PHASE_HUMAN_CLEANUP, String.valueOf(fieldViews.get(1).getLblCleanup().getEnabled())); - - ViewTabber v = this.control.getMatchController().getView().getTabberController().getView(); - Constant.Runtime.MILL[0] = v.getLblMilling().getEnabled(); - - fp.setPref(FPref.DEV_MILLING_LOSS, String.valueOf(Constant.Runtime.MILL[0])); - fp.setPref(FPref.UI_LAYOUT_PARAMS, String.valueOf(control.getMatchController().getView().getLayoutParams())); - fp.setPref(FPref.DEV_UNLIMITED_LAND, String.valueOf(v.getLblUnlimitedLands().getEnabled())); - - fp.save(); - return true; - } - - /* - * (non-Javadoc) - * - * @see forge.Display#setCard(forge.Card) - */ - @Override - public void setCard(final Card c) { - this.control.getMatchView().getDetailController().showCard(c); - this.control.getMatchView().getPictureController().showCard(c); - } - - /** - * Required by display interface. Due to be deprecated: handled by control - * class. - * - * @return a {@link forge.Card} object. - */ - public final Card getCard() { - return this.control.getMatchView().getDetailController().getCurrentCard(); - } -} diff --git a/src/main/java/forge/view/Main.java b/src/main/java/forge/view/Main.java index 4021003777d..7db57acfb9a 100644 --- a/src/main/java/forge/view/Main.java +++ b/src/main/java/forge/view/Main.java @@ -18,6 +18,7 @@ package forge.view; import forge.Singletons; +import forge.control.FControl; import forge.error.ErrorViewer; import forge.error.ExceptionHandler; import forge.model.FModel; @@ -45,15 +46,20 @@ public final class Main { try { final FModel model = new FModel(); final FView view = new FView(); + final FControl control = new FControl(); Singletons.setModel(model); Singletons.setView(view); + Singletons.setControl(control); // Instantiate FGameState for TriggerHandler on card objects created in preloader. model.resetGameState(); // Start splash frame. view.initialize(); + + // Start control on FView. + control.initialize(); } catch (final Throwable exn) { ErrorViewer.showError(exn); } diff --git a/src/main/java/forge/view/home/SplashFrame.java b/src/main/java/forge/view/SplashFrame.java similarity index 90% rename from src/main/java/forge/view/home/SplashFrame.java rename to src/main/java/forge/view/SplashFrame.java index 8a92054c574..63b6f8f1bb7 100644 --- a/src/main/java/forge/view/home/SplashFrame.java +++ b/src/main/java/forge/view/SplashFrame.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.view.home; +package forge.view; import java.awt.Color; import java.awt.Dimension; @@ -56,7 +56,8 @@ public class SplashFrame extends JFrame { private static final int CLOSEBTN_SIDELENGTH = 15; private static final Color CLOSEBTN_COLOR = new Color(215, 208, 188); - private final FProgressBar barLoader; + /** Preload bar, static accessible. */ + public static final FProgressBar PROGRESS_BAR = new FProgressBar(); /** * Create the frame; this must be called from an event @@ -140,21 +141,16 @@ public class SplashFrame extends JFrame { pnlContent.getInputMap().put(KeyStroke.getKeyStroke("ESCAPE"), "escAction"); pnlContent.getActionMap().put("escAction", actClose); - barLoader = new FProgressBar(); - barLoader.setString("Welcome to Forge."); - barLoader.setBounds(SplashFrame.BAR_PADDING_X, splashHeightPx - SplashFrame.BAR_PADDING_Y + PROGRESS_BAR.setString("Welcome to Forge."); + PROGRESS_BAR.setBounds(SplashFrame.BAR_PADDING_X, splashHeightPx - SplashFrame.BAR_PADDING_Y - SplashFrame.BAR_HEIGHT, splashWidthPx - (2 * SplashFrame.BAR_PADDING_X), SplashFrame.BAR_HEIGHT); - pnlContent.add(barLoader); + pnlContent.add(PROGRESS_BAR); final JLabel bgLabel = new JLabel(bgIcon); bgLabel.setBounds(0, 0, splashWidthPx, splashHeightPx); pnlContent.add(bgLabel); this.pack(); - } - - /** @return FProgressBar   The preloader. */ - public final FProgressBar getProgressBar() { - return this.barLoader; + this.setVisible(true); } } diff --git a/src/main/java/forge/view/bazaar/BazaarTopLevel.java b/src/main/java/forge/view/ViewBazaarUI.java similarity index 93% rename from src/main/java/forge/view/bazaar/BazaarTopLevel.java rename to src/main/java/forge/view/ViewBazaarUI.java index e9e7f425e9b..07af4b4ed7c 100644 --- a/src/main/java/forge/view/bazaar/BazaarTopLevel.java +++ b/src/main/java/forge/view/ViewBazaarUI.java @@ -1,4 +1,4 @@ -package forge.view.bazaar; +package forge.view; import javax.swing.JPanel; import javax.swing.SwingConstants; @@ -7,6 +7,7 @@ import javax.swing.SwingUtilities; import net.miginfocom.swing.MigLayout; import forge.Command; import forge.quest.data.bazaar.QuestStallManager; +import forge.view.bazaar.ViewStall; import forge.view.toolbox.FLabel; import forge.view.toolbox.FPanel; import forge.view.toolbox.FSkin; @@ -15,14 +16,14 @@ import forge.view.toolbox.FSkin; /** Lays out containers and borders for resizeable layout and * instantiates top-level controller for bazaar UI. */ @SuppressWarnings("serial") -public class BazaarTopLevel extends FPanel { +public class ViewBazaarUI extends FPanel { private final JPanel pnlAllStalls; private final ViewStall pnlSingleStall; private FLabel previousSelected; /** Lays out containers and borders for resizeable layout and * instantiates top-level controller for bazaar UI. */ - public BazaarTopLevel() { + public ViewBazaarUI() { super(); // Final inits diff --git a/src/main/java/forge/view/editor/EditorTopLevel.java b/src/main/java/forge/view/ViewEditorUI.java similarity index 87% rename from src/main/java/forge/view/editor/EditorTopLevel.java rename to src/main/java/forge/view/ViewEditorUI.java index bfe4e759f62..5847885a1a7 100644 --- a/src/main/java/forge/view/editor/EditorTopLevel.java +++ b/src/main/java/forge/view/ViewEditorUI.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.view.editor; +package forge.view; import forge.view.toolbox.FPanel; @@ -26,12 +26,12 @@ import forge.view.toolbox.FPanel; */ @SuppressWarnings("serial") -public class EditorTopLevel extends FPanel { +public class ViewEditorUI extends FPanel { /** * Instantiates a new editor top level. */ - public EditorTopLevel() { + public ViewEditorUI() { super(); } } diff --git a/src/main/java/forge/view/home/HomeTopLevel.java b/src/main/java/forge/view/ViewHomeUI.java similarity index 93% rename from src/main/java/forge/view/home/HomeTopLevel.java rename to src/main/java/forge/view/ViewHomeUI.java index 70c17a78e6c..967d0ccd82b 100644 --- a/src/main/java/forge/view/home/HomeTopLevel.java +++ b/src/main/java/forge/view/ViewHomeUI.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.view.home; +package forge.view; import java.awt.Rectangle; import java.awt.event.ActionEvent; @@ -37,6 +37,12 @@ import forge.control.home.ControlSealed; import forge.control.home.ControlUtilities; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import forge.view.home.ViewConstructed; +import forge.view.home.ViewDraft; +import forge.view.home.ViewQuest; +import forge.view.home.ViewSealed; +import forge.view.home.ViewSettings; +import forge.view.home.ViewUtilities; import forge.view.toolbox.FButton; import forge.view.toolbox.FPanel; import forge.view.toolbox.FSkin; @@ -49,7 +55,7 @@ import forge.view.toolbox.FSkin; */ @SuppressWarnings("serial") -public class HomeTopLevel extends FPanel { +public class ViewHomeUI extends FPanel { private JPanel pnlMenu, pnlContent; private FButton btnDraft, btnConstructed, btnSealed, btnQuest, btnSettings, btnUtilities, btnExit, btnDeckEditor; private String constraints; @@ -68,7 +74,7 @@ public class HomeTopLevel extends FPanel { /** * Instantiates a new home top level. */ - public HomeTopLevel() { + public ViewHomeUI() { super(); constructed = new ViewConstructed(this); @@ -131,7 +137,7 @@ public class HomeTopLevel extends FPanel { btnDeckEditor = new FButton(); btnDeckEditor.setAction(new AbstractAction() { public void actionPerformed(ActionEvent arg0) { - HomeTopLevel.this.getUtilitiesController().showDeckEditor(null, null); + ViewHomeUI.this.getUtilitiesController().showDeckEditor(null, null); } }); btnDeckEditor.setText("Deck Editor"); @@ -331,7 +337,7 @@ public class HomeTopLevel extends FPanel { } /** @return ControlHomeUI */ - public ControlHomeUI getController() { + public ControlHomeUI getControl() { return control; } diff --git a/src/main/java/forge/view/match/MatchTopLevel.java b/src/main/java/forge/view/ViewMatchUI.java similarity index 74% rename from src/main/java/forge/view/match/MatchTopLevel.java rename to src/main/java/forge/view/ViewMatchUI.java index 73787d552ae..1204e361d29 100644 --- a/src/main/java/forge/view/match/MatchTopLevel.java +++ b/src/main/java/forge/view/ViewMatchUI.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.view.match; +package forge.view; import java.awt.Color; import java.awt.Cursor; @@ -23,23 +23,21 @@ import java.awt.Graphics; import java.awt.Rectangle; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; -import java.util.ArrayList; import java.util.List; -import javax.swing.JFrame; +import javax.swing.JButton; import javax.swing.JPanel; -import javax.swing.JTextArea; import net.miginfocom.swing.MigLayout; -import forge.AllZone; import forge.control.ControlMatchUI; -import forge.control.match.ControlDetail; -import forge.control.match.ControlDock; -import forge.control.match.ControlField; -import forge.control.match.ControlHand; -import forge.control.match.ControlInput; -import forge.control.match.ControlPicture; -import forge.control.match.ControlTabber; +import forge.view.match.ViewBattlefield; +import forge.view.match.ViewDetail; +import forge.view.match.ViewDock; +import forge.view.match.ViewField; +import forge.view.match.ViewHand; +import forge.view.match.ViewMessage; +import forge.view.match.ViewPicture; +import forge.view.match.ViewTabber; import forge.view.toolbox.FPanel; import forge.view.toolbox.FSkin; @@ -52,16 +50,15 @@ import forge.view.toolbox.FSkin; */ @SuppressWarnings("serial") -public class MatchTopLevel extends FPanel { - private ViewBattlefield battlefield; - private ViewDetail detail; - private ViewDock dock; - private ViewHand hand; - private ViewInput input; - private ViewPicture picture; - private ViewTabber tabber; - - private ControlMatchUI control; +public class ViewMatchUI extends FPanel { + private final ControlMatchUI control; + private final ViewBattlefield battlefield; + private final ViewDetail detail; + private final ViewDock dock; + private final ViewHand hand; + private final ViewMessage message; + private final ViewPicture picture; + private final ViewTabber tabber; private int w, h, b; private double delta; @@ -90,7 +87,7 @@ public class MatchTopLevel extends FPanel { * - Implements Display interface used in singleton pattern * */ - public MatchTopLevel() { + public ViewMatchUI() { super(); // Set properties @@ -134,7 +131,7 @@ public class MatchTopLevel extends FPanel { add(pnlB6); // Declare and add various view components - input = new ViewInput(); + message = new ViewMessage(); hand = new ViewHand(this); dock = new ViewDock(); battlefield = new ViewBattlefield(); @@ -143,7 +140,7 @@ public class MatchTopLevel extends FPanel { picture = new ViewPicture(); String constraints = "w 100%!, h 100%!"; - pnlInput.add(input, constraints); + pnlInput.add(message, constraints); pnlHand.add(hand, constraints); pnlBattlefield.add(battlefield, constraints); pnlDock.add(dock, constraints); @@ -153,7 +150,7 @@ public class MatchTopLevel extends FPanel { // After all components are in place, instantiate controller. addDragListeners(); - this.control = new ControlMatchUI(this); + control = new ControlMatchUI(this); } /** @@ -357,124 +354,64 @@ public class MatchTopLevel extends FPanel { super.paintComponent(g); } - // ========== Retrieval functions for easier interaction with children - // panels. + //========== Retrieval methods - /** - * Retrieves top level controller (actions, observers, etc.) for this UI. - * - * @return ControlMatchUI - */ - public ControlMatchUI getController() { + /** @return {@link forge.control.ControlMatchUI} */ + public ControlMatchUI getControl() { return this.control; } - /** - * Gets the detail controller. - * - * @return ControlDetail - */ - public ControlDetail getDetailController() { - return MatchTopLevel.this.detail.getController(); - } - - /** - * Gets the picture controller. - * - * @return ControlPicture - */ - public ControlPicture getPictureController() { - return MatchTopLevel.this.picture.getController(); - } - - /** - * Gets the tabber controller. - * - * @return ControlTabber - */ - public ControlTabber getTabberController() { - return MatchTopLevel.this.tabber.getController(); - } - - /** - * Gets the input controller. - * - * @return ControlInput - */ - public ControlInput getInputController() { - return MatchTopLevel.this.input.getController(); - } - - /** - * Gets the hand controller. - * - * @return ControlHand - */ - public ControlHand getHandController() { - return MatchTopLevel.this.hand.getController(); - } - - /** - * Gets the dock controller. - * - * @return ControlDock - */ - public ControlDock getDockController() { - return MatchTopLevel.this.dock.getController(); - } - - /** - * Gets the field controllers. - * - * @return List - */ - public List getFieldControllers() { - final List fields = this.battlefield.getFields(); - final List controllers = new ArrayList(); - - for (final ViewField f : fields) { - controllers.add(f.getController()); - } - - return controllers; - } - /** * Gets the field views. * * @return List */ public List getFieldViews() { - return MatchTopLevel.this.battlefield.getFields(); + return ViewMatchUI.this.battlefield.getFields(); } - // ========== Input panel and human hand retrieval functions - // Also due to be deprecated. Access should be handled by child component - // view and/or controller. - - /** - * Gets the pnl message. - * - * @return JTextArea Message area of input panel. - */ - public JTextArea getPnlMessage() { - return MatchTopLevel.this.input.getTarMessage(); + /** @return {@link forge.view.match.ViewDock} */ + public ViewDock getDockView() { + return this.dock; } - /** - * Gets the pnl hand. - * - * @return ViewHand Retrieves player hand panel. - */ - public ViewHand getPnlHand() { - return MatchTopLevel.this.hand; + /** @return {@link forge.view.match.ViewTabber} */ + public ViewTabber getViewTabber() { + return this.tabber; } - /** - * Gets the top level frame. - * - * @return JFrame - */ - public JFrame getTopLevelFrame() { - return (JFrame) AllZone.getDisplay(); + + /** @return {@link forge.view.match.ViewDetail} */ + public ViewDetail getViewDetail() { + return this.detail; + } + + /** @return {@link forge.view.match.ViewPicture} */ + public ViewPicture getViewPicture() { + return this.picture; + } + + /** @return {@link forge.view.match.ViewHand} */ + public ViewHand getViewHand() { + return this.hand; + } + + /** @return {@link forge.view.match.ViewMessage} */ + public ViewMessage getViewMessage() { + return this.message; + } + + /** @return {@link forge.view.match.ViewBattlefield} */ + public ViewBattlefield getViewBattlefield() { + return this.battlefield; + } + + /** @return {@link javax.swing.JButton} */ + public JButton getBtnCancel() { + return this.message.getBtnCancel(); + } + + /** @return {@link javax.swing.JButton} */ + public JButton getBtnOK() { + return this.message.getBtnOK(); } } diff --git a/src/main/java/forge/view/bazaar/ViewItem.java b/src/main/java/forge/view/bazaar/ViewItem.java index 046bfa9e378..4a7738731dc 100644 --- a/src/main/java/forge/view/bazaar/ViewItem.java +++ b/src/main/java/forge/view/bazaar/ViewItem.java @@ -7,8 +7,8 @@ import javax.swing.SwingUtilities; import net.miginfocom.swing.MigLayout; import forge.AllZone; import forge.Command; +import forge.Singletons; import forge.quest.data.bazaar.QuestStallPurchasable; -import forge.view.GuiTopLevel; import forge.view.toolbox.FLabel; import forge.view.toolbox.FPanel; import forge.view.toolbox.FSkin; @@ -49,7 +49,7 @@ public class ViewItem extends FPanel { AllZone.getQuestData().addCredits(getItem().getSellingPrice()); getItem().onPurchase(); AllZone.getQuestData().saveData(); - ((GuiTopLevel) AllZone.getDisplay()).getController().getBazaarView().refreshLastInstance(); + Singletons.getView().getBazaarView().refreshLastInstance(); } }); } diff --git a/src/main/java/forge/view/bazaar/ViewStall.java b/src/main/java/forge/view/bazaar/ViewStall.java index 6535efcfdcf..50964a9d3dd 100644 --- a/src/main/java/forge/view/bazaar/ViewStall.java +++ b/src/main/java/forge/view/bazaar/ViewStall.java @@ -35,6 +35,7 @@ import forge.control.bazaar.ControlStall; import forge.quest.data.bazaar.QuestStallDefinition; import forge.quest.data.bazaar.QuestStallManager; import forge.quest.data.bazaar.QuestStallPurchasable; +import forge.view.ViewBazaarUI; import forge.view.toolbox.FLabel; import forge.view.toolbox.FScrollPane; import forge.view.toolbox.FSkin; @@ -54,12 +55,12 @@ public class ViewStall extends JPanel { private final JPanel pnlInventory; private final FScrollPane scrInventory; private final ControlStall control; - private final BazaarTopLevel parentView; + private final ViewBazaarUI parentView; private List lstItemPanels; private QuestStallDefinition stall; - /** @param v0 {@link forge.view.bazaar.BazaarTopLevel} */ - protected ViewStall(final BazaarTopLevel v0) { + /** @param v0 {@link forge.view.ViewBazaarUI} */ + public ViewStall(final ViewBazaarUI v0) { // Final/component inits this.lblStallName = new FLabel.Builder().text("").fontAlign(SwingConstants.CENTER).build(); this.lblEmpty = new FLabel.Builder() @@ -171,8 +172,8 @@ public class ViewStall extends JPanel { } } - /** @return {@link forge.view.bazaar.BazaarTopLevel} */ - public BazaarTopLevel getParentView() { + /** @return {@link forge.view.ViewBazaarUI} */ + public ViewBazaarUI getParentView() { return this.parentView; } } diff --git a/src/main/java/forge/view/home/StartButton.java b/src/main/java/forge/view/home/StartButton.java index 6e5a0d07f31..167673b233a 100644 --- a/src/main/java/forge/view/home/StartButton.java +++ b/src/main/java/forge/view/home/StartButton.java @@ -2,6 +2,7 @@ package forge.view.home; import javax.swing.JButton; +import forge.view.ViewHomeUI; import forge.view.toolbox.FSkin; /** @@ -11,9 +12,9 @@ import forge.view.toolbox.FSkin; @SuppressWarnings("serial") public class StartButton extends JButton { /** - * @param v0   HomeTopLevel + * @param v0   ViewHomeUI */ - public StartButton(HomeTopLevel v0) { + public StartButton(ViewHomeUI v0) { super(); setRolloverEnabled(true); setRolloverIcon(FSkin.getIcon(FSkin.ButtonImages.IMG_BTN_START_OVER)); diff --git a/src/main/java/forge/view/home/ViewConstructed.java b/src/main/java/forge/view/home/ViewConstructed.java index 0b91a955b2a..19eebe94002 100644 --- a/src/main/java/forge/view/home/ViewConstructed.java +++ b/src/main/java/forge/view/home/ViewConstructed.java @@ -10,6 +10,7 @@ import javax.swing.SwingConstants; import net.miginfocom.swing.MigLayout; import forge.control.home.ControlConstructed; +import forge.view.ViewHomeUI; import forge.view.toolbox.FLabel; import forge.view.toolbox.FList; import forge.view.toolbox.FProgressBar; @@ -22,7 +23,7 @@ import forge.view.toolbox.FSkin; */ @SuppressWarnings("serial") public class ViewConstructed extends JPanel { - private final HomeTopLevel parentView; + private final ViewHomeUI parentView; private final ControlConstructed control; private final JButton btnStart; private final FProgressBar barProgress; @@ -40,9 +41,9 @@ public class ViewConstructed extends JPanel { /** * Assembles swing components for "Constructed" mode menu. * - * @param v0 {@link forge.view.home.HomeTopLevel} parent view + * @param v0 {@link forge.view.ViewHomeUI} parent view */ - public ViewConstructed(HomeTopLevel v0) { + public ViewConstructed(ViewHomeUI v0) { //========== Basic init stuff super(); this.setOpaque(false); @@ -217,8 +218,8 @@ public class ViewConstructed extends JPanel { } //========= RETRIEVAL FUNCTIONS - /** @return {@link forge.view.home.HomeTopLevel} */ - public HomeTopLevel getParentView() { + /** @return {@link forge.view.ViewHomeUI} */ + public ViewHomeUI getParentView() { return parentView; } diff --git a/src/main/java/forge/view/home/ViewDraft.java b/src/main/java/forge/view/home/ViewDraft.java index 43cf3642e23..5b0d05c0a56 100644 --- a/src/main/java/forge/view/home/ViewDraft.java +++ b/src/main/java/forge/view/home/ViewDraft.java @@ -16,15 +16,15 @@ import javax.swing.text.StyleConstants; import javax.swing.text.StyledDocument; import net.miginfocom.swing.MigLayout; -import forge.AllZone; import forge.Command; +import forge.Singletons; import forge.control.home.ControlDraft; import forge.game.GameType; +import forge.view.ViewHomeUI; import forge.view.toolbox.DeckLister; import forge.view.toolbox.FButton; import forge.view.toolbox.FLabel; import forge.view.toolbox.FList; -import forge.view.toolbox.FOverlay; import forge.view.toolbox.FPanel; import forge.view.toolbox.FProgressBar; import forge.view.toolbox.FScrollPane; @@ -37,7 +37,7 @@ import forge.view.toolbox.FSkin; @SuppressWarnings("serial") public class ViewDraft extends JPanel { private final ControlDraft control; - private final HomeTopLevel parentView; + private final ViewHomeUI parentView; private final JList lstAI; private final FProgressBar barProgress; private final DeckLister lstHumanDecks; @@ -106,9 +106,9 @@ public class ViewDraft extends JPanel { /** * Assembles swing components for "Draft" mode menu. - * @param v0 (HomeTopLevel, parent view) + * @param v0 (ViewHomeUI, parent view) */ - public ViewDraft(HomeTopLevel v0) { + public ViewDraft(ViewHomeUI v0) { super(); this.parentView = v0; this.setOpaque(false); @@ -193,14 +193,13 @@ public class ViewDraft extends JPanel { /** */ public void showDirections() { - final FOverlay overlay = AllZone.getOverlay(); final FButton btnClose = new FButton(); final FPanel pnlContainer = new FPanel(); btnClose.setAction(new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - overlay.hideOverlay(); + Singletons.getView().getOverlay().hideOverlay(); } }); btnClose.setText("Close"); @@ -211,14 +210,14 @@ public class ViewDraft extends JPanel { pnlContainer.add(tpnDirections, "w 90%, gap 5% 0 20px 0, wrap"); pnlContainer.add(btnClose, "w 300px!, h 40px!, gap 0 0 20px 20px, alignx center"); - overlay.removeAll(); - overlay.setLayout(new MigLayout("insets 0")); - overlay.add(pnlContainer, "w 50%, gap 25% 0 5% 5%, wrap"); - overlay.showOverlay(); + Singletons.getView().getOverlay().removeAll(); + Singletons.getView().getOverlay().setLayout(new MigLayout("insets 0")); + Singletons.getView().getOverlay().add(pnlContainer, "w 50%, gap 25% 0 5% 5%, wrap"); + Singletons.getView().getOverlay().showOverlay(); } - /** @return HomeTopLevel */ - public HomeTopLevel getParentView() { + /** @return ViewHomeUI */ + public ViewHomeUI getParentView() { return parentView; } diff --git a/src/main/java/forge/view/home/ViewQuest.java b/src/main/java/forge/view/home/ViewQuest.java index 5b9d48eb933..767c3e9d868 100644 --- a/src/main/java/forge/view/home/ViewQuest.java +++ b/src/main/java/forge/view/home/ViewQuest.java @@ -26,6 +26,7 @@ import forge.properties.NewConstants; import forge.quest.data.QuestChallenge; import forge.quest.data.QuestDuel; import forge.quest.data.QuestEvent; +import forge.view.ViewHomeUI; import forge.view.toolbox.DeckLister; import forge.view.toolbox.FCheckBox; import forge.view.toolbox.FLabel; @@ -43,7 +44,7 @@ import forge.view.toolbox.SubTab; */ @SuppressWarnings("serial") public class ViewQuest extends JScrollPane { - private final HomeTopLevel parentView; + private final ViewHomeUI parentView; private final ControlQuest control; private final String eventPanelConstraints; private final Color clrBorders; @@ -69,9 +70,9 @@ public class ViewQuest extends JScrollPane { /** * Populates Swing components of Quest mode in home screen. * - * @param v0   {@link forge.view.home.HomeTopLevel} parent view + * @param v0   {@link forge.view.ViewHomeUI} parent view */ - public ViewQuest(final HomeTopLevel v0) { + public ViewQuest(final ViewHomeUI v0) { // Display super(VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_AS_NEEDED); this.setBorder(null); @@ -630,8 +631,8 @@ public class ViewQuest extends JScrollPane { return selectedOpponent; } - /** @return {@link forge.view.home.HomeTopLevel} */ - public HomeTopLevel getParentView() { + /** @return {@link forge.view.ViewHomeUI} */ + public ViewHomeUI getParentView() { return parentView; } diff --git a/src/main/java/forge/view/home/ViewSealed.java b/src/main/java/forge/view/home/ViewSealed.java index 0ac9d56bad3..1c293cce431 100644 --- a/src/main/java/forge/view/home/ViewSealed.java +++ b/src/main/java/forge/view/home/ViewSealed.java @@ -8,6 +8,7 @@ import javax.swing.SwingConstants; import net.miginfocom.swing.MigLayout; import forge.control.home.ControlSealed; import forge.game.GameType; +import forge.view.ViewHomeUI; import forge.view.toolbox.DeckLister; import forge.view.toolbox.FLabel; import forge.view.toolbox.FProgressBar; @@ -20,7 +21,7 @@ import forge.view.toolbox.FSkin; */ @SuppressWarnings("serial") public class ViewSealed extends JPanel { - private final HomeTopLevel parentView; + private final ViewHomeUI parentView; private final ControlSealed control; private DeckLister lstHumanDecks; private final JButton btnStart; @@ -30,9 +31,9 @@ public class ViewSealed extends JPanel { /** * Assembles swing components for "Sealed" mode menu. * - * @param v0 {@link forge.view.home.HomeTopLevel} parent view + * @param v0 {@link forge.view.ViewHomeUI} parent view */ - public ViewSealed(HomeTopLevel v0) { + public ViewSealed(ViewHomeUI v0) { super(); this.setOpaque(false); this.setLayout(new MigLayout("insets 0, gap 0, hidemode 2, wrap")); @@ -67,8 +68,8 @@ public class ViewSealed extends JPanel { control.addListeners(); } - /** @return {@link forge.view.home.HomeTopLevel} */ - public HomeTopLevel getParentView() { + /** @return {@link forge.view.ViewHomeUI} */ + public ViewHomeUI getParentView() { return parentView; } diff --git a/src/main/java/forge/view/home/ViewSettings.java b/src/main/java/forge/view/home/ViewSettings.java index c2e8a4db12c..6c7115bb98d 100644 --- a/src/main/java/forge/view/home/ViewSettings.java +++ b/src/main/java/forge/view/home/ViewSettings.java @@ -28,7 +28,6 @@ import net.miginfocom.swing.MigLayout; import org.apache.commons.lang3.StringUtils; -import forge.AllZone; import forge.PlayerType; import forge.Singletons; import forge.control.KeyboardShortcuts; @@ -37,7 +36,7 @@ import forge.control.home.ControlSettings; import forge.properties.ForgePreferences.FPref; import forge.properties.ForgeProps; import forge.properties.NewConstants.Lang.OldGuiNewGame.NewGameText; -import forge.view.GuiTopLevel; +import forge.view.ViewHomeUI; import forge.view.toolbox.FLabel; import forge.view.toolbox.FList; import forge.view.toolbox.FScrollPane; @@ -52,7 +51,7 @@ import forge.view.toolbox.SubTab; public class ViewSettings extends JPanel { private final ControlSettings control; private final FLabel btnReset, lblTitleSkin; - private final HomeTopLevel parentView; + private final ViewHomeUI parentView; private final JList lstChooseSkin; @@ -71,7 +70,7 @@ public class ViewSettings extends JPanel { * Assembles swing components for "Settings" mode menu. * @param view0   HomeTopLevel */ - public ViewSettings(final HomeTopLevel view0) { + public ViewSettings(final ViewHomeUI view0) { // Display super(); this.setOpaque(false); @@ -204,7 +203,7 @@ public class ViewSettings extends JPanel { final JLabel lblShortcuts = new SectionLabel("Keyboard Shortcuts"); pnlPrefs.add(lblShortcuts, sectionConstraints); - final List shortcuts = ((GuiTopLevel) AllZone.getDisplay()).getController().getShortcuts(); + final List shortcuts = Singletons.getControl().getShortcuts(); FLabel lblTemp; KeyboardShortcutField ksf; @@ -581,7 +580,7 @@ public class ViewSettings extends JPanel { } /** @return {@link forge.view.home.HomeTopLevel} */ - public HomeTopLevel getParentView() { + public ViewHomeUI getParentView() { return parentView; } diff --git a/src/main/java/forge/view/home/ViewUtilities.java b/src/main/java/forge/view/home/ViewUtilities.java index 2dc0741fe1c..51671757c49 100644 --- a/src/main/java/forge/view/home/ViewUtilities.java +++ b/src/main/java/forge/view/home/ViewUtilities.java @@ -14,11 +14,11 @@ import javax.swing.text.StyleConstants; import javax.swing.text.StyledDocument; import net.miginfocom.swing.MigLayout; -import forge.AllZone; +import forge.Singletons; import forge.control.home.ControlUtilities; +import forge.view.ViewHomeUI; import forge.view.toolbox.FButton; import forge.view.toolbox.FLabel; -import forge.view.toolbox.FOverlay; import forge.view.toolbox.FPanel; import forge.view.toolbox.FSkin; @@ -28,7 +28,7 @@ import forge.view.toolbox.FSkin; */ @SuppressWarnings("serial") public class ViewUtilities extends JPanel { - private final HomeTopLevel parentView; + private final ViewHomeUI parentView; private final ControlUtilities control; private final JTextPane tpnLicensing; private final JLabel lblLicensing; @@ -53,9 +53,9 @@ public class ViewUtilities extends JPanel { * Assembles swing components for "Utilities" mode menu. * * @param v0 - *   HomeTopLevel + *   ViewHomeUI */ - public ViewUtilities(HomeTopLevel v0) { + public ViewUtilities(ViewHomeUI v0) { super(); this.setOpaque(false); this.setLayout(new MigLayout("insets 0, gap 0, wrap, ay center")); @@ -150,14 +150,13 @@ public class ViewUtilities extends JPanel { /** */ public void showLicensing() { - final FOverlay overlay = AllZone.getOverlay(); final FButton btnClose = new FButton(); final FPanel pnlContainer = new FPanel(); btnClose.setAction(new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - overlay.hideOverlay(); + Singletons.getView().getOverlay().hideOverlay(); } }); btnClose.setText("Close"); @@ -168,10 +167,10 @@ public class ViewUtilities extends JPanel { pnlContainer.add(tpnLicensing, "w 90%, gap 5% 0 20px 0, wrap"); pnlContainer.add(btnClose, "w 300px!, h 40px!, gap 0 0 20px 20px, alignx center"); - overlay.removeAll(); - overlay.setLayout(new MigLayout("insets 0")); - overlay.add(pnlContainer, "w 50%, gap 25% 0 5% 5%, wrap"); - overlay.showOverlay(); + Singletons.getView().getOverlay().removeAll(); + Singletons.getView().getOverlay().setLayout(new MigLayout("insets 0")); + Singletons.getView().getOverlay().add(pnlContainer, "w 50%, gap 25% 0 5% 5%, wrap"); + Singletons.getView().getOverlay().showOverlay(); } /** @return {@link forge.view.toolbox.FLabel} */ @@ -224,8 +223,8 @@ public class ViewUtilities extends JPanel { return ViewUtilities.this.control; } - /** @return HomeTopLevel */ - public HomeTopLevel getParentView() { + /** @return ViewHomeUI */ + public ViewHomeUI getParentView() { return parentView; } } // end class ViewUtilities diff --git a/src/main/java/forge/view/match/QuestWinLoseHandler.java b/src/main/java/forge/view/match/QuestWinLoseHandler.java index 402b5b29e7a..407b9ee9217 100644 --- a/src/main/java/forge/view/match/QuestWinLoseHandler.java +++ b/src/main/java/forge/view/match/QuestWinLoseHandler.java @@ -53,7 +53,6 @@ import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences.QPref; import forge.quest.data.QuestUtil; import forge.util.MyRandom; -import forge.view.GuiTopLevel; import forge.view.toolbox.FSkin; /** @@ -66,41 +65,34 @@ import forge.view.toolbox.FSkin; * */ public class QuestWinLoseHandler extends ControlWinLose { - private final boolean wonMatch; - private ImageIcon icoTemp; - private JLabel lblTemp1; - private JLabel lblTemp2; - private ViewWinLose view; - private boolean isAnte; + private final transient boolean wonMatch; + private final transient ViewWinLose view; + private transient ImageIcon icoTemp; + private transient JLabel lblTemp1; + private transient JLabel lblTemp2; + private final transient boolean isAnte; /** String constraint parameters for title blocks and cardviewer blocks. */ - private final String constraintsTitle = "w 95%!, gap 0 0 20px 10px"; - private final String constraintsText = "w 95%!,, h 180px!, gap 0 0 0 20px"; - private final String constraintsCards = "w 95%!, h 330px!, gap 0 0 0 20px"; + private static final String CONSTRAINTS_TITLE = "w 95%!, gap 0 0 20px 10px"; + private static final String CONSTRAINTS_TEXT = "w 95%!,, h 180px!, gap 0 0 0 20px"; + private static final String CONSTRAINTS_CARDS = "w 95%!, h 330px!, gap 0 0 0 20px"; - private class CommonObjects { - private FMatchState matchState; - private QuestData qData; - private QuestEvent qEvent; - private QuestPreferences qPrefs; - } - - private final CommonObjects model; + private final transient FMatchState matchState; + private final transient QuestData qData; + private final transient QuestEvent qEvent; /** * Instantiates a new quest win lose handler. * * @param v0 ViewWinLose object */ - public QuestWinLoseHandler(ViewWinLose v0) { - super(v0); - this.view = v0; - this.model = new CommonObjects(); - this.model.matchState = AllZone.getMatchState(); - this.model.qData = AllZone.getQuestData(); - this.model.qEvent = AllZone.getQuestEvent(); - this.model.qPrefs = Singletons.getModel().getQuestPreferences(); - this.wonMatch = this.model.matchState.isMatchWonBy(AllZone.getHumanPlayer().getName()); + public QuestWinLoseHandler(final ViewWinLose view0) { + super(view0); + this.view = view0; + matchState = AllZone.getMatchState(); + qData = AllZone.getQuestData(); + qEvent = AllZone.getQuestEvent(); + this.wonMatch = matchState.isMatchWonBy(AllZone.getHumanPlayer().getName()); this.isAnte = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_ANTE); } @@ -113,25 +105,26 @@ public class QuestWinLoseHandler extends ControlWinLose { */ @Override public final void startNextRound() { - AllZone.getDisplay().savePrefs(); - this.model.qPrefs.save(); + Singletons.getModel().savePrefs(); + GuiUtils.closeOverlay(); + Singletons.getModel().getQuestPreferences().save(); if (Constant.Quest.FANTASY_QUEST[0]) { int extraLife = 0; - if (this.model.qEvent.getEventType().equals("challenge")) { - if (this.model.qData.getInventory().hasItem("Zeppelin")) { + if (qEvent.getEventType().equals("challenge")) { + if (qData.getInventory().hasItem("Zeppelin")) { extraLife = 3; } } - final CardList humanList = QuestUtil.getHumanStartingCards(this.model.qData, this.model.qEvent); - final CardList computerList = QuestUtil.getComputerStartingCards(this.model.qData, this.model.qEvent); + final CardList humanList = QuestUtil.getHumanStartingCards(qData, qEvent); + final CardList computerList = QuestUtil.getComputerStartingCards(qData, qEvent); - final int humanLife = this.model.qData.getLife() + extraLife; + final int humanLife = qData.getLife() + extraLife; int computerLife = 20; - if (this.model.qEvent.getEventType().equals("challenge")) { - computerLife = ((QuestChallenge) this.model.qEvent).getAILife(); + if (qEvent.getEventType().equals("challenge")) { + computerLife = ((QuestChallenge) qEvent).getAILife(); } AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0], @@ -153,21 +146,21 @@ public class QuestWinLoseHandler extends ControlWinLose { @Override public final boolean populateCustomPanel() { this.getView().getBtnRestart().setVisible(false); - this.model.qData.getCards().resetNewList(); + qData.getCards().resetNewList(); //do per-game actions - if (this.model.matchState.hasWonLastGame(AllZone.getHumanPlayer().getName())) { + if (matchState.hasWonLastGame(AllZone.getHumanPlayer().getName())) { if (isAnte) { - CardList antes = AllZone.getComputerPlayer().getCardsIn(Zone.Ante); - List antesPrinted = AllZone.getMatchState().addAnteWon(antes); + final CardList antes = AllZone.getComputerPlayer().getCardsIn(Zone.Ante); + final List antesPrinted = AllZone.getMatchState().addAnteWon(antes); this.anteWon(antesPrinted); } } else { if (isAnte) { - CardList antes = AllZone.getHumanPlayer().getCardsIn(Zone.Ante); - List antesPrinted = AllZone.getMatchState().addAnteLost(antes); - for (CardPrinted ante : antesPrinted) { + final CardList antes = AllZone.getHumanPlayer().getCardsIn(Zone.Ante); + final List antesPrinted = AllZone.getMatchState().addAnteLost(antes); + for (final CardPrinted ante : antesPrinted) { //the last param here (should) determine if this is added to the Card Shop AllZone.getQuestData().getCards().sellCard(ante, 0, false); } @@ -175,7 +168,7 @@ public class QuestWinLoseHandler extends ControlWinLose { } } - if (!this.model.matchState.isMatchOver()) { + if (matchState.isMatchOver() == false) { this.getView().getBtnQuit().setText("Quit (15 Credits)"); return isAnte; } else { @@ -193,7 +186,7 @@ public class QuestWinLoseHandler extends ControlWinLose { this.awardEventCredits(); // Challenge reward credits - if (this.model.qEvent.getEventType().equals("challenge")) { + if (qEvent.getEventType().equals("challenge")) { this.awardChallengeWin(); } @@ -203,12 +196,12 @@ public class QuestWinLoseHandler extends ControlWinLose { } // Random rare for winning against a very hard deck - if (this.model.qData.getDifficultyIndex() == 4) { + if (qData.getDifficultyIndex() == 4) { this.awardRandomRare("You've won a random rare for winning against a very hard deck."); } // Award jackpot every 80 games won (currently 10 rares) - final int wins = this.model.qData.getWin(); + final int wins = qData.getWin(); if ((wins > 0) && ((wins % 80) == 0)) { this.awardJackpot(); } @@ -220,8 +213,8 @@ public class QuestWinLoseHandler extends ControlWinLose { // Win or lose, still a chance to win a booster, frequency set in // preferences - final int outcome = this.wonMatch ? this.model.qData.getWin() : this.model.qData.getLost(); - if ((outcome % this.model.qPrefs.getPreferenceInt(QPref.WINS_BOOSTER, this.model.qData.getDifficultyIndex())) == 0) { + final int outcome = this.wonMatch ? qData.getWin() : qData.getLost(); + if ((outcome % Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.WINS_BOOSTER, qData.getDifficultyIndex())) == 0) { this.awardBooster(); } @@ -243,10 +236,9 @@ public class QuestWinLoseHandler extends ControlWinLose { // Generate Swing components and attach. this.lblTemp1 = new TitleLabel("Ante Lost: You lost the following cards in Ante:"); - final QuestWinLoseCardViewer cv = new QuestWinLoseCardViewer(antesLost); - - this.getView().getPnlCustom().add(this.lblTemp1, constraintsTitle); - this.getView().getPnlCustom().add(cv, constraintsCards); + this.getView().getPnlCustom().add(this.lblTemp1, QuestWinLoseHandler.CONSTRAINTS_TITLE); + this.getView().getPnlCustom().add( + new QuestWinLoseCardViewer(antesLost), QuestWinLoseHandler.CONSTRAINTS_CARDS); } /** @@ -257,15 +249,14 @@ public class QuestWinLoseHandler extends ControlWinLose { * */ private void anteWon(final List antesWon) { - StringBuilder sb = new StringBuilder(); - sb.append("Ante Won: These cards will be available in your card pool after this match."); + final StringBuilder str = new StringBuilder(); + str.append("Ante Won: These cards will be available in your card pool after this match."); // Generate Swing components and attach. - this.lblTemp1 = new TitleLabel(sb.toString()); + this.lblTemp1 = new TitleLabel(str.toString()); - final QuestWinLoseCardViewer cv = new QuestWinLoseCardViewer(antesWon); - - this.getView().getPnlCustom().add(this.lblTemp1, constraintsTitle); - this.getView().getPnlCustom().add(cv, constraintsCards); + this.getView().getPnlCustom().add(this.lblTemp1, QuestWinLoseHandler.CONSTRAINTS_TITLE); + this.getView().getPnlCustom().add( + new QuestWinLoseCardViewer(antesWon), QuestWinLoseHandler.CONSTRAINTS_CARDS); } /** @@ -278,33 +269,33 @@ public class QuestWinLoseHandler extends ControlWinLose { */ @Override public final void actionOnQuit() { - int x = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.PENALTY_LOSS); + final int x = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.PENALTY_LOSS); // Record win/loss in quest data if (this.wonMatch) { - this.model.qData.addWin(); + qData.addWin(); } else { - this.model.qData.addLost(); - this.model.qData.subtractCredits(x); + qData.addLost(); + qData.subtractCredits(x); } - this.model.qData.getCards().clearShopList(); + qData.getCards().clearShopList(); - if (this.model.qData.getAvailableChallenges() != null) { - this.model.qData.clearAvailableChallenges(); + if (qData.getAvailableChallenges() != null) { + qData.clearAvailableChallenges(); } - this.model.matchState.reset(); + matchState.reset(); AllZone.setQuestEvent(null); - this.model.qData.saveData(); - this.model.qPrefs.save(); - AllZone.getDisplay().savePrefs(); + qData.saveData(); + Singletons.getModel().getQuestPreferences().save(); + Singletons.getModel().savePrefs(); - FControl g = ((GuiTopLevel) AllZone.getDisplay()).getController(); - g.getMatchController().deinitMatch(); - g.changeState(FControl.HOME_SCREEN); - g.getHomeView().showQuestMenu(); + Singletons.getControl().getMatchControl().deinitMatch(); + Singletons.getControl().changeState(FControl.HOME_SCREEN); + Singletons.getView().getHomeView().showQuestMenu(); + GuiUtils.closeOverlay(); } /** @@ -325,7 +316,7 @@ public class QuestWinLoseHandler extends ControlWinLose { int credEstates = 0; // Basic win bonus - final int base = this.model.qPrefs.getPreferenceInt(QPref.REWARDS_BASE); + final int base = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_BASE); double multiplier = 1; String diff = AllZone.getQuestEvent().getDifficulty(); @@ -342,14 +333,14 @@ public class QuestWinLoseHandler extends ControlWinLose { } credBase += (int) ((base * multiplier) - + (Double.parseDouble(this.model.qPrefs.getPreference(QPref.REWARDS_WINS_MULTIPLIER)) - * this.model.qData.getWin())); + + (Double.parseDouble(Singletons.getModel().getQuestPreferences().getPreference(QPref.REWARDS_WINS_MULTIPLIER)) + * qData.getWin())); sb.append(diff + " opponent: " + credBase + " credits.
"); // Gameplay bonuses (for each game win) boolean hasNeverLost = true; final Player computer = AllZone.getComputerPlayer(); - for (final GameSummary game : this.model.matchState.getGamesPlayed()) { + for (final GameSummary game : matchState.getGamesPlayed()) { if (game.isWinner(computer.getName())) { hasNeverLost = false; continue; // no rewards for losing a game @@ -386,7 +377,7 @@ public class QuestWinLoseHandler extends ControlWinLose { } // Mulligan to zero final int cntCardsHumanStartedWith = humanRating.getOpeningHandSize(); - final int mulliganReward = this.model.qPrefs.getPreferenceInt(QPref.REWARDS_MULLIGAN0); + final int mulliganReward = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_MULLIGAN0); if (0 == cntCardsHumanStartedWith) { credGameplay += mulliganReward; @@ -399,7 +390,7 @@ public class QuestWinLoseHandler extends ControlWinLose { final int turnCredits = this.getCreditsRewardForWinByTurn(winTurn); if (winTurn == 0) { - System.err.println("QuestWinLoseHandler > " + "turn calculation error: Zero turn win"); + throw new UnsupportedOperationException("QuestWinLoseHandler > " + "turn calculation error: Zero turn win"); } else if (winTurn == 1) { sb.append("Won in one turn!"); } else if (winTurn <= 5) { @@ -418,15 +409,15 @@ public class QuestWinLoseHandler extends ControlWinLose { // Undefeated bonus if (hasNeverLost) { - credUndefeated += this.model.qPrefs.getPreferenceInt(QPref.REWARDS_UNDEFEATED); - final int reward = this.model.qPrefs.getPreferenceInt(QPref.REWARDS_UNDEFEATED); + credUndefeated += Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_UNDEFEATED); + final int reward = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_UNDEFEATED); sb.append(String.format("You have not lost once! " + "Bonus: %d credits.
", reward)); } // Estates bonus credTotal = credBase + credGameplay + credUndefeated; double estateValue = 0; - switch (this.model.qData.getInventory().getItemLevel("Estates")) { + switch (qData.getInventory().getItemLevel("Estates")) { case 1: estateValue = .1; break; @@ -464,7 +455,7 @@ public class QuestWinLoseHandler extends ControlWinLose { sb.append(String.format("%s %d credits in total.", congrats, credTotal)); sb.append(""); - this.model.qData.addCredits(credTotal); + qData.addCredits(credTotal); // Generate Swing components and attach. this.icoTemp = GuiUtils.getResizedIcon(FSkin.getIcon(FSkin.QuestIcons.ICO_GOLD), 0.5); @@ -478,8 +469,8 @@ public class QuestWinLoseHandler extends ControlWinLose { this.lblTemp2.setIcon(this.icoTemp); this.lblTemp2.setIconTextGap(50); - this.getView().getPnlCustom().add(this.lblTemp1, constraintsTitle); - this.getView().getPnlCustom().add(this.lblTemp2, constraintsText); + this.getView().getPnlCustom().add(this.lblTemp1, QuestWinLoseHandler.CONSTRAINTS_TITLE); + this.getView().getPnlCustom().add(this.lblTemp2, QuestWinLoseHandler.CONSTRAINTS_TEXT); } /** @@ -490,7 +481,7 @@ public class QuestWinLoseHandler extends ControlWinLose { * */ private void awardRandomRare(final String message) { - final CardPrinted c = this.model.qData.getCards().addRandomRare(); + final CardPrinted c = qData.getCards().addRandomRare(); final List cardsWon = new ArrayList(); cardsWon.add(c); @@ -499,8 +490,8 @@ public class QuestWinLoseHandler extends ControlWinLose { final QuestWinLoseCardViewer cv = new QuestWinLoseCardViewer(cardsWon); - this.view.getPnlCustom().add(this.lblTemp1, constraintsTitle); - this.view.getPnlCustom().add(cv, constraintsCards); + this.view.getPnlCustom().add(this.lblTemp1, QuestWinLoseHandler.CONSTRAINTS_TITLE); + this.view.getPnlCustom().add(cv, QuestWinLoseHandler.CONSTRAINTS_CARDS); } /** @@ -511,14 +502,14 @@ public class QuestWinLoseHandler extends ControlWinLose { * */ private void awardJackpot() { - final List cardsWon = this.model.qData.getCards().addRandomRare(10); + final List cardsWon = qData.getCards().addRandomRare(10); // Generate Swing components and attach. this.lblTemp1 = new TitleLabel("You just won 10 random rares!"); final QuestWinLoseCardViewer cv = new QuestWinLoseCardViewer(cardsWon); - this.view.getPnlCustom().add(this.lblTemp1, constraintsTitle); - this.view.getPnlCustom().add(cv, constraintsCards); + this.view.getPnlCustom().add(this.lblTemp1, QuestWinLoseHandler.CONSTRAINTS_TITLE); + this.view.getPnlCustom().add(cv, QuestWinLoseHandler.CONSTRAINTS_CARDS); } /** @@ -535,7 +526,7 @@ public class QuestWinLoseHandler extends ControlWinLose { int index = 0; for (int i = 0; i < formats.size(); i++) { - if (formats.get(i).toString().equals(this.model.qPrefs.getPreference(QPref.BOOSTER_FORMAT))) { + if (formats.get(i).toString().equals(Singletons.getModel().getQuestPreferences().getPreference(QPref.BOOSTER_FORMAT))) { index = i; break; } @@ -544,16 +535,16 @@ public class QuestWinLoseHandler extends ControlWinLose { ch.show(index); final GameFormat selected = ch.getSelectedValue(); - this.model.qPrefs.setPreference(QPref.BOOSTER_FORMAT, selected.toString()); + Singletons.getModel().getQuestPreferences().setPreference(QPref.BOOSTER_FORMAT, selected.toString()); - final List cardsWon = this.model.qData.getCards().addCards(selected.getFilterPrinted()); + final List cardsWon = qData.getCards().addCards(selected.getFilterPrinted()); // Generate Swing components and attach. this.lblTemp1 = new TitleLabel("Bonus booster pack from the \"" + selected.getName() + "\" format!"); final QuestWinLoseCardViewer cv = new QuestWinLoseCardViewer(cardsWon); - this.view.getPnlCustom().add(this.lblTemp1, constraintsTitle); - this.view.getPnlCustom().add(cv, constraintsCards); + this.view.getPnlCustom().add(this.lblTemp1, QuestWinLoseHandler.CONSTRAINTS_TITLE); + this.view.getPnlCustom().add(cv, QuestWinLoseHandler.CONSTRAINTS_CARDS); } /** @@ -564,26 +555,26 @@ public class QuestWinLoseHandler extends ControlWinLose { * */ private void awardChallengeWin() { - if (!((QuestChallenge) this.model.qEvent).getRepeatable()) { - this.model.qData.addCompletedChallenge(((QuestChallenge) this.model.qEvent).getId()); + if (!((QuestChallenge) qEvent).getRepeatable()) { + qData.addCompletedChallenge(((QuestChallenge) qEvent).getId()); } // Note: challenge only registers as "played" if it's won. // This doesn't seem right, but it's easy to fix. Doublestrike 01-10-11 - this.model.qData.addChallengesPlayed(); + qData.addChallengesPlayed(); - final List cardsWon = ((QuestChallenge) this.model.qEvent).getCardRewardList(); - final long questRewardCredits = ((QuestChallenge) this.model.qEvent).getCreditsReward(); + final List cardsWon = ((QuestChallenge) qEvent).getCardRewardList(); + final long questRewardCredits = ((QuestChallenge) qEvent).getCreditsReward(); final StringBuilder sb = new StringBuilder(); sb.append("Challenge completed.

"); sb.append("Challenge bounty: " + questRewardCredits + " credits."); - this.model.qData.addCredits(questRewardCredits); + qData.addCredits(questRewardCredits); // Generate Swing components and attach. this.icoTemp = GuiUtils.getResizedIcon(FSkin.getIcon(FSkin.QuestIcons.ICO_BOX), 0.5); - this.lblTemp1 = new TitleLabel("Challenge Rewards for \"" + ((QuestChallenge) this.model.qEvent).getTitle() + this.lblTemp1 = new TitleLabel("Challenge Rewards for \"" + ((QuestChallenge) qEvent).getTitle() + "\""); this.lblTemp2 = new JLabel(sb.toString()); @@ -593,18 +584,18 @@ public class QuestWinLoseHandler extends ControlWinLose { this.lblTemp2.setIconTextGap(50); this.lblTemp2.setIcon(this.icoTemp); - this.getView().getPnlCustom().add(this.lblTemp1, constraintsTitle); - this.getView().getPnlCustom().add(this.lblTemp2, constraintsText); + this.getView().getPnlCustom().add(this.lblTemp1, QuestWinLoseHandler.CONSTRAINTS_TITLE); + this.getView().getPnlCustom().add(this.lblTemp2, QuestWinLoseHandler.CONSTRAINTS_TEXT); if (cardsWon != null) { final QuestWinLoseCardViewer cv = new QuestWinLoseCardViewer(cardsWon); - this.getView().getPnlCustom().add(cv, constraintsCards); - this.model.qData.getCards().addAllCards(cardsWon); + this.getView().getPnlCustom().add(cv, QuestWinLoseHandler.CONSTRAINTS_CARDS); + qData.getCards().addAllCards(cardsWon); } } private void penalizeLoss() { - int x = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.PENALTY_LOSS); + final int x = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.PENALTY_LOSS); this.icoTemp = GuiUtils.getResizedIcon(FSkin.getIcon(FSkin.QuestIcons.ICO_HEART), 0.5); this.lblTemp1 = new TitleLabel("Gameplay Results"); @@ -616,8 +607,8 @@ public class QuestWinLoseHandler extends ControlWinLose { this.lblTemp2.setIconTextGap(50); this.lblTemp2.setIcon(this.icoTemp); - this.getView().getPnlCustom().add(this.lblTemp1, constraintsTitle); - this.getView().getPnlCustom().add(this.lblTemp2, constraintsText); + this.getView().getPnlCustom().add(this.lblTemp1, QuestWinLoseHandler.CONSTRAINTS_TITLE); + this.getView().getPnlCustom().add(this.lblTemp2, QuestWinLoseHandler.CONSTRAINTS_TEXT); } /** @@ -629,7 +620,7 @@ public class QuestWinLoseHandler extends ControlWinLose { * @return boolean */ private boolean getLuckyCoinResult() { - final boolean hasCoin = this.model.qData.getInventory().getItemLevel("Lucky Coin") >= 1; + final boolean hasCoin = qData.getInventory().getItemLevel("Lucky Coin") >= 1; return MyRandom.getRandom().nextFloat() <= (hasCoin ? 0.65f : 0.5f); } @@ -649,13 +640,13 @@ public class QuestWinLoseHandler extends ControlWinLose { case LifeReachedZero: return 0; // nothing special here, ordinary kill case Milled: - return this.model.qPrefs.getPreferenceInt(QPref.REWARDS_MILLED); + return Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_MILLED); case Poisoned: - return this.model.qPrefs.getPreferenceInt(QPref.REWARDS_POISON); + return Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_POISON); case DidNotLoseYet: // Felidar, Helix Pinnacle, etc. - return this.model.qPrefs.getPreferenceInt(QPref.REWARDS_UNDEFEATED); + return Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_UNDEFEATED); case SpellEffect: // Door to Nothingness, etc. - return this.model.qPrefs.getPreferenceInt(QPref.REWARDS_UNDEFEATED); + return Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_UNDEFEATED); default: return 0; } @@ -671,16 +662,18 @@ public class QuestWinLoseHandler extends ControlWinLose { * @return int credits won */ private int getCreditsRewardForWinByTurn(final int iTurn) { - int credits = 0; + int credits; if (iTurn == 1) { - credits = this.model.qPrefs.getPreferenceInt(QPref.REWARDS_TURN1); + credits = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_TURN1); } else if (iTurn <= 5) { - credits = this.model.qPrefs.getPreferenceInt(QPref.REWARDS_TURN5); + credits = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_TURN5); } else if (iTurn <= 10) { - credits = this.model.qPrefs.getPreferenceInt(QPref.REWARDS_TURN10); + credits = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_TURN10); } else if (iTurn <= 15) { - credits = this.model.qPrefs.getPreferenceInt(QPref.REWARDS_TURN15); + credits = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.REWARDS_TURN15); + } else { + credits = 0; } return credits; diff --git a/src/main/java/forge/view/match/ViewDetail.java b/src/main/java/forge/view/match/ViewDetail.java index bc7abe87680..81f0fd5520f 100644 --- a/src/main/java/forge/view/match/ViewDetail.java +++ b/src/main/java/forge/view/match/ViewDetail.java @@ -54,7 +54,7 @@ public class ViewDetail extends FPanel { * * @return ControlDetail */ - public ControlDetail getController() { + public ControlDetail getControl() { return control; } diff --git a/src/main/java/forge/view/match/ViewDock.java b/src/main/java/forge/view/match/ViewDock.java index 56e36e76666..8ac95784225 100644 --- a/src/main/java/forge/view/match/ViewDock.java +++ b/src/main/java/forge/view/match/ViewDock.java @@ -33,7 +33,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; -import forge.AllZone; +import forge.Singletons; import forge.control.match.ControlDock; import forge.view.toolbox.FButton; import forge.view.toolbox.FOverlay; @@ -68,7 +68,7 @@ public class ViewDock extends FPanel { this.actClose = new AbstractAction() { @Override public void actionPerformed(final ActionEvent e) { - AllZone.getOverlay().hideOverlay(); + Singletons.getView().getOverlay().hideOverlay(); } }; @@ -119,7 +119,7 @@ public class ViewDock extends FPanel { * * @return ControlDock */ - public ControlDock getController() { + public ControlDock getControl() { return this.control; } @@ -188,7 +188,7 @@ public class ViewDock extends FPanel { /** */ private void overlaySettings() { - final FOverlay overlay = AllZone.getOverlay(); + final FOverlay overlay = Singletons.getView().getOverlay(); overlay.setLayout(new MigLayout("insets 0")); overlay.showOverlay(); diff --git a/src/main/java/forge/view/match/ViewField.java b/src/main/java/forge/view/match/ViewField.java index 89c8b9adf02..78652e8473b 100644 --- a/src/main/java/forge/view/match/ViewField.java +++ b/src/main/java/forge/view/match/ViewField.java @@ -49,7 +49,6 @@ import forge.game.GameType; import forge.properties.ForgePreferences.FPref; import forge.properties.ForgeProps; import forge.properties.NewConstants; -import forge.view.GuiTopLevel; import forge.view.toolbox.FLabel; import forge.view.toolbox.FPanel; import forge.view.toolbox.FSkin; @@ -204,7 +203,7 @@ public class ViewField extends FPanel { * * @return ControlField */ - public ControlField getController() { + public ControlField getControl() { return this.control; } @@ -351,8 +350,8 @@ public class ViewField extends FPanel { */ public void updateDetails(final Player p0) { // "Players" panel update - final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView(); - t.getTabberController().getView().updatePlayerLabels(p0); + Singletons.getControl().getMatchControl() + .getTabberControl().getView().updatePlayerLabels(p0); // Poison/life this.getLblLife().setText("" + p0.getLife()); diff --git a/src/main/java/forge/view/match/ViewHand.java b/src/main/java/forge/view/match/ViewHand.java index 9f1b9053864..c26b3155f0a 100644 --- a/src/main/java/forge/view/match/ViewHand.java +++ b/src/main/java/forge/view/match/ViewHand.java @@ -22,6 +22,7 @@ import javax.swing.JScrollPane; import net.miginfocom.swing.MigLayout; import arcane.ui.HandArea; import forge.control.match.ControlHand; +import forge.view.ViewMatchUI; import forge.view.toolbox.FPanel; /** @@ -32,14 +33,14 @@ import forge.view.toolbox.FPanel; public class ViewHand extends FPanel { private ControlHand control; private HandArea hand; - private MatchTopLevel topLevel; + private ViewMatchUI topLevel; /** * Swing components for user hand. * - * @param v0   The MatchTopLevel parent. + * @param v0   The ViewMatchUI parent. */ - public ViewHand(MatchTopLevel v0) { + public ViewHand(ViewMatchUI v0) { final JScrollPane scroller = new JScrollPane(); ViewHand.this.hand = new HandArea(scroller); topLevel = v0; @@ -62,7 +63,7 @@ public class ViewHand extends FPanel { * * @return ControlHand */ - public ControlHand getController() { + public ControlHand getControl() { return ViewHand.this.control; } @@ -75,8 +76,8 @@ public class ViewHand extends FPanel { return ViewHand.this.hand; } - /** @return MatchTopLevel */ - public MatchTopLevel getTopLevel() { + /** @return ViewMatchUI */ + public ViewMatchUI getTopLevel() { return this.topLevel; } } diff --git a/src/main/java/forge/view/match/ViewInput.java b/src/main/java/forge/view/match/ViewMessage.java similarity index 90% rename from src/main/java/forge/view/match/ViewInput.java rename to src/main/java/forge/view/match/ViewMessage.java index 1d169986a71..de997e126ab 100644 --- a/src/main/java/forge/view/match/ViewInput.java +++ b/src/main/java/forge/view/match/ViewMessage.java @@ -31,7 +31,7 @@ import javax.swing.Timer; import javax.swing.border.MatteBorder; import net.miginfocom.swing.MigLayout; -import forge.control.match.ControlInput; +import forge.control.match.ControlMessage; import forge.view.toolbox.FButton; import forge.view.toolbox.FPanel; import forge.view.toolbox.FSkin; @@ -41,8 +41,8 @@ import forge.view.toolbox.FSkin; * */ @SuppressWarnings("serial") -public class ViewInput extends FPanel { - private final ControlInput control; +public class ViewMessage extends FPanel { + private final ControlMessage control; private final JButton btnOK, btnCancel; private final JTextArea tarMessage; private final JLabel lblGames; @@ -54,7 +54,7 @@ public class ViewInput extends FPanel { * Assembles UI for input area (buttons and message panel). * */ - public ViewInput() { + public ViewMessage() { super(); this.setToolTipText("Input Area"); this.setLayout(new MigLayout("wrap 2, fill, insets 0, gap 0")); @@ -87,21 +87,21 @@ public class ViewInput extends FPanel { this.addComponentListener(new ComponentAdapter() { @Override public void componentResized(ComponentEvent e) { - int px = (int) (ViewInput.this.getWidth() / 17); + int px = (int) (ViewMessage.this.getWidth() / 17); px = (px < 11 ? 11 : px); tarMessage.setFont(FSkin.getFont(px)); } }); // After all components are in place, instantiate controller. - this.control = new ControlInput(this); + this.control = new ControlMessage(this); } /** * Gets the controller. * - * @return ControlInput + * @return ControlMessage */ - public ControlInput getController() { + public ControlMessage getControl() { return this.control; } diff --git a/src/main/java/forge/view/match/ViewPicture.java b/src/main/java/forge/view/match/ViewPicture.java index 4a66228e0c3..d3db3bc41f7 100644 --- a/src/main/java/forge/view/match/ViewPicture.java +++ b/src/main/java/forge/view/match/ViewPicture.java @@ -51,7 +51,7 @@ public class ViewPicture extends FPanel { * * @return ControlPicture */ - public ControlPicture getController() { + public ControlPicture getControl() { return control; } diff --git a/src/main/java/forge/view/match/ViewTabber.java b/src/main/java/forge/view/match/ViewTabber.java index 87f70fb02d5..1bdce7f51f8 100644 --- a/src/main/java/forge/view/match/ViewTabber.java +++ b/src/main/java/forge/view/match/ViewTabber.java @@ -60,7 +60,6 @@ import forge.gui.ForgeAction; import forge.gui.MultiLineLabelUI; import forge.properties.ForgePreferences.FPref; import forge.properties.NewConstants; -import forge.view.GuiTopLevel; import forge.view.toolbox.FSkin; import forge.view.toolbox.FVerticalTabPanel; @@ -215,7 +214,7 @@ public class ViewTabber extends JPanel { * * @return ControlTabber */ - public ControlTabber getController() { + public ControlTabber getControl() { return this.control; } @@ -226,7 +225,6 @@ public class ViewTabber extends JPanel { */ public void updateStack() { final MagicStack stack = AllZone.getStack(); - final MatchTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView(); int count = 1; JTextArea tar; @@ -275,8 +273,8 @@ public class ViewTabber extends JPanel { tar.addMouseListener(new MouseAdapter() { @Override public void mouseEntered(final MouseEvent e) { - t.getDetailController().showCard(spell.getSpellAbility().getSourceCard()); - t.getPictureController().showCard(spell.getSpellAbility().getSourceCard()); + Singletons.getControl().getMatchControl().setCard(spell.getSpellAbility().getSourceCard()); + // ghandi does this work? } }); @@ -310,7 +308,7 @@ public class ViewTabber extends JPanel { } } - t.getInputController().getView().getBtnOK().requestFocusInWindow(); + Singletons.getView().getMatchView().getBtnOK().requestFocusInWindow(); } /** Returns array with [background, foreground] colors. */ diff --git a/src/main/java/forge/view/match/ViewWinLose.java b/src/main/java/forge/view/match/ViewWinLose.java index 96367c198bf..38b45f3c9c3 100644 --- a/src/main/java/forge/view/match/ViewWinLose.java +++ b/src/main/java/forge/view/match/ViewWinLose.java @@ -13,6 +13,7 @@ import forge.AllZone; import forge.Constant; import forge.PhaseHandler; import forge.Player; +import forge.Singletons; import forge.control.match.ControlWinLose; import forge.game.GameType; import forge.model.FMatchState; @@ -36,7 +37,7 @@ public class ViewWinLose { /** */ public ViewWinLose() { - final FOverlay overlay = AllZone.getOverlay(); + final FOverlay overlay = Singletons.getView().getOverlay(); final FMatchState matchState = AllZone.getMatchState(); final JPanel pnlLeft = new JPanel(); diff --git a/src/main/java/forge/view/toolbox/DeckLister.java b/src/main/java/forge/view/toolbox/DeckLister.java index c685dae111d..de29019dc97 100644 --- a/src/main/java/forge/view/toolbox/DeckLister.java +++ b/src/main/java/forge/view/toolbox/DeckLister.java @@ -20,13 +20,13 @@ import net.miginfocom.swing.MigLayout; import forge.AllZone; import forge.Command; import forge.Constant; +import forge.Singletons; import forge.deck.Deck; import forge.deck.DeckIO; import forge.deck.DeckManager; import forge.game.GameType; import forge.gui.deckeditor.DeckEditorCommon; import forge.gui.deckeditor.DeckEditorQuest; -import forge.view.GuiTopLevel; /** * Creates deck list for selected decks for quick deleting, editing, and basic info. @@ -401,7 +401,7 @@ public class DeckLister extends JPanel { else if (gametype.equals(GameType.Quest)) { AllZone.getQuestData().removeDeck(d0.getName()); AllZone.getQuestData().saveData(); - ((GuiTopLevel) AllZone.getDisplay()).getController().getHomeView().getBtnQuest().grabFocus(); + Singletons.getView().getHomeView().getBtnQuest().grabFocus(); } else { deckmanager.deleteDeck(d0.getName()); diff --git a/src/main/java/forge/view/toolbox/FOverlay.java b/src/main/java/forge/view/toolbox/FOverlay.java index fb72699b7fe..2dbd09a73ee 100644 --- a/src/main/java/forge/view/toolbox/FOverlay.java +++ b/src/main/java/forge/view/toolbox/FOverlay.java @@ -42,6 +42,8 @@ public class FOverlay extends JPanel { */ public FOverlay() { super(); + this.setOpaque(false); + this.setVisible(false); this.btnClose = new JButton("X"); this.btnClose.setForeground(Color.white); this.btnClose.setBorder(BorderFactory.createLineBorder(Color.white)); diff --git a/src/main/java/forge/view/toolbox/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java index 118bcfb27f1..9fbddd883f7 100644 --- a/src/main/java/forge/view/toolbox/FSkin.java +++ b/src/main/java/forge/view/toolbox/FSkin.java @@ -35,8 +35,8 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.border.LineBorder; -import forge.Singletons; import forge.gui.GuiUtils; +import forge.view.SplashFrame; /** * Assembles settings from selected or default theme as appropriate. Saves in a @@ -324,7 +324,7 @@ public enum FSkin { private static Map avatars; private static final String - FILE_SKINS_DIR = "res/images/skins/", + FILE_SKINS_DIR = "res/skins/", FILE_ICON_SPRITE = "sprite_icons.png", FILE_FOIL_SPRITE = "sprite_foils.png", FILE_AVATAR_SPRITE = "sprite_avatars.png", @@ -412,7 +412,7 @@ public enum FSkin { if (FSkin.preferredName.isEmpty()) { FSkin.loadLight("default"); } // Everything OK? - final FProgressBar barProgress = Singletons.getView().getProgressBar(); + final FProgressBar barProgress = SplashFrame.PROGRESS_BAR; SwingUtilities.invokeLater(new Runnable() { @Override diff --git a/src/test/java/forge/GuiMultipleBlockers4Test.java b/src/test/java/forge/GuiMultipleBlockers4Test.java index 23de76a2a54..aae12e557e3 100644 --- a/src/test/java/forge/GuiMultipleBlockers4Test.java +++ b/src/test/java/forge/GuiMultipleBlockers4Test.java @@ -20,7 +20,7 @@ public class GuiMultipleBlockers4Test { list.add(AllZone.getCardFactory().getCard("Frostling", null)); for (int i = 0; i < 2; i++) { - new GuiMultipleBlockers(null, list, i + 1, null); + new GuiMultipleBlockers(null, list, i + 1); } } }