MyObservable - moved frequent calls to a variable, moved the very class to utils package

.gitattributes

@@ -11636,7 +11636,6 @@ src/main/java/forge/GameEntity.java -text
 src/main/java/forge/GameLog.java -text
 src/main/java/forge/HandSizeOp.java svneol=native#text/plain
 src/main/java/forge/ImageCache.java svneol=native#text/plain
-src/main/java/forge/MyObservable.java svneol=native#text/plain
 src/main/java/forge/NameChanger.java svneol=native#text/plain
 src/main/java/forge/Singletons.java svneol=native#text/plain
 src/main/java/forge/StaticEffect.java svneol=native#text/plain
@@ -12143,6 +12142,7 @@ src/main/java/forge/util/IStorageView.java -text
 src/main/java/forge/util/IgnoringXStream.java -text
 src/main/java/forge/util/LineReader.java -text
 src/main/java/forge/util/MultiplexOutputStream.java svneol=native#text/plain
+src/main/java/forge/util/MyObservable.java svneol=native#text/plain
 src/main/java/forge/util/MyRandom.java svneol=native#text/plain
 src/main/java/forge/util/StorageImmediatelySerialized.java svneol=native#text/plain
 src/main/java/forge/util/StorageReaderFile.java -text

src/main/java/forge/GameEntity.java

@@ -21,6 +21,7 @@ import java.util.ArrayList;
 
 import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.util.MyObservable;
 
 /**
  * <p>

src/main/java/forge/GameLog.java

@@ -20,6 +20,8 @@ package forge;
 
 import java.util.ArrayList;
 
+import forge.util.MyObservable;
+
 
 /**
  * <p>

src/main/java/forge/control/input/InputControl.java

@@ -21,13 +21,13 @@ import java.util.LinkedList;
 import java.util.Stack;
 
 import forge.AllZone;
-import forge.MyObservable;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.ComputerAIInput;
 import forge.game.player.Player;
 import forge.gui.match.CMatchUI;
 import forge.model.FModel;
+import forge.util.MyObservable;
 
 /**
  * <p>

src/main/java/forge/game/phase/PhaseHandler.java

@@ -29,12 +29,12 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.GameActionUtil;
-import forge.MyObservable;
 import forge.Singletons;
 import forge.card.trigger.TriggerType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.properties.ForgePreferences.FPref;
+import forge.util.MyObservable;
 
 /**
  * <p>

src/main/java/forge/game/zone/MagicStack.java

@@ -31,7 +31,6 @@ import forge.CardList;
 import forge.CardListFilter;
 import forge.Command;
 import forge.GameActionUtil;
-import forge.MyObservable;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cardfactory.CardFactoryUtil;
@@ -60,6 +59,7 @@ import forge.gui.GuiUtils;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.SDisplayUtil;
 import forge.gui.match.CMatchUI;
+import forge.util.MyObservable;
 import forge.view.ButtonUtil;
 
 /**

src/main/java/forge/game/zone/PlayerZone.java

@@ -19,7 +19,7 @@ package forge.game.zone;
 
 import java.util.Observer;
 
-import forge.MyObservable;
+import forge.util.MyObservable;
 
 //PlayerZone observers the cards that are added to its zone
 /**

src/main/java/forge/gui/GuiInput.java

@@ -22,11 +22,11 @@ import java.util.Observer;
 
 import forge.AllZone;
 import forge.Card;
-import forge.MyObservable;
 import forge.Singletons;
 import forge.control.input.Input;
 import forge.game.player.Player;
 import forge.game.zone.PlayerZone;
+import forge.util.MyObservable;
 
 /**
  * <p>

src/main/java/forge/util/MyObservable.java

@@ -15,10 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge;
+package forge.util;
 
 import java.util.Observable;
 
+import forge.Singletons;
+import forge.game.phase.PhaseHandler;
+
 /**
  * <p>
  * MyObservable class.
@@ -38,12 +41,13 @@ public class MyObservable extends Observable {
         this.notifyObservers();
 
         if (Singletons.getModel() == null) { return; }
+        PhaseHandler phases = Singletons.getModel().getGameState().getPhaseHandler(); 
         
-        if ((Singletons.getModel().getGameState().getPhaseHandler() != null) && Singletons.getModel().getGameState().getPhaseHandler().isNeedToNextPhase()) {
+        if ((phases != null) && phases.isNeedToNextPhase()) {
-            if (Singletons.getModel().getGameState().getPhaseHandler().isNeedToNextPhaseInit()) {
+            if (phases.isNeedToNextPhaseInit()) {
                 // this is used.
-                Singletons.getModel().getGameState().getPhaseHandler().setNeedToNextPhase(false);
+                phases.setNeedToNextPhase(false);
-                Singletons.getModel().getGameState().getPhaseHandler().nextPhase();
+                phases.nextPhase();
             }
         }
     }