Remove some deprecations.

This also fixes the param mode panel incorrectly using the global config.
Up until now it was using the global config, so only default mode aliases
would have been available, not ircd/network-specific ones.

Fortunately there aren't many param modes...

Conflicts:
        src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java
        src/com/dmdirc/addons/ui_swing/components/modes/UserModesPane.java

Change-Id: Ibe0986050b67264238b34abedd95f84afab5e959
Fixes-issue: CLIENT-481
Reviewed-on: http://gerrit.dmdirc.com/3280
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Reviewed-on: http://gerrit.dmdirc.com/3341

src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.modes;
 
 import com.dmdirc.Channel;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.parser.interfaces.Parser;
 
 /** Non list mode panel. */
@@ -33,20 +32,15 @@ public final class ChannelModesPane extends ModesPane {
     private static final long serialVersionUID = 1;
     /** Parent channel. */
     private final Channel channel;
-    /** Swing controller. */
-    private final SwingController controller;
 
     /**
      * Creates a new instance of ChannelModesPane.
      *
-     * @param controller Swing controller
-     * @param channel    Parent channel
+     * @param channel Parent channel
      */
-    public ChannelModesPane(final SwingController controller,
-            final Channel channel) {
-        super();
+    public ChannelModesPane(final Channel channel) {
+        super(channel.getConfigManager(), channel.getIconManager());
 
-        this.controller = controller;
         this.channel = channel;
         initModesPanel();
     }
@@ -54,8 +48,7 @@ public final class ChannelModesPane extends ModesPane {
     /** {@inheritDoc} */
     @Override
     public boolean hasModeValue(final String mode) {
-        return channel.getConfigManager().hasOptionString("server", "mode"
-                + mode);
+        return channel.getConfigManager().hasOptionString("server", "mode" + mode);
     }
 
     /** {@inheritDoc} */
@@ -124,10 +117,4 @@ public final class ChannelModesPane extends ModesPane {
         channel.getChannelInfo().flushModes();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public SwingController getSwingController() {
-        return controller;
-    }
-
 }

src/com/dmdirc/addons/ui_swing/components/modes/ModesPane.java

@@ -22,9 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.components.modes;
 
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.Insets;
 import java.util.HashMap;
@@ -56,10 +57,16 @@ public abstract class ModesPane extends JPanel {
     private final JPanel paramModesPanel;
     /** Modes set, used for layout. */
     private final Set<String> modes;
+    /** The config to read mode aliases information from. */
+    private final AggregateConfigProvider config;
+    /** The manager to use to retrieve validation error icons. */
+    private final IconManager iconManager;
 
-    public ModesPane() {
-        super();
-
+    /**
+     * @param config      The config to read mode aliases information from.
+     * @param iconManager The manager to use to retrieve validation error icons.
+     */
+    public ModesPane(final AggregateConfigProvider config, final IconManager iconManager) {
         setLayout(new MigLayout("fill, wmax 100%, wrap 1"));
         booleanModesPanel = new JPanel(new MigLayout("wrap 2"));
         paramModesPanel = new JPanel(new MigLayout("wrap 2"));
@@ -67,6 +74,8 @@ public abstract class ModesPane extends JPanel {
         modeCheckBoxes = new HashMap<>();
         modeInputs = new HashMap<>();
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
+        this.config = config;
+        this.iconManager = iconManager;
     }
 
     public Map<String, JCheckBox> getBooleanModes() {
@@ -112,8 +121,8 @@ public abstract class ModesPane extends JPanel {
             final boolean state = ourBooleanModes.split(" ")[0].contains(
                     mode.subSequence(0, 1));
 
-            final ParamModePanel panel = new ParamModePanel(mode, state, value,
-                    getSwingController());
+            final ParamModePanel panel = new ParamModePanel(config, iconManager, mode,
+                    state, value);
 
             getParamModes().put(mode, panel);
         }
@@ -236,13 +245,6 @@ public abstract class ModesPane extends JPanel {
         }
     }
 
-    /**
-     * Returns the Swing controller to grab various objects from.
-     *
-     * @return Swing controller
-     */
-    public abstract SwingController getSwingController();
-
     /**
      * Checks whether there is a plain text description for this mode.
      *

src/com/dmdirc/addons/ui_swing/components/modes/ParamModePanel.java

@@ -22,9 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.components.modes;
 
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.validators.RegexStringValidator;
 
 import java.awt.Component;
@@ -60,21 +61,25 @@ public final class ParamModePanel extends JPanel implements ActionListener {
     /**
      * Creates a new instance of ParamModePanel.
      *
-     * @param thisMode   The mode that this panel should deal with
-     * @param state      The current state of the mode
-     * @param value      The current value of the mode
-     * @param controller Swing controller to gain access to settings/icons
+     * @param config      The config to read mode aliases information from.
+     * @param iconManager The manager to use to retrieve validation error icons.
+     * @param thisMode    The mode that this panel should deal with
+     * @param state       The current state of the mode
+     * @param value       The current value of the mode
      */
-    public ParamModePanel(final String thisMode, final boolean state,
-            final String value, final SwingController controller) {
+    public ParamModePanel(
+            final AggregateConfigProvider config,
+            final IconManager iconManager,
+            final String thisMode,
+            final boolean state,
+            final String value) {
         super();
         this.mode = thisMode;
         this.originalValue = value;
         String text;
         String tooltip;
-        if (controller.getGlobalConfig().hasOptionString("server", "mode" + mode)) {
-            tooltip = "Mode " + mode + ": " + controller.getGlobalConfig()
-                    .getOption("server", "mode" + mode);
+        if (config.hasOptionString("server", "mode" + mode)) {
+            tooltip = "Mode " + mode + ": " + config.getOption("server", "mode" + mode);
         } else {
             tooltip = "Mode " + mode + ": Unknown";
         }
@@ -83,8 +88,8 @@ public final class ParamModePanel extends JPanel implements ActionListener {
 
         text = "Mode " + mode + ": ";
 
-        if (controller.getGlobalConfig().hasOptionString("server", "mode" + mode)) {
-            text = controller.getGlobalConfig().getOption("server", "mode" + mode)
+        if (config.hasOptionString("server", "mode" + mode)) {
+            text = config.getOption("server", "mode" + mode)
                     + " [+" + mode + "]: ";
         }
 
@@ -93,7 +98,7 @@ public final class ParamModePanel extends JPanel implements ActionListener {
         checkBox.setOpaque(UIUtilities.getTabbedPaneOpaque());
         add(checkBox);
 
-        textField = new ValidatingJTextField(controller.getIconManager(),
+        textField = new ValidatingJTextField(iconManager,
                 new RegexStringValidator("^[^ ]*$", "Cannot contain spaces"));
         textField.setText(value);
         add(textField, "growx, pushx");

src/com/dmdirc/addons/ui_swing/components/modes/UserModesPane.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.modes;
 
 import com.dmdirc.Server;
-import com.dmdirc.addons.ui_swing.SwingController;
 
 /** User mode panel. */
 public final class UserModesPane extends ModesPane {
@@ -36,20 +35,15 @@ public final class UserModesPane extends ModesPane {
     private static final long serialVersionUID = 1;
     /** Parent server. */
     private final Server server;
-    /** Swing controller. */
-    private final SwingController controller;
 
     /**
      * Creates a new instance of UserModesPane.
      *
-     * @param controller Swing controller
-     * @param server     Parent server
+     * @param server Parent server
      */
-    public UserModesPane(final SwingController controller,
-            final Server server) {
-        super();
+    public UserModesPane(final Server server) {
+        super(server.getConfigManager(), server.getIconManager());
 
-        this.controller = controller;
         this.server = server;
         initModesPanel();
     }
@@ -116,10 +110,4 @@ public final class UserModesPane extends ModesPane {
         server.getParser().getLocalClient().flushModes();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public SwingController getSwingController() {
-        return controller;
-    }
-
 }

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

@@ -25,19 +25,16 @@ package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 import com.dmdirc.Channel;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 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;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -74,16 +71,10 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     private TopicPane topicModesPane;
     /** List modes panel. */
     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. */
-    private final IconManager iconManager;
     /** Preferences Manager. */
     private final PreferencesManager preferencesManager;
     /** Preferences setting component factory. */
@@ -92,11 +83,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     /**
      * Creates a new instance of ChannelSettingsDialog.
      *
-     * @param controller         Swing controller
      * @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
@@ -105,11 +93,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
      * @param parentWindow       Parent window
      */
     public ChannelSettingsDialog(
-            final SwingController controller,
             final IdentityFactory identityFactory,
             final SwingWindowFactory windowFactory,
-            final IconManager iconManager,
-            final AggregateConfigProvider globalConfig,
             final ConfigProvider userConfig,
             final ServiceManager serviceManager,
             final PreferencesManager preferencesManager,
@@ -118,9 +103,6 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
             final MainFrame parentWindow) {
         super(parentWindow, ModalityType.MODELESS);
 
-        this.controller = checkNotNull(controller);
-        this.iconManager = checkNotNull(iconManager);
-        this.globalConfig = checkNotNull(globalConfig);
         this.userConfig = checkNotNull(userConfig);
         this.serviceManager = checkNotNull(serviceManager);
         this.preferencesManager = checkNotNull(preferencesManager);
@@ -165,13 +147,14 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
 
     /** Initialises the Topic tab. */
     private void initTopicTab() {
-        topicModesPane = new TopicPane(channel, iconManager, serviceManager, this, channelWindow);
+        topicModesPane = new TopicPane(channel, channel.getIconManager(), serviceManager,
+                this, channelWindow);
         tabbedPane.addTab("Topic", topicModesPane);
     }
 
     /** Initialises the IRC Settings tab. */
     private void initIrcTab() {
-        channelModesPane = new ChannelModesPane(controller, channel);
+        channelModesPane = new ChannelModesPane(channel);
 
         final JScrollPane channelModesSP = new JScrollPane(channelModesPane);
         channelModesSP.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
@@ -184,8 +167,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
 
     /** Initialises the IRC Settings tab. */
     private void initListModesTab() {
-        channelListModesPane = new ChannelListModesPane(globalConfig, userConfig, iconManager,
-                channel, this);
+        channelListModesPane = new ChannelListModesPane(channel.getConfigManager(), userConfig,
+                channel.getIconManager(), channel, this);
         tabbedPane.addTab("List Modes", channelListModesPane);
     }
 
@@ -198,7 +181,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
 
     /** Initialises the channel settings. */
     private void initSettingsPanel() {
-        channelSettingsPane = new SettingsPanel(iconManager, compFactory,
+        channelSettingsPane = new SettingsPanel(channel.getIconManager(), compFactory,
                 "These settings are specific to this channel on this network,"
                 + " any settings specified here will overwrite global settings");
         channelSettingsPane.addOption(preferencesManager.getChannelSettings(

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -27,7 +27,6 @@ import com.dmdirc.ServerState;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.modes.UserModesPane;
@@ -36,7 +35,6 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -72,16 +70,12 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
     /**
      * Creates a new instance of ServerSettingsDialog.
      *
-     * @param controller     Swing controller
-     * @param iconManager    Icon manager
      * @param compFactory    Preferences setting component factory
      * @param performWrapper Wrapper for the perform tab.
      * @param server         The server object that we're editing settings for
      * @param parentWindow   Parent window
      */
     public ServerSettingsDialog(
-            final SwingController controller,
-            final IconManager iconManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
             final Server server,
@@ -93,35 +87,34 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
         setTitle("Server settings");
         setResizable(false);
 
-        initComponents(controller, parentWindow, iconManager, server.getConfigManager(),
-                compFactory);
+        initComponents(parentWindow, server.getConfigManager(), compFactory);
         initListeners();
     }
 
     /**
      * Initialises the main UI components.
      *
-     * @param controller  Swing controller
-     * @param iconManager Icon manager
-     *
-     * @config Config to read from
-     * @param compFactory Preferences setting component factory
+     * @param parentWindow The window that owns this dialog
+     * @param config       Config to read from
+     * @param compFactory  Preferences setting component factory
      */
-    private void initComponents(final SwingController controller, final MainFrame parentWindow,
-            final IconManager iconManager, final AggregateConfigProvider config,
+    private void initComponents(
+            final MainFrame parentWindow,
+            final AggregateConfigProvider config,
             final PrefsComponentFactory compFactory) {
         orderButtons(new JButton(), new JButton());
 
         tabbedPane = new JTabbedPane();
 
-        modesPanel = new UserModesPane(controller, server);
+        modesPanel = new UserModesPane(server);
 
-        ignoreList = new IgnoreListPanel(iconManager, server, parentWindow);
+        ignoreList = new IgnoreListPanel(server.getIconManager(), server, parentWindow);
 
-        performPanel = new PerformTab(iconManager, config, performWrapper, server);
+        performPanel = new PerformTab(server.getIconManager(), config, performWrapper, server);
 
-        settingsPanel = new SettingsPanel(iconManager, compFactory, "These settings are specific"
-                + " to this network, any settings specified here will overwrite global settings");
+        settingsPanel = new SettingsPanel(server.getIconManager(), compFactory,
+                "These settings are specific to this network, any settings specified here will "
+                + "overwrite global settings");
 
         if (settingsPanel != null) {
             addSettings();

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

@@ -23,13 +23,11 @@
 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;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
@@ -44,11 +42,9 @@ 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;
 
 import javax.inject.Provider;
 import javax.inject.Qualifier;
@@ -122,16 +118,13 @@ public class DialogModule {
     @Provides
     @Singleton
     public KeyedDialogProvider<Server, ServerSettingsDialog> getServerSettingsDialogProvider(
-            final SwingController controller,
-            @GlobalConfig final IconManager iconManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
             final MainFrame parentWindow) {
         return new KeyedDialogProvider<Server, ServerSettingsDialog>() {
             @Override
             protected ServerSettingsDialog getInstance(final Server key) {
-                return new ServerSettingsDialog(controller, iconManager, compFactory,
-                        performWrapper, key, parentWindow);
+                return new ServerSettingsDialog(compFactory, performWrapper, key, parentWindow);
             }
         };
     }
@@ -139,11 +132,8 @@ public class DialogModule {
     @Provides
     @Singleton
     public KeyedDialogProvider<Channel, ChannelSettingsDialog> getChannelSettingsDialogProvider(
-            final SwingController controller,
             final IdentityFactory identityFactory,
             final SwingWindowFactory windowFactory,
-            @GlobalConfig final IconManager iconManager,
-            @GlobalConfig final AggregateConfigProvider globalConfig,
             @UserConfig final ConfigProvider userConfig,
             final ServiceManager serviceManager,
             final PreferencesManager preferencesManager,
@@ -152,8 +142,8 @@ public class DialogModule {
         return new KeyedDialogProvider<Channel, ChannelSettingsDialog>() {
             @Override
             protected ChannelSettingsDialog getInstance(final Channel key) {
-                return new ChannelSettingsDialog(controller, identityFactory, windowFactory,
-                        iconManager, globalConfig, userConfig, serviceManager, preferencesManager,
+                return new ChannelSettingsDialog(identityFactory, windowFactory,
+                        userConfig, serviceManager, preferencesManager,
                         compFactory, key, parentWindow);
             }
         };