Annoying code tidying.

Change-Id: I052f46c59cfb19b64afbcaf2fbc02b17d1f40da6
Reviewed-on: http://gerrit.dmdirc.com/1633
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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;
 

src/com/dmdirc/addons/ui_swing/actions/ChannelCopyAction.java

@@ -42,9 +42,9 @@ public final class ChannelCopyAction extends AbstractAction {
     /** channel to be copied. */
     private final String channel;
 
-    /** 
+    /**
      * Instantiates a new channel copy action.
-     * 
+     *
      * @param channel channel to be copied
      */
     public ChannelCopyAction(final String channel) {
@@ -53,13 +53,14 @@ public final class ChannelCopyAction extends AbstractAction {
         this.channel = channel;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
+    @Override
     public void actionPerformed(final ActionEvent e) {
-        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(channel),
-                null);
+        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+                new StringSelection(channel), null);
     }
-} 
+}

src/com/dmdirc/addons/ui_swing/actions/CloseFrameContainerAction.java

@@ -40,11 +40,11 @@ public final class CloseFrameContainerAction extends AbstractAction {
      */
     private static final long serialVersionUID = 1;
     /** Frame container to be closed. */
-    private FrameContainer frame;
+    private final FrameContainer frame;
 
-    /** 
+    /**
      * Instantiates a new close a frame container action.
-     * 
+     *
      * @param frame frame container to be closed
      */
     public CloseFrameContainerAction(final FrameContainer frame) {
@@ -53,9 +53,9 @@ public final class CloseFrameContainerAction extends AbstractAction {
         this.frame = frame;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
@@ -64,4 +64,4 @@ public final class CloseFrameContainerAction extends AbstractAction {
             frame.close();
         }
     }
-} 
+}

src/com/dmdirc/addons/ui_swing/actions/CommandAction.java

@@ -30,28 +30,28 @@ import java.awt.event.ActionEvent;
 import javax.swing.AbstractAction;
 
 /**
- * Executes a command. 
+ * Executes a command.
  */
 public class CommandAction extends AbstractAction {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    
+
     /** Command parser. */
     private final CommandParser parser;
-    
+
     /** Window. */
     private final transient Window window;
-    
+
     /** Command. */
     private final String command;
-    
-    /** 
-     * Creates a new instance of CommandAction. 
+
+    /**
+     * Creates a new instance of CommandAction.
      *
      * @param parser Command parser
      * @param window Window
@@ -61,15 +61,15 @@ public class CommandAction extends AbstractAction {
     public CommandAction(final CommandParser parser, final Window window,
             final String name, final String command) {
         super(name);
-        
+
         this.parser = parser;
         this.window = window;
         this.command = command;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
@@ -78,5 +78,5 @@ public class CommandAction extends AbstractAction {
             parser.parseCommand(window.getContainer(), window, line);
         }
     }
-    
+
 }

src/com/dmdirc/addons/ui_swing/actions/CopyAction.java

@@ -67,8 +67,7 @@ public final class CopyAction extends AbstractAction {
     /** {@inheritDoc} */
     @Override
     public boolean isEnabled() {
-        return comp.isEnabled()
-                && comp.getSelectedText() != null
+        return comp.isEnabled() && comp.getSelectedText() != null
                 && !(comp instanceof JPasswordField);
     }
 }

src/com/dmdirc/addons/ui_swing/actions/CutAction.java

@@ -39,7 +39,6 @@ public final class CutAction extends AbstractAction {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-
     /** Text component to be acted upon. */
     private final JTextComponent comp;
 
@@ -67,9 +66,7 @@ public final class CutAction extends AbstractAction {
     /** {@inheritDoc} */
     @Override
     public boolean isEnabled() {
-        return comp.isEditable()
-                && comp.isEnabled()
-                && comp.getSelectedText() != null
-                && !(comp instanceof JPasswordField);
+        return comp.isEditable() && comp.isEnabled() && comp.getSelectedText()
+                != null && !(comp instanceof JPasswordField);
     }
 }

src/com/dmdirc/addons/ui_swing/actions/HyperlinkCopyAction.java

@@ -42,9 +42,9 @@ public final class HyperlinkCopyAction extends AbstractAction {
     /** hyperlink to be copied. */
     private final String hyperlink;
 
-    /** 
+    /**
      * Instantiates a new hyperlink copy action.
-     * 
+     *
      * @param hyperlink hyperlink to be copied
      */
     public HyperlinkCopyAction(final String hyperlink) {
@@ -53,14 +53,14 @@ public final class HyperlinkCopyAction extends AbstractAction {
         this.hyperlink = hyperlink;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(hyperlink),
-                null);
+        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+                new StringSelection(hyperlink), null);
     }
-} 
+}

src/com/dmdirc/addons/ui_swing/actions/InputTextFramePasteAction.java

@@ -55,9 +55,9 @@ public final class InputTextFramePasteAction extends AbstractAction {
         this.inputFrame = inputFrame;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override

src/com/dmdirc/addons/ui_swing/actions/NicknameCopyAction.java

@@ -42,9 +42,9 @@ public final class NicknameCopyAction extends AbstractAction {
     /** Nickname to be copied. */
     private final String nickname;
 
-    /** 
+    /**
      * Instantiates a new nickname copy action.
-     * 
+     *
      * @param nickname Nickname to be copied
      */
     public NicknameCopyAction(final String nickname) {
@@ -53,14 +53,14 @@ public final class NicknameCopyAction extends AbstractAction {
         this.nickname = nickname;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(nickname),
-                null);
+        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+                new StringSelection(nickname), null);
     }
-} 
+}

src/com/dmdirc/addons/ui_swing/actions/NoNewlinesPasteAction.java

