diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java index a1333699537..85492d39e41 100644 --- a/src/main/java/forge/control/FControl.java +++ b/src/main/java/forge/control/FControl.java @@ -39,7 +39,10 @@ import forge.control.KeyboardShortcuts.Shortcut; * between various display states in that JFrame. Controllers are instantiated * separately by each state's top level view class. */ -public final class FControl { +public enum FControl { + /** */ + SINGLETON_INSTANCE; + private List shortcuts; private JLayeredPane display; private int state; @@ -63,7 +66,7 @@ public final class FControl { * switches between various display states in that JFrame. Controllers are * instantiated separately by each state's top level view class. */ - public FControl() { + private FControl() { // "Close" button override during match this.waConcede = new WindowAdapter() { @Override diff --git a/src/main/java/forge/view/Main.java b/src/main/java/forge/view/Main.java index 7db57acfb9a..43c418c02dd 100644 --- a/src/main/java/forge/view/Main.java +++ b/src/main/java/forge/view/Main.java @@ -46,7 +46,7 @@ public final class Main { try { final FModel model = new FModel(); final FView view = new FView(); - final FControl control = new FControl(); + final FControl control = FControl.SINGLETON_INSTANCE; Singletons.setModel(model); Singletons.setView(view);