From 286d7d043c4cab8ec16172a8738b453b2c5f647c Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Tue, 14 Jan 2014 07:21:49 +0000
Subject: [PATCH] Restored functionality : deckeditor shows all valid formats
 for decks in its list.

---
 .../src/main/java/forge/game/GameFormat.java    |  3 ++-
 .../toolbox/itemmanager/views/ItemColumn.java   | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java
index 390adafaa0e..94c4a25ba6b 100644
--- a/forge-game/src/main/java/forge/game/GameFormat.java
+++ b/forge-game/src/main/java/forge/game/GameFormat.java
@@ -290,7 +290,6 @@ public class GameFormat implements Comparable<GameFormat> {
                 if ( gf.isDeckLegal(deck) )
                     return gf;
             }
-            
             return NoFormat;
         }
         
@@ -300,6 +299,8 @@ public class GameFormat implements Comparable<GameFormat> {
                 if (gf.isDeckLegal(deck))
                     result.add(gf);
             }
+            if( result.isEmpty())
+                result.add(NoFormat);
             return result;
         }
     }
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java
index 6133a423d15..4bba11a632c 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java
@@ -22,7 +22,10 @@ import java.util.regex.Pattern;
 
 import javax.swing.table.TableColumn;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
 
 import forge.Singletons;
 import forge.card.CardAiHints;
@@ -34,6 +37,7 @@ import forge.card.mana.ManaCost;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
+import forge.game.GameFormat;
 import forge.gui.CardPreferences;
 import forge.item.IPaperCard;
 import forge.item.InventoryItem;
@@ -407,8 +411,14 @@ public class ItemColumn extends TableColumn {
                         if (deck == null) {
                             return -1;
                         }
-                        return Singletons.getModel().getFormats().getFormatOfDeck(deck).getIndex();
-
+                        Iterable<GameFormat> all = Singletons.getModel().getFormats().getAllFormatsOfDeck(deck);
+                        int acc = 0;
+                        for(GameFormat gf : all) {
+                            int ix = gf.getIndex();
+                            if( ix < 30 )
+                                acc |= 0x40000000 >> (ix - 1);
+                        }
+                        return acc;
                     }
                 },
                 new Function<Entry<? extends InventoryItem, Integer>, Object>() {
@@ -418,7 +428,8 @@ public class ItemColumn extends TableColumn {
                         if (deck == null) {
                             return null;
                         }
-                        return Singletons.getModel().getFormats().getFormatOfDeck(deck).getName();
+                        Iterable<GameFormat> all = Singletons.getModel().getFormats().getAllFormatsOfDeck(deck);
+                        return StringUtils.join(Iterables.transform(all, GameFormat.FN_GET_NAME) , ", ");
                     }
                 }),
         DECK_MAIN("Main", "Main Deck", 30, 30, 30, SortState.ASC, new IntegerRenderer(),