Fix URL panel.

Reading settings needed to be done from the global config to pick
the defaults, writing settings to the user config.

Change-Id: I626284ac3b5a70827d8872edbd488865b959f9c4
Fixes-Issue: CLIENT-457
Reviewed-on: http://gerrit.dmdirc.com/3209
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.dialogs.url.URLSubsitutionsPanel;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.ui.core.util.URLHandler;
 
@@ -53,8 +54,10 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** Config. */
-    private final ConfigProvider config;
+    /** Global config. */
+    private final AggregateConfigProvider globalConfig;
+    /** User settings. */
+    private final ConfigProvider userSettings;
     /** URL. */
     private final URI uri;
     /** Show insets? */
@@ -83,15 +86,19 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
     /**
      * Instantiates the URLDialog.
      *
-     * @param config    Configuration
-     * @param url       URL to open once added
-     * @param useInsets Show insets?
+     * @param globalConfig Global configuration
+     * @param userSettings User settings
+     * @param url          URL to open once added
+     * @param useInsets    Show insets?
      */
-    public URLProtocolPanel(final ConfigProvider config, final URI url,
+    public URLProtocolPanel(final AggregateConfigProvider globalConfig,
+            final ConfigProvider userSettings,
+            final URI url,
             final boolean useInsets) {
         super();
 
-        this.config = config;
+        this.globalConfig = globalConfig;
+        this.userSettings = userSettings;
         uri = url;
         this.useInsets = useInsets;
 
@@ -165,7 +172,7 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
 
     /** Saves the settings. */
     public void save() {
-        config.setOption("protocol", uri.getScheme().toLowerCase(), getSelection());
+        userSettings.setOption("protocol", uri.getScheme().toLowerCase(), getSelection());
     }
 
     /**
@@ -204,8 +211,8 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
      * Updates the selection.
      */
     public void updateSelection() {
-        if (uri != null && config.hasOptionString("protocol", uri.getScheme())) {
-            final String option = config.getOption("protocol", uri.getScheme());
+        if (uri != null && globalConfig.hasOptionString("protocol", uri.getScheme())) {
+            final String option = globalConfig.getOption("protocol", uri.getScheme());
             switch (option) {
                 case "DMDIRC":
                     optionType.setSelected(dmdirc.getModel(), true);

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

@@ -152,7 +152,7 @@ public class URLConfigPanel extends JPanel implements
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         table.getRowSorter().toggleSortOrder(0);
         details = new HashMap<>();
-        empty = new URLProtocolPanel(userConfig, null, true);
+        empty = new URLProtocolPanel(globalConfig, userConfig, null, true);
         activeComponent = empty;
         add = new JButton("Add");
         remove = new JButton("Remove");
@@ -166,7 +166,7 @@ public class URLConfigPanel extends JPanel implements
             try {
                 final URI uri = new URI(option + "://example.test.com");
                 model.addURI(uri);
-                details.put(uri, new URLProtocolPanel(userConfig, uri, true));
+                details.put(uri, new URLProtocolPanel(globalConfig, userConfig, uri, true));
             } catch (final URISyntaxException ex) {
                 //Ignore wont happen
             }
@@ -286,7 +286,7 @@ public class URLConfigPanel extends JPanel implements
                     try {
                         final URI uri = new URI(getText() + "://example.test.com");
                         model.addURI(uri);
-                        details.put(uri, new URLProtocolPanel(userConfig, uri, true));
+                        details.put(uri, new URLProtocolPanel(globalConfig, userConfig, uri, true));
                         return true;
                     } catch (final URISyntaxException ex) {
                         return false;

src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java

@@ -22,11 +22,13 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.url;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.util.annotations.factory.Factory;
@@ -62,12 +64,14 @@ public class URLDialog extends StandardDialog implements ActionListener {
      * Instantiates the URLDialog.
      *
      * @param url          URL to open once added
-     * @param config       Config
+     * @param global       Global Configuration
+     * @param config       User settings
      * @param parentWindow Parent window
      * @param urlHandler   The URL Handler to use to handle clicked links
      */
     public URLDialog(
             @Unbound final URI url,
+            @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider global,
             @SuppressWarnings("qualifiers") @UserConfig final ConfigProvider config,
             final MainFrame parentWindow,
             final URLHandler urlHandler) {
@@ -77,7 +81,7 @@ public class URLDialog extends StandardDialog implements ActionListener {
         this.parentWindow = parentWindow;
         this.urlHandler = urlHandler;
 
-        initComponents(config);
+        initComponents(global, config);
         layoutComponents();
         addListeners();
 
@@ -85,11 +89,11 @@ public class URLDialog extends StandardDialog implements ActionListener {
     }
 
     /** Initialises the components. */
-    private void initComponents(final ConfigProvider config) {
+    private void initComponents(final AggregateConfigProvider global, final ConfigProvider config) {
         orderButtons(new JButton(), new JButton());
         blurb = new TextLabel("Please select the appropriate action to " + "handle " + url.
                 getScheme() + ":// URLs from the list " + "below.");
-        panel = new URLProtocolPanel(config, url, false);
+        panel = new URLProtocolPanel(global, config, url, false);
     }
 
     /** Lays out the components. */