Fix error trying to save CSD settings.

Because of the ordering of assignments in ChannelSettingsDialog's ctor,
we weren't assigning the global config before passing it in to the
list modes pane. This caused NPEs if toggling the 'show extended info'
option and saving.

Change-Id: I89f1ca9e29aa38fcf278e9afd2b9fbc214b4fbe3
Fixes-Issue: CLIENT-454
Reviewed-on: http://gerrit.dmdirc.com/3212
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -62,6 +62,8 @@ import javax.swing.event.ListSelectionListener;
 
 import net.miginfocom.swing.MigLayout;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /** List modes panel. */
 public final class ChannelListModesPane extends JPanel implements ActionListener,
         ListSelectionListener, ConfigChangeListener {
@@ -120,12 +122,12 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             final Window parentWindow) {
         super();
 
-        this.globalConfig = globalConfig;
-        this.userConfig = userConfig;
-        this.iconManager = iconManager;
+        this.globalConfig = checkNotNull(globalConfig);
+        this.userConfig = checkNotNull(userConfig);
+        this.iconManager = checkNotNull(iconManager);
+        this.channel = checkNotNull(channel);
+        this.parentWindow = checkNotNull(parentWindow);
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
-        this.channel = channel;
-        this.parentWindow = parentWindow;
 
         list = new JList<>();
         nativeRenderer = list.getCellRenderer();

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

@@ -49,6 +49,8 @@ import javax.swing.WindowConstants;
 
 import net.miginfocom.swing.MigLayout;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Allows the user to modify channel settings (modes, topics, etc).
  */
@@ -99,7 +101,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
      * @param serviceManager     Service manager
      * @param preferencesManager Preferences Manager
      * @param compFactory        Preferences setting component factory
-     * @param newChannel         The channel object that we're editing settings for
+     * @param channel            The channel object that we're editing settings for
      * @param parentWindow       Parent window
      */
     public ChannelSettingsDialog(
@@ -112,25 +114,25 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
             final ServiceManager serviceManager,
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
-            final Channel newChannel,
+            final Channel channel,
             final MainFrame parentWindow) {
         super(parentWindow, ModalityType.MODELESS);
 
-        this.controller = controller;
-        this.iconManager = iconManager;
-        this.userConfig = userConfig;
-        this.serviceManager = serviceManager;
-        this.preferencesManager = preferencesManager;
-        this.compFactory = compFactory;
+        this.controller = checkNotNull(controller);
+        this.iconManager = checkNotNull(iconManager);
+        this.globalConfig = checkNotNull(globalConfig);
+        this.userConfig = checkNotNull(userConfig);
+        this.serviceManager = checkNotNull(serviceManager);
+        this.preferencesManager = checkNotNull(preferencesManager);
+        this.compFactory = checkNotNull(compFactory);
+        this.channel = checkNotNull(channel);
 
-        channel = newChannel;
-        identity = identityFactory.createChannelConfig(channel.getConnection().getNetwork(),
+        this.identity = identityFactory.createChannelConfig(channel.getConnection().getNetwork(),
                 channel.getChannelInfo().getName());
-        this.channelWindow = (InputWindow) windowFactory.getSwingWindow(newChannel);
+        this.channelWindow = (InputWindow) windowFactory.getSwingWindow(channel);
 
         initComponents();
         initListeners();
-        this.globalConfig = globalConfig;
     }
 
     /** Initialises the main UI components. */