From 6cfe43e9b7e769b594b1fd69e46c80277d06f10b Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Thu, 3 Mar 2016 00:25:27 +0300
Subject: [PATCH] Make DeckGeneratorDialog fields non-static for more
 OOP-style.

---
 .../deck/generator/DeckGeneratorDialog.java   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorDialog.java b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorDialog.java
index 8e3770ce582..e6ef49e9ec9 100644
--- a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorDialog.java
+++ b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorDialog.java
@@ -48,13 +48,13 @@ import java.util.Date;
  */
 public class DeckGeneratorDialog {
 
-    private static JDialog dlg;
-    private static String selectedColors;
-    private static JComboBox cbSets;
-    private static JComboBox cbDeckSize;
-    private static JButton btnGenerate, btnCancel;
-    private static JCheckBox cArtifacts, cSingleton, cNonBasicLands;
-    private static SimpleDateFormat dateFormat;
+    private JDialog dlg;
+    private String selectedColors;
+    private JComboBox<String> cbSets;
+    private JComboBox<String> cbDeckSize;
+    private JButton btnGenerate, btnCancel;
+    private JCheckBox cArtifacts, cSingleton, cNonBasicLands;
+    private SimpleDateFormat dateFormat;
 
     public DeckGeneratorDialog()
     {
@@ -83,7 +83,7 @@ public class DeckGeneratorDialog {
         p0.add(Box.createVerticalStrut(5));
         JPanel jPanel = new JPanel();
         JLabel text3 = new JLabel("Choose sets:");
-        cbSets = new JComboBox(ConstructedFormats.getTypes());
+        cbSets = new JComboBox<String>(ConstructedFormats.getTypes());
         cbSets.setSelectedIndex(0);
         cbSets.setPreferredSize(new Dimension(300, 25));
         cbSets.setMaximumSize(new Dimension(300, 25));
@@ -100,7 +100,7 @@ public class DeckGeneratorDialog {
         p0.add(Box.createVerticalStrut(5));
         JPanel jPanel2 = new JPanel();
         JLabel textDeckSize = new JLabel("Deck size:");
-        cbDeckSize = new JComboBox(new String[]{"40","60"});
+        cbDeckSize = new JComboBox<String>(new String[] { "40", "60" });
         cbDeckSize.setSelectedIndex(0);
         cbDeckSize.setPreferredSize(new Dimension(300, 25));
         cbDeckSize.setMaximumSize(new Dimension(300, 25));
@@ -168,7 +168,7 @@ public class DeckGeneratorDialog {
         dlg.dispose();
     }
 
-    public static void cleanUp() {
+    public void cleanUp() {
         for (ActionListener al: btnGenerate.getActionListeners()) {
             btnGenerate.removeActionListener(al);
         }
@@ -187,7 +187,7 @@ public class DeckGeneratorDialog {
             tmp.createNewFile();
             deck.setName(deckName);
             Sets.saveDeck(tmp.getAbsolutePath(), deck.getDeckCardLists());
-            DeckGeneratorDialog.cleanUp();
+            cleanUp();
             return tmp.getAbsolutePath();
         } catch (Exception e) {
             JOptionPane.showMessageDialog(null, "Couldn't generate deck. Try again.");