Remove some depecation warnings, lombok some code.

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

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

@@ -38,7 +38,6 @@ import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
@@ -65,6 +64,7 @@ import javax.swing.MenuSelectionManager;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
+import lombok.Getter;
 import net.miginfocom.swing.MigLayout;
 
 /**
@@ -107,6 +107,7 @@ public final class MainFrame extends JFrame implements WindowListener,
     /** Exit code. */
     private int exitCode = 0;
     /** Status bar. */
+    @Getter
     private SwingStatusBar statusBar;
     /** Main split pane. */
     private SplitPane mainSplitPane;
@@ -126,27 +127,27 @@ public final class MainFrame extends JFrame implements WindowListener,
         focusOrder = new QueuedLinkedHashSet<TextFrame>();
         initComponents();
 
-        imageIcon = new ImageIcon(new IconManager(IdentityManager
-                .getGlobalConfig()).getImage("icon"));
+        imageIcon = new ImageIcon(new IconManager(controller.getGlobalConfig())
+                .getImage("icon"));
         setIconImage(imageIcon.getImage());
 
         CoreUIUtils.centreWindow(this);
 
         addWindowListener(this);
 
-        showVersion = IdentityManager.getGlobalConfig().getOptionBool("ui",
+        showVersion = controller.getGlobalConfig().getOptionBool("ui",
                 "showversion");
-        version = IdentityManager.getGlobalConfig().getOption("version",
+        version = controller.getGlobalConfig().getOption("version",
                 "version");
-        IdentityManager.getGlobalConfig().addChangeListener("ui", "lookandfeel",
+        controller.getGlobalConfig().addChangeListener("ui", "lookandfeel",
                 this);
-        IdentityManager.getGlobalConfig().addChangeListener("ui", "showversion",
+        controller.getGlobalConfig().addChangeListener("ui", "showversion",
                 this);
-        IdentityManager.getGlobalConfig().addChangeListener("ui",
+        controller.getGlobalConfig().addChangeListener("ui",
                 "framemanager", this);
-        IdentityManager.getGlobalConfig().addChangeListener("ui",
+        controller.getGlobalConfig().addChangeListener("ui",
                 "framemanagerPosition", this);
-        IdentityManager.getGlobalConfig().addChangeListener("icon", "icon",
+        controller.getGlobalConfig().addChangeListener("icon", "icon",
                 this);
 
 
@@ -175,15 +176,6 @@ public final class MainFrame extends JFrame implements WindowListener,
         frameManager = new CtrlTabWindowManager(controller, this, rootPane);
     }
 
-    /**
-     * Returns the status bar for this frame.
-     *
-     * @return Status bar
-     */
-    public SwingStatusBar getStatusBar() {
-        return statusBar;
-    }
-
     /**
      * Returns the size of the frame manager.
      *
@@ -337,11 +329,11 @@ public final class MainFrame extends JFrame implements WindowListener,
                     controller.getWindowFactory().removeWindowListener(
                             mainFrameManager);
                 }
-                final String manager = IdentityManager.getGlobalConfig().
-                        getOption("ui", "framemanager");
+                final String manager = controller.getGlobalConfig()
+                        .getOption("ui", "framemanager");
                 try {
-                    mainFrameManager = (FrameManager) Class.forName(manager).
-                            getConstructor().newInstance();
+                    mainFrameManager = (FrameManager) Class.forName(manager)
+                            .getConstructor().newInstance();
                 } catch (InvocationTargetException ex) {
                     Logger.appError(ErrorLevel.MEDIUM, "Unable to load frame "
                             + "manager, falling back to default.", ex);
@@ -421,10 +413,10 @@ public final class MainFrame extends JFrame implements WindowListener,
      * @return Returns the initialised split pane
      */
     private SplitPane initSplitPane() {
-        final SplitPane splitPane = new SplitPane(SplitPane
-                .Orientation.HORIZONTAL);
-        position = FramemanagerPosition.getPosition(IdentityManager.
-                getGlobalConfig().getOption("ui", "framemanagerPosition"));
+        final SplitPane splitPane = new SplitPane(controller.getGlobalConfig(),
+                SplitPane.Orientation.HORIZONTAL);
+        position = FramemanagerPosition.getPosition(controller
+                .getGlobalConfig().getOption("ui", "framemanagerPosition"));
 
         if (position == FramemanagerPosition.UNKNOWN) {
             position = FramemanagerPosition.LEFT;
@@ -448,7 +440,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 splitPane.setResizeWeight(0.0);
                 splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        Integer.MAX_VALUE, IdentityManager.getGlobalConfig().
+                        Integer.MAX_VALUE, controller.getGlobalConfig().
                         getOptionInt("ui", "frameManagerSize")));
                 break;
             case LEFT:
@@ -457,7 +449,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 splitPane.setResizeWeight(0.0);
                 splitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        IdentityManager.getGlobalConfig().getOptionInt("ui",
+                        controller.getGlobalConfig().getOptionInt("ui",
                         "frameManagerSize"), Integer.MAX_VALUE));
                 break;
             case BOTTOM:
@@ -466,7 +458,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 splitPane.setResizeWeight(1.0);
                 splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        Integer.MAX_VALUE, IdentityManager.getGlobalConfig().
+                        Integer.MAX_VALUE, controller.getGlobalConfig().
                         getOptionInt("ui", "frameManagerSize")));
                 break;
             case RIGHT:
@@ -475,7 +467,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 splitPane.setResizeWeight(1.0);
                 splitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        IdentityManager.getGlobalConfig().getOptionInt("ui",
+                        controller.getGlobalConfig().getOptionInt("ui",
                         "frameManagerSize"), Integer.MAX_VALUE));
                 break;
             default:
@@ -498,7 +490,7 @@ public final class MainFrame extends JFrame implements WindowListener,
      * @param exitCode Exit code
      */
     public void quit(final int exitCode) {
-        if (exitCode == 0 && IdentityManager.getGlobalConfig().getOptionBool(
+        if (exitCode == 0 && controller.getGlobalConfig().getOptionBool(
                 "ui", "confirmQuit")) {
             final StandardQuestionDialog dialog = new ConfirmQuitDialog(this) {
 
@@ -538,9 +530,9 @@ public final class MainFrame extends JFrame implements WindowListener,
             protected Void doInBackground() {
                 ActionManager.getActionManager().triggerEvent(
                         CoreActionType.CLIENT_CLOSING, null);
-                ServerManager.getServerManager().closeAll(IdentityManager.
-                        getGlobalConfig().getOption("general", "closemessage"));
-                IdentityManager.getConfigIdentity().setOption("ui",
+                ServerManager.getServerManager().closeAll(controller
+                        .getGlobalConfig().getOption("general", "closemessage"));
+                controller.getGlobalIdentity().setOption("ui",
                         "frameManagerSize",
                         String.valueOf(getFrameManagerSize()));
                 return null;
@@ -577,12 +569,12 @@ public final class MainFrame extends JFrame implements WindowListener,
                     }
                 });
             } else {
-                showVersion = IdentityManager.getGlobalConfig().getOptionBool(
+                showVersion = controller.getGlobalConfig().getOptionBool(
                         "ui", "showversion");
             }
         } else {
-            imageIcon = new ImageIcon(new IconManager(IdentityManager
-                    .getGlobalConfig()).getImage("icon"));
+            imageIcon = new ImageIcon(new IconManager(controller
+                        .getGlobalConfig()).getImage("icon"));
             UIUtilities.invokeLater(new Runnable() {
 
                 /** {@inheritDoc} */
@@ -735,7 +727,7 @@ public final class MainFrame extends JFrame implements WindowListener,
         if (!quitting) {
             removeWindowListener(this);
         }
-        IdentityManager.getGlobalConfig().removeListener(this);
+        controller.getGlobalConfig().removeListener(this);
         super.dispose();
     }
 }

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

@@ -38,6 +38,7 @@ import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -78,11 +79,13 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.UIManager.LookAndFeelInfo;
 
+import lombok.Getter;
 import net.miginfocom.layout.PlatformDefaults;
 
 /**
  * Controls the main swing UI.
  */
+@SuppressWarnings("PMD.UnusedPrivateField")
 public class SwingController extends BasePlugin implements UIController {
 
     /**
@@ -93,16 +96,20 @@ public class SwingController extends BasePlugin implements UIController {
     private static final long serialVersionUID = 1;
 
     /** Window factory. */
+    @Getter
     private final SwingWindowFactory windowFactory =
             new SwingWindowFactory(this);
     /** Waiting on mainframe creation. */
     private final AtomicBoolean mainFrameCreated = new AtomicBoolean(false);
     /** URL Handler to use. */
-    private final URLHandler urlHandler = new URLHandler(this);
+    @Getter
+    private final URLHandler URLHandler = new URLHandler(this);
     /** Singleton instance of MainFrame. */
-    private MainFrame me;
+    @Getter
+    private MainFrame mainFrame;
     /** Status bar. */
-    private SwingStatusBar statusBar;
+    @Getter
+    private SwingStatusBar swingStatusBar;
     /** Top level window list. */
     private final List<java.awt.Window> windows;
     /** Error dialog. */
@@ -113,6 +120,15 @@ public class SwingController extends BasePlugin implements UIController {
     private DialogKeyListener keyListener;
     /** This plugin's plugin info object. */
     private final PluginInfo pluginInfo;
+    /** Global config manager. */
+    @Getter
+    private final ConfigManager globalConfig;
+    /** Global config identity. */
+    @Getter
+    private final Identity globalIdentity;
+    /** Addon config identity. */
+    @Getter
+    private final Identity addonIdentity;
 
     /**
      * Instantiates a new SwingController.
@@ -122,6 +138,12 @@ public class SwingController extends BasePlugin implements UIController {
     public SwingController(final PluginInfo pluginInfo) {
         super();
         this.pluginInfo = pluginInfo;
+        globalConfig = IdentityManager.getIdentityManager()
+                .getGlobalConfiguration();
+        globalIdentity = IdentityManager.getIdentityManager()
+                .getGlobalConfigIdentity();
+        addonIdentity = IdentityManager.getIdentityManager()
+                .getGlobalAddonIdentity();
         setAntiAlias();
         windows = new ArrayList<java.awt.Window>();
         registerCommand(new ServerSettings(), ServerSettings.INFO);
@@ -136,8 +158,8 @@ public class SwingController extends BasePlugin implements UIController {
      */
     public final void setAntiAlias() {
         // For this to work it *HAS* to be before anything else UI related.
-        final boolean aaSetting = IdentityManager.getGlobalConfig().
-                getOptionBool("ui", "antialias");
+        final boolean aaSetting = getGlobalConfig()
+                .getOptionBool("ui", "antialias");
         System.setProperty("awt.useSystemAAFontSettings",
                 Boolean.toString(aaSetting));
         System.setProperty("swing.aatext", Boolean.toString(aaSetting));
@@ -152,44 +174,6 @@ public class SwingController extends BasePlugin implements UIController {
         return mainFrameCreated.get();
     }
 
-    /**
-     * Returns a URL Handler which may be used when working with the Swing UI.
-     *
-     * @return A URL handler for use with the swing UI
-     * @since 0.6.5
-     */
-    public URLHandler getURLHandler() {
-        return urlHandler;
-    }
-
-    /**
-     * Returns the window factory used by this controller.
-     *
-     * @return This controller's window factory
-     * @since 0.6.4
-     */
-    public SwingWindowFactory getWindowFactory() {
-        return windowFactory;
-    }
-
-    /**
-     * Retrieves the main window used by this UI.
-     *
-     * @return This UI's main window
-     */
-    public MainFrame getMainFrame() {
-        return me;
-    }
-
-    /**
-     * Retrieves the Swing Status Bar used by this UI.
-     *
-     * @return This UI's status bar
-     */
-    public SwingStatusBar getSwingStatusBar() {
-        return statusBar;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showFirstRunWizard() {
@@ -213,8 +197,8 @@ public class SwingController extends BasePlugin implements UIController {
                         semaphore.release();
                     }
                 };
-                final SwingFirstRunWizard wizard = new SwingFirstRunWizard(me,
-                        SwingController.this);
+                final SwingFirstRunWizard wizard = new SwingFirstRunWizard(
+                        getMainFrame(), SwingController.this);
                 wizard.getWizardDialog().addWizardListener(listener);
                 wizard.display();
             }
@@ -230,9 +214,9 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                ChannelSettingsDialog.showChannelSettingsDialog(channel, me,
-                        (InputWindow) getWindowFactory().getSwingWindow(
-                        channel));
+                ChannelSettingsDialog.showChannelSettingsDialog(channel,
+                        getMainFrame(), (InputWindow) getWindowFactory()
+                        .getSwingWindow(channel));
             }
         });
     }
@@ -245,7 +229,8 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                ServerSettingsDialog.showServerSettingsDialog(server, me);
+                ServerSettingsDialog.showServerSettingsDialog(
+                        server, getMainFrame());
             }
         });
     }
@@ -255,7 +240,7 @@ public class SwingController extends BasePlugin implements UIController {
      */
     public void updateLookAndFeel() {
         try {
-            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(IdentityManager.
+            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(
                     getGlobalConfig().getOption("ui", "lookandfeel")));
             final int state = UIUtilities.invokeAndWait(
                     new ReturnableThread<Integer>() {
@@ -263,7 +248,7 @@ public class SwingController extends BasePlugin implements UIController {
                 /** {@inheritDoc} */
                 @Override
                 public void run() {
-                    setObject(me.getExtendedState());
+                    setObject(getMainFrame().getExtendedState());
                 }
             });
             UIUtilities.invokeLater(new Runnable() {
@@ -281,7 +266,7 @@ public class SwingController extends BasePlugin implements UIController {
                     @Override
                     public void run() {
                         SwingUtilities.updateComponentTreeUI(window);
-                        if (window != me) {
+                        if (window != getMainFrame()) {
                             window.pack();
                         }
                     }
@@ -292,7 +277,7 @@ public class SwingController extends BasePlugin implements UIController {
                 /** {@inheritDoc} */
                 @Override
                 public void run() {
-                    me.setExtendedState(state);
+                    getMainFrame().setExtendedState(state);
                 }
             });
         } catch (ClassNotFoundException ex) {
@@ -332,7 +317,7 @@ public class SwingController extends BasePlugin implements UIController {
 
         try {
             UIUtilities.initUISettings();
-            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(IdentityManager.
+            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(
                     getGlobalConfig().getOption("ui", "lookandfeel")));
         } catch (UnsupportedOperationException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
@@ -360,7 +345,7 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                URLDialog.showURLDialog(url, me, urlHandler);
+                URLDialog.showURLDialog(url, getMainFrame(), getURLHandler());
 
             }
         });
@@ -387,8 +372,8 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                new StandardMessageDialog(me, ModalityType.MODELESS, title,
-                        message).display();
+                new StandardMessageDialog(getMainFrame(), ModalityType.MODELESS,
+                        title, message).display();
             }
         });
     }
@@ -443,13 +428,13 @@ public class SwingController extends BasePlugin implements UIController {
             @Override
             public void run() {
                 initUISettings();
-                me = new MainFrame(SwingController.this);
-                me.setVisible(true);
+                mainFrame = new MainFrame(SwingController.this);
+                getMainFrame().setVisible(true);
                 mainFrameCreated.set(true);
-                statusBar = me.getStatusBar();
-                errorDialog = new ErrorListDialog(me);
+                swingStatusBar = getMainFrame().getStatusBar();
+                errorDialog = new ErrorListDialog(getMainFrame());
                 StatusBarManager.getStatusBarManager().registerStatusBar(
-                        statusBar);
+                        getSwingStatusBar());
             }
         });
 
@@ -467,9 +452,10 @@ public class SwingController extends BasePlugin implements UIController {
         errorDialog.dispose();
         WindowManager.getWindowManager().removeListener(windowFactory);
         mainFrameCreated.set(false);
-        me.dispose();
+        getMainFrame().dispose();
         windowFactory.dispose();
-        StatusBarManager.getStatusBarManager().registerStatusBar(statusBar);
+        StatusBarManager.getStatusBarManager()
+                .registerStatusBar(getSwingStatusBar());
         eventQueue.pop();
         KeyboardFocusManager.getCurrentKeyboardFocusManager().
                 removeKeyEventDispatcher(keyListener);
@@ -482,10 +468,9 @@ public class SwingController extends BasePlugin implements UIController {
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        final Identity defaults = IdentityManager.getAddonIdentity();
-        defaults.setOption("ui", "textPaneFontName",
+        getAddonIdentity().setOption("ui", "textPaneFontName",
                 UIManager.getFont("TextPane.font").getFamily());
-        defaults.setOption("ui", "textPaneFontSize",
+        getAddonIdentity().setOption("ui", "textPaneFontSize",
                 UIManager.getFont("TextPane.font").getSize());
     }
 
@@ -741,7 +726,7 @@ public class SwingController extends BasePlugin implements UIController {
      * @param menuItem Menu item to add
      */
     public void addMenuItem(final String parentMenu, final JMenuItem menuItem) {
-        me.getJMenuBar().addMenuItem(parentMenu, menuItem);
+        getMainFrame().getJMenuBar().addMenuItem(parentMenu, menuItem);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/SplitPane.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 
 import java.awt.Component;
@@ -59,38 +58,42 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     /**
      * Instantiates a new snapping split pane. Defaults to using a horizontal
      * split, two null components and snapping to the left component.
+     *
+     * @param manager Config manager to read values from
      */
-    public SplitPane() {
-        this(Orientation.HORIZONTAL, null, null);
+    public SplitPane(final ConfigManager manager) {
+        this(manager, Orientation.HORIZONTAL, null, null);
     }
 
     /**
      * Instantiates a new snapping split pane. Defaults to using a horizontal
      * split, two null components and snapping to the left component.
      *
+     * @param manager Config manager to read values from
      * @param orientation Split pane orientation
      */
-    public SplitPane(final Orientation orientation) {
-        this(orientation, null, null);
+    public SplitPane(final ConfigManager manager, final Orientation orientation) {
+        this(manager, orientation, null, null);
     }
 
     /**
      * Instantiates a new snapping split pane. Defaults to using two null
      * components.
      *
+     * @param manager Config manager to read values from
      * @param orientation Split pane orientation
      * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
      * @param leftComponent left component
      * @param rightComponent right component
      */
-    public SplitPane(final Orientation orientation,
+    public SplitPane(final ConfigManager manager, final Orientation orientation,
             final Component leftComponent, final Component rightComponent) {
         super((orientation.equals(Orientation.HORIZONTAL))
                 ? HORIZONTAL_SPLIT : VERTICAL_SPLIT,
                 true, leftComponent, rightComponent);
 
-        config = IdentityManager.getGlobalConfig();
+        config = manager;
         useOneTouchExpandable = config.getOptionBool(
                 "ui", "useOneTouchExpandable");
 

src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

@@ -28,7 +28,6 @@ import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.SearchBar;
 import com.dmdirc.interfaces.ui.SearchBar.Direction;
@@ -70,7 +69,7 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
     /** Frame parent. */
     private final TextFrame parent;
     /** Close button. */
-    private ImageButton closeButton;
+    private ImageButton<Object> closeButton;
     /** Next match button. */
     private JButton nextButton;
     /** Previous match button. */
@@ -112,7 +111,7 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
 
     /** Initialises components. */
     private void initComponents() {
-        closeButton = new ImageButton("close",
+        closeButton = new ImageButton<Object>("close",
                 parent.getIconManager().getIcon("close-inactive"),
                 parent.getIconManager().getIcon("close-active"));
         nextButton = new JButton();
@@ -157,9 +156,9 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
         caseCheck.addActionListener(this);
         searchBox.getDocument().addDocumentListener(this);
 
-        IdentityManager.getGlobalConfig().addChangeListener(
+        parent.getController().getGlobalConfig().addChangeListener(
                 "ui", "backgroundcolour", this);
-        IdentityManager.getGlobalConfig().addChangeListener(
+        parent.getController().getGlobalConfig().addChangeListener(
                 "ui", "foregroundcolour", this);
     }
 
@@ -409,13 +408,13 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
     /** Sets the colours used in this document. */
     private void setColours() {
         searchBox.setForeground(UIUtilities.convertColour(
-                IdentityManager.getGlobalConfig().
+                parent.getController().getGlobalConfig().
                 getOptionColour("ui", "foregroundcolour")));
         searchBox.setBackground(UIUtilities.convertColour(
-                IdentityManager.getGlobalConfig().
+                parent.getController().getGlobalConfig().
                 getOptionColour("ui", "backgroundcolour")));
         searchBox.setCaretColor(UIUtilities.convertColour(
-                IdentityManager.getGlobalConfig().
+                parent.getController().getGlobalConfig().
                 getOptionColour("ui", "foregroundcolour")));
     }
 }

src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -130,7 +130,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         topicBar.setVisible(getContainer().getConfigManager().getOptionBool(
                 getController().getDomain(), "showtopicbar"));
 
-        splitPane = new SplitPane(SplitPane.Orientation.HORIZONTAL);
+        splitPane = new SplitPane(controller.getGlobalConfig(),
+                SplitPane.Orientation.HORIZONTAL);
 
         setLayout(new MigLayout("fill, ins 0, hidemode 3, wrap 1"));
 

src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -31,7 +31,6 @@ import com.dmdirc.addons.ui_swing.components.addonpanel.PluginPanel;
 import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.logger.ErrorLevel;
@@ -69,6 +68,8 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     private static final long serialVersionUID = 9;
     /** Previously instantiated instance of SwingPreferencesDialog. */
     private static volatile SwingPreferencesDialog me;
+    /** Parent UI Controller. */
+    private final SwingController controller;
     /** Preferences tab list, used to switch option types. */
     private JList tabList;
     /** Main panel. */
@@ -92,6 +93,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     private SwingPreferencesDialog(final SwingController controller) {
         super(controller.getMainFrame(), ModalityType.MODELESS);
 
+        this.controller = controller;
         this.parentWindow = controller.getMainFrame();
 
         initComponents();
@@ -272,7 +274,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             if (tabList.getSelectedIndex() > -1) {
                 final PreferencesCategory node = (PreferencesCategory) tabList.
                         getSelectedValue();
-                IdentityManager.getConfigIdentity().setOption("dialogstate",
+                controller.getGlobalIdentity().setOption("dialogstate",
                         "preferences", node.getPath());
             }
             saveOptions();
@@ -346,7 +348,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     }
 
     private void restoreActiveCategory() {
-        final String oldCategoryPath = IdentityManager.getGlobalConfig().
+        final String oldCategoryPath = controller.getGlobalConfig().
                 getOption("dialogstate", "preferences");
         final DefaultListModel model = (DefaultListModel) tabList.getModel();
         int indexToSelect = 0;