From 3eefc0899a27454dd7f285a70fe9cde7ce3dd21f Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Mon, 29 Aug 2011 08:00:15 +0000
Subject: [PATCH]  add old deck generators back due to popular demand

---
 .../java/forge/view/swing/OldGuiNewGame.java  | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/main/java/forge/view/swing/OldGuiNewGame.java b/src/main/java/forge/view/swing/OldGuiNewGame.java
index 67d187ea858..bce4db1bfee 100644
--- a/src/main/java/forge/view/swing/OldGuiNewGame.java
+++ b/src/main/java/forge/view/swing/OldGuiNewGame.java
@@ -805,13 +805,10 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
         decks.add("2-Color Deck");
         decks.add("3-Color Deck");
         decks.add("5-Color Deck");
-        //decks.add("2-Color Deck (original)");
-        //decks.add("3-Color Deck (original)");
-        //decks.add("5-Color Deck (original)");
+        decks.add("2-Color Deck (original)");
+        decks.add("3-Color Deck (original)");
+        decks.add("5-Color Deck (original)");
         decks.add("Semi-Random Theme Deck");
-        //decks.add("2-Color Deck (new)");
-        //decks.add("3-Color Deck (new)");
-        //decks.add("5-Color Deck (new)");
 
         String prompt = "Generate ";
         if (playerType.equals(PlayerType.HUMAN)) {
@@ -824,22 +821,19 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
         Object o = GuiUtils.getChoice(prompt, decks.toArray());
 
         if (o.toString().equals(decks.get(0))) {
-            //d = generateConstructedDeck();
             d = generate2ColorDeck(playerType);
         } else if (o.toString().equals(decks.get(1))) {
-            //d = generateConstructed3ColorDeck();
             d = generate3ColorDeck(playerType);
         } else if (o.toString().equals(decks.get(2))) {
-            //d = generateConstructed5ColorDeck();
             d = generate5ColorDeck(playerType);
         } else if (o.toString().equals(decks.get(3))) {
+            d = generateConstructedDeck();    
+        } else if (o.toString().equals(decks.get(4))) {
+            d = generateConstructed3ColorDeck();
+        } else if (o.toString().equals(decks.get(5))) {
+            d = generateConstructed5ColorDeck();
+        } else if (o.toString().equals(decks.get(6))) {
             d = generateConstructedThemeDeck();
-        //} else if (o.toString().equals(decks.get(4))) {
-        //    d = generate2ColorDeck(playerType);
-        //} else if (o.toString().equals(decks.get(5))) {
-        //    d = generate3ColorDeck(playerType);
-        //} else if (o.toString().equals(decks.get(6))) {
-        //    d = generate5ColorDeck(playerType);
         }
 
         if (playerType.equals(PlayerType.HUMAN)) {
@@ -849,14 +843,14 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
         }
     }
 
-    /*
+    /**
      * <p>
      * generateConstructedDeck.
      * </p>
      *
      * @return a {@link forge.deck.Deck} object.
      */
-/*    private Deck generateConstructedDeck() {
+    private Deck generateConstructedDeck() {
         GenerateConstructedDeck gen = new GenerateConstructedDeck();
         CardList name = gen.generateDeck();
         Deck deck = new Deck(Constant.GameType.Constructed);
@@ -865,16 +859,16 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
             deck.addMain(name.get(i).getName());
         }
         return deck;
-    }*/
+    }
 
-    /*
+    /**
      * <p>
      * generateConstructed3ColorDeck.
      * </p>
      *
      * @return a {@link forge.deck.Deck} object.
      */
-/*    private Deck generateConstructed3ColorDeck() {
+    private Deck generateConstructed3ColorDeck() {
         GenerateConstructedMultiColorDeck gen = new GenerateConstructedMultiColorDeck();
         CardList name = gen.generate3ColorDeck();
         Deck deck = new Deck(Constant.GameType.Constructed);
@@ -883,16 +877,16 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
             deck.addMain(name.get(i).getName());
         }
         return deck;
-    }*/
+    }
 
-    /*
+    /**
      * <p>
      * generateConstructed5ColorDeck.
      * </p>
      *
      * @return a {@link forge.deck.Deck} object.
      */
-/*    private Deck generateConstructed5ColorDeck() {
+    private Deck generateConstructed5ColorDeck() {
         GenerateConstructedMultiColorDeck gen = new GenerateConstructedMultiColorDeck();
         CardList name = gen.generate5ColorDeck();
         Deck deck = new Deck(Constant.GameType.Constructed);
@@ -901,7 +895,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
             deck.addMain(name.get(i).getName());
         }
         return deck;
-    }*/
+    }
 
     /**
      * <p>