Coverted deck editors and cardshop to JDialog.

This allows them to be modal and gets rid of the setAlwaysOnTop() call. (Which causes all manner of headaches on Linux)

src/main/java/forge/gui/deckeditor/DeckEditorBase.java

@@ -20,13 +20,12 @@ package forge.gui.deckeditor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-
+import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
-
 import forge.Command;
 import forge.deck.DeckBase;
 import forge.gui.deckeditor.elements.CardPanelBase;
@@ -45,7 +44,7 @@ import forge.util.Predicate;
  * @param <T> the generic type
  * @param <TModel> the generic type
  */
-public abstract class DeckEditorBase<T extends InventoryItem, TModel extends DeckBase> extends JFrame {
+public abstract class DeckEditorBase<T extends InventoryItem, TModel extends DeckBase> extends JDialog {
     private static final long serialVersionUID = -401223933343539977L;
 
     /** The filter boxes. */
@@ -65,6 +64,10 @@ public abstract class DeckEditorBase<T extends InventoryItem, TModel extends Dec
     /** The bottom. */
     private TableView<T> bottomTableWithCards;
 
+    public DeckEditorBase(JFrame parent) {
+        super(parent, ModalityType.APPLICATION_MODAL);
+    }
+
     // top shows available card pool
     // if constructed, top shows all cards
     // if sealed, top shows N booster packs

src/main/java/forge/gui/deckeditor/DeckEditorConstructed.java

@@ -18,9 +18,7 @@
 package forge.gui.deckeditor;
 
 import java.awt.Container;
-import java.awt.Dialog.ModalityType;
 import java.awt.Font;
-import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -30,12 +28,11 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 
-import net.miginfocom.swing.MigLayout;
 import forge.Command;
 import forge.Singletons;
 import forge.deck.Deck;
@@ -52,6 +49,7 @@ import forge.item.InventoryItem;
 import forge.item.ItemPool;
 import forge.util.Lambda0;
 import forge.util.Predicate;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * <p>
@@ -145,7 +143,6 @@ public final class DeckEditorConstructed extends DeckEditorBase<CardPrinted, Dec
         this.filterNameTypeSet.setListeners(new OnChangeTextUpdateDisplay(), this.getItemListenerUpdatesDisplay());
 
         this.setSize(1024, 740);
-        this.setExtendedState(Frame.MAXIMIZED_BOTH);
 
     }
 
@@ -153,7 +150,8 @@ public final class DeckEditorConstructed extends DeckEditorBase<CardPrinted, Dec
      * Instantiates a new deck editor common.
      *
      */
-    public DeckEditorConstructed() {
+    public DeckEditorConstructed(JFrame parent) {
+        super(parent);
         try {
             this.setFilterBoxes(new FilterCheckBoxes(true));
             this.setTopTableWithCards(new TableView<CardPrinted>("Avaliable Cards", true, true, CardPrinted.class));

src/main/java/forge/gui/deckeditor/DeckEditorLimited.java

@@ -19,7 +19,6 @@ package forge.gui.deckeditor;
 
 import java.awt.Container;
 import java.awt.Font;
-import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -29,12 +28,11 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 
-import net.miginfocom.swing.MigLayout;
 import forge.Command;
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
@@ -50,6 +48,7 @@ import forge.item.InventoryItem;
 import forge.util.IStorage;
 import forge.util.Lambda0;
 import forge.util.Predicate;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * <p>
@@ -141,16 +140,17 @@ public final class DeckEditorLimited extends DeckEditorBase<CardPrinted, DeckGro
         this.filterNameTypeSet.setListeners(new OnChangeTextUpdateDisplay(), this.getItemListenerUpdatesDisplay());
 
         this.setSize(1024, 740);
-        this.setExtendedState(Frame.MAXIMIZED_BOTH);
 
     }
 
     /**
      * Instantiates a new deck editor common.
      *
+     * @param mainFrame
      * @param deckMap the deck map
      */
-    public DeckEditorLimited(final IStorage<DeckGroup> deckMap) {
+    public DeckEditorLimited(JFrame mainFrame, final IStorage<DeckGroup> deckMap) {
+        super(mainFrame);
         try {
             this.setFilterBoxes(new FilterCheckBoxes(true));
             this.setTopTableWithCards(new TableView<CardPrinted>("Avaliable Cards", true, true, CardPrinted.class));

src/main/java/forge/gui/deckeditor/DeckEditorQuest.java

@@ -18,6 +18,7 @@
 package forge.gui.deckeditor;
 
 // import java.awt.Font;
+
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -27,9 +28,9 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JFrame;
 
 import forge.Command;
 import forge.Constant;
@@ -176,11 +177,12 @@ public final class DeckEditorQuest extends DeckEditorBase<CardPrinted, Deck> {
     /**
      * Instantiates a new deck editor quest.
      * 
+     * @param parent
      * @param questData2
      *            the quest data2
      */
-    public DeckEditorQuest(final QuestController questData2) {
+    public DeckEditorQuest(JFrame parent, final QuestController questData2) {
-
+        super(parent);
         this.questData = questData2;
         try {
             this.setFilterBoxes(new FilterCheckBoxes(false));

src/main/java/forge/gui/deckeditor/DraftingProcess.java

@@ -30,8 +30,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.swing.JButton;
+import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
 import javax.swing.WindowConstants;
@@ -187,8 +187,8 @@ public class DraftingProcess extends DeckEditorBase<CardPrinted, DeckGroup> {
     /**
      * Instantiates a new deck editor draft.
      */
-    public DraftingProcess() {
+    public DraftingProcess(JFrame parent) {
-
+        super(parent);
         try {
             this.setTopTableWithCards(new TableView<CardPrinted>("Choose one card", false, CardPrinted.class));
             this.setBottomTableWithCards(new TableView<CardPrinted>("Previously picked cards", true, CardPrinted.class));

src/main/java/forge/gui/deckeditor/QuestCardShop.java

@@ -28,8 +28,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.swing.JButton;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 
@@ -211,7 +211,8 @@ public final class QuestCardShop extends DeckEditorBase<InventoryItem, DeckBase>
      * @param qd
      *            a {@link forge.quest.data.QuestData} object.
      */
-    public QuestCardShop(final QuestController qd) {
+    public QuestCardShop(JFrame parent, final QuestController qd) {
+        super(parent);
         this.questData = qd;
         try {
             this.setFilterBoxes(null);

src/main/java/forge/gui/deckeditor/elements/DeckAnalysis.java

@@ -28,11 +28,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
-
 import javax.swing.BorderFactory;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
-import javax.swing.JFrame;
+import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -45,12 +44,12 @@ import javax.swing.border.BevelBorder;
 import javax.swing.event.MouseInputAdapter;
 import javax.swing.table.DefaultTableModel;
 
-import net.miginfocom.swing.MigLayout;
 import forge.card.CardRules;
 import forge.card.CardType;
 import forge.item.CardPrinted;
 import forge.item.ItemPoolView;
 import forge.util.MyRandom;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * This code was edited or generated using CloudGarden's Jigloo SWT/Swing GUI
@@ -111,7 +110,7 @@ public class DeckAnalysis extends javax.swing.JDialog {
     private JSeparator jSeparator1;
     private JLabel jLabel2;
     private JButton jButtonOk;
-    private final JFrame jF;
+    private final JDialog parentDialog;
 
     /** The deck. */
     private final ItemPoolView<CardPrinted> deck;
@@ -126,11 +125,11 @@ public class DeckAnalysis extends javax.swing.JDialog {
      * @param deckView
      *            the deck view
      */
-    public DeckAnalysis(final JFrame g, final ItemPoolView<CardPrinted> deckView) {
+    public DeckAnalysis(final JDialog g, final ItemPoolView<CardPrinted> deckView) {
         super(g);
         this.deck = deckView;
 
-        this.jF = g;
+        this.parentDialog = g;
         this.initGUI();
     }
 
@@ -160,7 +159,7 @@ public class DeckAnalysis extends javax.swing.JDialog {
             this.addWindowListener(new WindowAdapter() {
                 @Override
                 public void windowClosing(final WindowEvent arg0) {
-                    DeckAnalysis.this.jF.setEnabled(true);
+                    DeckAnalysis.this.parentDialog.setEnabled(true);
                 }
 
                 @Override
@@ -475,7 +474,7 @@ public class DeckAnalysis extends javax.swing.JDialog {
             this.jButtonOk.addMouseListener(new MouseInputAdapter() {
                 @Override
                 public void mouseClicked(final MouseEvent e) {
-                    DeckAnalysis.this.jF.setEnabled(true);
+                    DeckAnalysis.this.parentDialog.setEnabled(true);
                     DeckAnalysis.this.dispose();
                 }
             });

src/main/java/forge/gui/home/quest/CSubmenuQuestDecks.java

@@ -74,7 +74,8 @@ public enum CSubmenuQuestDecks implements ICSubmenu {
         VSubmenuQuestDecks.SINGLETON_INSTANCE.getBtnNewDeck().setCommand(new Command() {
             @Override
             public void execute() {
-                final DeckEditorQuest editor = new DeckEditorQuest(AllZone.getQuest());
+                final DeckEditorQuest editor =
+                        new DeckEditorQuest(Singletons.getView().getFrame(), AllZone.getQuest());
                 editor.show(cmdDeckExit);
                 OverlayUtils.showOverlay();
                 editor.setVisible(true);

src/main/java/forge/gui/home/quest/SubmenuQuestUtil.java

@@ -1,5 +1,11 @@
 package forge.gui.home.quest;
 
+import java.io.File;
+import java.util.List;
+import javax.swing.ImageIcon;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+
 import forge.AllZone;
 import forge.Command;
 import forge.Constant;
@@ -16,9 +22,9 @@ import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FTextArea;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
-import forge.quest.QuestEventChallenge;
 import forge.quest.QuestController;
 import forge.quest.QuestEvent;
+import forge.quest.QuestEventChallenge;
 import forge.quest.QuestMode;
 import forge.quest.QuestUtil;
 import forge.quest.bazaar.QuestItemType;
@@ -29,13 +35,6 @@ import forge.quest.data.QuestPreferences.QPref;
 import net.miginfocom.swing.MigLayout;
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.File;
-import java.util.List;
-
-import javax.swing.ImageIcon;
-import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
-
 /** 
  * Utilities for the quest submenu, all over the MVC spectrum.
  * If a piece of code can be reused, it's dumped here.
@@ -186,7 +185,7 @@ public class SubmenuQuestUtil {
             }
         };
 
-        final QuestCardShop g = new QuestCardShop(AllZone.getQuest());
+        final QuestCardShop g = new QuestCardShop(Singletons.getView().getFrame(), AllZone.getQuest());
         g.show(exit);
         g.setVisible(true);
     }

src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java

@@ -5,7 +5,6 @@ import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
@@ -220,7 +219,7 @@ public enum CSubmenuDraft implements ICSubmenu {
     private void setupDraft() {
         OverlayUtils.showOverlay();
 
-        final DraftingProcess draft = new DraftingProcess();
+        final DraftingProcess draft = new DraftingProcess(Singletons.getView().getFrame());
 
         // Determine what kind of booster draft to run
         final ArrayList<String> draftTypes = new ArrayList<String>();

src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java

@@ -6,15 +6,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 
-import net.slightlymagic.braids.util.UtilFunctions;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.Command;
 import forge.Constant;
 import forge.Singletons;
@@ -33,6 +28,8 @@ import forge.item.CardPrinted;
 import forge.item.ItemPool;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import net.slightlymagic.braids.util.UtilFunctions;
+import org.apache.commons.lang3.StringUtils;
 
 /** 
  * TODO: Write javadoc for this type.
@@ -226,8 +223,9 @@ public enum CSubmenuSealed implements ICSubmenu {
         sealed.addAiDeck(sd.buildAIDeck(sDeck.toForgeCardList()));
         Singletons.getModel().getDecks().getSealed().add(sealed);
 
-        final DeckEditorBase<?, T> editor = (DeckEditorBase<?, T>)
+        final DeckEditorBase<?, T> editor = (DeckEditorBase<?, T>) new DeckEditorLimited(
-                new DeckEditorLimited(Singletons.getModel().getDecks().getSealed());
+                Singletons.getView().getFrame(),
+                Singletons.getModel().getDecks().getSealed());
 
         editor.show(cmdExit);
         editor.getController().setModel((T) sealed);

src/main/java/forge/gui/home/utilities/CSubmenuDeckEditor.java

@@ -1,6 +1,7 @@
 package forge.gui.home.utilities;
 
 import forge.Command;
+import forge.Singletons;
 import forge.deck.DeckBase;
 import forge.gui.deckeditor.DeckEditorBase;
 import forge.gui.deckeditor.DeckEditorConstructed;
@@ -45,7 +46,8 @@ public enum CSubmenuDeckEditor implements ICSubmenu {
      */
     @SuppressWarnings("unchecked")
     private <T extends DeckBase> void showDeckEditor() {
-        DeckEditorBase<?, T> editor = (DeckEditorBase<?, T>) new DeckEditorConstructed();
+        DeckEditorBase<?, T> editor =
+                (DeckEditorBase<?, T>) new DeckEditorConstructed(Singletons.getView().getFrame());
         editor.show(null);
         editor.setVisible(true);
     }

src/main/java/forge/gui/toolbox/DeckLister.java

@@ -24,16 +24,15 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.border.MatteBorder;
 
-import net.miginfocom.swing.MigLayout;
 import forge.AllZone;
 import forge.Command;
 import forge.Constant;
@@ -45,6 +44,7 @@ import forge.gui.OverlayUtils;
 import forge.gui.deckeditor.DeckEditorConstructed;
 import forge.gui.deckeditor.DeckEditorLimited;
 import forge.gui.deckeditor.DeckEditorQuest;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * Creates deck list for selected decks for quick deleting, editing, and basic
@@ -424,34 +424,34 @@ public class DeckLister extends JPanel {
     private void editDeck(final Deck d0) {
         OverlayUtils.showOverlay();
 
+        JFrame mainFrame = Singletons.getView().getFrame();
         switch (this.gametype) {
-        case Quest:
+            case Quest:
             Constant.Runtime.HUMAN_DECK[0] = d0;
-            final DeckEditorQuest editor = new DeckEditorQuest(AllZone.getQuest());
+            final DeckEditorQuest editor = new DeckEditorQuest(mainFrame, AllZone.getQuest());
             editor.show(this.cmdEditorExit);
             editor.setVisible(true);
-            editor.setAlwaysOnTop(true);
             break;
-        case Constructed:
+            case Constructed:
-            final DeckEditorConstructed cEditor = new DeckEditorConstructed();
+            final DeckEditorConstructed cEditor = 
+                    new DeckEditorConstructed(mainFrame);
             cEditor.show(this.cmdEditorExit);
             cEditor.getController().load(d0.getName());
             cEditor.setVisible(true);
-            cEditor.setAlwaysOnTop(true);
             break;
         case Sealed:
-            final DeckEditorLimited sEditor = new DeckEditorLimited(Singletons.getModel().getDecks().getSealed());
+            final DeckEditorLimited sEditor = 
+                    new DeckEditorLimited(mainFrame, Singletons.getModel().getDecks().getSealed());
             sEditor.show(this.cmdEditorExit);
             sEditor.getController().load(d0.getName());
             sEditor.setVisible(true);
-            sEditor.setAlwaysOnTop(true);
             break;
         case Draft:
-            final DeckEditorLimited dEditor = new DeckEditorLimited(Singletons.getModel().getDecks().getDraft());
+            final DeckEditorLimited dEditor =
+                    new DeckEditorLimited(mainFrame, Singletons.getModel().getDecks().getDraft());
             dEditor.show(this.cmdEditorExit);
             dEditor.getController().load(d0.getName());
             dEditor.setVisible(true);
-            dEditor.setAlwaysOnTop(true);
             break;
         default:
             break;