@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.actions;
-
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-
-import java.awt.Toolkit;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-
-import javax.swing.AbstractAction;
-import javax.swing.text.JTextComponent;
-
-/**
- * Paste action that strips newlines from pastes.
- */
-public final class NoNewlinesPasteAction extends AbstractAction {
-    
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-    
-    /**
-     * Creates a new instance of NoNewlinesPasteAction.
-     */
-    public NoNewlinesPasteAction() {
-        super("TopicPasteAction");
-    }
-    
-    /** 
-     * {@inheritDoc}
-     * 
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        final JTextComponent comp;
-        
-        if (e.getSource() instanceof JTextComponent) {
-            comp = (JTextComponent) e.getSource();
-        } else {
-            return;
-        }
-        
-        String clipboard = null;
-        
-        if (!Toolkit.getDefaultToolkit().getSystemClipboard().
-                isDataFlavorAvailable(DataFlavor.stringFlavor)) {
-            return;
-        }
-        
-        try {
-            //get the contents of the clipboard
-            clipboard = (String) Toolkit.getDefaultToolkit().
-                    getSystemClipboard().getData(DataFlavor.stringFlavor);
-            //remove newlines
-            clipboard = clipboard.replaceAll("(\r\n|\n|\r)", " ");
-            
-            //insert the contents at the current cursor position
-            comp.replaceSelection(clipboard);
-        } catch (IOException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to get clipboard contents: " + ex.getMessage());
-        } catch (UnsupportedFlavorException ex) {
-            Logger.appError(ErrorLevel.LOW, "Unable to get clipboard contents", ex);
-        }
-    }
-    
-}

src/com/dmdirc/addons/ui_swing/actions/NoSpacesPasteAction.java

@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.actions;
-
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-
-import java.awt.Toolkit;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-
-import javax.swing.AbstractAction;
-import javax.swing.text.JTextComponent;
-
-/**
- * Paste action that strips newlines from pastes.
- */
-public final class NoSpacesPasteAction extends AbstractAction {
-    
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-    
-    /** Creates a new instance of TopicPasteAction. */
-    public NoSpacesPasteAction() {
-        super("NoSpacesPasteAction");
-    }
-    
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        final JTextComponent comp;
-        
-        if (e.getSource() instanceof JTextComponent) {
-            comp = (JTextComponent) e.getSource();
-        } else {
-            return;
-        }
-        
-        String clipboard = null;
-        
-        if (!Toolkit.getDefaultToolkit().getSystemClipboard().
-                isDataFlavorAvailable(DataFlavor.stringFlavor)) {
-            return;
-        }
-        
-        try {
-            //get the contents of the clipboard
-            clipboard = (String) Toolkit.getDefaultToolkit().
-                    getSystemClipboard().getData(DataFlavor.stringFlavor);
-            //remove spaces
-            clipboard = clipboard.replaceAll("\\s", "");
-            
-            //insert the contents at the current cursor position
-        comp.replaceSelection(clipboard);
-        } catch (IOException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to get clipboard contents: " + ex.getMessage());
-        } catch (UnsupportedFlavorException ex) {
-            Logger.appError(ErrorLevel.LOW, "Unable to get clipboard contents", ex);
-        }
-    }
-    
-}

src/com/dmdirc/addons/ui_swing/actions/PasteAction.java

