From d01925107f9581682e2eda0d6f25aeb2d47cae80 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Tue, 21 Jan 2014 18:54:02 +0000
Subject: [PATCH] fix label on 'Choose deck' button

---
 .../src/main/java/forge/gui/deckeditor/DeckProxy.java  | 10 ++++++++++
 .../forge/gui/home/sanctioned/VSubmenuConstructed.java |  6 ++++--
 .../forge/gui/toolbox/itemmanager/ItemManager.java     |  3 ++-
 .../forge/gui/toolbox/itemmanager/views/ItemView.java  |  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java b/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java
index 821acf015dd..78ff023f09f 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java
@@ -6,7 +6,9 @@ import java.util.Map.Entry;
 
 import org.apache.commons.lang3.StringUtils;
 
+import com.google.common.base.Function;
 import com.google.common.base.Predicate;
+
 import forge.Singletons;
 import forge.card.ColorSet;
 import forge.deck.CardPool;
@@ -28,6 +30,14 @@ public class DeckProxy implements InventoryItem {
     protected final Deck deck;
     protected final IStorage<?> storage;
     
+    public static final Function<DeckProxy, String> FN_GET_NAME = new Function<DeckProxy, String>() {
+        @Override
+        public String apply(DeckProxy arg0) {
+            return arg0.getName();
+        }
+        
+    };
+    
     // cached values
     protected ColorSet color;
     protected Iterable<GameFormat> formats;
diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
index 2d2b59fe22b..017cfaef3da 100644
--- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
+++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
@@ -10,6 +10,7 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeMap;
@@ -428,8 +429,9 @@ public enum VSubmenuConstructed implements IVSubmenu<CSubmenuConstructed> {
         mainDeckPanel.add(mainChooser, "grow, push, wrap");
     }
 
-    protected void onDeckClicked(int iPlayer, DeckType type, Iterable<DeckProxy> selectedDecks) {
-        String text = type.toString() + ": " + Lang.joinHomogenous(selectedDecks);
+    protected void onDeckClicked(int iPlayer, DeckType type, Collection<DeckProxy> selectedDecks) {
+        
+        String text = type.toString() + ": " + Lang.joinHomogenous(selectedDecks, DeckProxy.FN_GET_NAME);
         deckSelectorBtns.get(iPlayer).setText(text);
     }
 
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
index e70752b794b..1f8788d8fa4 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
@@ -28,6 +28,7 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -468,7 +469,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
      * 
      * @return Iterable<T>
      */
-    public Iterable<T> getSelectedItems() {
+    public Collection<T> getSelectedItems() {
         return this.table.getSelectedItems();
     }
 
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemView.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemView.java
index bc04e987962..ad8e5f9ccae 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemView.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemView.java
@@ -11,6 +11,7 @@ import java.awt.event.FocusEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.swing.JComponent;
@@ -80,7 +81,7 @@ public abstract class ItemView<T extends InventoryItem> {
         return index >= 0 ? getItemAtIndex(index) : null;
     }
 
-    public final Iterable<T> getSelectedItems() {
+    public final Collection<T> getSelectedItems() {
         List<T> items = new ArrayList<T>();
         for (Integer i : getSelectedIndices()) {
             items.add(getItemAtIndex(i));