From 332fc9c41fdf2e1fa485171001df40e47996ecca Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Sun, 22 Jan 2012 08:18:35 +0000
Subject: [PATCH] Further semantic organization: Moved getGameInfo out of
 AllZone, into FModel.

getGameInfo returns a GameSummary object, so it has been renamed to getGameSummary.
---
 src/main/java/forge/AllZone.java                 | 13 -------------
 src/main/java/forge/GameAction.java              |  2 +-
 src/main/java/forge/PhaseUtil.java               |  2 +-
 src/main/java/forge/gui/input/InputMulligan.java |  5 +++--
 src/main/java/forge/model/FGameState.java        |  8 ++++----
 src/main/java/forge/model/FModel.java            |  6 ++++++
 6 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java
index f003c4cf00f..74833602734 100644
--- a/src/main/java/forge/AllZone.java
+++ b/src/main/java/forge/AllZone.java
@@ -27,7 +27,6 @@ import forge.card.cardfactory.PreloadingCardFactory;
 import forge.card.replacement.ReplacementHandler;
 import forge.card.trigger.TriggerHandler;
 import forge.deck.DeckManager;
-import forge.game.GameSummary;
 import forge.game.limited.CardRatings;
 import forge.gui.input.InputControl;
 import forge.model.FGameState;
@@ -427,18 +426,6 @@ public final class AllZone {
         return null;
     }
 
-    /**
-     * <p>
-     * getGameInfo.
-     * </p>
-     * 
-     * @return a {@link forge.game.GameSummary} object.
-     * @since 1.0.15
-     */
-    public static GameSummary getGameInfo() {
-        return Singletons.getModel().getGameState().getGameInfo();
-    }
-
     /**
      * <p>
      * getTriggerHandler.
diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index 316548f0e4a..848b4f5ce7a 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -753,7 +753,7 @@ public class GameAction {
      */
     public final boolean checkEndGameState() {
         // Win / Lose
-        final GameSummary game = AllZone.getGameInfo();
+        final GameSummary game = Singletons.getModel().getGameSummary();
         boolean humanWins = false;
         boolean computerWins = false;
         final Player computer = AllZone.getComputerPlayer();
diff --git a/src/main/java/forge/PhaseUtil.java b/src/main/java/forge/PhaseUtil.java
index 43bf5f570ef..b09dc628ad6 100644
--- a/src/main/java/forge/PhaseUtil.java
+++ b/src/main/java/forge/PhaseUtil.java
@@ -65,7 +65,7 @@ public class PhaseUtil {
         final Player turn = AllZone.getPhaseHandler().getPlayerTurn();
 
         AllZone.getPhaseHandler().turnReset();
-        AllZone.getGameInfo().notifyNextTurn();
+        Singletons.getModel().getGameSummary().notifyNextTurn();
 
         AllZone.getCombat().reset();
         AllZone.getCombat().setAttackingPlayer(turn);
diff --git a/src/main/java/forge/gui/input/InputMulligan.java b/src/main/java/forge/gui/input/InputMulligan.java
index 187c9cfc113..48f5e0be95c 100644
--- a/src/main/java/forge/gui/input/InputMulligan.java
+++ b/src/main/java/forge/gui/input/InputMulligan.java
@@ -32,6 +32,7 @@ import forge.PhaseHandler;
 import forge.PhaseUtil;
 import forge.Player;
 import forge.PlayerZone;
+import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
 import forge.game.GamePlayerRating;
@@ -99,7 +100,7 @@ public class InputMulligan extends Input {
     @Override
     public final void selectButtonCancel() {
         final Player humanPlayer = AllZone.getHumanPlayer();
-        final GamePlayerRating humanRating = AllZone.getGameInfo().getPlayerRating(humanPlayer.getName());
+        final GamePlayerRating humanRating = Singletons.getModel().getGameSummary().getPlayerRating(humanPlayer.getName());
 
         final int newHand = this.doMulligan(humanPlayer, humanRating);
 
@@ -122,7 +123,7 @@ public class InputMulligan extends Input {
     final void end() {
         // Computer mulligan
         final Player aiPlayer = AllZone.getComputerPlayer();
-        final GamePlayerRating aiRating = AllZone.getGameInfo().getPlayerRating(aiPlayer.getName());
+        final GamePlayerRating aiRating = Singletons.getModel().getGameSummary().getPlayerRating(aiPlayer.getName());
         boolean aiTakesMulligan = true;
 
         // Computer mulligans if there are no cards with converted mana cost of
diff --git a/src/main/java/forge/model/FGameState.java b/src/main/java/forge/model/FGameState.java
index 8ed8a49d1a1..b0617c77272 100644
--- a/src/main/java/forge/model/FGameState.java
+++ b/src/main/java/forge/model/FGameState.java
@@ -68,7 +68,7 @@ public class FGameState {
     private PlayerZone stackZone = new DefaultPlayerZone(Constant.Zone.Stack, null);
 
     private long timestamp = 0;
-    private GameSummary gameInfo;
+    private GameSummary gameSummary;
 
     /**
      * Constructor.
@@ -384,15 +384,15 @@ public class FGameState {
      * 
      * @return the game info
      */
-    public final GameSummary getGameInfo() {
-        return this.gameInfo;
+    public final GameSummary getGameSummary() {
+        return this.gameSummary;
     }
 
     /**
      * Call this each time you start a new game, ok?.
      */
     public final void newGameCleanup() {
-        this.gameInfo = new GameSummary(this.humanPlayer.getName(), this.computerPlayer.getName());
+        this.gameSummary = new GameSummary(this.humanPlayer.getName(), this.computerPlayer.getName());
 
         this.getHumanPlayer().reset();
         this.getComputerPlayer().reset();
diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java
index dd2c7fc6566..ce4dbb4a016 100644
--- a/src/main/java/forge/model/FModel.java
+++ b/src/main/java/forge/model/FModel.java
@@ -34,6 +34,7 @@ import forge.Constant;
 import forge.ConstantStringArrayList;
 import forge.FileUtil;
 import forge.HttpUtil;
+import forge.game.GameSummary;
 import forge.gui.input.InputControl;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgeProps;
@@ -297,6 +298,11 @@ public class FModel {
         return this.gameState;
     }
 
+    /** @return {@link forge.game.GameSummary} */
+    public final GameSummary getGameSummary() {
+        return this.gameState.getGameSummary();
+    }
+
     /**
      * Create and return a new game state.
      *