added a method to launch game by a single call to FControl (removed duplicate code from controllers specific to game modes)

src/main/java/forge/control/FControl.java

@@ -38,6 +38,7 @@ import forge.Singletons;
 import forge.control.KeyboardShortcuts.Shortcut;
 import forge.game.Game;
 import forge.game.GameType;
+import forge.game.Match;
 import forge.game.player.LobbyPlayer;
 import forge.game.player.Player;
 import forge.gui.GuiDialog;
@@ -401,9 +402,14 @@ public enum FControl {
     }
 
     
+    public final void startGameWithUi(Match match) {
+        attachToGame(match.createGame());
+        match.startGame();
+    }
+    
     private final FControlGameEventHandler fcVisitor = new FControlGameEventHandler(this);
     private final FControlGamePlayback playbackControl = new FControlGamePlayback(this);
-    public void attachToGame(Game game0) {
+    private void attachToGame(Game game0) {
         // TODO: Detach from other game we might be looking at
         
         

src/main/java/forge/game/limited/GauntletMini.java

@@ -169,8 +169,7 @@ public class GauntletMini {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 SOverlayUtils.hideOverlay();
             }
         });

src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java

@@ -127,8 +127,7 @@ public enum CSubmenuGauntletContests implements ICDoc {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 SOverlayUtils.hideOverlay();
             }
         });

src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java

@@ -118,8 +118,7 @@ public enum CSubmenuGauntletLoad implements ICDoc {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 SOverlayUtils.hideOverlay();
             }
         });

src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java

@@ -152,8 +152,7 @@ public enum CSubmenuGauntletQuick implements ICDoc {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 SOverlayUtils.hideOverlay();
             }
         });

src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java

@@ -444,8 +444,7 @@ public class SSubmenuQuestUtil {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 // no overlays here?
             }
         });

src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java

@@ -127,8 +127,7 @@ public enum CSubmenuConstructed implements ICDoc {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 SOverlayUtils.hideOverlay();
             }
         });

src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java

@@ -140,8 +140,7 @@ public enum CSubmenuDraft implements ICDoc {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 SOverlayUtils.hideOverlay();
             }
         });

src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java

@@ -238,8 +238,7 @@ public enum CSubmenuArchenemy implements ICDoc {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 SOverlayUtils.hideOverlay();
             }
         });

src/main/java/forge/gui/home/variant/CSubmenuPlanechase.java

@@ -219,8 +219,7 @@ public enum CSubmenuPlanechase implements ICDoc {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 SOverlayUtils.hideOverlay();
             }
         });

src/main/java/forge/gui/home/variant/CSubmenuVanguard.java

@@ -181,8 +181,7 @@ public enum CSubmenuVanguard implements ICDoc {
         FThreads.invokeInEdtLater(new Runnable(){
             @Override
             public void run() {
-                Singletons.getControl().attachToGame(mc.createGame());
+                Singletons.getControl().startGameWithUi(mc);
-                mc.startGame();
                 SOverlayUtils.hideOverlay();
             }
         });

src/main/java/forge/gui/match/ControlWinLose.java

@@ -78,8 +78,7 @@ public class ControlWinLose {
             executeAnte();
         }
 
-        Singletons.getControl().attachToGame(match.createGame());
+        Singletons.getControl().startGameWithUi(match);
-        match.startGame();
     }
 
     /** Action performed when "restart" button is pressed in default win/lose UI. */
@@ -87,8 +86,7 @@ public class ControlWinLose {
         SOverlayUtils.hideOverlay();
         saveOptions();
         match.clearGamesPlayed();
-        Singletons.getControl().attachToGame(match.createGame());
+        Singletons.getControl().startGameWithUi(match);
-        match.startGame();
     }
 
     /** Action performed when "quit" button is pressed in default win/lose UI. */

src/main/java/forge/gui/match/GauntletWinLose.java

@@ -206,8 +206,7 @@ public class GauntletWinLose extends ControlWinLose {
 
             SOverlayUtils.hideOverlay();
             saveOptions();
-            Singletons.getControl().attachToGame(mc.createGame());
+            Singletons.getControl().startGameWithUi(mc);
-            mc.startGame();
         } else {
             super.actionOnContinue();
         }