Remove unused ctor args

Change-Id: I970b49db0abac46d15a11e2b71dc0b50bd3a8faf
Depends-on: Ief1c8e499af7e3a43328046dc140ba941d8cb010
Reviewed-on: http://gerrit.dmdirc.com/2033
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/ui_dummy/DummyChannelWindow.java

@@ -35,6 +35,6 @@ public final class DummyChannelWindow extends DummyInputWindow {
      * @param parent Parent channel
      */
     public DummyChannelWindow(final Channel parent) {
-        super(parent, parent.getCommandParser());
+        super(parent);
     }
 }

src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.UIController;
@@ -40,10 +39,8 @@ public class DummyInputWindow implements InputWindow {
      * Instantiates a new DummyInputWindow.
      *
      * @param owner Parent window
-     * @param commandParser Parent command parser
      */
-    public DummyInputWindow(final WritableFrameContainer owner,
-            final CommandParser commandParser) {
+    public DummyInputWindow(final WritableFrameContainer owner) {
         this.container = owner;
     }
 

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -433,7 +433,7 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(new URLConfigPanel(me, urlHandler));
+                setObject(new URLConfigPanel(me));
             }
         });
     }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
@@ -53,11 +52,9 @@ public class AwayLabel extends JLabel implements ConfigChangeListener,
     /**
      * Creates a new away label for the specified container.
      *
-     * @param mainFrame Parent main frame
      * @param container Parent frame container
      */
