From f9efa46ca155baee773e0573e06f9a4e434ecde9 Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Sun, 25 Nov 2012 13:18:37 +0000
Subject: [PATCH] *Variants: Added error handling for managing not to select
 deck/avatar in vanguard mode. *Variants: Prevented user from selecting
 multiple avatars.

---
 .../gui/home/variant/CSubmenuVanguard.java    | 50 ++++++++++++-------
 .../gui/home/variant/VSubmenuVanguard.java    |  1 +
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/main/java/forge/gui/home/variant/CSubmenuVanguard.java b/src/main/java/forge/gui/home/variant/CSubmenuVanguard.java
index 2c01b3ce7d5..3a786325ca6 100644
--- a/src/main/java/forge/gui/home/variant/CSubmenuVanguard.java
+++ b/src/main/java/forge/gui/home/variant/CSubmenuVanguard.java
@@ -12,6 +12,7 @@ import javax.swing.SwingWorker;
 import com.google.common.collect.Iterables;
 
 import forge.Command;
+import forge.GameActionUtil;
 import forge.Singletons;
 import forge.control.Lobby;
 import forge.deck.Deck;
@@ -117,27 +118,28 @@ public enum CSubmenuVanguard implements ICDoc {
         final SwingWorker<Object, Void> worker = new SwingWorker<Object, Void>() {
             @Override
             public Object doInBackground() {
-                List<Deck> playerDecks = new ArrayList<Deck>();
-                for(FDeckChooser fdc : view.getDeckChoosers())
-                {
-                    playerDecks.add(fdc.getDeck());
-                }
-                
-                List<Object> playerAvatars = new ArrayList<Object>();
-                for(FList fl : view.getAvatarLists())
-                {
-                    playerAvatars.add(fl.getSelectedValue());
-                }
-                
-                Lobby lobby = Singletons.getControl().getLobby();
-                MatchStartHelper helper = new MatchStartHelper();
                 Random rnd = new Random();
+                
+                List<Deck> playerDecks = new ArrayList<Deck>();
                 for(int i=0;i<view.getNumPlayers();i++)
                 {
-                    LobbyPlayer player = lobby.findLocalPlayer(i == 0 ? PlayerType.HUMAN : PlayerType.COMPUTER);
+                    Deck d = view.getDeckChoosers().get(i).getDeck();
                     
+                    if(d == null)
+                    {
+                        //ERROR!
+                        GameActionUtil.showInfoDialg("No deck selected for player " + (i+1));
+                        return null;
+                    }
+                    playerDecks.add(d);
+                }
+                
+                List<CardPrinted> playerAvatars = new ArrayList<CardPrinted>();
+                for(int i=0;i<view.getNumPlayers();i++)
+                {
                     CardPrinted avatar = null;
-                    if(playerAvatars.get(i) instanceof String)
+                    Object obj = view.getAvatarLists().get(i).getSelectedValue();
+                    if(obj instanceof String)
                     {
                         //Random is the only string in the list so grab a random avatar.
                         if(i == 0)
@@ -155,8 +157,22 @@ public enum CSubmenuVanguard implements ICDoc {
                     {
                         avatar = (CardPrinted)playerAvatars.get(i);
                     }
+                    if(avatar == null)
+                    {
+                        //ERROR!
+                        GameActionUtil.showInfoDialg("No avatar selected for player " + (i+1));
+                        return null;
+                    }
+                    playerAvatars.add(avatar);
+                }
+                
+                Lobby lobby = Singletons.getControl().getLobby();
+                MatchStartHelper helper = new MatchStartHelper();
+                for(int i=0;i<view.getNumPlayers();i++)
+                {
+                    LobbyPlayer player = lobby.findLocalPlayer(i == 0 ? PlayerType.HUMAN : PlayerType.COMPUTER);
                     
-                    helper.addVanguardPlayer(player, playerDecks.get(i), avatar);
+                    helper.addVanguardPlayer(player, playerDecks.get(i), playerAvatars.get(i));
                 }
                 MatchController mc = Singletons.getModel().getMatch(); 
                 mc.initMatch(GameType.Vanguard, helper.getPlayerMap());
diff --git a/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java b/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
index 62e7d5ab257..50a4810216f 100644
--- a/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
+++ b/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
@@ -161,6 +161,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
             
             tempList.setListData(i == 0 ? humanListData : aiListData);
             tempList.setSelectedIndex(0);
+            tempList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
             
             deckChoosers.add(tempChooser);
             avatarLists.add(tempList);