@@ -34,17 +34,16 @@ import javax.swing.text.JTextComponent;
  * Paste action.
  */
 public final class PasteAction extends AbstractAction {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
     /** Text component to be acted upon. */
     private final JTextComponent comp;
-    
+
     /**
      * Instantiates a new paste action.
      *
@@ -52,10 +51,10 @@ public final class PasteAction extends AbstractAction {
      */
     public PasteAction(final JTextComponent comp) {
         super("Paste");
-        
+
         this.comp = comp;
     }
-    
+
     /**
      * {@inheritDoc}
      *
@@ -65,7 +64,7 @@ public final class PasteAction extends AbstractAction {
     public void actionPerformed(final ActionEvent e) {
         comp.paste();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean isEnabled() {

src/com/dmdirc/addons/ui_swing/actions/RedoAction.java

@@ -35,28 +35,28 @@ import javax.swing.undo.UndoManager;
  * Handles redo's on text components.
  */
 public final class RedoAction extends AbstractAction {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
+
     /** Undo manager. */
     private final UndoManager undoManager;
-    
-    /** 
-     * Creates a new instance of RedoAction. 
+
+    /**
+     * Creates a new instance of RedoAction.
      *
      * @param undoManager UndoManager to use for this redo action
      */
     public RedoAction(final UndoManager undoManager) {
         super("Undo");
-        
+
         this.undoManager = undoManager;
     }
-    
+
     /**
      * {@inheritDoc}
      *
@@ -72,5 +72,5 @@ public final class RedoAction extends AbstractAction {
             Logger.userError(ErrorLevel.LOW, "Unable to redo");
         }
     }
-    
+
 }

src/com/dmdirc/addons/ui_swing/actions/SanitisedFilenamePasteAction.java → src/com/dmdirc/addons/ui_swing/actions/ReplacePasteAction.java

@@ -35,27 +35,35 @@ import javax.swing.AbstractAction;
 import javax.swing.text.JTextComponent;
 
 /**
- * Paste action that sanitises filenames
+ * Paste action that replaces matching regexes.
  */
-public final class SanitisedFilenamePasteAction extends AbstractAction {
-    
+public final class ReplacePasteAction extends AbstractAction {
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
-    /** Invalid filename characters. */
-    private static final String INVALID_CHARS = "^[^\\w\\.\\s\\-\\#\\&\\_]";
-    
+    /** Regex to match for replacement. */
+    private final String replacementRegex;
+    /** Replacement string. */
+    private final String replacementString;
+
     /**
-     * Creates a new instance of SanitisedFilenamePasteAction.
+     * Creates a new instance of regex replacement paste action.
+     *
+     * @param replacementRegex Regex to match for replacement
+     * @param replacementString Replacement string
      */
-    public SanitisedFilenamePasteAction() {
+    public ReplacePasteAction(final String replacementRegex,
+            final String replacementString) {
         super("NoSpacesPasteAction");
+
+        this.replacementRegex = replacementRegex;
+        this.replacementString = replacementString;
     }
-    
+
     /**
      * {@inheritDoc}
      *
@@ -63,35 +71,27 @@ public final class SanitisedFilenamePasteAction extends AbstractAction {
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        final JTextComponent comp;
-        
-        if (e.getSource() instanceof JTextComponent) {
-            comp = (JTextComponent) e.getSource();
-        } else {
-            return;
-        }
-        
-        String clipboard = null;
-        
-        if (!Toolkit.getDefaultToolkit().getSystemClipboard().
+        if (!(e.getSource() instanceof JTextComponent)
+                || !Toolkit.getDefaultToolkit().getSystemClipboard().
                 isDataFlavorAvailable(DataFlavor.stringFlavor)) {
             return;
         }
-        
+
         try {
-            //get the contents of the clipboard
-            clipboard = (String) Toolkit.getDefaultToolkit().
-                    getSystemClipboard().getData(DataFlavor.stringFlavor);
-            //remove invalid letters
-            clipboard = clipboard.replaceAll(INVALID_CHARS, "");
-            
-            //insert the contents at the current cursor position
-        comp.replaceSelection(clipboard);
+            //Get clipboard clipboard contents
+            //Replace spaces with nothing
+            //Replace the current selection with the contents of the clipboard
+            ((JTextComponent) e.getSource()).replaceSelection(((String)
+                    Toolkit.getDefaultToolkit()
+                    .getSystemClipboard().getData(DataFlavor.stringFlavor))
+                    .replaceAll(replacementRegex, replacementString));
         } catch (IOException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to get clipboard contents: " + ex.getMessage());
+            Logger.userError(ErrorLevel.LOW, "Unable to get clipboard "
+                    + "contents: " + ex.getMessage());
         } catch (UnsupportedFlavorException ex) {
-            Logger.appError(ErrorLevel.LOW, "Unable to get clipboard contents", ex);
+            Logger.appError(ErrorLevel.LOW, "Unable to get clipboard "
+                    + "contents", ex);
         }
     }
-    
+
 }

src/com/dmdirc/addons/ui_swing/actions/SearchAction.java

@@ -32,41 +32,41 @@ import javax.swing.AbstractAction;
  * Opens and focuses the search bar.
  */
 public final class SearchAction extends AbstractAction {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    
     /** Parent searchbar. */
     private final SwingSearchBar searchBar;
-    
-    /** 
-     * Creates a new instance of SearchAction. 
+
+    /**
+     * Creates a new instance of SearchAction.
      *
      * @param searchBar Parent searchbar.
      */
     public SearchAction(final SwingSearchBar searchBar) {
         super("Search");
-        
+
         this.searchBar = searchBar;
     }
-    
+
     /**
      * {@inheritDoc}
      *
      * @param e Action event
      */
     @Override
-    public void actionPerformed(final ActionEvent e) { 
+    public void actionPerformed(final ActionEvent e) {
         if (searchBar.isVisible()) {
             searchBar.getFocus();
-            searchBar.search(searchBar.getSearchPhrase(), searchBar.isCaseSensitive());
+            searchBar.search(searchBar.getSearchPhrase(),
+                    searchBar.isCaseSensitive());
         } else {
             searchBar.open();
         }
-    } 
-    
+    }
+
 }

src/com/dmdirc/addons/ui_swing/actions/TopicEnterAction.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -38,7 +38,7 @@ public class TopicEnterAction extends AbstractAction {
      */
     private static final long serialVersionUID = 1;
     /** Parent pane. */
-    private ChannelSettingsDialog parent;
+    private final ChannelSettingsDialog parent;
 
     /**
      * Creates a new topic enter action with the associated parent.
@@ -46,6 +46,7 @@ public class TopicEnterAction extends AbstractAction {
      * @param parent Parent dialog
      */
     public TopicEnterAction(final ChannelSettingsDialog parent) {
+        super("TopicEnterAction");
         this.parent = parent;
     }
 

src/com/dmdirc/addons/ui_swing/actions/UndoAction.java

@@ -35,28 +35,27 @@ import javax.swing.undo.UndoManager;
  * Handles undo's on text components.
  */
 public final class UndoAction extends AbstractAction {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
     /** Undo manager. */
     private final UndoManager undoManager;
-    
-    /** 
-     * Creates a new instance of UndoAction. 
+
+    /**
+     * Creates a new instance of UndoAction.
      *
      * @param undoManager UndoManager to use for this redo action
      */
     public UndoAction(final UndoManager undoManager) {
         super("Undo");
-        
+
         this.undoManager = undoManager;
     }
-    
+
     /**
      * {@inheritDoc}
      *
@@ -72,5 +71,5 @@ public final class UndoAction extends AbstractAction {
             Logger.userError(ErrorLevel.LOW, "Unable to undo");
         }
     }
-    
+
 }

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

@@ -30,24 +30,25 @@ import javax.swing.undo.UndoManager;
  * Undoable edit listener.
  */
 public final class DMDircUndoableEditListener implements UndoableEditListener {
-    
+
     /** Undo manager. */
     private final UndoManager undoManager;
-    
-    /** 
-     * Creates a new instance of DMDircUndoableEditListener. 
+
+    /**
+     * Creates a new instance of DMDircUndoableEditListener.
      *
      * @param undoManager UndoManager to use for this listener
      */
     public DMDircUndoableEditListener(final UndoManager undoManager) {
         super();
-        
+
         this.undoManager = undoManager;
     }
-    
+
     /** {@inheritDoc} */
+    @Override
     public void undoableEditHappened(final UndoableEditEvent evt) {
         undoManager.addEdit(evt.getEdit());
     }
-    
+
 }

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

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -43,20 +43,20 @@ public class EtchedLineBorder extends EtchedBorder {
     /** Border side. */
     public enum BorderSide {
         /** Creates a border at the top. */
-        TOP, 
+        TOP,
         /** Creates a border at the bottom. */
-        BOTTOM, 
+        BOTTOM,
     };
 
     /**
      * Creates a new etched line border.
-     * 
+     *
      * @param type Etch type
      * @param side Border side
      */
     public EtchedLineBorder(final int type, final BorderSide side) {
         super(type);
-        
+
         this.side = side;
     }
 
@@ -66,24 +66,19 @@ public class EtchedLineBorder extends EtchedBorder {
             final int y, final int width, final int height) {
         g.translate(x, y);
 
-        g.setColor(etchType == LOWERED ? getShadowColor(c) : getHighlightColor(c));
+        g.setColor(etchType == LOWERED
+                ? getShadowColor(c) : getHighlightColor(c));
         switch (side) {
             case TOP:
                 g.drawLine(0, 0, width - 2, 0);
-                break;
-            case BOTTOM:
-                g.drawLine(0, height - 1, width - 2, height - 1);
-                break;
-            default:
-                break;
-        }
-
-        g.setColor(etchType == LOWERED ? getHighlightColor(c) : getShadowColor(c));
-        switch (side) {
-            case TOP:
+                g.setColor(etchType == LOWERED
+                        ? getHighlightColor(c) : getShadowColor(c));
                 g.drawLine(0, 1, width - 2, 1);
                 break;
             case BOTTOM:
+                g.drawLine(0, height - 1, width - 2, height - 1);
+                g.setColor(etchType == LOWERED
+                        ? getHighlightColor(c) : getShadowColor(c));
                 g.drawLine(0, height, width - 2, height);
                 break;
             default:

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import java.io.File;
+
 import javax.swing.filechooser.FileFilter;
 
 /**
@@ -32,7 +33,7 @@ public class ExecutableFileFilter extends FileFilter {
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @param file File to check
      */
     @Override
@@ -40,13 +41,13 @@ public class ExecutableFileFilter extends FileFilter {
         return (file.isDirectory() || file.canExecute());
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @return Description
      */
     @Override
     public String getDescription() {
         return "Executable files";
     }
-}
+}

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

@@ -29,8 +29,8 @@ import com.dmdirc.util.ListenerList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.awt.event.KeyListener;
+
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.JPanel;
@@ -52,13 +52,10 @@ public class FileBrowser extends JPanel implements ActionListener {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-
-    /** Browse button. */
-    private JButton browseButton;
     /** Text field to show path of chosen file. */
-    private ValidatingJTextField pathField;
+    private final ValidatingJTextField pathField;
     /** File browsing window. */
-    private JFileChooser fileChooser = new JFileChooser();
+    private final JFileChooser fileChooser = new JFileChooser();
     /** Our listeners. */
     private final ListenerList listeners = new ListenerList();
 
@@ -69,9 +66,11 @@ public class FileBrowser extends JPanel implements ActionListener {
      * @param type The type of filechooser we want (Files/Directories/Both)
      */
     public FileBrowser(final PreferencesSetting setting, final int type) {
+        super();
+
         fileChooser.setFileSelectionMode(type);
-        
-        browseButton = new JButton("Browse");
+
+        final JButton browseButton = new JButton("Browse");
         browseButton.addActionListener(this);
 
         pathField = new ValidatingJTextField(new JTextField(setting.getValue()),

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

@@ -39,8 +39,14 @@ import javax.swing.SwingUtilities;
  */
 public class FontPicker extends JComboBox {
 
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
     private static final long serialVersionUID = -9054812588033935839L;
-    private String fontFamily;
+    /** Font family to choose from. */
+    private final String fontFamily;
 
     /**
      * Creates a new Font picker for the specified font family.
@@ -76,6 +82,12 @@ public class FontPicker extends JComboBox {
         }.executeInExecutor();
     }
 
+
+    /**
+     * Loads the fonts and adds them to the font picker.
+     *
+     * @param fonts Fonts to load
+     */
     private void loadFonts(final String[] fonts) {
         final int size = getFont().getSize();
         for (final String font : fonts) {

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

@@ -45,8 +45,8 @@ public class GenericComboBoxModel<T> extends GenericListModel<T> implements
     @Override
     @SuppressWarnings("unchecked")
     public void setSelectedItem(final Object anItem) {
-        if ((selectedObject != null && !selectedObject.equals(anItem)) || selectedObject
-                == null && anItem != null) {
+        if ((selectedObject != null && !selectedObject.equals(anItem))
+                || selectedObject == null && anItem != null) {
             selectedObject = (T) anItem;
             fireContentsChanged(this, -1, -1);
         }

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

@@ -1,17 +1,17 @@
 /*
- * 
+ *
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -37,22 +37,32 @@ import javax.swing.AbstractListModel;
  */
 public class GenericListModel<T> extends AbstractListModel {
 
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
     private static final long serialVersionUID = -4227892376992714545L;
-    private List<T> list;
+    /** Data stored in list. */
+    private final List<T> list;
 
     /**
      * Instantiates an empty generic list model.
      */
     public GenericListModel() {
+        super();
+
         this.list = Collections.synchronizedList(new ArrayList<T>());
     }
 
     /**
      * Instantiates a list model containing the specified list items.
      *
-     * @param list
+     * @param list Data to be included in the model
      */
     public GenericListModel(final List<T> list) {
+        super();
+
         this.list = Collections.synchronizedList(new ArrayList<T>(list));
     }
 
@@ -63,7 +73,7 @@ public class GenericListModel<T> extends AbstractListModel {
     }
 
     /**
-     * Returns the specified index in the list
+     * Returns the specified index in the list.
      *
      * @param index Index of the item to return
      *
@@ -167,7 +177,7 @@ public class GenericListModel<T> extends AbstractListModel {
      */
     public boolean remove(final T obj) {
         final int index = indexOf(obj);
-        boolean succes = list.remove(obj);
+        final boolean succes = list.remove(obj);
         if (index >= 0) {
             fireIntervalRemoved(this, index, index);
         }
@@ -199,7 +209,8 @@ public class GenericListModel<T> extends AbstractListModel {
      */
     public void removeRange(final int start, final int end) {
         if (start > end) {
-            throw new IllegalArgumentException("start must be greater than or equal to end");
+            throw new IllegalArgumentException("start must be greater than "
+                    + "or equal to end");
         }
         for (int i = end; i >= start; i--) {
             list.remove(i);
@@ -208,7 +219,7 @@ public class GenericListModel<T> extends AbstractListModel {
     }
 
     /**
-     * Adds all the objects in the specified collection to this list
+     * Adds all the objects in the specified collection to this list.
      *
      * @param collection Collection to add
      */
@@ -219,7 +230,7 @@ public class GenericListModel<T> extends AbstractListModel {
     /**
      * Adds all the objects in the specified collection to this list at the
      * specified index.
-     * 
+     *
      * @param index Index to add the items
      * @param collection Collection to add
      */

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

@@ -33,14 +33,14 @@ import javax.swing.JButton;
  * Image button.
  */
 public class ImageButton extends JButton {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    
+
     /**
      * Creates a new instance of ImageButton.
      *
@@ -50,7 +50,7 @@ public class ImageButton extends JButton {
     public ImageButton(final String actionCommand, final Icon icon) {
         this(actionCommand, icon, icon);
     }
-    
+
     /**
      * Creates a new instance of ImageButton.
      *
@@ -58,11 +58,11 @@ public class ImageButton extends JButton {
      * @param icon Normal icon for the button
      * @param rolloverIcon Rollover icon for the button
      */
-    public ImageButton(final String actionCommand, final Icon icon, 
+    public ImageButton(final String actionCommand, final Icon icon,
             final Icon rolloverIcon) {
         this(actionCommand, icon, rolloverIcon, rolloverIcon);
     }
-    
+
     /**
      * Creates a new instance of ImageButton.
      *
@@ -71,10 +71,10 @@ public class ImageButton extends JButton {
      * @param rolloverIcon Rollover icon for the button
      * @param pressedIcon Pressed icon for the button
      */
-    public ImageButton(final String actionCommand, final Icon icon, 
+    public ImageButton(final String actionCommand, final Icon icon,
             final Icon rolloverIcon, final Icon pressedIcon) {
         super();
-        
+
         setIcon(icon);
         setRolloverIcon(rolloverIcon);
         setPressedIcon(pressedIcon);
@@ -84,10 +84,10 @@ public class ImageButton extends JButton {
         setPreferredSize(new Dimension(16, 0));
         setActionCommand(actionCommand);
     }
-    
+
     /**
-     * Sets all the image buttons icons
-     * 
+     * Sets all the image buttons icons.
+     *
      * @param icon New icon
      */
     public void setIcons(final Icon icon) {

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

@@ -33,14 +33,14 @@ import javax.swing.JToggleButton;
  * Image toggle button.
  */
 public class ImageToggleButton extends JToggleButton {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    
+
     /**
      * Creates a new instance of ImageToggleButton.
      *
@@ -50,7 +50,7 @@ public class ImageToggleButton extends JToggleButton {
     public ImageToggleButton(final String actionCommand, final Icon icon) {
         this(actionCommand, icon, icon);
     }
-    
+
     /**
      * Creates a new instance of ImageToggleButton.
      *
@@ -58,11 +58,11 @@ public class ImageToggleButton extends JToggleButton {
      * @param icon Normal icon for the button
      * @param rolloverIcon Rollover icon for the button
      */
-    public ImageToggleButton(final String actionCommand, final Icon icon, 
+    public ImageToggleButton(final String actionCommand, final Icon icon,
             final Icon rolloverIcon) {
         this(actionCommand, icon, rolloverIcon, rolloverIcon);
     }
-    
+
     /**
      * Creates a new instance of ImageToggleButton.
      *
@@ -71,10 +71,10 @@ public class ImageToggleButton extends JToggleButton {
      * @param rolloverIcon Rollover icon for the button
      * @param pressedIcon Pressed icon for the button
      */
-    public ImageToggleButton(final String actionCommand, final Icon icon, 
+    public ImageToggleButton(final String actionCommand, final Icon icon,
             final Icon rolloverIcon, final Icon pressedIcon) {
         super();
-        
+
         setIcon(icon);
         setRolloverIcon(rolloverIcon);
         setPressedIcon(pressedIcon);
@@ -85,10 +85,10 @@ public class ImageToggleButton extends JToggleButton {
         setPreferredSize(new Dimension(16, 0));
         setActionCommand(actionCommand);
     }
-    
+
     /**
-     * Sets all the image buttons icons
-     * 
+     * Sets all the image buttons icons.
+     *
      * @param icon New icon
      */
     public void setIcons(final Icon icon) {

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

@@ -64,7 +64,7 @@ public class ListScroller implements MouseWheelListener {
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Moust wheel event
      */
     @Override

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

@@ -29,6 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package com.dmdirc.addons.ui_swing.components;
 
 import java.awt.Component;
@@ -101,7 +102,7 @@ public class LockedLayer<T extends JComponent> extends
     /** Effect to apply when locked. */
     private LayerEffect[] lockedEffects = new LayerEffect[0];
     /** Focus listener. */
-    private final FocusListener focusListener = new FocusListener() {
+    private final transient FocusListener focusListener = new FocusListener() {
 
         /** {@inheritDoc} */
         @Override
@@ -232,7 +233,7 @@ public class LockedLayer<T extends JComponent> extends
 
     /** {@inheritDoc} */
     @Override
-    protected void paintLayer(final Graphics2D g2, 
+    protected void paintLayer(final Graphics2D g2,
             final JXLayer<? extends T> l) {
         if (isLocked()) {
             // Note: this code will be called only if layer changes its size,

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

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -47,7 +47,7 @@ public abstract class LoggingSwingWorker<T, V> extends SwingWorker<T, V> {
         try {
             get();
         } catch (InterruptedException ex) {
-        //Ignore
+            //Ignore
         } catch (ExecutionException ex) {
             Logger.appError(ErrorLevel.MEDIUM, ex.getMessage(), ex);
         }

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

@@ -55,8 +55,10 @@ public class NewlinesDocumentFilter extends DocumentFilter {
 
     /**
      * Removes new lines from the text.
-     * 
+     *
      * @param text Text to sanitise
+     *
+     * @return Sanitised string
      */
     private String sanitise(final String text) {
         if (text.contains("\n")) {

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

@@ -1,5 +1,4 @@
 /*
- *
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -57,7 +56,7 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
      */
     private static final long serialVersionUID = 10;
     /** Nick list. */
-    private JList nickList;
+    private final JList nickList;
     /** Parent frame. */
     private final ChannelFrame frame;
     /** Config. */
@@ -91,7 +90,8 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
         config.addChangeListener("ui", "nickListAltBackgroundColour", this);
 
         nickList.setCellRenderer(new NicklistRenderer(config, nickList));
-        nickList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        nickList.setSelectionMode(
+                ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
         nickList.addMouseListener(this);
 
@@ -167,28 +167,30 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
      */
     @Override
     public void processMouseEvent(final MouseEvent e) {
-        if (e.getSource() == nickList && nickList.getMousePosition() != null &&
-                getMousePosition() != null) {
-            if (checkCursorInSelectedCell() || selectNickUnderCursor()) {
-                if (e.isPopupTrigger()) {
-                    final Object[] values = nickList.getSelectedValues();
-                    final StringBuilder builder = new StringBuilder();
-
-                    for (Object value : values) {
-                        if (builder.length() > 0) {
-                            builder.append("\n");
-                        }
-
-                        builder.append(((ChannelClientInfo) value).getClient().getNickname());
-                    }
-
-                    frame.showPopupMenu(new ClickTypeValue(ClickType.NICKNAME,
-                            builder.toString()), new Point(e.getXOnScreen(),
-                            e.getYOnScreen()));
+        if (!e.isPopupTrigger()
+                || e.getSource() != nickList
+                || getMousePosition() == null
+                || nickList.getMousePosition() != null) {
+            return;
+        }
+        if (checkCursorInSelectedCell() || selectNickUnderCursor()) {
+            final Object[] values = nickList.getSelectedValues();
+            final StringBuilder builder = new StringBuilder();
+
+            for (Object value : values) {
+                if (builder.length() > 0) {
+                    builder.append("\n");
                 }
-            } else {
-                nickList.clearSelection();
+
+                builder.append(((ChannelClientInfo) value).getClient()
+                        .getNickname());
             }
+
+            frame.showPopupMenu(new ClickTypeValue(ClickType.NICKNAME,
+                    builder.toString()), new Point(e.getXOnScreen(),
+                    e.getYOnScreen()));
+        } else {
+            nickList.clearSelection();
         }
 
         super.processMouseEvent(e);
@@ -243,11 +245,11 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        if ("nickListAltBackgroundColour".equals(key) ||
-                "nicklistbackgroundcolour".equals(key) ||
-                "backgroundcolour".equals(key) ||
-                "nicklistforegroundcolour".equals(key) ||
-                "foregroundcolour".equals(key)) {
+        if ("nickListAltBackgroundColour".equals(key)
+                || "nicklistbackgroundcolour".equals(key)
+                || "backgroundcolour".equals(key)
+                || "nicklistforegroundcolour".equals(key)
+                || "foregroundcolour".equals(key)) {
             nickList.setBackground(config.getOptionColour(
                     "ui", "nicklistbackgroundcolour",
                     "ui", "backgroundcolour"));
@@ -256,7 +258,8 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
                     "ui", "foregroundcolour"));
             nickList.repaint();
         }
-        nickList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        nickList.setSelectionMode(
+                ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
     }
 
     /** {@inheritDoc} */

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
+
 import java.io.Serializable;
 import java.util.Comparator;
 
@@ -37,17 +38,11 @@ public final class NicklistComparator implements Comparator<ChannelClientInfo>,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
-    /**
-     * whether to sort the nicklist by modes.
-     */
+    /** whether to sort the nicklist by modes. */
     private final boolean sortByMode;
-    
-    /**
-     * whether to sort the nicklist by case.
-     */
+    /** whether to sort the nicklist by case. */
     private final boolean sortByCase;
-    
+
     /**
      * Creates a new instance of NicklistComparator.
      * @param newSortByMode sorts by channel mode of the user
@@ -58,7 +53,7 @@ public final class NicklistComparator implements Comparator<ChannelClientInfo>,
         this.sortByMode = newSortByMode;
         this.sortByCase = newSortByCase;
     }
-    
+
     /**
      * Compares two ChannelClient objects based on the settings the comparator
      * was initialised with.
@@ -70,9 +65,6 @@ public final class NicklistComparator implements Comparator<ChannelClientInfo>,
     @Override
     public int compare(final ChannelClientInfo client1,
             final ChannelClientInfo client2) {
-        final String nickname1 = client1.getClient().getNickname();
-        final String nickname2 = client2.getClient().getNickname();
-        
         if (sortByMode) {
             final int modeCom = client2.compareTo(client1);
 
@@ -80,7 +72,10 @@ public final class NicklistComparator implements Comparator<ChannelClientInfo>,
                 return modeCom;
             }
         }
-        
+
+        final String nickname1 = client1.getClient().getNickname();
+        final String nickname2 = client2.getClient().getNickname();
+
         if (sortByCase) {
             return nickname1.compareTo(nickname2);
         } else {

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

@@ -58,7 +58,8 @@ public final class NicklistListModel extends AbstractListModel implements
      * @param config Config manager
      */
     public NicklistListModel(final ConfigManager config) {
-        this(config, Collections.synchronizedList(new ArrayList<ChannelClientInfo>()));
+        this(config, Collections.synchronizedList(
+                new ArrayList<ChannelClientInfo>()));
     }
 
     /**
@@ -122,13 +123,11 @@ public final class NicklistListModel extends AbstractListModel implements
      * @return boolean success
      */
     public boolean replace(final Collection<ChannelClientInfo> clients) {
-        boolean returnValue = false;
-
         nicknames.clear();
-        returnValue = nicknames.addAll(clients);
+        nicknames.addAll(clients);
         sort();
 
-        return returnValue;
+        return true;
     }
 
     /**
@@ -139,12 +138,10 @@ public final class NicklistListModel extends AbstractListModel implements
      * @return boolean success
      */
     public boolean add(final ChannelClientInfo client) {
-        boolean returnValue = false;
-
-        returnValue = nicknames.add(client);
+        nicknames.add(client);
         sort();
 
-        return returnValue;
+        return true;
     }
 
     /**
@@ -197,4 +194,4 @@ public final class NicklistListModel extends AbstractListModel implements
 
         sort();
     }
-}
+}

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

@@ -33,6 +33,11 @@ import javax.swing.JButton;
  */
 class NoFocusButton extends JButton {
 
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
     private static final long serialVersionUID = -8282006158788878000L;
 
     /**

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

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -44,9 +43,17 @@ import net.miginfocom.swing.MigLayout;
 public class OptionalJSpinner extends JPanel implements ActionListener,
         ChangeListener {
 
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
     private static final long serialVersionUID = -2867331420063503447L;
+    /** Composite spinner. */
     private final JSpinner spinner;
+    /** Composite checkbox. */
     private final JCheckBox checkbox;
+    /** Our listeners. */
     private final ListenerList listeners;
 
     /**
@@ -81,19 +88,21 @@ public class OptionalJSpinner extends JPanel implements ActionListener,
      * @param enabled Initial selected state
      */
     public OptionalJSpinner(final SpinnerModel model, final boolean enabled) {
+        super();
+
         checkbox = new JCheckBox("", enabled);
         spinner = new JSpinner(model);
         listeners = new ListenerList();
 
         spinner.setEnabled(enabled);
 
-        spinner.addChangeListener(this);
-        checkbox.addActionListener(this);
-
         setLayout(new MigLayout("fill"));
 
         add(checkbox, "");
         add(spinner, "growx, pushx");
+
+        spinner.addChangeListener(this);
+        checkbox.addActionListener(this);
     }
 
     /**
@@ -123,7 +132,7 @@ public class OptionalJSpinner extends JPanel implements ActionListener,
      * deal with this.
      *
      * This method simply delegates to the model. It is equivalent to:
-     * 
+     *
      * getModel().getValue()
      *
      * @return The current value
@@ -188,6 +197,7 @@ public class OptionalJSpinner extends JPanel implements ActionListener,
         listeners.remove(ChangeListener.class, listener);
     }
 
+    /** Fires change listeners. */
     private void fireChangeListener() {
         for (ChangeListener listener : listeners.get(ChangeListener.class)) {
             listener.stateChanged(new ChangeEvent(this));

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

@@ -30,6 +30,7 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
 import javax.swing.table.TableModel;
+
 import net.miginfocom.layout.PlatformDefaults;
 
 /**
@@ -51,7 +52,7 @@ public class PackingTable extends JTable {
     /** Border padding. */
     private final int padding = (int) PlatformDefaults.getUnitValueX("related").
             getValue();
-    
+
     /**
      * Creates a new packing table.
      *
@@ -72,7 +73,8 @@ public class PackingTable extends JTable {
      * @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).
+     * @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,
@@ -80,7 +82,7 @@ public class PackingTable extends JTable {
         this(new DefaultTableModel(rows, cols), editable, scrollPane,
                 lastColumnFit);
     }
-    
+
     /**
      * Creates a new packing table.
      *
@@ -99,7 +101,8 @@ public class PackingTable extends JTable {
      * @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).
+     * @param lastColumnFit Should the last column fit text (true),
+     * or fit viewport (false).
      */
     public PackingTable(final TableModel tableModel, final boolean editable,
             final JScrollPane scrollPane, final boolean lastColumnFit) {
@@ -143,9 +146,11 @@ public class PackingTable extends JTable {
             return;
         }
 
-        final TableColumnModel myColumnModel = getTableHeader().getColumnModel();
+        final TableColumnModel myColumnModel = getTableHeader()
+                .getColumnModel();
         final int numCols = myColumnModel.getColumnCount();
-        final int totalSize = (int) (scrollPane.getViewportBorderBounds().width * 0.99);
+        final int totalSize = (int) (scrollPane.getViewportBorderBounds()
+                .width * 0.99);
         final int[] widths = new int[numCols];
         int widthsTotal = 0;
 
@@ -153,7 +158,8 @@ public class PackingTable extends JTable {
         if (!lastColumnFit) {
             checkNumCols--;
         }
-        for (int i = 0; i < checkNumCols; i++) { //NOPMD im not copying a damn array fgs
+        
+        for (int i = 0; i < checkNumCols; i++) { //NOPMD I'm not copying
             widths[i] = getWidth(i);
             widthsTotal += widths[i];
         }

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

@@ -83,8 +83,8 @@ public final class ParamModePanel extends JPanel implements ActionListener {
         text = "Mode " + mode + ": ";
 
         if (configManager.hasOptionString("server", "mode" + mode)) {
-            text = configManager.getOption("server", "mode" + mode) +
-                    " [+"+mode+"]: ";
+            text = configManager.getOption("server", "mode" + mode)
+                    + " [+" + mode + "]: ";
         }
 
         checkBox = new JCheckBox(text, state);
@@ -154,7 +154,7 @@ public final class ParamModePanel extends JPanel implements ActionListener {
 
     /**
      * Returns the checkbox component.
-     * 
+     *
      * @return Checkbox component.
      */
     public Component getCheckboxComponent() {
@@ -163,7 +163,7 @@ public final class ParamModePanel extends JPanel implements ActionListener {
 
     /**
      * Returns the value component.
-     * 
+     *
      * @return Value component
      */
     public Component getValueComponent() {

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

@@ -30,48 +30,54 @@ import javax.swing.text.DocumentFilter;
  * Filters input to create valid filenames.
  */
 public class SanitisedFilenameFilter extends DocumentFilter {
-    
+
     /** Invalid filename characters. */
     private static final String INVALID_CHARS = "^[^\\w\\.\\s\\-\\#\\&\\_]";
-    
+
     /** Creates a new instance of SanitisedFilenameFilter. */
     public SanitisedFilenameFilter() {
         super();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void insertString(final DocumentFilter.FilterBypass fb,
             final int offset, final String string, final AttributeSet attr)
             throws BadLocationException {
-        
+
         if (string == null || string.isEmpty()) {
             return;
         } else {
             replace(fb, offset, string.length(), string, attr);
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void remove(final DocumentFilter.FilterBypass fb, final int offset,
             final int length) throws BadLocationException {
-        
+
         replace(fb, offset, length, "", null);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void replace(final DocumentFilter.FilterBypass fb, final int offset,
             final int length, final String text, final AttributeSet attrs)
             throws BadLocationException {
-        
+
         fb.replace(offset, length, sanitise(text), attrs);
     }
-    
-    /** Sanitises the proposed value. */
+
+    /**
+     * Sanitises the proposed value.
+     *
+     * @param proposedValue String to sanitise
+     *
+     * @return Sanitised string
+     */
     private String sanitise(final String proposedValue) {
         return proposedValue.replaceAll(INVALID_CHARS, "");
     }
-    
+
 }

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

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -24,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import java.util.Comparator;
+
 import javax.swing.DefaultListModel;
 
 /**
@@ -40,7 +40,7 @@ public class SortedListModel<T> extends DefaultListModel {
      */
     private static final long serialVersionUID = 1L;
     /** Comparator. */
-    private Comparator<T> comparator;
+    private final Comparator<T> comparator;
 
     /**
      * Creates a new sorted list model using the specified comparator.
@@ -48,6 +48,8 @@ public class SortedListModel<T> extends DefaultListModel {
      * @param comparator Comparator
      */
     public SortedListModel(final Comparator<T> comparator) {
+        super();
+        
         this.comparator = comparator;
     }
 

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

@@ -50,11 +50,10 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
 
     /** Orientation type . */
     public enum Orientation {
-
         /** Horizontal orientation. */
         HORIZONTAL,
         /** Vertical orientation. */
-        VERTICAL
+        VERTICAL;
     }
 
     /**
@@ -62,65 +61,17 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
      * split, two null components and snapping to the left component.
      */
     public SplitPane() {
-        this(Orientation.HORIZONTAL);
+        this(Orientation.HORIZONTAL, null, null);
     }
 
     /**
      * Instantiates a new snapping split pane. Defaults to using a horizontal
      * split, two null components and snapping to the left component.
      *
-     * @param snapDistance Distance to around the preferred size
-     */
-    public SplitPane(final int snapDistance) {
-        this(Orientation.HORIZONTAL, snapDistance);
-    }
-
-    /**
-     * Instantiates a new snapping split pane. Defaults to using a horizontal
-     * split and two null components.
-     *
-     * @param leftComponentSnap Snap to the preferred size of the left component?
-     */
-    public SplitPane(final boolean leftComponentSnap) {
-        this(Orientation.HORIZONTAL, leftComponentSnap, 10);
-    }
-
-    /**
-     * Instantiates a new snapping split pane. Defaults to using a horizontal
-     * split and two null components.
-     *
-     * @param leftComponentSnap Snap to the preferred size of the left component?
-     * @param snapDistance Distance to around the preferred size
-     */
-    public SplitPane(final boolean leftComponentSnap,
-            final int snapDistance) {
-        this(Orientation.HORIZONTAL, leftComponentSnap, snapDistance);
-    }
-
-    /**
-     * Instantiates a new snapping split pane. Defaults to using two null
-     * components and snapping to the left component.
-     *
      * @param orientation Split pane orientation
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
-     * <code>JSplitPane.VERTICAL_SPLIT</code>
      */
     public SplitPane(final Orientation orientation) {
-        this(orientation, null, null, 10);
-    }
-
-    /**
-     * Instantiates a new snapping split pane. Defaults to using two null
-     * components and snapping to the left component.
-     *
-     * @param orientation Split pane orientation
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
-     * <code>JSplitPane.VERTICAL_SPLIT</code>
-     * @param snapDistance Distance to around the preferred size
-     */
-    public SplitPane(final Orientation orientation,
-            final int snapDistance) {
-        this(orientation, null, null, snapDistance);
+        this(orientation, null, null);
     }
 
     /**
@@ -130,97 +81,18 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
      * @param orientation Split pane orientation
      * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
-     * @param leftComponentSnap Snap to the preferred size of the left component?
-     */
-    public SplitPane(final Orientation orientation,
-            final boolean leftComponentSnap) {
-        this(orientation, null, null, leftComponentSnap, 10);
-    }
-
-    /**
-     * Instantiates a new snapping split pane. Defaults to using two null
-     * components.
-     *
-     * @param orientation Split pane orientation
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
-     * <code>JSplitPane.VERTICAL_SPLIT</code>
-     * @param leftComponentSnap Snap to the preferred size of the left component?
-     * @param snapDistance Distance to around the preferred size
-     */
-    public SplitPane(final Orientation orientation,
-            final boolean leftComponentSnap, final int snapDistance) {
-        this(orientation, null, null, leftComponentSnap, snapDistance);
-    }
-
-    /**
-     * Instantiates a new snapping split pane. Defaults to using two null
-     * components and snapping to the left component.
-     *
-     * @param orientation Split pane orientation
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
-     * <code>JSplitPane.VERTICAL_SPLIT</code>
      * @param leftComponent left component
      * @param rightComponent right component
      */
     public SplitPane(final Orientation orientation,
             final Component leftComponent, final Component rightComponent) {
-        this(orientation, leftComponent, rightComponent, true, 10);
-    }
-
-    /**
-     * Instantiates a new snapping split pane. Defaults to using two null
-     * components and snapping to the left component.
-     *
-     * @param orientation Split pane orientation
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
-     * <code>JSplitPane.VERTICAL_SPLIT</code>
-     * @param leftComponent left component
-     * @param rightComponent right component
-     * @param snapDistance Distance to around the preferred size
-     */
-    public SplitPane(final Orientation orientation,
-            final Component leftComponent, final Component rightComponent,
-            final int snapDistance) {
-        this(orientation, leftComponent, rightComponent, true, snapDistance);
-    }
-
-    /**
-     * Instantiates a new snapping split pane. Defaults to using two null
-     * components.
-     *
-     * @param orientation Split pane orientation
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
-     * <code>JSplitPane.VERTICAL_SPLIT</code>
-     * @param leftComponent left component
-     * @param rightComponent right component
-     * @param leftComponentSnap Snap to the preferred size of the left component?
-     */
-    public SplitPane(final Orientation orientation,
-            final Component leftComponent, final Component rightComponent,
-            final boolean leftComponentSnap) {
-        this(orientation, leftComponent, rightComponent, leftComponentSnap, 10);
-    }
-
-    /**
-     * Instantiates a new snapping split pane. Defaults to using two null
-     * components.
-     *
-     * @param orientation Split pane orientation
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
-     * <code>JSplitPane.VERTICAL_SPLIT</code>
-     * @param leftComponent left component
-     * @param rightComponent right component
-     * @param leftComponentSnap Snap to the preferred size of the left component?
-     * @param snapDistance Distance to around the preferred size
-     */
-    public SplitPane(final Orientation orientation,
-            final Component leftComponent, final Component rightComponent,
-            final boolean leftComponentSnap, final int snapDistance) {
-        super((orientation.equals(Orientation.HORIZONTAL)) ? HORIZONTAL_SPLIT : VERTICAL_SPLIT,
+        super((orientation.equals(Orientation.HORIZONTAL))
+                ? HORIZONTAL_SPLIT : VERTICAL_SPLIT,
                 true, leftComponent, rightComponent);
 
         config = IdentityManager.getGlobalConfig();
-        useOneTouchExpandable = config.getOptionBool("ui", "useOneTouchExpandable");
+        useOneTouchExpandable = config.getOptionBool(
+                "ui", "useOneTouchExpandable");
 
         setOneTouchExpandable(useOneTouchExpandable);
         setContinuousLayout(true);
@@ -234,7 +106,8 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        useOneTouchExpandable = config.getOptionBool("ui", "useOneTouchExpandable");
+        useOneTouchExpandable = config.getOptionBool(
+                "ui", "useOneTouchExpandable");
 
         UIUtilities.invokeLater(new Runnable() {
 
@@ -246,4 +119,3 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
         });
     }
 }
-

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

@@ -294,7 +294,8 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
             if (event.getKeyCode() == KeyEvent.VK_ESCAPE) {
                 close();
             } else if (event.getKeyCode() == KeyEvent.VK_ENTER) {
-                search(Direction.UP, searchBox.getText(), caseCheck.isSelected());
+                search(Direction.UP, searchBox.getText(),
+                        caseCheck.isSelected());
             } else if (event.getKeyCode() != KeyEvent.VK_F3 && event.
                     getKeyCode() != KeyEvent.VK_F) {
                 line = parent.getTextPane().getLastVisibleLine();
@@ -408,6 +409,7 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
         setColours();
     }
 
+    /** Sets the colours used in this document. */
     private void setColours() {
         searchBox.setForeground(IdentityManager.getGlobalConfig().
                 getOptionColour("ui", "foregroundcolour"));
@@ -443,7 +445,8 @@ class SearchValidator implements Validator<String> {
 
     /**
      * Sets whether this validator validates.
-     * @param validates
+     *
+     * @param validates Does this search bar validate?
      */
     public void setValidates(final boolean validates) {
         this.validates = validates;

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

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -45,8 +44,6 @@ public class TitlePanel extends JPanel {
     private static final long serialVersionUID = -4026633984970698130L;
     /** Title label. */
     private JLabel title;
-    /** Title border. */
-    final Border border;
 
     /**
      * Instantiates a new title panel.
@@ -75,8 +72,6 @@ public class TitlePanel extends JPanel {
     public TitlePanel(final Border border, final String text) {
         super(new MigLayout());
 
-        this.border = border;
-
         title = new JLabel(text);
         title.setFont(title.getFont().deriveFont((float) (title.getFont().
                 getSize() * 1.5)));

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

@@ -1,5 +1,4 @@
 /*
- *
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

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

@@ -28,7 +28,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.actions.NoNewlinesPasteAction;
+import com.dmdirc.addons.ui_swing.actions.ReplacePasteAction;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
 import com.dmdirc.addons.ui_swing.components.text.WrapEditorKit;
 import com.dmdirc.config.IdentityManager;
@@ -117,7 +117,7 @@ public class TopicBar extends JComponent implements ActionListener,
                 new NewlinesDocumentFilter());
 
         topicText.getActionMap().put("paste-from-clipboard",
-                new NoNewlinesPasteAction());
+                new ReplacePasteAction("(\r\n|\n|\r)", " "));
         topicEdit = new ImageButton("edit", IconManager.getIconManager().
                 getIcon("edit-inactive"), IconManager.getIconManager().
                 getIcon("edit"));
@@ -153,6 +153,11 @@ public class TopicBar extends JComponent implements ActionListener,
         topicText.getActionMap().put("enterButton", new AbstractAction(
                 "enterButton") {
 
+            /**
+             * A version number for this class. It should be changed whenever the class
+             * structure is changed (or anything else that would prevent serialized
+             * objects being unserialized with the new class).
+             */
             private static final long serialVersionUID = 1;
 
             /** {@inheritDoc} */
@@ -255,9 +260,11 @@ public class TopicBar extends JComponent implements ActionListener,
      * Commits a topic edit to the parent channel.
      */
     private void commitTopicEdit() {
-        if ((channel.getCurrentTopic() == null && !topicText.getText().isEmpty())
+        if ((channel.getCurrentTopic() == null
+                && !topicText.getText().isEmpty())
                 || (channel.getCurrentTopic() != null
-                && !channel.getCurrentTopic().getTopic().equals(topicText.getText()))) {
+                && !channel.getCurrentTopic().getTopic()
+                .equals(topicText.getText()))) {
             channel.setTopic(topicText.getText());
         }
         ((ChannelFrame) controller.getWindowFactory().getSwingWindow(channel))

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

@@ -89,7 +89,8 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
      * @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,
+            final URLHandler urlHandler) {
         super();
 
         this.uri = url;
@@ -107,7 +108,8 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
         commandPath = new JTextField();
         optionType = new ButtonGroup();
         dmdirc = new JRadioButton("Use DMDirc");
-        browser = new JRadioButton("Use browser (or system registered handler)");
+        browser = new JRadioButton(
+                "Use browser (or system registered handler)");
         mail = new JRadioButton("Use mail client");
         custom = new JRadioButton("Custom command");
         subsLabel = new JLabel();
@@ -128,7 +130,7 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
             "password"
         }));
         subsPanel.setVisible(custom.isSelected());
-        
+
         updateSelection();
     }
 
@@ -173,20 +175,17 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
      * @return Selected value
      */
     public String getSelection() {
-        final String value;
         if (optionType.getSelection() == dmdirc.getModel()) {
-            value = "DMDIRC";
+            return "DMDIRC";
         } else if (optionType.getSelection() == browser.getModel()) {
-            value = "BROWSER";
+            return "BROWSER";
         } else if (optionType.getSelection() == mail.getModel()) {
-            value = "MAIL";
+            return "MAIL";
         } else if (optionType.getSelection() == custom.getModel()) {
-            value = commandPath.getText();
+            return commandPath.getText();
         } else {
-            value = "";
+            return "";
         }
-
-        return value;
     }
 
     /**
@@ -252,8 +251,8 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
             final JFileChooser fileChooser = new JFileChooser();
             fileChooser.addChoosableFileFilter(new ExecutableFileFilter());
             fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
-            if (fileChooser.showDialog(this, "Select") ==
-                    JFileChooser.APPROVE_OPTION) {
+            if (fileChooser.showDialog(this, "Select") 
+                    == JFileChooser.APPROVE_OPTION) {
                 commandPath.setText(fileChooser.getSelectedFile().toString());
             }
         } else {

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

@@ -189,8 +189,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         topicBar.setVisible(getContainer().getConfigManager().getOptionBool(
                 getController().getDomain(), "showtopicbar"));
 
-        splitPane = new SplitPane(
-                SplitPane.Orientation.HORIZONTAL, false);
+        splitPane = new SplitPane(SplitPane.Orientation.HORIZONTAL);
 
         getContentPane().setLayout(new MigLayout(
                 "fill, ins 0, hidemode 3, wrap 1"));

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -1,17 +1,17 @@
 /*
- * 
+ *
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -26,7 +26,7 @@ package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 import com.dmdirc.Channel;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.actions.NoNewlinesPasteAction;
+import com.dmdirc.addons.ui_swing.actions.ReplacePasteAction;
 import com.dmdirc.addons.ui_swing.actions.TopicEnterAction;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
@@ -109,9 +109,9 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 
-        topicText.getActionMap().put("paste-from-clipboard",    
-                    new NoNewlinesPasteAction());
-        topicText.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 
+        topicText.getActionMap().put("paste-from-clipboard",
+                    new ReplacePasteAction("(\r\n|\n|\r)", " "));
+        topicText.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,
                 0), new TopicEnterAction(parent));
         topicText.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,
                 UIUtilities.getCtrlDownMask()), new TopicEnterAction(parent));