Tidy font + plaf handling

Change-Id: I892219602e96f57e5cba6b5da8f166442354d598
Reviewed-on: http://gerrit.dmdirc.com/3307
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -44,14 +44,12 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 
 import com.google.common.eventbus.EventBus;
 
 import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
 import java.awt.event.WindowListener;
@@ -88,8 +86,6 @@ public class MainFrame extends JFrame implements WindowListener,
     private final QueuedLinkedHashSet<TextFrame> focusOrder;
     /** Apple instance. */
     private final Apple apple;
-    /** Swing Controller. */
-    private final SwingController controller;
     /** Controller to use to end the program. */
     private final LifecycleController lifecycleController;
     /** The window factory to use to create and listen for windows. */
@@ -106,8 +102,6 @@ public class MainFrame extends JFrame implements WindowListener,
     private CtrlTabWindowManager frameManager;
     /** The listeners registered with this class. */
     private final ListenerList listeners = new ListenerList();
-    /** Window management. */
-    private final WindowManager windowManager;
     /** Provider of frame managers. */
     private final Provider<FrameManager> frameManagerProvider;
     /** The bus to despatch events on. */
@@ -138,37 +132,31 @@ public class MainFrame extends JFrame implements WindowListener,
     /**
      * Creates new form MainFrame.
      *
-     * @param controller           Swing controller
      * @param apple                Apple instance
      * @param windowFactory        The window factory to use to create and listen for windows.
      * @param lifecycleController  Controller to use to end the application.
      * @param globalConfig         The config to read settings from.
      * @param quitWorker           The quit worker to use when quitting the app.
      * @param iconManager          The icon manager to use to get icons.
-     * @param windowManager        Window management
      * @param frameManagerProvider Provider to use to retrieve frame managers.
      * @param eventBus             The event bus to post events to.
      */
     public MainFrame(
             final Apple apple,
-            final SwingController controller,
             final SwingWindowFactory windowFactory,
             final LifecycleController lifecycleController,
             final AggregateConfigProvider globalConfig,
             final Provider<QuitWorker> quitWorker,
             final IconManager iconManager,
-            final WindowManager windowManager,
             final Provider<FrameManager> frameManagerProvider,
             final EventBus eventBus) {
         checkOnEDT();
         this.apple = apple;
-        this.controller = controller;
         this.windowFactory = windowFactory;
         this.lifecycleController = lifecycleController;
         this.globalConfig = globalConfig;
         this.quitWorker = quitWorker;
         this.iconManager = iconManager;
-        this.windowManager = windowManager;
         this.frameManagerProvider = frameManagerProvider;
         this.eventBus = eventBus;
 
@@ -182,11 +170,9 @@ public class MainFrame extends JFrame implements WindowListener,
 
         showVersion = globalConfig.getOptionBool("ui", "showversion");
         version = globalConfig.getOption("version", "version");
-        globalConfig.addChangeListener("ui", "lookandfeel", this);
         globalConfig.addChangeListener("ui", "showversion", this);
         globalConfig.addChangeListener("ui", "framemanager", this);
         globalConfig.addChangeListener("ui", "framemanagerPosition", this);
-        globalConfig.addChangeListener("ui", "textPaneFontName", this);
         globalConfig.addChangeListener("icon", "icon", this);
 
         addWindowFocusListener(new WindowFocusListener() {
@@ -546,9 +532,6 @@ public class MainFrame extends JFrame implements WindowListener,
     public void configChanged(final String domain, final String key) {
         if ("ui".equals(domain)) {
             switch (key) {
-                case "lookandfeel":
-                    controller.updateLookAndFeel();
-                    break;
                 case "framemanager":
                 case "framemanagerPosition":
                     UIUtilities.invokeAndWait(new Runnable() {
@@ -564,12 +547,6 @@ public class MainFrame extends JFrame implements WindowListener,
                         }
                     });
                     break;
-                case "textPaneFontName":
-                    final String font = globalConfig.getOptionString("ui", "textPaneFontName");
-                    log.debug("Changing textpane font: {}", font);
-                    UIUtilities.setUIFont(new Font(font, Font.PLAIN, 12));
-                    controller.updateComponentTrees();
-                    break;
                 default:
                     showVersion = globalConfig.getOptionBool("ui", "showversion");
                     break;

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -40,6 +40,7 @@ import com.dmdirc.events.FeedbackNagEvent;
 import com.dmdirc.events.FirstRunEvent;
 import com.dmdirc.events.UnknownURLEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;
@@ -72,13 +73,17 @@ import javax.swing.UnsupportedLookAndFeelException;
 
 import net.miginfocom.layout.PlatformDefaults;
 
+import org.slf4j.LoggerFactory;
+
 import dagger.ObjectGraph;
 
 /**
  * Controls the main swing UI.
  */
-public class SwingController extends BaseCommandPlugin implements UIController {
+public class SwingController extends BaseCommandPlugin implements UIController,
+        ConfigChangeListener {
 
+    private static final org.slf4j.Logger log = LoggerFactory.getLogger(MainFrame.class);
     /** Top level window list. */
     private final List<java.awt.Window> windows;
     /** Error dialog. */
@@ -99,6 +104,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private SwingManager swingManager;
     /** This plugin's settings domain. */
     private final String domain;
+    /** Event bus to subscribe to events with. */
+    private final EventBus eventBus;
 
     /**
      * Instantiates a new SwingController.
@@ -117,6 +124,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final EventBus eventBus) {
         this.pluginInfo = pluginInfo;
         this.domain = pluginInfo.getDomain();
+        this.eventBus = eventBus;
 
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getUserSettings();
@@ -125,7 +133,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         iconManager = new IconManager(globalConfig, urlBuilder);
         setAntiAlias();
         windows = new ArrayList<>();
-        eventBus.register(this);
     }
 
     @Deprecated
@@ -266,13 +273,13 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     public void showURLDialog(final UnknownURLEvent event) {
         if (!event.isHandled()) {
             event.setHandled(true);
-        UIUtilities.invokeLater(new Runnable() {
+            UIUtilities.invokeLater(new Runnable() {
 
-            @Override
-            public void run() {
-                swingManager.getUrlDialogFactory().getURLDialog(event.getURI()).display();
-            }
-        });
+                @Override
+                public void run() {
+                    swingManager.getUrlDialogFactory().getURLDialog(event.getURI()).display();
+                }
+            });
         }
     }
 
@@ -339,6 +346,16 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             }
         });
 
+        addonIdentity.setOption("ui", "textPaneFontName",
+                UIManager.getFont("TextPane.font").getFamily());
+        addonIdentity.setOption("ui", "textPaneFontSize",
+                UIManager.getFont("TextPane.font").getSize());
+
+        eventBus.register(this);
+        globalConfig.addChangeListener("ui", "lookandfeel", this);
+        globalConfig.addChangeListener("ui", "textPaneFontName", this);
+        globalConfig.addChangeListener("ui", "textPaneFontSize", this);
+
         super.onLoad();
     }
 
@@ -347,6 +364,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         swingManager.unload();
 
         errorDialog.dispose();
+        eventBus.unregister(this);
+        globalConfig.removeListener(this);
 
         for (final java.awt.Window window : getTopLevelWindows()) {
             window.dispose();
@@ -354,14 +373,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         super.onUnload();
     }
 
-    @Override
-    public void domainUpdated() {
-        addonIdentity.setOption("ui", "textPaneFontName",
-                UIManager.getFont("TextPane.font").getFamily());
-        addonIdentity.setOption("ui", "textPaneFontSize",
-                UIManager.getFont("TextPane.font").getSize());
-    }
-
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         manager.getCategory("GUI").addSubCategory(createGeneralCategory());
@@ -657,4 +668,22 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return swingManager.getButtonProvider();
     }
 
+    @Override
+    public void configChanged(final String domain, final String key) {
+        switch (key) {
+            case "lookandfeel":
+                updateLookAndFeel();
+                break;
+            case "textPaneFontSize":
+            case "textPaneFontName":
+                final String font = globalConfig.getOptionString("ui", "textPaneFontName");
+                log.debug("Changing textpane font: {}", font);
+                UIUtilities.setUIFont(new Font(font, Font.PLAIN, 12));
+                updateComponentTrees();
+                break;
+            default:
+                break;
+        }
+    }
+
 }

src/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -59,7 +59,6 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.ServiceLocator;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.util.URLBuilder;
@@ -115,13 +114,11 @@ public class SwingModule {
     @Singleton
     public MainFrame getMainFrame(
             final Apple apple,
-            final SwingController swingController,
             final SwingWindowFactory windowFactory,
             final LifecycleController lifecycleController,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final Provider<QuitWorker> quitWorker,
             final URLBuilder urlBuilder,
-            final WindowManager windowManager,
             final Provider<FrameManager> frameManagerProvider,
             final EventBus eventBus) {
         return UIUtilities.invokeAndWait(new Callable<MainFrame>() {
@@ -130,13 +127,11 @@ public class SwingModule {
             public MainFrame call() {
                 return new MainFrame(
                         apple,
-                        swingController,
                         windowFactory,
                         lifecycleController,
                         globalConfig,
                         quitWorker,
                         new IconManager(globalConfig, urlBuilder),
-                        windowManager,
                         frameManagerProvider,
                         eventBus);
             }