Remove ComponentFrameFactory.

Instead, pass a list of suppliers of components into ComponentFrame.

Also ditch ComponentInputFrame which is unused.

dcc/src/com/dmdirc/addons/dcc/DCCManager.java

@@ -31,6 +31,8 @@ import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.addons.dcc.kde.KFileChooser;
+import com.dmdirc.addons.dcc.ui.PlaceholderPanel;
+import com.dmdirc.addons.dcc.ui.TransferPanel;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.frames.ComponentFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -56,6 +58,8 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.collect.Lists;
+
 import java.awt.Dialog;
 import java.awt.Window;
 import java.io.File;
@@ -65,9 +69,11 @@ import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javax.swing.JComponent;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
@@ -151,7 +157,9 @@ public class DCCManager {
                 new SwingWindowFactory.WindowProvider() {
                     @Override
                     public TextFrame getWindow(final FrameContainer container) {
-                        return componentFrameFactory.getComponentFrame(container, commandParser);
+                        return componentFrameFactory.getComponentFrame(container, commandParser,
+                                Lists.<Supplier<? extends JComponent>>newArrayList(
+                                        PlaceholderPanel::new));
                     }
 
                     @Override
@@ -164,7 +172,9 @@ public class DCCManager {
                 new SwingWindowFactory.WindowProvider() {
                     @Override
                     public TextFrame getWindow(final FrameContainer container) {
-                        return componentFrameFactory.getComponentFrame(container, commandParser);
+                        return componentFrameFactory.getComponentFrame(container, commandParser,
+                                Lists.<Supplier<? extends JComponent>>newArrayList(
+                                        () -> new TransferPanel(container, eventBus)));
                     }
 
                     @Override

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

@@ -22,12 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.util.URLBuilder;
+
+import java.util.function.Supplier;
 
 import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
@@ -41,47 +40,30 @@ public class ComponentFrame extends TextFrame {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 2;
-    /** URL builder to use when making components. */
-    private final URLBuilder urlBuilder;
-    /** Parent frame container. */
-    private final FrameContainer owner;
-    /** Parent controller. */
-    private final SwingController controller;
-    /** The global event bus. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of CustomFrame.
      *
-     * @param eventBus      The global event bus
      * @param deps          The dependencies required by text frames.
-     * @param urlBuilder    URL builder to use when making components.
      * @param owner         The frame container that owns this frame.
      * @param commandParser The parser to use to process commands.
+     * @param componentSupplier Supplier of components that will be in this frame.
      */
     public ComponentFrame(
-            final DMDircMBassador eventBus,
             final TextFrameDependencies deps,
-            final URLBuilder urlBuilder,
             final FrameContainer owner,
-            final CommandParser commandParser) {
+            final CommandParser commandParser,
+            final Iterable<Supplier<? extends JComponent>> componentSupplier) {
         super(owner, commandParser, deps);
-        this.eventBus = eventBus;
-        this.controller = deps.controller;
-        this.urlBuilder = urlBuilder;
-        this.owner = owner;
-        initComponents();
+        initComponents(componentSupplier);
     }
 
     /**
      * Initialises components in this frame.
      */
-    private void initComponents() {
+    private void initComponents(final Iterable<Supplier<? extends JComponent>> componentSupplier) {
         setLayout(new MigLayout("fill"));
-        for (JComponent comp : new ComponentCreator()
-                .initFrameComponents(this, controller, eventBus, urlBuilder, owner)) {
-            add(comp, "wrap, grow");
-        }
+        componentSupplier.forEach(c -> add(c.get(), "wrap, grow"));
     }
 
     @Override

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

@@ -25,10 +25,12 @@ package com.dmdirc.addons.ui_swing.components.frames;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.util.URLBuilder;
+
+import java.util.function.Supplier;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javax.swing.JComponent;
 
 import static com.dmdirc.addons.ui_swing.components.frames.TextFrame.TextFrameDependencies;
 
@@ -40,23 +42,21 @@ public class ComponentFrameFactory {
 
     private final DMDircMBassador eventBus;
     private final TextFrameDependencies dependencies;
-    private final URLBuilder urlBuilder;
 
     @Inject
     public ComponentFrameFactory(
             final DMDircMBassador eventBus,
-            final TextFrameDependencies dependencies,
-            final URLBuilder urlBuilder) {
+            final TextFrameDependencies dependencies) {
         this.eventBus = eventBus;
         this.dependencies = dependencies;
-        this.urlBuilder = urlBuilder;
     }
 
     public ComponentFrame getComponentFrame(
             final FrameContainer owner,
-            final CommandParser commandParser) {
-        final ComponentFrame frame = new ComponentFrame(eventBus, dependencies, urlBuilder, owner,
-                commandParser);
+            final CommandParser commandParser,
+            final Iterable<Supplier<? extends JComponent>> componentSupplier) {
+        final ComponentFrame frame = new ComponentFrame(dependencies, owner, commandParser,
+                componentSupplier);
         eventBus.subscribe(frame);
         return frame;
     }

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

@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.frames;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
-import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.util.URLBuilder;
-
-import javax.inject.Provider;
-import javax.swing.JComponent;
-import javax.swing.JPopupMenu;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * A component frame that includes an input field (for use with writable containers).
- */
-public class ComponentInputFrame extends InputTextFrame {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 2;
-    /** URL builder to use when making components. */
-    private final URLBuilder urlBuilder;
-    /** Parent frame container. */
-    private final FrameContainer owner;
-    /** Parent controller. */
-    private final SwingController controller;
-    /** The global event bus. */
-    private final DMDircMBassador eventBus;
-
-    /**
-     * Creates a new instance of CustomInputFrame.
-     *
-     * @param eventBus           The global event bus
-     * @param deps               The dependencies required by text frames.
-     * @param inputFieldProvider The provider to use to create a new input field.
-     * @param urlBuilder         URL builder to use when making components.
-     * @param owner              The frame container that owns this frame
-     */
-    public ComponentInputFrame(
-            final DMDircMBassador eventBus,
-            final TextFrameDependencies deps,
-            final Provider<SwingInputField> inputFieldProvider,
-            final URLBuilder urlBuilder,
-            final FrameContainer owner) {
-        super(deps, inputFieldProvider, owner);
-        this.eventBus = eventBus;
-        this.controller = deps.controller;
-        this.urlBuilder = urlBuilder;
-        this.owner = owner;
-        initComponents();
-    }
-
-    /**
-     * Initialises components in this frame.
-     */
-    private void initComponents() {
-        setLayout(new MigLayout("fill"));
-        for (JComponent comp : new ComponentCreator()
-                .initFrameComponents(this, controller, eventBus, urlBuilder, owner)) {
-            add(comp, "wrap, grow");
-        }
-    }
-
-    @Override
-    public PopupType getNicknamePopupType() {
-        return null;
-    }
-
-    @Override
-    public PopupType getChannelPopupType() {
-        return null;
-    }
-
-    @Override
-    public PopupType getHyperlinkPopupType() {
-        return null;
-    }
-
-    @Override
-    public PopupType getNormalPopupType() {
-        return null;
-    }
-
-    @Override
-    public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        //Add no custom popup items
-    }
-
-}