From 607f2970df69bc407f05f929a1d0a4a7c5200715 Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Sun, 19 Feb 2012 02:58:07 +0000 Subject: [PATCH] Renamed "getFooView()" to "getViewFoo()" for consistency. --- src/main/java/forge/ButtonUtil.java | 4 ++-- src/main/java/forge/PhaseUtil.java | 2 +- src/main/java/forge/Player.java | 2 +- .../java/forge/control/ControlMatchUI.java | 2 +- src/main/java/forge/control/FControl.java | 14 +++++------ .../java/forge/control/home/ControlQuest.java | 2 +- .../forge/control/home/ControlSettings.java | 2 +- .../forge/control/input/InputMulligan.java | 4 ++-- .../java/forge/control/match/ControlHand.java | 2 +- src/main/java/forge/model/FModel.java | 10 ++++---- src/main/java/forge/view/FView.java | 16 ++++++------- src/main/java/forge/view/Main.java | 24 +++++++++---------- src/main/java/forge/view/bazaar/ViewItem.java | 2 +- .../forge/view/match/QuestWinLoseHandler.java | 2 +- .../java/forge/view/match/ViewTabber.java | 2 +- .../java/forge/view/toolbox/DeckLister.java | 2 +- 16 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/main/java/forge/ButtonUtil.java b/src/main/java/forge/ButtonUtil.java index 3ebd9199fb0..64c246dfd7b 100644 --- a/src/main/java/forge/ButtonUtil.java +++ b/src/main/java/forge/ButtonUtil.java @@ -107,7 +107,7 @@ public class ButtonUtil { * @return a {@link forge.MyButton} object. */ private static JButton getOK() { - return Singletons.getView().getMatchView().getBtnOK(); + return Singletons.getView().getViewMatch().getBtnOK(); } /** @@ -118,6 +118,6 @@ public class ButtonUtil { * @return a {@link forge.MyButton} object. */ private static JButton getCancel() { - return Singletons.getView().getMatchView().getBtnCancel(); + return Singletons.getView().getViewMatch().getBtnCancel(); } } diff --git a/src/main/java/forge/PhaseUtil.java b/src/main/java/forge/PhaseUtil.java index c9a3b3083f0..9ee7fa6cc1b 100644 --- a/src/main/java/forge/PhaseUtil.java +++ b/src/main/java/forge/PhaseUtil.java @@ -419,7 +419,7 @@ public class PhaseUtil { } t.resetAllPhaseButtons(); - Singletons.getView().getMatchView().repaint(); + Singletons.getView().getViewMatch().repaint(); lbl.setActive(true); } } diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index e3d29639af7..a29cbe6be46 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -1814,7 +1814,7 @@ public abstract class Player extends GameEntity { * @return a boolean. */ public final boolean canPlayLand() { - if (Singletons.getView().getMatchView().getViewTabber().getLblUnlimitedLands().getEnabled() && this.isHuman() + if (Singletons.getView().getViewMatch().getViewTabber().getLblUnlimitedLands().getEnabled() && this.isHuman() && Constant.Runtime.DEV_MODE[0]) { return PhaseHandler.canCastSorcery(this); } diff --git a/src/main/java/forge/control/ControlMatchUI.java b/src/main/java/forge/control/ControlMatchUI.java index d79689e7c9c..32efc7a9cd9 100644 --- a/src/main/java/forge/control/ControlMatchUI.java +++ b/src/main/java/forge/control/ControlMatchUI.java @@ -105,7 +105,7 @@ public class ControlMatchUI implements CardContainer { // Update avatars final String[] indices = Singletons.getModel().getPreferences().getPref(FPref.UI_AVATARS).split(","); - final Object[] views = Singletons.getView().getMatchView().getFieldViews().toArray(); + final Object[] views = Singletons.getView().getViewMatch().getFieldViews().toArray(); for (int i = 0; i < views.length; i++) { final Image img; // Update AI quest icon diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java index dc73e00334a..44045b3ae05 100644 --- a/src/main/java/forge/control/FControl.java +++ b/src/main/java/forge/control/FControl.java @@ -82,7 +82,7 @@ public enum FControl { public void windowClosing(final WindowEvent e) { Singletons.getView().setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); changeState(0); - Singletons.getView().getHomeView().showQuestMenu(); + Singletons.getView().getViewHome().showQuestMenu(); } }; @@ -129,22 +129,22 @@ public enum FControl { // Fire up new state switch (i0) { case HOME_SCREEN: - display.add(Singletons.getView().getHomeView(), JLayeredPane.DEFAULT_LAYER); + display.add(Singletons.getView().getViewHome(), JLayeredPane.DEFAULT_LAYER); sizeChildren(); break; case MATCH_SCREEN: - display.add(Singletons.getView().getMatchView(), JLayeredPane.DEFAULT_LAYER); + display.add(Singletons.getView().getViewMatch(), JLayeredPane.DEFAULT_LAYER); sizeChildren(); Singletons.getView().addWindowListener(waConcede); break; case DEFAULT_EDITOR: - display.add(Singletons.getView().getEditorView(), JLayeredPane.DEFAULT_LAYER); + display.add(Singletons.getView().getViewEditor(), JLayeredPane.DEFAULT_LAYER); break; case QUEST_BAZAAR: - display.add(Singletons.getView().getBazaarView(), JLayeredPane.DEFAULT_LAYER); + display.add(Singletons.getView().getViewBazaar(), JLayeredPane.DEFAULT_LAYER); sizeChildren(); Singletons.getView().addWindowListener(waLeaveBazaar); break; @@ -161,7 +161,7 @@ public enum FControl { throw new IllegalArgumentException("FControl$getMatchControl\n" + "may only be called while the match UI is showing."); } - return Singletons.getView().getMatchView().getControl(); + return Singletons.getView().getViewMatch().getControl(); } /** Gets the home controller. @@ -172,7 +172,7 @@ public enum FControl { + "may only be called while the home UI is showing."); } - return Singletons.getView().getHomeView().getControl(); + return Singletons.getView().getViewHome().getControl(); } /** diff --git a/src/main/java/forge/control/home/ControlQuest.java b/src/main/java/forge/control/home/ControlQuest.java index 9ed882586d7..58772b13972 100644 --- a/src/main/java/forge/control/home/ControlQuest.java +++ b/src/main/java/forge/control/home/ControlQuest.java @@ -164,7 +164,7 @@ public class ControlQuest { public void execute() { AllZone.getQuestData().saveData(); refreshDecks(); - Singletons.getView().getHomeView().getBtnQuest().grabFocus(); + Singletons.getView().getViewHome().getBtnQuest().grabFocus(); } }; diff --git a/src/main/java/forge/control/home/ControlSettings.java b/src/main/java/forge/control/home/ControlSettings.java index fdb78affcbb..67085303678 100644 --- a/src/main/java/forge/control/home/ControlSettings.java +++ b/src/main/java/forge/control/home/ControlSettings.java @@ -222,7 +222,7 @@ public class ControlSettings { protected void done() { Singletons.getView().instantiateCachedUIStates(); Singletons.getControl().changeState(FControl.HOME_SCREEN); - Singletons.getView().getHomeView().showSettingsMenu(); + Singletons.getView().getViewHome().showSettingsMenu(); } }; w.execute(); diff --git a/src/main/java/forge/control/input/InputMulligan.java b/src/main/java/forge/control/input/InputMulligan.java index 74d77babe9a..11885b926da 100644 --- a/src/main/java/forge/control/input/InputMulligan.java +++ b/src/main/java/forge/control/input/InputMulligan.java @@ -56,8 +56,8 @@ public class InputMulligan extends Input { @Override public final void showMessage() { ButtonUtil.enableAll(); - Singletons.getView().getMatchView().getBtnOK().setText("No"); - Singletons.getView().getMatchView().getBtnCancel().setText("Yes"); + Singletons.getView().getViewMatch().getBtnOK().setText("No"); + Singletons.getView().getViewMatch().getBtnCancel().setText("Yes"); Singletons.getControl().getControlMatch().showMessage("Do you want to Mulligan?"); } diff --git a/src/main/java/forge/control/match/ControlHand.java b/src/main/java/forge/control/match/ControlHand.java index 3ac15526fba..bd0b4901f05 100644 --- a/src/main/java/forge/control/match/ControlHand.java +++ b/src/main/java/forge/control/match/ControlHand.java @@ -79,7 +79,7 @@ public class ControlHand { final Card c = view.getHandArea().getCardFromMouseOverPanel(); if (c != null) { Singletons.getControl().getControlMatch().getMessageControl().getInputControl().selectCard(c, AllZone.getHumanPlayer().getZone(Zone.Hand)); - Singletons.getView().getMatchView().getBtnOK().requestFocusInWindow(); + Singletons.getView().getViewMatch().getBtnOK().requestFocusInWindow(); } } }; diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index 1900a0f8f26..56418a8af0d 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -344,7 +344,7 @@ public class FModel { */ public final boolean savePrefs() { final ForgePreferences fp = this.preferences; - final List fieldViews = Singletons.getView().getMatchView().getFieldViews(); + final List fieldViews = Singletons.getView().getViewMatch().getFieldViews(); // AI field is at index [0] fp.setPref(FPref.PHASE_AI_UPKEEP, String.valueOf(fieldViews.get(0).getLblUpkeep().getEnabled())); @@ -378,11 +378,11 @@ public class FModel { 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())); - final ViewTabber v = Singletons.getView().getMatchView().getViewTabber(); + final ViewTabber v = Singletons.getView().getViewMatch().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.UI_LAYOUT_PARAMS, String.valueOf(Singletons.getView().getViewMatch().getLayoutParams())); fp.setPref(FPref.DEV_UNLIMITED_LAND, String.valueOf(v.getLblUnlimitedLands().getEnabled())); fp.save(); @@ -397,7 +397,7 @@ public class FModel { */ public final boolean loadPrefs() { final ForgePreferences fp = Singletons.getModel().getPreferences(); - final List fieldViews = Singletons.getView().getMatchView().getFieldViews(); + final List fieldViews = Singletons.getView().getViewMatch().getFieldViews(); Constant.Runtime.MILL[0] = fp.getPrefBoolean(FPref.DEV_MILLING_LOSS); Constant.Runtime.DEV_MODE[0] = fp.getPrefBoolean(FPref.DEV_MODE_ENABLED); @@ -434,7 +434,7 @@ public class FModel { 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)); + Singletons.getView().getViewMatch().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 633a1f978d6..e5e84b01601 100644 --- a/src/main/java/forge/view/FView.java +++ b/src/main/java/forge/view/FView.java @@ -124,36 +124,36 @@ public final class FView extends JFrame { } /** @return {@link forge.view.ViewHomeUI} */ - public ViewHomeUI getHomeView() { + public ViewHomeUI getViewHome() { if (Singletons.getControl().getState() != FControl.HOME_SCREEN) { - throw new IllegalArgumentException("FView$getHomeView\n" + throw new IllegalArgumentException("FView$getViewHome\n" + "may only be called while the home UI is showing."); } return FView.this.home; } /** @return {@link forge.view.ViewMatchUI} */ - public ViewMatchUI getMatchView() { + public ViewMatchUI getViewMatch() { if (Singletons.getControl().getState() != FControl.MATCH_SCREEN) { - throw new IllegalArgumentException("FView$getMatchView\n" + throw new IllegalArgumentException("FView$getVIewMatch\n" + "may only be called while the match UI is showing."); } return FView.this.match; } /** @return {@link forge.view.ViewEditorUI} */ - public ViewEditorUI getEditorView() { + public ViewEditorUI getViewEditor() { if (Singletons.getControl().getState() != FControl.DEFAULT_EDITOR) { - throw new IllegalArgumentException("FView$getEditorView\n" + throw new IllegalArgumentException("FView$getViewEditor\n" + "may only be called while the editor UI is showing."); } return FView.this.editor; } /** @return {@link forge.view.ViewBazaarUI} */ - public ViewBazaarUI getBazaarView() { + public ViewBazaarUI getViewBazaar() { if (Singletons.getControl().getState() != FControl.QUEST_BAZAAR) { - throw new IllegalArgumentException("FView$getBazaarView\n" + throw new IllegalArgumentException("FView$getViewBazaar\n" + "may only be called while the bazaar UI is showing."); } return FView.this.bazaar; diff --git a/src/main/java/forge/view/Main.java b/src/main/java/forge/view/Main.java index 4d3ad521a13..f18ecade529 100644 --- a/src/main/java/forge/view/Main.java +++ b/src/main/java/forge/view/Main.java @@ -76,28 +76,28 @@ public final class Main { switch(lastMenu) { case draft: - Singletons.getView().getHomeView().getBtnDraft().grabFocus(); - Singletons.getView().getHomeView().showDraftMenu(); + Singletons.getView().getViewHome().getBtnDraft().grabFocus(); + Singletons.getView().getViewHome().showDraftMenu(); break; case sealed: - Singletons.getView().getHomeView().getBtnSealed().grabFocus(); - Singletons.getView().getHomeView().showSealedMenu(); + Singletons.getView().getViewHome().getBtnSealed().grabFocus(); + Singletons.getView().getViewHome().showSealedMenu(); break; case quest: - Singletons.getView().getHomeView().getBtnQuest().grabFocus(); - Singletons.getView().getHomeView().showQuestMenu(); + Singletons.getView().getViewHome().getBtnQuest().grabFocus(); + Singletons.getView().getViewHome().showQuestMenu(); break; case settings: - Singletons.getView().getHomeView().getBtnSettings().grabFocus(); - Singletons.getView().getHomeView().showSettingsMenu(); + Singletons.getView().getViewHome().getBtnSettings().grabFocus(); + Singletons.getView().getViewHome().showSettingsMenu(); break; case utilities: - Singletons.getView().getHomeView().getBtnUtilities().grabFocus(); - Singletons.getView().getHomeView().showUtilitiesMenu(); + Singletons.getView().getViewHome().getBtnUtilities().grabFocus(); + Singletons.getView().getViewHome().showUtilitiesMenu(); break; default: - Singletons.getView().getHomeView().getBtnConstructed().grabFocus(); - Singletons.getView().getHomeView().showConstructedMenu(); + Singletons.getView().getViewHome().getBtnConstructed().grabFocus(); + Singletons.getView().getViewHome().showConstructedMenu(); } } }); diff --git a/src/main/java/forge/view/bazaar/ViewItem.java b/src/main/java/forge/view/bazaar/ViewItem.java index 4a7738731dc..6446e024403 100644 --- a/src/main/java/forge/view/bazaar/ViewItem.java +++ b/src/main/java/forge/view/bazaar/ViewItem.java @@ -49,7 +49,7 @@ public class ViewItem extends FPanel { AllZone.getQuestData().addCredits(getItem().getSellingPrice()); getItem().onPurchase(); AllZone.getQuestData().saveData(); - Singletons.getView().getBazaarView().refreshLastInstance(); + Singletons.getView().getViewBazaar().refreshLastInstance(); } }); } diff --git a/src/main/java/forge/view/match/QuestWinLoseHandler.java b/src/main/java/forge/view/match/QuestWinLoseHandler.java index ac16e1c07c0..687546494e3 100644 --- a/src/main/java/forge/view/match/QuestWinLoseHandler.java +++ b/src/main/java/forge/view/match/QuestWinLoseHandler.java @@ -293,7 +293,7 @@ public class QuestWinLoseHandler extends ControlWinLose { Singletons.getControl().getControlMatch().deinitMatch(); Singletons.getControl().changeState(FControl.HOME_SCREEN); - Singletons.getView().getHomeView().showQuestMenu(); + Singletons.getView().getViewHome().showQuestMenu(); GuiUtils.closeOverlay(); } diff --git a/src/main/java/forge/view/match/ViewTabber.java b/src/main/java/forge/view/match/ViewTabber.java index c1fc78782d8..ffd7ef92185 100644 --- a/src/main/java/forge/view/match/ViewTabber.java +++ b/src/main/java/forge/view/match/ViewTabber.java @@ -307,7 +307,7 @@ public class ViewTabber extends JPanel { } } - Singletons.getView().getMatchView().getBtnOK().requestFocusInWindow(); + Singletons.getView().getViewMatch().getBtnOK().requestFocusInWindow(); } /** Returns array with [background, foreground] colors. */ diff --git a/src/main/java/forge/view/toolbox/DeckLister.java b/src/main/java/forge/view/toolbox/DeckLister.java index 4d02d140cce..c7a1aa34df9 100644 --- a/src/main/java/forge/view/toolbox/DeckLister.java +++ b/src/main/java/forge/view/toolbox/DeckLister.java @@ -401,7 +401,7 @@ public class DeckLister extends JPanel { else if (gametype.equals(GameType.Quest)) { AllZone.getQuestData().removeDeck(d0.getName()); AllZone.getQuestData().saveData(); - Singletons.getView().getHomeView().getBtnQuest().grabFocus(); + Singletons.getView().getViewHome().getBtnQuest().grabFocus(); } else { AllZone.getDecks().getConstructed().delete(d0.getName());