Add factory for SSL Cert dialog.

Remove some dependencies from TextFrameDependencies.

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

@@ -27,16 +27,13 @@ import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;
+import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialogFactory;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.ServerCertificateProblemEncounteredEvent;
 import com.dmdirc.events.ServerCertificateProblemResolvedEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
-
-import java.awt.Window;
 
 import javax.inject.Provider;
 import javax.swing.JMenuItem;
@@ -53,10 +50,6 @@ public final class ServerFrame extends InputTextFrame {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 9;
-    /** Main window provider. */
-    private final Provider<Window> mainWindow;
-    /** Icon manager. */
-    private final IconManager iconManager;
     /** Dialog provider to close SSD. */
     private final KeyedDialogProvider<Connection, ServerSettingsDialog> dialogProvider;
     /** popup menu item. */
@@ -65,6 +58,8 @@ public final class ServerFrame extends InputTextFrame {
     private SSLCertificateDialog sslDialog;
     /** Server instance. */
     private final Connection connection;
+    /** Factory to use to create SSL certificate dialogs. */
+    private final SSLCertificateDialogFactory sslDialogFactory;
 
     /**
      * Creates a new ServerFrame.
@@ -79,10 +74,10 @@ public final class ServerFrame extends InputTextFrame {
             final Provider<SwingInputField> inputFieldProvider,
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
             final KeyedDialogProvider<Connection, ServerSettingsDialog> dialogProvider,
+            final SSLCertificateDialogFactory sslDialogFactory,
             final Connection owner) {
         super(deps, inputFieldProvider, inputTextFramePasteActionFactory, owner.getWindowModel());
-        this.mainWindow = deps.mainWindow;
-        this.iconManager = deps.iconManager;
+        this.sslDialogFactory = sslDialogFactory;
         this.dialogProvider = dialogProvider;
         this.connection = owner;
         initComponents();
@@ -151,9 +146,7 @@ public final class ServerFrame extends InputTextFrame {
             sslDialog.dispose();
         }
 
-        sslDialog = new SSLCertificateDialog(iconManager, mainWindow.get(),
-                new SSLCertificateDialogModel(event.getCertificateChain(), event.getProblems(),
-                        event.getCertificateManager()));
+        sslDialog = sslDialogFactory.create(event);
         sslDialog.display();
     }
 

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

@@ -27,6 +27,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
+import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialogFactory;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.core.components.WindowComponent;
@@ -52,6 +53,7 @@ public class ServerFrameFactory implements SwingWindowFactory.WindowProvider {
     private final Provider<KeyedDialogProvider<Connection, ServerSettingsDialog>> dialogProvider;
     private final DMDircMBassador eventBus;
     private final InputTextFramePasteActionFactory inputTextFramePasteActionFactory;
+    private final SSLCertificateDialogFactory sslCertificateDialogFactory;
 
     @Inject
     public ServerFrameFactory(
@@ -59,19 +61,21 @@ public class ServerFrameFactory implements SwingWindowFactory.WindowProvider {
             final Provider<TextFrameDependencies> dependencies,
             final Provider<SwingInputField> inputFieldProvider,
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
-            final Provider<KeyedDialogProvider<Connection, ServerSettingsDialog>> dialogProvider) {
+            final Provider<KeyedDialogProvider<Connection, ServerSettingsDialog>> dialogProvider,
+            final SSLCertificateDialogFactory sslCertificateDialogFactory) {
         this.eventBus = eventBus;
         this.dependencies = dependencies;
         this.inputFieldProvider = inputFieldProvider;
         this.dialogProvider = dialogProvider;
         this.inputTextFramePasteActionFactory = inputTextFramePasteActionFactory;
+        this.sslCertificateDialogFactory = sslCertificateDialogFactory;
     }
 
     @Override
     public TextFrame getWindow(final FrameContainer container) {
         final ServerFrame frame =  new ServerFrame(dependencies.get(), inputFieldProvider,
-                inputTextFramePasteActionFactory, dialogProvider.get(), container.getConnection()
-                .get());
+                inputTextFramePasteActionFactory, dialogProvider.get(),
+                sslCertificateDialogFactory, container.getConnection().get());
         eventBus.subscribe(frame);
         return frame;
     }

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

@@ -35,7 +35,6 @@ import com.dmdirc.addons.ui_swing.components.SwingSearchBarFactory;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
 import com.dmdirc.addons.ui_swing.events.SwingActiveWindowChangeRequestEvent;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
-import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.addons.ui_swing.textpane.ClickTypeValue;
 import com.dmdirc.addons.ui_swing.textpane.MouseEventType;
@@ -76,7 +75,6 @@ import java.awt.event.WindowEvent;
 import java.util.Optional;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -520,13 +518,11 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
 
         final TextPaneFactory textPaneFactory;
         final SwingController controller;
-        final Provider<java.awt.Window> mainWindow;
         final PopupManager popupManager;
         final DMDircMBassador eventBus;
         final AggregateConfigProvider globalConfig;
         final PasteDialogFactory pasteDialog;
         final ServiceManager serviceManager;
-        final IconManager iconManager;
         final ActiveFrameManager activeFrameManager;
         final Clipboard clipboard;
         final CommandController commandController;
@@ -539,12 +535,10 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
         public TextFrameDependencies(
                 final TextPaneFactory textPaneFactory,
                 final SwingController controller,
-                @MainWindow final Provider<java.awt.Window> mainWindow,
                 final PopupManager popupManager,
                 final DMDircMBassador eventBus,
                 final PasteDialogFactory pasteDialog,
                 final ServiceManager serviceManager,
-                @GlobalConfig final IconManager iconManager,
                 @GlobalConfig final AggregateConfigProvider globalConfig,
                 final ActiveFrameManager activeFrameManager,
                 final Clipboard clipboard,
@@ -555,13 +549,11 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
                 final SwingSearchBarFactory searchBarFactory) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
-            this.mainWindow = mainWindow;
             this.popupManager = popupManager;
             this.eventBus = eventBus;
             this.globalConfig = globalConfig;
             this.pasteDialog = pasteDialog;
             this.serviceManager = serviceManager;
-            this.iconManager = iconManager;
             this.activeFrameManager = activeFrameManager;
             this.clipboard = clipboard;
             this.commandController = commandController;

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/SSLCertificateDialogFactory.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
+
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.events.ServerCertificateProblemEncounteredEvent;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
+
+import java.awt.Window;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+/**
+ * Factory for {@link SSLCertificateDialog}s.
+ */
+@Singleton
+public class SSLCertificateDialogFactory {
+
+    private final IconManager iconManager;
+    private final Provider<Window> mainWindowProvider;
+
+    @Inject
+    public SSLCertificateDialogFactory(
+            final IconManager iconManager,
+            @MainWindow final Provider<Window> mainWindowProvider) {
+        this.iconManager = iconManager;
+        this.mainWindowProvider = mainWindowProvider;
+    }
+
+    public SSLCertificateDialog create(final ServerCertificateProblemEncounteredEvent event) {
+        return new SSLCertificateDialog(iconManager, mainWindowProvider.get(),
+                new SSLCertificateDialogModel(event.getCertificateChain(), event.getProblems(),
+                        event.getCertificateManager()));
+    }
+
+}