-    public AwayLabel(final MainFrame mainFrame,
-            final FrameContainer container) {
+    public AwayLabel(final FrameContainer container) {
         super("(away)");
 
         this.container = container;

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

@@ -58,12 +58,11 @@ public class PackingTable extends JTable {
      *
      * @param rows Row data
      * @param cols Column data
-     * @param editable Whether the table should be editable or not
      * @param scrollPane Scrollpane parent
      */
     public PackingTable(final Object[][] rows, final Object[] cols,
-            final boolean editable, final JScrollPane scrollPane) {
-        this(new DefaultTableModel(rows, cols), editable, scrollPane, true);
+            final JScrollPane scrollPane) {
+        this(new DefaultTableModel(rows, cols), scrollPane, true);
     }
 
     /**
@@ -71,15 +70,13 @@ public class PackingTable extends JTable {
      *
      * @param rows Row data
      * @param cols Column data
-     * @param editable Whether the table should be editable or not
      * @param scrollPane Scrollpane parent
      * @param lastColumnFit Should the last column fit text (true),
      * or fit viewport (false).
      */
     public PackingTable(final Object[][] rows, final Object[] cols,
-            final boolean editable, final JScrollPane scrollPane,
-            final boolean lastColumnFit) {
-        this(new DefaultTableModel(rows, cols), editable, scrollPane,
+            final JScrollPane scrollPane, final boolean lastColumnFit) {
+        this(new DefaultTableModel(rows, cols), scrollPane,
                 lastColumnFit);
     }
 
@@ -87,24 +84,22 @@ public class PackingTable extends JTable {
      * Creates a new packing table.
      *
      * @param tableModel Table data model
-     * @param editable Whether the table should be editable or not
      * @param scrollPane Scrollpane parent
      */
-    public PackingTable(final TableModel tableModel, final boolean editable,
+    public PackingTable(final TableModel tableModel,
             final JScrollPane scrollPane) {
-        this(tableModel, editable, scrollPane, true);
+        this(tableModel, scrollPane, true);
     }
 
     /**
      * Creates a new packing table.
      *
      * @param tableModel Table data model
-     * @param editable Whether the table should be editable or not
      * @param scrollPane Scrollpane parent
      * @param lastColumnFit Should the last column fit text (true),
      * or fit viewport (false).
      */
-    public PackingTable(final TableModel tableModel, final boolean editable,
+    public PackingTable(final TableModel tableModel,
             final JScrollPane scrollPane, final boolean lastColumnFit) {
         super(tableModel);
 

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

@@ -87,10 +87,8 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
      *
      * @param url URL to open once added
      * @param useInsets Show insets?
-     * @param urlHandler The URL Handler to use to handle clicked links
      */
-    public URLProtocolPanel(final URI url, final boolean useInsets,
-            final URLHandler urlHandler) {
+    public URLProtocolPanel(final URI url, final boolean useInsets) {
         super();
 
         this.uri = url;

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

@@ -149,8 +149,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         inputFieldPopup.setOpaque(true);
         inputFieldPopup.setLightWeightPopupEnabled(true);
 
-        awayLabel = new AwayLabel(getController().getMainFrame(),
-                getContainer());
+        awayLabel = new AwayLabel(getContainer());
     }
 
     /**

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanel.java

@@ -133,7 +133,7 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
         scrollPane = new JScrollPane();
         model = new ActionTableModel(group == null ? new ArrayList<Action>()
                 : group.getActions());
-        table = new PackingTable(model, false, scrollPane, false) {
+        table = new PackingTable(model, scrollPane, false) {
 
             /**
              * A version number for this class. It should be changed whenever

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java

@@ -151,7 +151,7 @@ public final class AliasManagerDialog extends StandardDialog implements
         scrollPane = new JScrollPane();
 
         tableModel = new AliasTableModel(getTableData());
-        table = new PackingTable(tableModel, false, scrollPane, false) {
+        table = new PackingTable(tableModel, scrollPane, false) {
 
             /** Java Serialisation verion ID. */
             private static final long serialVersionUID = 1;

src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorTable.java

@@ -45,7 +45,7 @@ public class ErrorTable extends PackingTable {
      */
     public ErrorTable(final ErrorTableModel tableModel,
             final JScrollPane scrollPane) {
-        super(tableModel, false, scrollPane, true);
+        super(tableModel, scrollPane, true);
 
         setAutoCreateRowSorter(true);
         setAutoCreateColumnsFromModel(true);

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

@@ -132,10 +132,9 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
      * @since 0.6.3m1
      * @param category The category that is being initialised
      * @param panel The panel to which we're adding its contents
-     * @param path The textual path of this category
      */
     private void initCategory(final PreferencesCategory category,
-            final JPanel panel, final String path) {
+            final JPanel panel) {
 
         if (!category.getDescription().isEmpty()) {
             UIUtilities.invokeAndWait(new Runnable() {
@@ -170,7 +169,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
         }
 
         for (PreferencesSetting setting : category.getSettings()) {
-            addComponent(category, setting, panel);
+            addComponent(setting, panel);
         }
 
         if (!category.isInlineBefore()) {
@@ -185,12 +184,10 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
     /**
      * Initialises and adds a component to a panel.
      *
-     * @param category The category the setting is being added to
      * @param setting The setting to be used
      * @param panel The panel to add the component to
      */
-    private void addComponent(final PreferencesCategory category,
-            final PreferencesSetting setting,
+    private void addComponent(final PreferencesSetting setting,
             final JPanel panel) {
 
         final TextLabel label = new TextLabel(setting.getTitle() + ": ", false);
@@ -286,7 +283,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
 
         parent.add(panel, "span, growx, pushx, wrap");
 
-        initCategory(category, panel, "");
+        initCategory(category, panel);
     }
 
     /**
@@ -311,7 +308,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
             }
         });
 
-        initCategory(category, panel, category.getPath());
+        initCategory(category, panel);
 
         return panel;
     }

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

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.validators.URLProtocolValidator;
-import com.dmdirc.ui.core.util.URLHandler;
 
 import java.awt.Window;
 import java.awt.Dialog.ModalityType;
@@ -86,20 +85,16 @@ public class URLConfigPanel extends JPanel implements
     private int selectedRow;
     /** Parent window. */
     private Window parentWindow;
-    /** The URL Handler to use to handle clicked links. */
-    private final URLHandler urlHandler;
 
     /**
      * Instantiates a new URL config panel.
      *
      * @param parentWindow Parent window
-     * @param urlHandler The URL Handler to use to handle clicked links
      */
-    public URLConfigPanel(final Window parentWindow, final URLHandler urlHandler) {
+    public URLConfigPanel(final Window parentWindow) {
         super();
 
         this.parentWindow = parentWindow;
-        this.urlHandler = urlHandler;
 
         initComponents();
         addListeners();
@@ -113,7 +108,7 @@ public class URLConfigPanel extends JPanel implements
     private void initComponents() {
         tableScrollPane = new JScrollPane();
         model = new URLHandlerTableModel();
-        table = new PackingTable(model, false, tableScrollPane) {
+        table = new PackingTable(model, tableScrollPane) {
 
             private static final long serialVersionUID = 1;
 
@@ -140,7 +135,7 @@ public class URLConfigPanel extends JPanel implements
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         table.getRowSorter().toggleSortOrder(0);
         details = new HashMap<URI, URLProtocolPanel>();
-        empty = new URLProtocolPanel(null, true, urlHandler);
+        empty = new URLProtocolPanel(null, true);
         activeComponent = empty;
         add = new JButton("Add");
         remove = new JButton("Remove");
@@ -155,7 +150,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(uri, true, urlHandler));
+                details.put(uri, new URLProtocolPanel(uri, true));
             } catch (URISyntaxException ex) {
                 //Ignore wont happen
             }
@@ -285,7 +280,7 @@ public class URLConfigPanel extends JPanel implements
                         final URI uri = new URI(getText() +
                                 "://example.test.com");
                         model.addURI(uri);
-                        details.put(uri, new URLProtocolPanel(uri, true, urlHandler));
+                        details.put(uri, new URLProtocolPanel(uri, true));
                         return true;
                     } catch (URISyntaxException ex) {
                         return false;

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

@@ -114,7 +114,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
         enable = new JCheckBox();
         scrollPane = new JScrollPane();
         tableModel = new UpdateTableModel(UpdateChecker.getComponents());
-        table = new PackingTable(tableModel, false, scrollPane);
+        table = new PackingTable(tableModel, scrollPane);
         checkNow = new JButton("Check now");
         checkNow.setEnabled(IdentityManager.getGlobalConfig().getOptionBool(
                 "updater", "enable"));

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -150,8 +150,7 @@ public final class SwingUpdaterDialog extends StandardDialog implements
                 + "components of DMDirc:");
 
         scrollPane = new JScrollPane();
-        table = new PackingTable(new UpdateTableModel(updates), false,
-                scrollPane) {
+        table = new PackingTable(new UpdateTableModel(updates), scrollPane) {
 
             /** Serialisation version ID. */
             private static final long serialVersionUID = 1;

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

@@ -120,7 +120,7 @@ public final class URLDialog extends StandardDialog implements ActionListener {
         blurb = new TextLabel("Please select the appropriate action to " +
                 "handle " + url.getScheme() + ":// URLs from the list " +
                 "below.");
-        panel = new URLProtocolPanel(url, false, urlHandler);
+        panel = new URLProtocolPanel(url, false);
     }
 
     /** Lays out the components. */

src/com/dmdirc/addons/ui_web/DynamicRequestHandler.java

@@ -134,35 +134,35 @@ public class DynamicRequestHandler extends AbstractHandler {
             doProfiles(response);
             handled(request);
         } else if (target.equals("/dynamic/newserver")) {
-            doNewServer(request, response);
+            doNewServer(request);
             handled(request);
         } else if (target.equals("/dynamic/windowrefresh")) {
             doWindowRefresh(request, response);
             handled(request);
         } else if (target.equals("/dynamic/input")) {
-            doInput(request, response);
+            doInput(request);
             handled(request);
         } else if (target.equals("/dynamic/nicklistrefresh")) {
             doNicklist(request, response);
             handled(request);
         } else if (target.equals("/dynamic/tab")) {
-            doTab(request, response);
+            doTab(request);
             handled(request);
         } else if (target.equals("/dynamic/keyup")
                 || target.equals("/dynamic/keydown")) {
-            doKeyUpDown(target.equals("/dynamic/keyup"), request, response);
+            doKeyUpDown(target.equals("/dynamic/keyup"), request);
             handled(request);
         } else if (target.equals("/dynamic/key")) {
-            doKey(request, response);
+            doKey(request);
             handled(request);
         } else if (target.equals("/dynamic/clients")) {
-            doClients(request, response);
+            doClients(response);
             handled(request);
         } else if (target.equals("/dynamic/joinchannel")) {
-            doJoinChannel(request, response);
+            doJoinChannel(request);
             handled(request);
         } else if (target.equals("/dynamic/openquery")) {
-            doOpenQuery(request, response);
+            doOpenQuery(request);
             handled(request);
         }
     }
@@ -200,8 +200,7 @@ public class DynamicRequestHandler extends AbstractHandler {
         }
     }
 
-    private void doInput(final HttpServletRequest request,
-            final HttpServletResponse response) throws IOException {
+    private void doInput(final HttpServletRequest request) throws IOException {
         final WebWindow window = WebWindow.getWindow(
                 request.getParameter("window"));
 
@@ -212,8 +211,7 @@ public class DynamicRequestHandler extends AbstractHandler {
         }
     }
 
-    private void doKey(final HttpServletRequest request,
-            final HttpServletResponse response) throws IOException {
+    private void doKey(final HttpServletRequest request) throws IOException {
         final WebWindow window = WebWindow.getWindow(
                 request.getParameter("window"));
 
@@ -236,8 +234,7 @@ public class DynamicRequestHandler extends AbstractHandler {
         }
     }
 
-    private void doTab(final HttpServletRequest request,
-            final HttpServletResponse response) throws IOException {
+    private void doTab(final HttpServletRequest request) throws IOException {
         final WebWindow window = WebWindow.getWindow(request.getParameter(
                 "window"));
 
@@ -251,8 +248,8 @@ public class DynamicRequestHandler extends AbstractHandler {
         }
     }
 
-    private void doKeyUpDown(final boolean up, final HttpServletRequest request,
-            final HttpServletResponse response) throws IOException {
+    private void doKeyUpDown(final boolean up, final HttpServletRequest request)
+            throws IOException {
         final WebWindow window = WebWindow.getWindow(request.getParameter(
                 "window"));
 
@@ -272,9 +269,8 @@ public class DynamicRequestHandler extends AbstractHandler {
         }
     }
 
-    private void doNewServer(final HttpServletRequest request,
-            final HttpServletResponse response) throws
-            IOException {
+    private void doNewServer(final HttpServletRequest request)
+            throws IOException {
         try {
             new Server(new URI("irc://" + request.getParameter("password") + "@"
                     + request.getParameter("server") + ":"
@@ -340,23 +336,23 @@ public class DynamicRequestHandler extends AbstractHandler {
         response.getWriter().write(JSON.toString(windowEvents.toArray()));
     }
 
-    private void doClients(final HttpServletRequest request,
-            final HttpServletResponse response) throws IOException {
+    private void doClients(final HttpServletResponse response)
+            throws IOException {
         response.setStatus(HttpServletResponse.SC_OK);
         response.setContentType("application/json");
         response.getWriter().write(JSON.toString(CLIENTS.values().toArray()));
     }
 
-    private void doJoinChannel(final HttpServletRequest request,
-            final HttpServletResponse response) throws IOException {
+    private void doJoinChannel(final HttpServletRequest request)
+            throws IOException {
         final String windowID = request.getParameter("source");
         final WebWindow window = WebWindow.getWindow(windowID);
         window.getContainer().getServer().join(new ChannelJoinRequest(request.
                 getParameter("channel")));
     }
 
-    private void doOpenQuery(final HttpServletRequest request,
-            final HttpServletResponse response) throws IOException {
+    private void doOpenQuery(final HttpServletRequest request)
+            throws IOException {
         final String windowID = request.getParameter("source");
         final WebWindow window = WebWindow.getWindow(windowID);
         window.getContainer().getServer().getQuery(request.getParameter(

src/com/dmdirc/addons/ui_web/WebInterfacePlugin.java

@@ -41,7 +41,7 @@ public class WebInterfacePlugin extends BasePlugin {
     @Override
     public void onLoad() {
         if (ui == null) {
-             ui = new WebInterfaceUI(this);
+             ui = new WebInterfaceUI();
         }
     }
 
@@ -67,7 +67,7 @@ public class WebInterfacePlugin extends BasePlugin {
      */
     public void addWebHandler(final Handler newHandler) {
         if (ui == null) {
-             ui = new WebInterfaceUI(this);
+             ui = new WebInterfaceUI();
         }
 
         ui.addWebHandler(newHandler);

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

@@ -54,10 +54,8 @@ public class WebInterfaceUI implements UIController {
 
     /**
      * Creates a new WebInterfaceUI belonging to the specified plugin.
-     *
-     * @param plugin The plugin which owns this Web UI
      */
-    public WebInterfaceUI(final WebInterfacePlugin plugin) {
+    public WebInterfaceUI() {
         super();
 
         final SecurityHandler sh = new SecurityHandler();