Add a factory for swing search bars.

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

@@ -0,0 +1,54 @@
+/*
+ * 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.components;
+
+import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManager;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Factory for creating {@link SwingSearchBar}s.
+ */
+@Singleton
+public class SwingSearchBarFactory {
+
+    private final IconManager iconManager;
+    private final ColourManager colourManager;
+
+    @Inject
+    public SwingSearchBarFactory(
+            final IconManager iconManager,
+            @GlobalConfig final ColourManager colourManager) {
+        this.iconManager = iconManager;
+        this.colourManager = colourManager;
+    }
+
+    public SwingSearchBar create(final TextFrame owner) {
+        return new SwingSearchBar(owner, iconManager, colourManager);
+    }
+
+}

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

@@ -31,6 +31,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.InputFieldCopyAction;
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
 import com.dmdirc.addons.ui_swing.components.SwingSearchBar;
+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;
@@ -120,8 +121,6 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
     private DesktopWindowFrame popoutFrame;
     /** Desktop place holder object used if this frame is popped out. */
     private DesktopPlaceHolderFrame popoutPlaceholder;
-    /** Icon manager to retrieve icons from. */
-    private final IconManager iconManager;
 
     /**
      * Creates a new instance of Frame.
@@ -137,13 +136,12 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
         this.swingEventBus = deps.swingEventBus;
         this.popupManager = deps.popupManager;
         this.frameParent = owner;
-        this.iconManager = deps.iconManager;
         this.eventBus = deps.eventBus;
         this.commandParser = commandParser;
         this.clipboard = deps.clipboard;
         this.colourManager = deps.colourManagerFactory.getColourManager(owner.getConfigManager());
 
-        initComponents(deps.textPaneFactory, colourManager);
+        initComponents(deps.textPaneFactory, deps.searchBarFactory);
         setFocusable(true);
         setLayout(new MigLayout("fill"));
     }
@@ -224,10 +222,10 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
      * Initialises the components for this frame.
      */
     private void initComponents(final TextPaneFactory textPaneFactory,
-            final ColourManager colourManager) {
+            final SwingSearchBarFactory searchBarFactory) {
         setTextPane(textPaneFactory.getTextPane(this));
 
-        searchBar = new SwingSearchBar(this, iconManager, colourManager);
+        searchBar = searchBarFactory.create(this);
         searchBar.setVisible(false);
 
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
@@ -535,6 +533,7 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
         final ColourManagerFactory colourManagerFactory;
         final SwingEventBus swingEventBus;
         final TabCompleterUtils tabCompleterUtils;
+        final SwingSearchBarFactory searchBarFactory;
 
         @Inject
         public TextFrameDependencies(
@@ -552,7 +551,8 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
                 final CommandController commandController,
                 final ColourManagerFactory colourManagerFactory,
                 final SwingEventBus swingEventBus,
-                final TabCompleterUtils tabCompleterUtils) {
+                final TabCompleterUtils tabCompleterUtils,
+                final SwingSearchBarFactory searchBarFactory) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
             this.mainWindow = mainWindow;
@@ -568,6 +568,7 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
             this.colourManagerFactory = colourManagerFactory;
             this.swingEventBus = swingEventBus;
             this.tabCompleterUtils = tabCompleterUtils;
+            this.searchBarFactory = searchBarFactory;
         }
 
     }