Cleanup: Tightened up interface contracts in home submenus.

.gitattributes

@@ -12001,7 +12001,6 @@ src/main/java/forge/gui/framework/package-info.java -text svneol=native#text/pla
 src/main/java/forge/gui/home/CMainMenu.java -text
 src/main/java/forge/gui/home/EMenuGroup.java -text
 src/main/java/forge/gui/home/EMenuItem.java -text
-src/main/java/forge/gui/home/ICSubmenu.java -text
 src/main/java/forge/gui/home/IVSubmenu.java -text
 src/main/java/forge/gui/home/StartButton.java -text
 src/main/java/forge/gui/home/VHomeUI.java -text
@@ -12192,7 +12191,6 @@ src/main/java/forge/view/FView.java -text
 src/main/java/forge/view/Main.java -text
 src/main/java/forge/view/SplashFrame.java -text
 src/main/java/forge/view/ViewBazaarUI.java -text
-src/main/java/forge/view/ViewEditorUI.java -text
 src/main/java/forge/view/arcane/CardArea.java svneol=native#text/plain
 src/main/java/forge/view/arcane/CardPanel.java svneol=native#text/plain
 src/main/java/forge/view/arcane/CardPanelContainer.java svneol=native#text/plain

src/main/java/forge/gui/home/ICSubmenu.java

@@ -1,26 +0,0 @@
-package forge.gui.home;
-
-import forge.Command;
-
-/** 
- * Dictates methods required for a submenu controller.
- * 
- * <br><br><i>(I at beginning of class name denotes an interface.)</i>
- * <br><i>(C at beginning of class name denotes a controller class.)</i>
- */
-public interface ICSubmenu {
-    /** Fires when a menu is selected. Avoid any reference
-     * referring to VHomeUI in this method, because
-     * it is triggered when VHomeUI is initialized, which
-     * will create an NPE.
-     * 
-     * @return {@link forge.Command} */
-    Command getMenuCommand();
-
-    /** Call this method after the view singleton has been fully realized
-     * for the first time. This method should ideally only be called once. */
-    void initialize();
-
-    /** Update whatever content is in the panel. */
-    void update();
-}

src/main/java/forge/gui/home/IVSubmenu.java

@@ -1,8 +1,7 @@
 package forge.gui.home;
 
-import javax.swing.JPanel;
-
 import forge.gui.framework.EDocID;
+import forge.gui.framework.IVDoc;
 
 /**
  * Dictates methods required for a submenu view.
@@ -10,16 +9,7 @@ import forge.gui.framework.EDocID;
  * <br><br><i>(I at beginning of class name denotes an interface.)</i>
  * <br><i>(V at beginning of class name denotes a view class.)</i>
  */
