From 4f40e8fb106e9ad58bcb8cffd7889583a07f963f Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Sun, 19 Feb 2012 01:49:26 +0000
Subject: [PATCH] Enforced singleton pattern in FControl.

---
 src/main/java/forge/control/FControl.java | 7 +++++--
 src/main/java/forge/view/Main.java        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

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<Shortcut> 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);