Some reports fixes.

git-svn-id: http://svn.dmdirc.com/trunk@1772 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -75,7 +75,7 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
         
         if (result != negative) {
             if (origin == null) {
-                GlobalCommandParser.getGlobalCommandParser().parseCommand(origin, implodeArgs(1, args));
+                GlobalCommandParser.getGlobalCommandParser().parseCommand(null, implodeArgs(1, args));
             } else {
                 origin.getCommandParser().parseCommand(origin, implodeArgs(1, args));
             }

src/com/dmdirc/logger/DMDircExceptionHandler.java

@@ -22,13 +22,17 @@
 
 package com.dmdirc.logger;
 
-public class DMDircExceptionHandler implements Thread.UncaughtExceptionHandler {
+/**
+ * Passes uncaught exceptions to the logger.
+ */
+public final class DMDircExceptionHandler implements Thread.UncaughtExceptionHandler {
     
     /** Instantiates the Exception handler. */
     public DMDircExceptionHandler() {
         super();
     }
     
+    /** {@inheritDoc} */
     public void uncaughtException(final Thread thread, final Throwable throwable) {
         Logger.appError(ErrorLevel.HIGH, "Uncaught exception", throwable);
     }

src/com/dmdirc/ui/input/InputHandler.java

@@ -29,9 +29,9 @@ import com.dmdirc.commandparser.Command;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.IntelligentCommand;
-import com.dmdirc.ui.swing.components.ColourPickerDialog;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.swing.components.ColourPickerDialog;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/ui/interfaces/ChannelWindow.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui.interfaces;
 
 import com.dmdirc.parser.ChannelClientInfo;
+
 import java.util.List;
 
 /**

src/com/dmdirc/ui/interfaces/PreferencesPanel.java

@@ -61,7 +61,6 @@ public interface PreferencesPanel {
      * @param parentCategory parent category
      * @param name Category name
      * @param blurb category blurb
-     * @param nodeIcon icon for the node
      */
     void addCategory(final String parentCategory, final String name,
             final String blurb);

src/com/dmdirc/ui/interfaces/StatusBar.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui.interfaces;
 
 import java.awt.Component;
+
 import javax.swing.Icon;
 
 /**

src/com/dmdirc/ui/interfaces/UIController.java

@@ -29,6 +29,7 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.updater.Update;
+
 import java.util.List;
 
 /**
@@ -97,7 +98,7 @@ public interface UIController {
      * Creates a new preferences panel for the specified parent.
      *
      * @param parent Preferences panel parent
-     * @param text Preferences panel title
+     * @param title Preferences panel title
      *
      * @return PreferencesPanel
      */

src/com/dmdirc/ui/interfaces/UpdaterDialog.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui.interfaces;
 
 /**
- * Updater dialog
+ * Updater dialog.
  */
 public interface UpdaterDialog {
     

src/com/dmdirc/ui/swing/ChannelFrame.java

@@ -31,10 +31,10 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.ui.swing.components.InputFrame;
-import com.dmdirc.ui.swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ChannelWindow;
+import com.dmdirc.ui.swing.components.InputFrame;
+import com.dmdirc.ui.swing.dialogs.channelsetting.ChannelSettingsDialog;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;

src/com/dmdirc/ui/swing/CustomInputFrame.java

@@ -24,8 +24,8 @@ package com.dmdirc.ui.swing;
 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.ui.swing.components.InputFrame;
 import com.dmdirc.ui.input.InputHandler;
+import com.dmdirc.ui.swing.components.InputFrame;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/swing/MainFrame.java

@@ -31,6 +31,10 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.interfaces.FrameManager;
+import com.dmdirc.ui.interfaces.FramemanagerPosition;
+import com.dmdirc.ui.interfaces.StatusBar;
+import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.swing.components.Frame;
 import com.dmdirc.ui.swing.components.SwingStatusBar;
 import com.dmdirc.ui.swing.dialogs.ActionsManagerDialog;
@@ -39,13 +43,9 @@ import com.dmdirc.ui.swing.dialogs.PluginDialog;
 import com.dmdirc.ui.swing.dialogs.PreferencesDialog;
 import com.dmdirc.ui.swing.dialogs.ProfileEditorDialog;
 import com.dmdirc.ui.swing.dialogs.about.AboutDialog;
-import com.dmdirc.ui.interfaces.FrameManager;
-import com.dmdirc.ui.interfaces.FramemanagerPosition;
 import com.dmdirc.ui.swing.framemanager.MainFrameManager;
 import com.dmdirc.ui.swing.framemanager.windowmenu.WindowMenuFrameManager;
-import com.dmdirc.ui.interfaces.Window;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
-import com.dmdirc.ui.interfaces.StatusBar;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/swing/QueryFrame.java

@@ -25,9 +25,9 @@ package com.dmdirc.ui.swing;
 import com.dmdirc.Query;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.QueryCommandParser;
-import com.dmdirc.ui.swing.components.InputFrame;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.QueryWindow;
+import com.dmdirc.ui.swing.components.InputFrame;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.GridBagConstraints;

src/com/dmdirc/ui/swing/ServerFrame.java

@@ -27,10 +27,10 @@ import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.ServerCommandParser;
-import com.dmdirc.ui.swing.components.InputFrame;
-import com.dmdirc.ui.swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ServerWindow;
+import com.dmdirc.ui.swing.components.InputFrame;
+import com.dmdirc.ui.swing.dialogs.serversetting.ServerSettingsDialog;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;

src/com/dmdirc/ui/swing/SwingController.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.swing;
 
+
 import com.dmdirc.Channel;
 import com.dmdirc.Config;
 import com.dmdirc.Main;
@@ -31,12 +32,8 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.swing.components.SwingPreferencesPanel;
-import com.dmdirc.ui.swing.dialogs.SwingUpdaterDialog;
-import com.dmdirc.ui.swing.dialogs.channelsetting.ChannelSettingsDialog;
-import com.dmdirc.ui.swing.dialogs.firstrunwizard.SwingFirstRunWizard;
-import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.ChannelWindow;
+import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
 import com.dmdirc.ui.interfaces.PreferencesPanel;
@@ -45,6 +42,10 @@ import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.ui.interfaces.StatusBar;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.UpdaterDialog;
+import com.dmdirc.ui.swing.components.SwingPreferencesPanel;
+import com.dmdirc.ui.swing.dialogs.SwingUpdaterDialog;
+import com.dmdirc.ui.swing.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.ui.swing.dialogs.firstrunwizard.SwingFirstRunWizard;
 import com.dmdirc.ui.swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.updater.Update;
 
@@ -53,6 +54,7 @@ import java.awt.Font;
 import java.awt.Insets;
 import java.awt.Toolkit;
 import java.util.List;
+
 import javax.swing.BorderFactory;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
@@ -64,13 +66,18 @@ import javax.swing.plaf.FontUIResource;
  *
  * @author Chris
  */
-public class SwingController implements UIController {
+public final class SwingController implements UIController {
     
     /**
      * Singleton instance of MainFrame.
      */
     private static MainFrame me;
     
+    /** Instantiates a new SwingController. */
+    public SwingController() {
+        //Do nothing
+    }
+    
     /** {@inheritDoc} */
     public synchronized MainFrame getMainWindow() {
         if (me == null) {

src/com/dmdirc/ui/swing/components/InputFrame.java

@@ -27,12 +27,12 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.swing.actions.InputFramePasteAction;
+import com.dmdirc.ui.input.InputHandler;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.swing.actions.CopyAction;
 import com.dmdirc.ui.swing.actions.CutAction;
+import com.dmdirc.ui.swing.actions.InputFramePasteAction;
 import com.dmdirc.ui.swing.dialogs.PasteDialog;
-import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.ui.interfaces.InputWindow;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.AWTException;

src/com/dmdirc/ui/swing/components/SwingStatusBar.java

@@ -27,11 +27,11 @@ import com.dmdirc.IconManager;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ProgramError;
-import com.dmdirc.ui.swing.dialogs.error.ErrorListDialog;
+import com.dmdirc.ui.interfaces.StatusBar;
 import com.dmdirc.ui.interfaces.StatusErrorNotifier;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
+import com.dmdirc.ui.swing.dialogs.error.ErrorListDialog;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
-import com.dmdirc.ui.interfaces.StatusBar;
 
 import java.awt.Component;
 import java.awt.Dimension;

src/com/dmdirc/ui/swing/components/reorderablelist/ArrayListTransferHandler.java

@@ -24,6 +24,7 @@ package com.dmdirc.ui.swing.components.reorderablelist;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
@@ -38,7 +39,7 @@ import javax.swing.TransferHandler;
 /**
  * Arraylist Transfer handler.
  */
-public class ArrayListTransferHandler extends TransferHandler {
+public final class ArrayListTransferHandler extends TransferHandler {
     
     /**
      * A version number for this class. It should be changed whenever the class
@@ -47,13 +48,20 @@ public class ArrayListTransferHandler extends TransferHandler {
      */
     private static final long serialVersionUID = 1;
     
+    /** Local Transfer flavour. */
     private DataFlavor localArrayListFlavor;
+    /** Serial Transfer flavour. */
     private final DataFlavor serialArrayListFlavor;
-    private JList source = null;
-    private int[] indices = null;
-    private int addIndex = -1; //Location where items were added
-    private int addCount = 0;  //Number of items added
+    /** Source component. */
+    private JList source;
+    /** Dragged Indices. */
+    private int[] indices;
+    /** Index to add item(s). */
+    private int addIndex = -1;
+    /** Number of items to add. */
+    private int addCount;
     
+    /** Instantiates a new ArrayListTransferHandler. */
     public ArrayListTransferHandler() {
         super();
         
@@ -78,11 +86,11 @@ public class ArrayListTransferHandler extends TransferHandler {
         }
         
         try {
-            target = (JList)c;
+            target = (JList) c;
             if (hasLocalArrayListFlavor(t.getTransferDataFlavors())) {
-                alist = (ArrayList)t.getTransferData(localArrayListFlavor);
+                alist = (ArrayList) t.getTransferData(localArrayListFlavor);
             } else if (hasSerialArrayListFlavor(t.getTransferDataFlavors())) {
-                alist = (ArrayList)t.getTransferData(serialArrayListFlavor);
+                alist = (ArrayList) t.getTransferData(serialArrayListFlavor);
             } else {
                 return false;
             }
@@ -104,7 +112,7 @@ public class ArrayListTransferHandler extends TransferHandler {
             return true;
         }
         
-        final DefaultListModel listModel = (DefaultListModel)target.getModel();
+        final DefaultListModel listModel = (DefaultListModel) target.getModel();
         final int max = listModel.getSize();
         
         if (index < 0) {
@@ -119,7 +127,7 @@ public class ArrayListTransferHandler extends TransferHandler {
         addIndex = index;
         addCount = alist.size();
         
-        for (int i=0; i < alist.size(); i++) {
+        for (int i = 0; i < alist.size(); i++) {
             listModel.add(index++, alist.get(i));
         }
         
@@ -130,7 +138,7 @@ public class ArrayListTransferHandler extends TransferHandler {
     protected void exportDone(final JComponent c, final Transferable data,
             final int action) {
         if ((action == MOVE) && (indices != null)) {
-            final DefaultListModel model = (DefaultListModel)source.getModel();
+            final DefaultListModel model = (DefaultListModel) source.getModel();
             
             if (addCount > 0) {
                 for (int i = 0; i < indices.length; i++) {
@@ -139,7 +147,7 @@ public class ArrayListTransferHandler extends TransferHandler {
                     }
                 }
             }
-            for (int i = indices.length -1; i >= 0; i--) {
+            for (int i = indices.length - 1; i >= 0; i--) {
                 model.remove(indices[i]);
             }
         }
@@ -149,7 +157,13 @@ public class ArrayListTransferHandler extends TransferHandler {
         addCount = 0;
     }
     
-    /** {@inheritDoc} */
+    /** 
+     * Do any of the specified flavours match the local flavour.
+     * 
+     * @param flavors Flavours to check
+     *
+     * @return whether the flavour is supported
+     */
     private boolean hasLocalArrayListFlavor(final DataFlavor[] flavors) {
         if (localArrayListFlavor == null) {
             return false;
@@ -164,7 +178,13 @@ public class ArrayListTransferHandler extends TransferHandler {
         return false;
     }
     
-    /** {@inheritDoc} */
+    /** 
+     * Do any of the specified flavours match the serial flavour.
+     * 
+     * @param flavors Flavours to check
+     *
+     * @return whether the flavour is supported
+     */
     private boolean hasSerialArrayListFlavor(final DataFlavor[] flavors) {
         if (serialArrayListFlavor == null) {
             return false;

src/com/dmdirc/ui/swing/components/reorderablelist/ArrayListTransferable.java

@@ -24,6 +24,7 @@ package com.dmdirc.ui.swing.components.reorderablelist;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
@@ -32,13 +33,20 @@ import java.util.ArrayList;
 /**
  * Arraylist transferable.
  */
-public class ArrayListTransferable implements Transferable {
+public final class ArrayListTransferable implements Transferable {
     
+    /** Local tranfer flavour. */
     private DataFlavor localArrayListFlavor;
+    /** Serial transfer flavour. */
     private final DataFlavor serialArrayListFlavor;
+    /** Transferred ArrayList. */
     private final ArrayList data; //NOPMD
     
-    /** Initialises the ArrayListTransferable. */
+    /** 
+     * Initialises the ArrayListTransferable. 
+     *
+     * @param alist ArrayList to transfer
+     */
     public ArrayListTransferable(final ArrayList alist) { //NOPMD
         super();
         
@@ -68,7 +76,7 @@ public class ArrayListTransferable implements Transferable {
     
     /** {@inheritDoc} */
     public DataFlavor[] getTransferDataFlavors() {
-        return new DataFlavor[] { localArrayListFlavor, serialArrayListFlavor };
+        return new DataFlavor[]{localArrayListFlavor, serialArrayListFlavor, };
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/ui/swing/components/reorderablelist/ReorderableJList.java

@@ -47,8 +47,8 @@ import java.awt.dnd.DropTargetEvent;
 import java.awt.dnd.DropTargetListener;
 import java.io.IOException;
 import java.util.ArrayList;
-import javax.swing.DefaultListModel;
 
+import javax.swing.DefaultListModel;
 import javax.swing.JList;
 import javax.swing.ListSelectionModel;
 
@@ -123,6 +123,8 @@ public final class ReorderableJList extends JList implements DragSourceListener,
     
     /**
      * Returns whether the target is below the drop cell.
+     *
+     * @return if the target is above or below the point
      */
     public boolean getBelowTarget() {
         return belowTarget;
@@ -239,9 +241,9 @@ public final class ReorderableJList extends JList implements DragSourceListener,
         }
         
         //move items
-        final boolean sourceBeforeTarget = (draggedIndex < index);
+        final boolean sourceBeforeTarget = draggedIndex < index;
         final DefaultListModel mod = getModel();
-        final int newIndex = (sourceBeforeTarget ? index - 1 : index);
+        final int newIndex = sourceBeforeTarget ? index - 1 : index;
         mod.remove(draggedIndex);
         for (Object item : (ArrayList) dragged) {
             mod.add(newIndex, item);
@@ -271,7 +273,7 @@ public final class ReorderableJList extends JList implements DragSourceListener,
         final Transferable trans = new ArrayListTransferable(transferObject);
         //start drag
         draggedIndex = index;
-        dragSource.startDrag(dge,Cursor.getDefaultCursor(), trans, this);
+        dragSource.startDrag(dge, Cursor.getDefaultCursor(), trans, this);
     }
 }
 

src/com/dmdirc/ui/swing/components/reorderablelist/ReorderableJListCellRenderer.java

@@ -24,6 +24,7 @@ package com.dmdirc.ui.swing.components.reorderablelist;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -63,7 +64,7 @@ class ReorderableJListCellRenderer implements ListCellRenderer {
             final boolean hasFocus) {
         final JPanel panel = new JPanel();
         panel.setLayout(new BorderLayout());
-        final boolean isTargetCell = (value == parent.getTargetCell());
+        final boolean isTargetCell = value == parent.getTargetCell();
         
         final boolean showSelected = isSelected & (parent.getTargetCell() == null);
         

src/com/dmdirc/ui/swing/dialogs/NewServerDialog.java

@@ -28,9 +28,8 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.swing.MainFrame;
-import com.dmdirc.ui.swing.components.StandardDialog;
 import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.ui.swing.components.StandardDialog;
 import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 

src/com/dmdirc/ui/swing/dialogs/PasteDialog.java

@@ -23,7 +23,6 @@
 package com.dmdirc.ui.swing.dialogs;
 
 import com.dmdirc.Main;
-import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.ui.swing.components.InputFrame;
 import com.dmdirc.ui.swing.components.StandardDialog;
 import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;

src/com/dmdirc/ui/swing/dialogs/SwingUpdaterDialog.java

@@ -23,11 +23,11 @@
 package com.dmdirc.ui.swing.dialogs;
 
 import com.dmdirc.Main;
+import com.dmdirc.ui.interfaces.UpdaterDialog;
 import com.dmdirc.ui.swing.components.StandardDialog;
 import com.dmdirc.updater.Update;
 import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
-import com.dmdirc.ui.interfaces.UpdaterDialog;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -84,7 +84,7 @@ public final class SwingUpdaterDialog extends StandardDialog implements
         
         setLayout(new BorderLayout());
         
-        JLabel header = new JLabel("<html><big>Update Available</big><br><br>"
+        final JLabel header = new JLabel("<html><big>Update Available</big><br><br>"
                 + "An update is available for one or more "
                 + "components of DMDirc:</html>");
         header.setBorder(BorderFactory.createEmptyBorder(LARGE_BORDER,

src/com/dmdirc/ui/swing/dialogs/firstrunwizard/SwingFirstRunWizard.java

@@ -26,11 +26,11 @@ import com.dmdirc.Config;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.resourcemanager.ResourceManager;
+import com.dmdirc.ui.interfaces.FirstRunWizard;
 import com.dmdirc.ui.swing.dialogs.ProfileEditorDialog;
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import com.dmdirc.ui.swing.dialogs.wizard.Wizard;
 import com.dmdirc.ui.swing.dialogs.wizard.WizardDialog;
-import com.dmdirc.ui.interfaces.FirstRunWizard;
 
 import java.awt.Dimension;
 import java.io.File;
@@ -47,7 +47,7 @@ import java.util.Map.Entry;
 public final class SwingFirstRunWizard implements Wizard, FirstRunWizard {
     
     /** Wizard dialog. */
-    private static WizardDialog wizardDialog;
+    private WizardDialog wizardDialog;
     
     /** Instatiate the wizard. */
     public SwingFirstRunWizard() {
@@ -125,8 +125,7 @@ public final class SwingFirstRunWizard implements Wizard, FirstRunWizard {
         steps.add(new StepOne());
         steps.add(new StepTwo());
         
-        wizardDialog = new WizardDialog("Setup wizard", steps,
-                new SwingFirstRunWizard(), true);
+        wizardDialog = new WizardDialog("Setup wizard", steps, this, true);
         
         wizardDialog.setPreferredSize(new Dimension(400, 350));
         

src/com/dmdirc/ui/swing/framemanager/MainFrameManager.java

@@ -27,10 +27,10 @@ import com.dmdirc.Config;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
+import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.swing.framemanager.buttonbar.ButtonBar;
 import com.dmdirc.ui.swing.framemanager.tree.TreeFrameManager;
 import com.dmdirc.ui.swing.framemanager.windowmenu.WindowMenuFrameManager;
-import com.dmdirc.ui.interfaces.FrameManager;
 
 import java.awt.Color;
 import java.io.IOException;

src/com/dmdirc/ui/swing/framemanager/buttonbar/ButtonBar.java

@@ -28,10 +28,10 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.ui.swing.UIUtilities;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.FramemanagerPosition;
 import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.ui.swing.UIUtilities;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -27,9 +27,8 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.ui.swing.MainFrame;
-import com.dmdirc.ui.swing.components.FrameContainerComparator;
 import com.dmdirc.ui.interfaces.FrameManager;
+import com.dmdirc.ui.swing.components.FrameContainerComparator;
 
 import java.awt.Color;
 import java.awt.Font;

src/com/dmdirc/ui/swing/textpane/TextPane.java

@@ -118,11 +118,11 @@ public final class TextPane extends JComponent implements AdjustmentListener,
     /**
      * Stylises the specified string and adds it to the passed TextPane.
      *
-     * @param doc The document which the output should be added to
      * @param string The line to be stylised and added
      */
     public void addStyledString(final String string) {
-        final AttributedString text = Styliser.styledDocumentToAttributedString(Styliser.getStyledString(new String[]{string, }));
+        final AttributedString text = Styliser.styledDocumentToAttributedString(
+                Styliser.getStyledString(new String[]{string, }));
         
         if (text.getIterator().getEndIndex() == 0) {
             addText(new AttributedString("\n"));
@@ -134,11 +134,11 @@ public final class TextPane extends JComponent implements AdjustmentListener,
     /**
      * Stylises the specified string and adds it to the passed TextPane.
      *
-     * @param doc The document which the output should be added to
      * @param strings The strings to be stylised and added to a line
      */
     public void addStyledString(final String[] strings) {
-        final AttributedString text = Styliser.styledDocumentToAttributedString(Styliser.getStyledString(strings));
+        final AttributedString text = Styliser.styledDocumentToAttributedString(
+                Styliser.getStyledString(strings));
         
         if (text.getIterator().getEndIndex() == 0) {
             addText(new AttributedString("\n"));

src/com/dmdirc/ui/swing/textpane/TextPaneCanvas.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui.swing.textpane;
 
 import com.dmdirc.ui.messages.IRCTextAttribute;
+
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Point;