-public interface IVSubmenu {
-    /** Allows static factory creation by decoupling UI components.
-     * @return {@link javax.swing.JPanel} */
-    JPanel getPanel();
-
-    /** Retrives control object associated with this instance.
-     * @return {@link forge.gui.home.ICSubmenu}
-     */
-    ICSubmenu getSubmenuControl();
-
+public interface IVSubmenu extends IVDoc {
     /** Returns parent menu grouping of this submenu, useful for
      * functions such as expanding and collapsing in the menu area.
      * 

src/main/java/forge/gui/home/VMainMenu.java

@@ -214,8 +214,8 @@ public enum VMainMenu implements IVDoc {
                 // with the selection display process.
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
-                        if (item.getSubmenuControl().getMenuCommand() != null) {
-                            item.getSubmenuControl().getMenuCommand().execute();
+                        if (item.getLayoutControl().getCommandOnSelect() != null) {
+                            item.getLayoutControl().getCommandOnSelect().execute();
                         }
                     }
                 });

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

@@ -13,11 +13,11 @@ import forge.Command;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
 import forge.gui.home.CMainMenu;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.quest.SSubmenuQuestUtil.SelectablePanel;
 import forge.gui.toolbox.FLabel;
 import forge.quest.QuestController;
 import forge.quest.QuestEventChallenge;
+import forge.quest.bazaar.QuestItemType;
 import forge.quest.bazaar.QuestPetController;
 
 /** 
@@ -26,27 +26,10 @@ import forge.quest.bazaar.QuestPetController;
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  *
  */
-public enum CSubmenuChallenges implements ICSubmenu, ICDoc {
+public enum CSubmenuChallenges implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @SuppressWarnings("serial")
-    @Override
-    public Command getMenuCommand() {
-        final QuestController qc = AllZone.getQuest();
-        return new Command() {
-            @Override
-            public void execute() {
-                if (qc.getAchievements() == null) {
-                    CMainMenu.SINGLETON_INSTANCE.itemClick(EDocID.HOME_QUESTDATA);
-                }
-            }
-        };
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#initialize()
      */
@@ -71,10 +54,9 @@ public enum CSubmenuChallenges implements ICSubmenu, ICDoc {
                 new Command() {
                     @Override
                     public void execute() {
-                        int todo = 5;
-                        //AllZone.getQuest().getAchievements().setCurrentChallenges(null);
-                        //AllZone.getQuest().getAssets().setItemLevel(QuestItemType.ZEPPELIN, 2);
-                        //update();
+                        AllZone.getQuest().getAchievements().setCurrentChallenges(null);
+                        AllZone.getQuest().getAssets().setItemLevel(QuestItemType.ZEPPELIN, 2);
+                        update();
                     }
                 });
 
@@ -142,8 +124,17 @@ public enum CSubmenuChallenges implements ICSubmenu, ICDoc {
     /* (non-Javadoc)
      * @see forge.gui.framework.ICDoc#getCommandOnSelect()
      */
+    @SuppressWarnings("serial")
     @Override
     public Command getCommandOnSelect() {
-        return null;
+        final QuestController qc = AllZone.getQuest();
+        return new Command() {
+            @Override
+            public void execute() {
+                if (qc.getAchievements() == null) {
+                    CMainMenu.SINGLETON_INSTANCE.itemClick(EDocID.HOME_QUESTDATA);
+                }
+            }
+        };
     }
 }

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

@@ -9,7 +9,6 @@ import forge.Command;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
 import forge.gui.home.CMainMenu;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.quest.SSubmenuQuestUtil.SelectablePanel;
 import forge.quest.QuestController;
 import forge.quest.QuestEventDuel;
@@ -21,26 +20,10 @@ import forge.quest.bazaar.QuestPetController;
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  *
  */
-public enum CSubmenuDuels implements ICSubmenu, ICDoc {
+public enum CSubmenuDuels implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @SuppressWarnings("serial")
-    @Override
-    public Command getMenuCommand() {
-        final QuestController qc = AllZone.getQuest();
-        return new Command() {
-            public void execute() {
-                if (qc.getAchievements() == null) {
-                    CMainMenu.SINGLETON_INSTANCE.itemClick(EDocID.HOME_QUESTDATA);
-                }
-            }
-        };
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#initialize()
      */
@@ -113,8 +96,16 @@ public enum CSubmenuDuels implements ICSubmenu, ICDoc {
     /* (non-Javadoc)
      * @see forge.gui.framework.ICDoc#getCommandOnSelect()
      */
+    @SuppressWarnings("serial")
     @Override
     public Command getCommandOnSelect() {
-        return null;
+        final QuestController qc = AllZone.getQuest();
+        return new Command() {
+            public void execute() {
+                if (qc.getAchievements() == null) {
+                    CMainMenu.SINGLETON_INSTANCE.itemClick(EDocID.HOME_QUESTDATA);
+                }
+            }
+        };
     }
 }

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

@@ -17,7 +17,6 @@ import forge.Command;
 import forge.Singletons;
 import forge.gui.GuiUtils;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.quest.QuestController;
@@ -34,7 +33,7 @@ import forge.quest.io.QuestDataIO;
  *
  */
 @SuppressWarnings("serial")
-public enum CSubmenuQuestData implements ICSubmenu, ICDoc {
+public enum CSubmenuQuestData implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -55,14 +54,6 @@ public enum CSubmenuQuestData implements ICSubmenu, ICDoc {
                 new Command() { @Override public void execute() { newQuest(); } });
     }
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @Override
-    public Command getMenuCommand() {
-        return null;
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#update()
      */

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

@@ -12,7 +12,6 @@ import forge.gui.deckeditor.controllers.CEditorQuest;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
 import forge.gui.home.CMainMenu;
-import forge.gui.home.ICSubmenu;
 import forge.quest.QuestController;
 import forge.quest.data.QuestPreferences.QPref;
 
@@ -22,7 +21,7 @@ import forge.quest.data.QuestPreferences.QPref;
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  */
 @SuppressWarnings("serial")
-public enum CSubmenuQuestDecks implements ICSubmenu, ICDoc {
+public enum CSubmenuQuestDecks implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -42,22 +41,6 @@ public enum CSubmenuQuestDecks implements ICSubmenu, ICDoc {
     private final Command cmdDeckDelete = new Command() { @Override
         public void execute() { update(); } };
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @Override
-    public Command getMenuCommand() {
-        final QuestController qc = AllZone.getQuest();
-        return new Command() {
-            @Override
-            public void execute() {
-                if (qc.getAchievements() == null) {
-                    CMainMenu.SINGLETON_INSTANCE.itemClick(EDocID.HOME_QUESTDATA);
-                }
-            }
-        };
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#update()
      */
@@ -125,6 +108,14 @@ public enum CSubmenuQuestDecks implements ICSubmenu, ICDoc {
      */
     @Override
     public Command getCommandOnSelect() {
-        return null;
+        final QuestController qc = AllZone.getQuest();
+        return new Command() {
+            @Override
+            public void execute() {
+                if (qc.getAchievements() == null) {
+                    CMainMenu.SINGLETON_INSTANCE.itemClick(EDocID.HOME_QUESTDATA);
+                }
+            }
+        };
     }
 }

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

@@ -3,7 +3,6 @@ package forge.gui.home.quest;
 import forge.Command;
 import forge.Singletons;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.quest.VSubmenuQuestPrefs.PrefInput;
 import forge.quest.data.QuestPreferences;
 import forge.quest.data.QuestPreferences.QPref;
@@ -14,7 +13,7 @@ import forge.quest.data.QuestPreferences.QPref;
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  *
  */
-public enum CSubmenuQuestPrefs implements ICSubmenu, ICDoc {
+public enum CSubmenuQuestPrefs implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -33,14 +32,6 @@ public enum CSubmenuQuestPrefs implements ICSubmenu, ICDoc {
 
     }
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @Override
-    public Command getMenuCommand() {
-        return null;
-    }
-
     /**
      * Checks validity of values entered into prefInputs.
      * @param i0 &emsp; a PrefInput object

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

@@ -282,11 +282,11 @@ public class SSubmenuQuestUtil {
                         selectedOpponent.setSelected(false);
                     }
 
-                    if (VSubmenuDuels.SINGLETON_INSTANCE.getPanel().isShowing() && getCurrentDeck() != null) {
+                    if (VSubmenuDuels.SINGLETON_INSTANCE.getPnlDuels().isShowing() && getCurrentDeck() != null) {
                         VSubmenuDuels.SINGLETON_INSTANCE.getBtnStart().setEnabled(true);
                         VSubmenuChallenges.SINGLETON_INSTANCE.getBtnStart().setEnabled(false);
                     }
-                    else if (VSubmenuChallenges.SINGLETON_INSTANCE.getPanel().isShowing() &&  getCurrentDeck() != null) {
+                    else if (VSubmenuChallenges.SINGLETON_INSTANCE.getPnlChallenges().isShowing() &&  getCurrentDeck() != null) {
                         VSubmenuDuels.SINGLETON_INSTANCE.getBtnStart().setEnabled(false);
                         VSubmenuChallenges.SINGLETON_INSTANCE.getBtnStart().setEnabled(true);
                     }

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

@@ -17,7 +17,6 @@ import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
 import forge.gui.toolbox.FCheckBox;
@@ -82,14 +81,6 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet, IVDoc {
         .opaque(true).hoverable(true).text("Spell Shop")
         .fontSize(14).tooltip("Travel to the Spell Shop").build();
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /* (non-Javadoc)
      * @see forge.view.home.IViewSubmenu#getGroup()
      */
@@ -114,14 +105,6 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet, IVDoc {
         return EDocID.HOME_QUESTCHALLENGES;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuChallenges.SINGLETON_INSTANCE;
-    }
-
     /* (non-Javadoc)
      * @see forge.view.home.IViewSubmenu#populate()
      */

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

@@ -17,7 +17,6 @@ import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
 import forge.gui.toolbox.FCheckBox;
@@ -81,14 +80,6 @@ public enum VSubmenuDuels implements IVSubmenu, IStatsAndPet, IVDoc {
         .opaque(true).hoverable(true).text("Spell Shop")
         .fontSize(14).tooltip("Travel to the Spell Shop").build();
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /* (non-Javadoc)
      * @see forge.view.home.IViewSubmenu#getGroup()
      */
@@ -113,14 +104,6 @@ public enum VSubmenuDuels implements IVSubmenu, IStatsAndPet, IVDoc {
         return EDocID.HOME_QUESTDUELS;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuDuels.SINGLETON_INSTANCE;
-    }
-
     /* (non-Javadoc)
      * @see forge.view.home.IViewSubmenu#populate()
      */

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

@@ -22,9 +22,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FPanel;
@@ -40,7 +38,7 @@ import forge.util.IStorageView;
  *
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  */
-public enum VSubmenuQuestData implements IVSubmenu, IVDoc {
+public enum VSubmenuQuestData implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -201,15 +199,6 @@ public enum VSubmenuQuestData implements IVSubmenu, IVDoc {
         return EMenuGroup.QUEST;
     }
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
-
     /* (non-Javadoc)
      * @see forge.gui.home.IVSubmenu#getMenuTitle()
      */
@@ -226,14 +215,6 @@ public enum VSubmenuQuestData implements IVSubmenu, IVDoc {
         return EDocID.HOME_QUESTDATA;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuQuestData.SINGLETON_INSTANCE;
-    }
-
     /**
      * @return {@link forge.gui.home.quest.QuestFileLister}
      */

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

@@ -8,9 +8,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.toolbox.DeckLister;
 import forge.gui.toolbox.FLabel;
@@ -22,7 +20,7 @@ import forge.gui.toolbox.FScrollPane;
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  *
  */
-public enum VSubmenuQuestDecks implements IVSubmenu, IVDoc {
+public enum VSubmenuQuestDecks implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -69,14 +67,6 @@ public enum VSubmenuQuestDecks implements IVSubmenu, IVDoc {
         return EMenuGroup.QUEST;
     }
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.home.IVSubmenu#getMenuTitle()
      */
@@ -93,14 +83,6 @@ public enum VSubmenuQuestDecks implements IVSubmenu, IVDoc {
         return EDocID.HOME_QUESTDECKS;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuQuestDecks.SINGLETON_INSTANCE;
-    }
-
     /** @return {@link forge.gui.toolbox.DeckLister} */
     public DeckLister getLstDecks() {
         return this.lstDecks;

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

@@ -19,9 +19,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FPanel;
@@ -36,7 +34,7 @@ import forge.quest.data.QuestPreferences.QPref;
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  *
  */
-public enum VSubmenuQuestPrefs implements IVSubmenu, IVDoc {
+public enum VSubmenuQuestPrefs implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -148,14 +146,6 @@ public enum VSubmenuQuestPrefs implements IVSubmenu, IVDoc {
         return EMenuGroup.QUEST;
     }
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.home.IVSubmenu#getMenuTitle()
      */
@@ -172,14 +162,6 @@ public enum VSubmenuQuestPrefs implements IVSubmenu, IVDoc {
         return EDocID.HOME_QUESTPREFS;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuQuestPrefs.SINGLETON_INSTANCE;
-    }
-
     /** @return {@link javax.swing.JLabel} */
     public JLabel getLblErrRewards() {
         return lblErrRewards;

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

@@ -36,7 +36,6 @@ import forge.game.GameNew;
 import forge.game.player.PlayerType;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 import forge.gui.toolbox.FLabel;
 import forge.item.CardPrinted;
 import forge.item.ItemPoolView;
@@ -53,7 +52,7 @@ import forge.util.IStorage;
  *
  */
 @SuppressWarnings("serial")
-public enum CSubmenuConstructed implements ICSubmenu, ICDoc {
+public enum CSubmenuConstructed implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -87,13 +86,6 @@ public enum CSubmenuConstructed implements ICSubmenu, ICDoc {
         COLOR_VALS.put("Red", "red");
         COLOR_VALS.put("White", "white");
     }
-    /* (non-Javadoc)
-     * @see forge.gui.home.ICSubmenu#getMenuCommand()
-     */
-    @Override
-    public Command getMenuCommand() {
-        return null;
-    }
 
     /* (non-Javadoc)
      * @see forge.gui.home.ICSubmenu#initialize()

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

@@ -25,7 +25,6 @@ import forge.gui.SOverlayUtils;
 import forge.gui.deckeditor.CDeckEditorUI;
 import forge.gui.deckeditor.controllers.CEditorDraftingProcess;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 import forge.gui.toolbox.FSkin;
 
 /** 
@@ -35,7 +34,7 @@ import forge.gui.toolbox.FSkin;
  *
  */
 @SuppressWarnings("serial")
-public enum CSubmenuDraft implements ICSubmenu, ICDoc {
+public enum CSubmenuDraft implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -129,14 +128,6 @@ public enum CSubmenuDraft implements ICSubmenu, ICDoc {
         });
     }
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @Override
-    public Command getMenuCommand() {
-        return null;
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#update()
      */

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

@@ -28,7 +28,6 @@ import forge.gui.deckeditor.CDeckEditorUI;
 import forge.gui.deckeditor.controllers.ACEditorBase;
 import forge.gui.deckeditor.controllers.CEditorLimited;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 import forge.gui.toolbox.FSkin;
 import forge.item.CardPrinted;
 import forge.item.ItemPool;
@@ -43,7 +42,7 @@ import forge.util.TextUtil;
  *
  */
 @SuppressWarnings("serial")
-public enum CSubmenuSealed implements ICSubmenu, ICDoc {
+public enum CSubmenuSealed implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -96,14 +95,6 @@ public enum CSubmenuSealed implements ICSubmenu, ICDoc {
         });
     }
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @Override
-    public Command getMenuCommand() {
-        return null;
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#update()
      */

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

@@ -16,9 +16,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
 import forge.gui.toolbox.FCheckBox;
@@ -33,7 +31,7 @@ import forge.gui.toolbox.FScrollPane;
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  *
  */
-public enum VSubmenuConstructed implements IVSubmenu, IVDoc {
+public enum VSubmenuConstructed implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -89,22 +87,6 @@ public enum VSubmenuConstructed implements IVSubmenu, IVDoc {
         grpRadiosAI.add(radQuestsAI);
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuConstructed.SINGLETON_INSTANCE;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.home.IVSubmenu#getGroupEnum()
      */

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

@@ -22,9 +22,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
 import forge.gui.toolbox.DeckLister;
@@ -40,7 +38,7 @@ import forge.gui.toolbox.FSkin;
  *
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  */
-public enum VSubmenuDraft implements IVSubmenu, IVDoc {
+public enum VSubmenuDraft implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -68,14 +66,6 @@ public enum VSubmenuDraft implements IVSubmenu, IVDoc {
         return EMenuGroup.SANCTIONED;
     }
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.home.IVSubmenu#getMenuTitle()
      */
@@ -246,14 +236,6 @@ public enum VSubmenuDraft implements IVSubmenu, IVDoc {
         return parentCell;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuDraft.SINGLETON_INSTANCE;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.framework.IVDoc#getLayoutControl()
      */

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

@@ -20,9 +20,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.home.StartButton;
 import forge.gui.toolbox.DeckLister;
@@ -37,7 +35,7 @@ import forge.gui.toolbox.FSkin;
  *
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  */
-public enum VSubmenuSealed implements IVSubmenu, IVDoc {
+public enum VSubmenuSealed implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -107,22 +105,6 @@ public enum VSubmenuSealed implements IVSubmenu, IVDoc {
         return EDocID.HOME_SEALED;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuSealed.SINGLETON_INSTANCE;
-    }
-
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /** @return {@link javax.swing.JLabel} */
     public JLabel getBtnDirections() {
         return this.btnDirections;

src/main/java/forge/gui/home/settings/CSubmenuAvatars.java

@@ -2,7 +2,6 @@ package forge.gui.home.settings;
 
 import forge.Command;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 
 /** 
  * Controls the avatars submenu in the home UI.
@@ -10,7 +9,7 @@ import forge.gui.home.ICSubmenu;
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  *
  */
-public enum CSubmenuAvatars implements ICSubmenu, ICDoc {
+public enum CSubmenuAvatars implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -21,14 +20,6 @@ public enum CSubmenuAvatars implements ICSubmenu, ICDoc {
     public void initialize() {
     }
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @Override
-    public Command getMenuCommand() {
-        return null;
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#update()
      */

src/main/java/forge/gui/home/settings/CSubmenuPreferences.java

@@ -12,7 +12,6 @@ import forge.Constant;
 import forge.Singletons;
 import forge.control.RestartUtil;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 import forge.gui.toolbox.FSkin;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
@@ -23,7 +22,7 @@ import forge.properties.ForgePreferences.FPref;
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  *
  */
-public enum CSubmenuPreferences implements ICSubmenu, ICDoc {
+public enum CSubmenuPreferences implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -155,14 +154,6 @@ public enum CSubmenuPreferences implements ICSubmenu, ICDoc {
         });
     }
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @Override
-    public Command getMenuCommand() {
-        return null;
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#update()
      */

src/main/java/forge/gui/home/settings/VSubmenuAvatars.java

@@ -16,9 +16,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FScrollPane;
@@ -30,7 +28,7 @@ import forge.properties.ForgePreferences.FPref;
  *
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  */
-public enum VSubmenuAvatars implements IVSubmenu, IVDoc {
+public enum VSubmenuAvatars implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -73,14 +71,6 @@ public enum VSubmenuAvatars implements IVSubmenu, IVDoc {
         return EMenuGroup.SETTINGS;
     }
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.home.IVSubmenu#getMenuTitle()
      */
@@ -97,14 +87,6 @@ public enum VSubmenuAvatars implements IVSubmenu, IVDoc {
         return EDocID.HOME_AVATARS;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuAvatars.SINGLETON_INSTANCE;
-    }
-
     @SuppressWarnings("serial")
     private void populateAvatars() {
         final Map<Integer, Image> avatarMap = FSkin.getAvatars();

src/main/java/forge/gui/home/settings/VSubmenuPreferences.java

@@ -32,9 +32,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FList;
@@ -48,7 +46,7 @@ import forge.properties.NewConstants.Lang.OldGuiNewGame.NewGameText;
  *
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  */
-public enum VSubmenuPreferences implements IVSubmenu, IVDoc {
+public enum VSubmenuPreferences implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -178,14 +176,6 @@ public enum VSubmenuPreferences implements IVSubmenu, IVDoc {
         return EMenuGroup.SETTINGS;
     }
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.home.IVSubmenu#getMenuTitle()
      */
@@ -202,14 +192,6 @@ public enum VSubmenuPreferences implements IVSubmenu, IVDoc {
         return EDocID.HOME_PREFERENCES;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuPreferences.SINGLETON_INSTANCE;
-    }
-
     /** Consolidates checkbox styling in one place. */
     @SuppressWarnings("serial")
     private class OptionsCheckBox extends JCheckBox {

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

@@ -5,7 +5,6 @@ import forge.control.FControl;
 import forge.gui.deckeditor.CDeckEditorUI;
 import forge.gui.deckeditor.controllers.CEditorConstructed;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 
 /** 
  * Controls the deck editor submenu option in the home UI.
@@ -13,7 +12,7 @@ import forge.gui.home.ICSubmenu;
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  *
  */
-public enum CSubmenuDeckEditor implements ICSubmenu, ICDoc {
+public enum CSubmenuDeckEditor implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -24,16 +23,6 @@ public enum CSubmenuDeckEditor implements ICSubmenu, ICDoc {
     public void initialize() {
     }
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @SuppressWarnings("serial")
-    @Override
-    public Command getMenuCommand() {
-        return new Command() { @Override
-            public void execute() { showDeckEditor(); } };
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#update()
      */
@@ -51,8 +40,10 @@ public enum CSubmenuDeckEditor implements ICSubmenu, ICDoc {
     /* (non-Javadoc)
      * @see forge.gui.framework.ICDoc#getCommandOnSelect()
      */
+    @SuppressWarnings("serial")
     @Override
     public Command getCommandOnSelect() {
-        return null;
+        return new Command() { @Override
+            public void execute() { showDeckEditor(); } };
     }
 }

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

@@ -2,7 +2,6 @@ package forge.gui.home.utilities;
 
 import forge.Command;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 
 /** 
  * Controls the exit submenu option in the home UI.
@@ -10,20 +9,10 @@ import forge.gui.home.ICSubmenu;
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  *
  */
-public enum CSubmenuExit implements ICSubmenu, ICDoc {
+public enum CSubmenuExit implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @SuppressWarnings("serial")
-    @Override
-    public Command getMenuCommand() {
-        return new Command() { @Override
-            public void execute() { System.exit(0); } };
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#update()
      */
@@ -40,8 +29,10 @@ public enum CSubmenuExit implements ICSubmenu, ICDoc {
     /* (non-Javadoc)
      * @see forge.gui.framework.ICDoc#getCommandOnSelect()
      */
+    @SuppressWarnings("serial")
     @Override
     public Command getCommandOnSelect() {
-        return getMenuCommand();
+        return new Command() { @Override
+            public void execute() { System.exit(0); } };
     }
 }

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

@@ -8,7 +8,6 @@ import forge.gui.download.GuiDownloadPrices;
 import forge.gui.download.GuiDownloadQuestImages;
 import forge.gui.download.GuiDownloadSetPicturesLQ;
 import forge.gui.framework.ICDoc;
-import forge.gui.home.ICSubmenu;
 
 /** 
  * Controls the utilities submenu in the home UI.
@@ -17,7 +16,7 @@ import forge.gui.home.ICSubmenu;
  *
  */
 @SuppressWarnings("serial")
-public enum CSubmenuUtilities implements ICSubmenu, ICDoc {
+public enum CSubmenuUtilities implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
@@ -65,14 +64,6 @@ public enum CSubmenuUtilities implements ICSubmenu, ICDoc {
         view.getBtnLicensing().setCommand(cmdLicensing);
     }
 
-    /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#getCommand()
-     */
-    @Override
-    public Command getMenuCommand() {
-        return null;
-    }
-
     /* (non-Javadoc)
      * @see forge.control.home.IControlSubmenu#update()
      */

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

@@ -7,9 +7,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.toolbox.FLabel;
 
@@ -19,7 +17,7 @@ import forge.gui.toolbox.FLabel;
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  *
  */
-public enum VSubmenuDeckEditor implements IVSubmenu, IVDoc {
+public enum VSubmenuDeckEditor implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -40,7 +38,7 @@ public enum VSubmenuDeckEditor implements IVSubmenu, IVDoc {
         pnl.setOpaque(false);
 
         pnl.add(new FLabel.Builder().text("Open Deck Editor").opaque(true)
-                .hoverable(true).cmdClick(CSubmenuDeckEditor.SINGLETON_INSTANCE.getMenuCommand())
+                .hoverable(true).cmdClick(CSubmenuDeckEditor.SINGLETON_INSTANCE.getCommandOnSelect())
                 .fontSize(16).build(), "w 200px!, h 40px!");
 
         parentCell.getBody().setLayout(new MigLayout("insets 0, gap 0"));
@@ -55,14 +53,6 @@ public enum VSubmenuDeckEditor implements IVSubmenu, IVDoc {
         return EMenuGroup.UTILITIES;
     }
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.home.IVSubmenu#getMenuTitle()
      */
@@ -79,14 +69,6 @@ public enum VSubmenuDeckEditor implements IVSubmenu, IVDoc {
         return EDocID.HOME_DECKEDITOR;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuDeckEditor.SINGLETON_INSTANCE;
-    }
-
     //========== Overridden from IVDoc
 
     /* (non-Javadoc)

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

@@ -7,9 +7,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.toolbox.FLabel;
 
@@ -19,7 +17,7 @@ import forge.gui.toolbox.FLabel;
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  *
  */
-public enum VSubmenuExit implements IVSubmenu, IVDoc {
+public enum VSubmenuExit implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -39,7 +37,7 @@ public enum VSubmenuExit implements IVSubmenu, IVDoc {
         pnl.setOpaque(false);
 
         pnl.add(new FLabel.Builder().text("Open Deck Editor").opaque(true)
-                .hoverable(true).cmdClick(CSubmenuDeckEditor.SINGLETON_INSTANCE.getMenuCommand())
+                .hoverable(true).cmdClick(CSubmenuDeckEditor.SINGLETON_INSTANCE.getCommandOnSelect())
                 .fontSize(16).build(), "w 200px!, h 40px!");
     }
 
@@ -51,14 +49,6 @@ public enum VSubmenuExit implements IVSubmenu, IVDoc {
         return EMenuGroup.UTILITIES;
     }
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.home.IVSubmenu#getMenuTitle()
      */
@@ -75,14 +65,6 @@ public enum VSubmenuExit implements IVSubmenu, IVDoc {
         return EDocID.HOME_EXIT;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuExit.SINGLETON_INSTANCE;
-    }
-
     /* (non-Javadoc)
      * @see forge.gui.framework.IVDoc#getDocumentID()
      */

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

@@ -23,9 +23,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
-import forge.gui.framework.IVDoc;
 import forge.gui.home.EMenuGroup;
-import forge.gui.home.ICSubmenu;
 import forge.gui.home.IVSubmenu;
 import forge.gui.toolbox.FButton;
 import forge.gui.toolbox.FLabel;
@@ -41,7 +39,7 @@ import forge.properties.NewConstants.Lang;
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  *
  */
-public enum VSubmenuUtilities implements IVSubmenu, IVDoc {
+public enum VSubmenuUtilities implements IVSubmenu {
     /** */
     SINGLETON_INSTANCE;
 
@@ -141,14 +139,6 @@ public enum VSubmenuUtilities implements IVSubmenu, IVDoc {
         return EMenuGroup.UTILITIES;
     }
 
-    /* (non-Javadoc)
-     * @see forge.view.home.IViewSubmenu#getPanel()
-     */
-    @Override
-    public JPanel getPanel() {
-        return pnl;
-    }
-
     /** @return {@link forge.gui.toolbox.FLabel} */
     public FLabel getBtnDownloadPics() {
         return btnDownloadPics;
@@ -296,14 +286,6 @@ public enum VSubmenuUtilities implements IVSubmenu, IVDoc {
         return EDocID.HOME_UTILITIES;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.home.IVSubmenu#getSubmenuControl()
-     */
-    @Override
-    public ICSubmenu getSubmenuControl() {
-        return CSubmenuUtilities.SINGLETON_INSTANCE;
-    }
-
     //========== Overridden from IVDoc
 
     /* (non-Javadoc)

src/main/java/forge/view/ViewEditorUI.java

@@ -1,37 +0,0 @@
-/*
- * Forge: Play Magic: the Gathering.
- * Copyright (C) 2011  Forge Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package forge.view;
-
-import forge.gui.toolbox.FPanel;
-
-/**
- * Lays out battle, sidebar, user areas in locked % vals and repaints as
- * necessary.
- * 
- */
-
-@SuppressWarnings("serial")
-public class ViewEditorUI extends FPanel {
-
-    /**
-     * Instantiates a new editor top level.
-     */
-    public ViewEditorUI() {
-        super();
-    }
-}