Tidy up the channel list modes pane.

Change-Id: Ifbe77fd01a01c4c3613515eb3499e803c9c236bd
Reviewed-on: http://gerrit.dmdirc.com/3133
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -143,11 +143,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return globalConfig;
     }
 
-    @Deprecated
-    public ConfigProvider getGlobalIdentity() {
-        return globalIdentity;
-    }
-
     @Deprecated
     public IconManager getIconManager() {
         return iconManager;

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -23,13 +23,15 @@
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.renderers.ExtendedListModeCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ListModeCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.parser.common.ChannelListModeItem;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.collections.MapList;
 import com.dmdirc.util.validators.NotEmptyValidator;
 
@@ -92,27 +94,39 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     private final JCheckBox toggle;
     /** Parent window. */
     private final Window parentWindow;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Native cell renderer. */
     private final ListCellRenderer nativeRenderer;
     /** Cell renderer. */
     private ListCellRenderer renderer;
     /** Mode list. */
     private JList list;
+    /** The config to read settings from. */
+    private final AggregateConfigProvider globalConfig;
+    /** The config to write settings to. */
+    private final ConfigProvider userConfig;
+    /** The manager to use to retrieve icons for dialogs and validation. */
+    private final IconManager iconManager;
 
     /**
      * Creates a new instance of ChannelListModePane.
      *
-     * @param controller   Swing controller
+     * @param globalConfig The config to read settings from.
+     * @param userConfig   The config to write settings to.
+     * @param iconManager  The manager to use to retrieve icons for dialogs and validation.
      * @param channel      Parent channel
      * @param parentWindow Parent window
      */
-    public ChannelListModesPane(final SwingController controller,
-            final Channel channel, final Window parentWindow) {
+    public ChannelListModesPane(
+            final AggregateConfigProvider globalConfig,
+            final ConfigProvider userConfig,
+            final IconManager iconManager,
+            final Channel channel,
+            final Window parentWindow) {
         super();
 
-        this.controller = controller;
+        this.globalConfig = globalConfig;
+        this.userConfig = userConfig;
+        this.iconManager = iconManager;
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.channel = channel;
         this.parentWindow = parentWindow;
@@ -134,8 +148,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         removeListModeButton = new JButton("Remove");
         removeListModeButton.setEnabled(false);
         modeCount = new JLabel();
-        toggle = new JCheckBox("Show extended information", channel.getConfigManager()
-                .getOptionBool("general", "extendedListModes"));
+        toggle = new JCheckBox("Show extended information",
+                channel.getConfigManager().getOptionBool("general", "extendedListModes"));
         toggle.setOpaque(UIUtilities.getTabbedPaneOpaque());
 
         initListModesPanel();
@@ -264,9 +278,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         }
 
         channel.getChannelInfo().flushModes();
-
-        controller.getGlobalIdentity().
-                setOption("general", "extendedListModes", toggle.isSelected());
+        userConfig.setOption("general", "extendedListModes", toggle.isSelected());
     }
 
     /** Adds a list mode. */
@@ -279,7 +291,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
                     getOption("server", "mode" + listModesArray[selectedIndex]);
         }
         new StandardInputDialog(parentWindow, ModalityType.DOCUMENT_MODAL,
-                controller.getIconManager(), "Add new " + modeText,
+                iconManager, "Add new " + modeText,
                 "Please enter the hostmask for the new " + modeText,
                 new NotEmptyValidator()) {
             /**
@@ -390,8 +402,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        if (controller.getGlobalConfig().getOptionBool("general",
-                "extendedListModes")) {
+        if (globalConfig.getOptionBool("general", "extendedListModes")) {
             renderer = new ListModeCellRenderer(nativeRenderer);
         } else {
             renderer = new ExtendedListModeCellRenderer();

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -32,6 +32,7 @@ import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.modes.ChannelModesPane;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.InputWindow;
@@ -73,6 +74,10 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     private ChannelListModesPane channelListModesPane;
     /** Swing controller. */
     private final SwingController controller;
+    /** The config to read settings from. */
+    private final AggregateConfigProvider globalConfig;
+    /** The config to write settings to. */
+    private final ConfigProvider userConfig;
     /** Service manager. */
     private final ServiceManager serviceManager;
     /** Icon manager. */
@@ -89,6 +94,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
      * @param identityFactory    Identity factory
      * @param windowFactory      Swing window factory
      * @param iconManager        Icon manager
+     * @param globalConfig       The config to read global settings from.
+     * @param userConfig         The config to write global settings to.
      * @param serviceManager     Service manager
      * @param preferencesManager Preferences Manager
      * @param compFactory        Preferences setting component factory
@@ -100,6 +107,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
             final IdentityFactory identityFactory,
             final SwingWindowFactory windowFactory,
             final IconManager iconManager,
+            final AggregateConfigProvider globalConfig,
+            final ConfigProvider userConfig,
             final ServiceManager serviceManager,
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
@@ -109,6 +118,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
 
         this.controller = controller;
         this.iconManager = iconManager;
+        this.userConfig = userConfig;
         this.serviceManager = serviceManager;
         this.preferencesManager = preferencesManager;
         this.compFactory = compFactory;
@@ -120,6 +130,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
 
         initComponents();
         initListeners();
+        this.globalConfig = globalConfig;
     }
 
     /** Initialises the main UI components. */
@@ -171,7 +182,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
 
     /** Initialises the IRC Settings tab. */
     private void initListModesTab() {
-        channelListModesPane = new ChannelListModesPane(controller, channel, this);
+        channelListModesPane = new ChannelListModesPane(globalConfig, userConfig, iconManager,
+                channel, this);
         tabbedPane.addTab("List Modes", channelListModesPane);
     }
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.injection;
 
 import com.dmdirc.Channel;
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.Server;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -43,6 +44,8 @@ import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.IconManager;
@@ -140,6 +143,8 @@ public class DialogModule {
             final IdentityFactory identityFactory,
             final SwingWindowFactory windowFactory,
             @GlobalConfig final IconManager iconManager,
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            @UserConfig final ConfigProvider userConfig,
             final ServiceManager serviceManager,
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
@@ -148,8 +153,8 @@ public class DialogModule {
             @Override
             protected ChannelSettingsDialog getInstance(final Channel key) {
                 return new ChannelSettingsDialog(controller, identityFactory, windowFactory,
-                        iconManager, serviceManager, preferencesManager, compFactory, key,
-                        parentWindow);
+                        iconManager, globalConfig, userConfig, serviceManager, preferencesManager,
+                        compFactory, key, parentWindow);
             }
         };
     }