Tidy up javadoc

Change-Id: I428d39dedd0380a783bb612ab6ff4176302eb157
Reviewed-on: http://gerrit.dmdirc.com/2884
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/dcc/kde/KFileChooser.java

@@ -53,7 +53,7 @@ import javax.swing.filechooser.FileSystemView;
  *   and kdialog is in either /usr/bin or /bin
  * - Selection mode FILES_AND_DIRECTORIES can not be used
  */
-public final class KFileChooser extends JFileChooser {
+public class KFileChooser extends JFileChooser {
 
     /**
      * A version number for this class.
@@ -165,6 +165,7 @@ public final class KFileChooser extends JFileChooser {
     /**
      * Constructs a FileChooser pointing to the user's default directory.
      *
+     * @param config Config provider used to retrieve settings
      * @param plugin The DCC Plugin that is requesting a chooser
      * @return The relevant FileChooser
      */
@@ -175,6 +176,7 @@ public final class KFileChooser extends JFileChooser {
     /**
      * Constructs a FileChooser using the given File as the path.
      *
+     * @param config Config provider used to retrieve settings
      * @param plugin The DCC Plugin that is requesting a chooser
      * @param currentDirectory Directory to use as the base directory
      * @return The relevant FileChooser
@@ -186,6 +188,7 @@ public final class KFileChooser extends JFileChooser {
     /**
      * Constructs a FileChooser using the given current directory and FileSystemView.
      *
+     * @param config Config provider used to retrieve settings
      * @param plugin The DCC Plugin that is requesting a chooser
      * @param currentDirectory Directory to use as the base directory
      * @param fsv The FileSystemView to use
@@ -198,6 +201,7 @@ public final class KFileChooser extends JFileChooser {
     /**
      * Constructs a FileChooser using the given FileSystemView.
      *
+     * @param config Config provider used to retrieve settings
      * @param plugin The DCC Plugin that is requesting a chooser
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
@@ -209,6 +213,7 @@ public final class KFileChooser extends JFileChooser {
     /**
      * Constructs a FileChooser using the given path.
      *
+     * @param config Config provider used to retrieve settings
      * @param plugin The DCC Plugin that is requesting a chooser
      * @param currentDirectoryPath Directory to use as the base directory
      * @return The relevant FileChooser
@@ -220,6 +225,7 @@ public final class KFileChooser extends JFileChooser {
     /**
      * Constructs a FileChooser using the given current directory path and FileSystemView.
      *
+     * @param config Config provider used to retrieve settings
      * @param plugin The DCC Plugin that is requesting a chooser
      * @param currentDirectoryPath Directory to use as the base directory
      * @param fsv The FileSystemView to use
@@ -254,7 +260,7 @@ public final class KFileChooser extends JFileChooser {
             return super.showOpenDialog(parent);
         }
 
-        final ArrayList<String> params = new ArrayList<String>();
+        final ArrayList<String> params = new ArrayList<>();
         if (isMultiSelectionEnabled()) {
             params.add("--multiple");
             params.add("--separate-output");
@@ -317,7 +323,7 @@ public final class KFileChooser extends JFileChooser {
             return super.showSaveDialog(parent);
         }
 
-        final ArrayList<String> params = new ArrayList<String>();
+        final ArrayList<String> params = new ArrayList<>();
         if (getDialogTitle() != null && !getDialogTitle().isEmpty()) {
             params.add("--caption");
             params.add(getDialogTitle());

src/com/dmdirc/addons/identd/IdentdServer.java

@@ -57,6 +57,9 @@ public final class IdentdServer implements Runnable {
 
     /**
      * Create the IdentdServer.
+     *
+     * @param plugin Parent ident plugin
+     * @param serverManager Server manager to iterate over servers
      */
     public IdentdServer(final IdentdPlugin plugin, final ServerManager serverManager) {
         super();

src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java

@@ -24,11 +24,12 @@ package com.dmdirc.addons.mediasource_dcop;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
-import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.NoSuchProviderException;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -45,11 +46,13 @@ public class DcopMediaSourcePlugin extends BasePlugin
 
     /**
      * Creates a new instance of DcopMediaSourcePlugin.
+     *
+     * @param pluginManager Plugin manager to retrieve services from
      */
     public DcopMediaSourcePlugin(final PluginManager pluginManager) {
         super();
         this.pluginManager = pluginManager;
-        sources = new ArrayList<MediaSource>();
+        sources = new ArrayList<>();
         sources.add(new AmarokSource(this));
         sources.add(new KaffeineSource(this));
         sources.add(new NoatunSource(this));
@@ -67,13 +70,13 @@ public class DcopMediaSourcePlugin extends BasePlugin
             return (List<String>) pluginManager.getExportedService("dcop")
                     .execute(query);
         } catch (NoSuchProviderException nspe) {
-            return new ArrayList<String>();
+            return new ArrayList<>();
         }
     }
 
     /** {@inheritDoc} */
     @Override
     public List<MediaSource> getSources() {
-        return sources;
+        return Collections.unmodifiableList(sources);
     }
 }

src/com/dmdirc/addons/osd/OsdManager.java

@@ -59,6 +59,7 @@ public class OsdManager {
     /**
      * Add messages to the queue and call displayWindows.
      *
+     * @param timeout Time message will be displayed
      * @param message Message to be displayed.
      */
     public void showWindow(final int timeout, final String message) {

src/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -49,7 +49,6 @@ public class DebugWindow extends FrameContainer {
      * @param title The title of this window
      * @param parser The parser this plugin is debugging
      * @param server The Server window this is a child of
-     * @param windowManager Window management
      */
     public DebugWindow(final DebugPlugin plugin, final String title, final Parser parser, final Server server) {
         super("raw", "Parser Debug", title, server.getConfigManager(),

src/com/dmdirc/addons/relaybot/RelayCallbackManager.java

@@ -61,8 +61,8 @@ public class RelayCallbackManager extends CallbackManager implements SocketClose
     /**
      * Create a new RelayCallbackManager and replace
      *
-     * @param myPlugin
-     * @param parser
+     * @param myPlugin Parent plugin
+     * @param parser Parser to relay
      */
     public RelayCallbackManager(final RelayBotPlugin myPlugin, final IRCParser parser) {
         super(parser, getImplementations());
@@ -74,8 +74,7 @@ public class RelayCallbackManager extends CallbackManager implements SocketClose
     }
 
     private static Map<Class<?>, Class<?>> getImplementations() {
-        final Map<Class<?>, Class<?>> implementations
-                = new HashMap<Class<?>, Class<?>>();
+        final Map<Class<?>, Class<?>> implementations = new HashMap<>();
 
         for (Class<?> child : IRCParser.class.getAnnotation(ChildImplementations.class).value()) {
             for (Class<?> iface : child.getInterfaces()) {
@@ -101,13 +100,7 @@ public class RelayCallbackManager extends CallbackManager implements SocketClose
                 if (myPlugin.isListening(channel)) {
                     return;
                 }
-            } catch (NoSuchFieldException ex) {
-                ex.printStackTrace();
-            } catch (SecurityException ex) {
-                ex.printStackTrace();
-            } catch (IllegalArgumentException ex) {
-                ex.printStackTrace();
-            } catch (IllegalAccessException ex) {
+            } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException ex) {
                 ex.printStackTrace();
             }
         }
@@ -136,8 +129,8 @@ public class RelayCallbackManager extends CallbackManager implements SocketClose
     /**
      * Set the Callback Manager of a given parser.
      *
-     * @param parser
-     * @param cbm
+     * @param parser Parser to set the callback manager on
+     * @param cbm Callback manager to set
      */
     private void setCallbackManager(final IRCParser parser, final CallbackManager cbm) {
         try {
@@ -172,13 +165,7 @@ public class RelayCallbackManager extends CallbackManager implements SocketClose
 
             // Replace the old one with the new one.
             field.set(parser, cbm);
-        } catch (IllegalArgumentException ex) {
-            ex.printStackTrace();
-        } catch (IllegalAccessException ex) {
-            ex.printStackTrace();
-        } catch (NoSuchFieldException ex) {
-            ex.printStackTrace();
-        } catch (SecurityException ex) {
+        } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException ex) {
             ex.printStackTrace();
         }
     }
@@ -186,7 +173,8 @@ public class RelayCallbackManager extends CallbackManager implements SocketClose
     /**
      * When the socket closes, reset the callback manager.
      *
-     * @param parser
+     * @param parser Parser to reset
+     * @param date Time socket closed
      */
     @Override
     public void onSocketClosed(final Parser parser, final Date date) {

src/com/dmdirc/addons/relaybot/RelayChannelHandler.java

@@ -69,6 +69,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
      * Create a new RelayChannelHandler.
      *
      * @param myPlugin Parent plugin
+     * @param identityController Identity controller to read settings from
      * @param myChannel channel to hax!
      */
     public RelayChannelHandler(

src/com/dmdirc/addons/relaybot/RelayClientInfo.java

@@ -48,7 +48,7 @@ public class RelayClientInfo extends IRCClientInfo {
     /**
      * Should the full nickname (nick@server) be used by getNickname?
      *
-     * @param value
+     * @param value Should we colour name?
      */
     public void setShowFullNickname(final boolean value) {
         showFullNickname = value;

src/com/dmdirc/addons/scriptplugin/ScriptEngineWrapper.java

@@ -47,7 +47,7 @@ public class ScriptEngineWrapper {
     private final File file;
 
     /** Script-Local JS Helper */
-    private JavaScriptHelper localHelper = new JavaScriptHelper();
+    private final JavaScriptHelper localHelper = new JavaScriptHelper();
 
     /** The script plugin that owns this wrapper. */
     private final ScriptPlugin plugin;
@@ -57,6 +57,9 @@ public class ScriptEngineWrapper {
      *
      * @param plugin The script plugin that owns this wrapper
      * @param filename Filename of script
+     *
+     * @throws java.io.FileNotFoundException If file is not found
+     * @throws javax.script.ScriptException If there was an error during creation
      */
     protected ScriptEngineWrapper(final ScriptPlugin plugin, final String filename) throws FileNotFoundException, ScriptException {
         this.plugin = plugin;
@@ -90,6 +93,11 @@ public class ScriptEngineWrapper {
 
     /**
      * Create a new engine for this script
+     *
+     * @return Created script engine
+     *
+     * @throws java.io.FileNotFoundException If file is not found
+     * @throws javax.script.ScriptException If there was an error during creation
      */
     protected ScriptEngine createEngine() throws FileNotFoundException, ScriptException {
         final ScriptEngine result = plugin.getScriptFactory().getEngineByName("JavaScript");
@@ -131,6 +139,8 @@ public class ScriptEngineWrapper {
 
     /**
      * Try to reload this script.
+     *
+     * @return True if script was reloaded
      */
     protected boolean reload() {
         // Tell the current engine that its about to be obliterated.

src/com/dmdirc/addons/scriptplugin/TypedProperties.java

@@ -128,7 +128,7 @@ public class TypedProperties extends Properties {
      *
      * @param in
      *            InputStream to load from.
-     * @throws java.io.IOException
+     * @throws java.io.IOException if an error occurs loading the XML
      */
     @Override
     public synchronized void loadFromXML(final InputStream in) throws IOException {
@@ -447,7 +447,7 @@ public class TypedProperties extends Properties {
             return fallback;
         } else {
             final String[] bits = res.split("\n");
-            final ArrayList<String> result = new ArrayList<String>();
+            final ArrayList<String> result = new ArrayList<>();
             for (final String bit : bits) {
                 result.add(bit);
             }

src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -44,7 +44,7 @@ import org.jdesktop.jxlayer.plaf.effect.BufferedImageOpEffect;
 /**
  * Dialog to show and edit server lists.
  */
-public final class ServerListDialog extends StandardDialog implements
+public class ServerListDialog extends StandardDialog implements
         ActionListener, ServerListListener {
 
     /** Serial version UID. */
@@ -76,7 +76,6 @@ public final class ServerListDialog extends StandardDialog implements
      * Creates a new server list dialog.
      *
      * @param controller Swing controller
-     * @param modalityType Desired modality
      * @param urlHandler The URL Handler to use to handle clicked links
      * @param performWrapper The wrapper to use for the perform tab
      */

src/com/dmdirc/addons/serverlists/ServerGroupItemBase.java

@@ -103,8 +103,7 @@ public abstract class ServerGroupItemBase implements ServerGroupItem {
     protected abstract ServerGroup getParent();
 
     /**
-     * Returns the {@link Identity} which corresponds to this server's desired
-     * profile.
+     * Returns the {@link ConfigProvider} which corresponds to this server's desired profile.
      *
      * @return This server's profile identity
      */

src/com/dmdirc/addons/serverlists/io/ServerEntryReader.java

@@ -34,7 +34,8 @@ import java.net.URISyntaxException;
 import lombok.RequiredArgsConstructor;
 
 /**
- * Facilitates loading of a {@link ServerEntry} from a DMDirc {@link Identity}.
+ * Facilitates loading of a {@link com.dmdirc.addons.serverlists.ServerEntry} from a DMDirc
+ * {@link com.dmdirc.interfaces.config.ConfigProvider}.
  *
  * @since 0.6.4
  */

src/com/dmdirc/addons/serverlists/io/ServerGroupReader.java

@@ -32,7 +32,7 @@ import java.net.URISyntaxException;
 import java.util.Map;
 
 /**
- * Facilitates loading of a {@link ServerGroup} from a DMDirc {@link Identity}.
+ * Facilitates loading of a {@link ServerGroup} from a DMDirc {@link ConfigProvider}.
  *
  * @since 0.6.4
  */
@@ -67,7 +67,7 @@ public class ServerGroupReader {
     /**
      * Reads the default server group from this reader's identity.
      *
-     * @see #read(java.lang.String)
+     * @see #read(ServerGroup, java.lang.String)
      * @return A ServerGroup corresponding to the identity's default group
      * @throws IllegalArgumentException If the identity doesn't define a group
      */
@@ -114,15 +114,10 @@ public class ServerGroupReader {
             } else if (item.endsWith(" server")) {
                 try {
                     group.addItem(entryReader.read(group, item));
-                } catch (URISyntaxException ex) {
-                    // TODO: Raise an error about malformed server
-                } catch (IllegalArgumentException ex) {
+                } catch (URISyntaxException | IllegalArgumentException ex) {
                     // TODO: Raise an error about malformed server
                 }
-            }
-
-            // TODO: Raise an error about unknown content?
-        }
+            }        }
 
         return group;
     }

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

@@ -89,6 +89,7 @@ public class Apple implements InvocationHandler, ActionListener {
      * </ul>
      *
      * @param configManager Config manager
+     * @param controller Parent swing controller
      */
     public Apple(final AggregateConfigProvider configManager, final SwingController controller) {
         this.configManager = configManager;
@@ -125,7 +126,7 @@ public class Apple implements InvocationHandler, ActionListener {
     private Object reflectMethod(final Object obj, final String className, final String methodName, final Class[] classes, final Object[] objects) {
         try {
             final Class<?> clazz = className == null ? obj.getClass() : Class.forName(className);
-            final Method method = clazz.getMethod(methodName, classes == null ? new Class[0] : classes);
+            final Method method = clazz.getMethod(methodName, classes == null ? new Class<?>[0] : classes);
             return method.invoke(obj, objects == null ? new Object[0] : objects);
         } catch (IllegalArgumentException | InvocationTargetException |
                 ClassNotFoundException | NoSuchMethodException | IllegalAccessException ex) {
@@ -209,7 +210,7 @@ public class Apple implements InvocationHandler, ActionListener {
      *                   the foreground, or only the foremost one
      */
     public void requestForeground(final boolean allWindows) {
-        doAppleMethod("requestForeground", new Class[]{Boolean.TYPE}, new Object[]{allWindows});
+        doAppleMethod("requestForeground", new Class<?>[]{Boolean.TYPE}, new Object[]{allWindows});
     }
 
     /**
@@ -222,7 +223,7 @@ public class Apple implements InvocationHandler, ActionListener {
      *            otherwise it will bounce until clicked on.
      */
     public void requestUserAttention(final boolean isCritical) {
-        doAppleMethod("requestUserAttention", new Class[]{Boolean.TYPE}, new Object[]{isCritical});
+        doAppleMethod("requestUserAttention", new Class<?>[]{Boolean.TYPE}, new Object[]{isCritical});
     }
 
     /**
@@ -231,7 +232,7 @@ public class Apple implements InvocationHandler, ActionListener {
      * @param menu the PopupMenu to attach to this application's Dock icon
      */
     public void setDockMenu(final PopupMenu menu) {
-        doAppleMethod("setDockMenu", new Class[]{PopupMenu.class}, new Object[]{menu});
+        doAppleMethod("setDockMenu", new Class<?>[]{PopupMenu.class}, new Object[]{menu});
     }
 
     /**
@@ -250,7 +251,7 @@ public class Apple implements InvocationHandler, ActionListener {
      * @param image The image to use
      */
     public void setDockIconImage(final Image image) {
-        doAppleMethod("setDockIconImage", new Class[]{Image.class}, new Object[]{image});
+        doAppleMethod("setDockIconImage", new Class<?>[]{Image.class}, new Object[]{image});
     }
 
     /**
@@ -270,7 +271,7 @@ public class Apple implements InvocationHandler, ActionListener {
      * @param badge textual label to affix to the Dock icon
      */
     public void setDockIconBadge(final String badge) {
-        doAppleMethod("setDockIconBadge", new Class[]{String.class}, new Object[]{badge});
+        doAppleMethod("setDockIconBadge", new Class<?>[]{String.class}, new Object[]{badge});
     }
 
     /**
@@ -281,7 +282,7 @@ public class Apple implements InvocationHandler, ActionListener {
      * @param menuBar to use when no other frames are active
      */
     public void setDefaultMenuBar(final JMenuBar menuBar) {
-        doAppleMethod("setDefaultMenuBar", new Class[]{JMenuBar.class}, new Object[]{menuBar});
+        doAppleMethod("setDefaultMenuBar", new Class<?>[]{JMenuBar.class}, new Object[]{menuBar});
     }
 
     /**
@@ -294,9 +295,9 @@ public class Apple implements InvocationHandler, ActionListener {
     private boolean addHandler(final String handlerClass, final String handlerMethod) {
         try {
             final Class<?> listenerClass = Class.forName(handlerClass);
-            final Object listener = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{listenerClass}, this);
+            final Object listener = Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{listenerClass}, this);
 
-            final Method method = getApplication().getClass().getMethod(handlerMethod, new Class[]{listenerClass});
+            final Method method = getApplication().getClass().getMethod(handlerMethod, new Class<?>[]{listenerClass});
             method.invoke(getApplication(), listener);
 
             return true;
@@ -337,13 +338,13 @@ public class Apple implements InvocationHandler, ActionListener {
         }
 
         try {
-            final Class[] classes = new Class[args.length];
+            final Class<?>[] classes = new Class<?>[args.length];
 
             for (int i = 0; i < args.length; i++) {
                 if (EventObject.class.isInstance(args[i])) {
                     classes[i] = EventObject.class;
                 } else {
-                    final Class c = args[i].getClass();
+                    final Class<?> c = args[i].getClass();
                     if (c.getCanonicalName().equals("com.apple.eawt.QuitResponse")) {
                         classes[i] = Object.class;
                     } else {

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

@@ -355,6 +355,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * For more details on what parameters might be required see
      * {@link DialogManager#getDialog(Class, Object...)}
      *
+     * @param <T> Dialog type
      * @see DialogManager#getDialog(Class, Object...) getDialog
      *
      * @param klass The class of the dialog to show

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

@@ -126,16 +126,8 @@ public final class UIUtilities {
     public static void initUISettings() {
         try {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (InstantiationException ex) {
-            throw new UnsupportedOperationException("Unable to switch to the " +
-                    "system look and feel", ex);
-        } catch (ClassNotFoundException ex) {
-            throw new UnsupportedOperationException("Unable to switch to the " +
-                    "system look and feel", ex);
-        } catch (UnsupportedLookAndFeelException ex) {
-            throw new UnsupportedOperationException("Unable to switch to the " +
-                    "system look and feel", ex);
-        } catch (IllegalAccessException ex) {
+        } catch (InstantiationException | ClassNotFoundException | 
+                  UnsupportedLookAndFeelException | IllegalAccessException ex) {
             throw new UnsupportedOperationException("Unable to switch to the " +
                     "system look and feel", ex);
         }
@@ -167,7 +159,7 @@ public final class UIUtilities {
      * @param font New font
      */
     public static void setUIFont(final Font font) {
-        final Enumeration keys = UIManager.getDefaults().keys();
+        final Enumeration<?> keys = UIManager.getDefaults().keys();
         while (keys.hasMoreElements()) {
             final Object key = keys.nextElement();
             final Object value = UIManager.get(key);
@@ -238,9 +230,6 @@ public final class UIUtilities {
      * @param returnable Thread to be executed
      *
      * @return Result from the completed thread or null if an exception occurred
-     *
-     * @throws Exception This method will re throw any exception thrown in the
-     * executed code
      */
     @SneakyThrows
     @SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes")
@@ -371,7 +360,7 @@ public final class UIUtilities {
      */
     public static String clipStringifNeeded(final JComponent component,
             final String string, final int avaiableWidth) {
-        if ((string == null) || (string.equals(""))) {
+        if ((string == null) || (string.isEmpty())) {
             return "";
         }
         final FontMetrics fm = component.getFontMetrics(component.getFont());
@@ -393,7 +382,7 @@ public final class UIUtilities {
      */
     public static String clipString(final JComponent component,
             final String string, final int avaiableWidth) {
-        if ((string == null) || (string.equals(""))) {
+        if ((string == null) || (string.isEmpty())) {
             return "";
         }
         final FontMetrics fm = component.getFontMetrics(component.getFont());
@@ -434,9 +423,9 @@ public final class UIUtilities {
      * colour of the textpane.
      *
      * @param g Graphics object to draw onto
-     * @param bounds
-     * @param backgroundImage
-     * @param backgroundOption
+     * @param bounds Bounds to paint within
+     * @param backgroundImage background image
+     * @param backgroundOption How to draw the background
      */
     public static void paintBackground(final Graphics2D g,
             final Rectangle bounds,

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

@@ -32,7 +32,7 @@ import javax.swing.JButton;
 /**
  * Image button, also has the ability to hold an object.
  *
- * <T> Type of object the button holds.
+ * @param <T> Type of object the button holds.
  */
 public class ImageButton<T> extends JButton {
 

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

@@ -51,7 +51,8 @@ public class ListScroller implements MouseWheelListener {
     /**
      * Creates a new instance of ListScroller. You will need to manually need
      * to add a listener to trigger the scrolling behaviour either by adding a
-     * mouse wheel listener or by triggering {@link changeFocus(boolean)}.
+     * mouse wheel listener or by triggering
+     * {@link #changeFocus(boolean)}.
      *
      * @param model List model to scroll over
      * @param selectionModel List selection model to scroll over
@@ -79,7 +80,7 @@ public class ListScroller implements MouseWheelListener {
      * Creates a new instance of ListScroller and attaches it to the specified
      * model and selection model.  You will need to manually need to add a
      * listener to trigger the scrolling behaviour either by adding a mouse
-     * wheel listener or by triggering {@link changeFocus(boolean)}.
+     * wheel listener or by triggering {@link #changeFocus(boolean)}.
      *
      * @param model List model to scroll over
      * @param selectionModel List selection model to scroll over

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

@@ -52,31 +52,31 @@ import org.jdesktop.jxlayer.plaf.effect.LayerEffect;
  * This allows temporarily blocking a part of the interface
  * with all it subcomponents, it is also useful when some kind of action
  * is in progress, e.g. reading data from a database.
- * <p/>
+ * <p>
  * When {@code true} is passed to the {@link #setLocked(boolean)},
  * the {@code JXLayer} of this {@code LockableLayerUI} becomes "locked".
  * It sets the "wait" mouse cursor and stops reacting
  * on mouse, keyboard and focus events.
- * <p/>
+ * <p>
  * If {@code setLocked(boolean)} is called with {@code false} parameter
  * after that, the {@code JXLayer}, together with all its subcomponents,
  * gets back to live.
- * <p/>
+ * <p>
  * Subclasses usually override {@link #paintLayer(Graphics2D,JXLayer)} or
  * {@link #getLayerEffects(JXLayer)} to implement some visual effects
  * when {@code JXLayer} is in locked state.
- * <p/>
+ * <p>
  * Here is an example of using {@code LockableLayerUI}:
  * <pre>
  * JComponent myComponent = getMyComponent(); // just any component
- * <p/>
+ *
  * LockableLayerUI lockableUI = new LockableLayerUI();
  * JXLayer&lt;JComponent&gt; layer = new JXLayer&lt;JComponent&gt;(myComponent,
  * lockableUI);
- * <p/>
+ *
  * // locking the layer, use lockableUI.setLocked(false) to unlock
  * lockableUI.setLocked(true);
- * <p/>
+ *
  * // add the layer to a frame or a panel, like any other component
  * frame.add(layer);
  * </pre>
@@ -301,8 +301,9 @@ public class LockedLayer<T extends JComponent> extends
 
     /**
      * This method returns the array of {@code LayerEffect}s
-     * set using {@link #setLayerEffects(LayerEffect...)}
-     * <p/>
+     * set using
+     * {@link #setLockedEffects(LayerEffect...)}
+     * <p>
      * If a {@code LockableUI} provides more extensive API
      * to support different {@code Effect}s depending on its state
      * or on the state of the passed {@code JXLayer},

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonFilter.java

@@ -44,14 +44,14 @@ public class AddonFilter extends RowFilter<DefaultTableModel, Integer> {
     /**
      * Creates a new addon filter.
      *
-     * @param verifiedBox
-     * @param unverifiedBox
-     * @param installedBox
-     * @param notinstalledBox
-     * @param pluginsBox
-     * @param themesBox
-     * @param actionsBox
-     * @param searchBox
+     * @param verifiedBox Verified checkbox
+     * @param unverifiedBox Unverified checkbox
+     * @param installedBox Installed checkbox
+     * @param notinstalledBox Not installed checkbox
+     * @param pluginsBox Plugins checkbox
+     * @param themesBox Themes checkbox
+     * @param actionsBox Actions checkbox
+     * @param searchBox Search field
      */
     public AddonFilter(final ButtonModel verifiedBox,
             final ButtonModel unverifiedBox, final ButtonModel installedBox,

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonSorter.java

@@ -42,12 +42,12 @@ public class AddonSorter extends TableRowSorter<DefaultTableModel> implements
     /**
      * Creates a new addon sorter.
      *
-     * @param model
-     * @param sortByDate
-     * @param sortByName
-     * @param sortByRating
-     * @param sortByStatus
-     * @param filter
+     * @param model Table model to sort
+     * @param sortByDate Sort by date
+     * @param sortByName Sort by name
+     * @param sortByRating Sort by rating
+     * @param sortByStatus Sort by status
+     * @param filter Addon filter
      */
     public AddonSorter(final DefaultTableModel model, final ButtonModel sortByDate,
             final ButtonModel sortByName, final ButtonModel sortByRating,

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java

@@ -65,6 +65,8 @@ public class DurationDisplay extends JPanel implements ActionListener,
 
     /**
      * Initialises a new duration display of 0 milliseconds.
+     *
+     * @param controller Controller for dialog creation
      */
     public DurationDisplay(final SwingController controller) {
         this(controller, 0);
@@ -73,6 +75,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
     /**
      * Instantiates a new duration display.
      *
+     * @param controller Controller for dialog creation
      * @param window Parent window.
      *
      * @since 0.6
@@ -85,6 +88,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
     /**
      * Instantiates a new duration display.
      *
+     * @param controller Controller for dialog creation
      * @param duration Starting duration
      */
     public DurationDisplay(final SwingController controller,
@@ -95,6 +99,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
     /**
      * Initialises a new duration display showing the specified millisecond duration.
      *
+     * @param controller Controller for dialog creation
      * @param window Parent window.
      * @param duration Duration to display in milliseconds
      *

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java

@@ -75,6 +75,8 @@ public class DurationEditor extends StandardDialog implements ActionListener {
 
     /**
      * Instantiates a new duration editor.
+     *
+     * @param controller Controller for dialog creation
      */
     public DurationEditor(final SwingController controller) {
         this(controller, 0);
@@ -83,6 +85,8 @@ public class DurationEditor extends StandardDialog implements ActionListener {
     /**
      * Instantiates a new duration editor.
      *
+     * @param controller Controller for dialog creation
+     *
      * @param window Parent window.
      *
      * @since 0.6
@@ -95,6 +99,8 @@ public class DurationEditor extends StandardDialog implements ActionListener {
     /**
      * Instantiates a new duration editor.
      *
+     * @param controller Controller for dialog creation
+     *
      * @param duration Starting duration
      */
     public DurationEditor(final SwingController controller,
@@ -105,7 +111,7 @@ public class DurationEditor extends StandardDialog implements ActionListener {
     /**
      * Instantiates a new duration editor.
      *
-     * @param controller Swing controller
+     * @param controller Controller for dialog creation
      * @param window Parent window.
      * @param duration Starting duration
      *

src/com/dmdirc/addons/ui_swing/components/expandingsettings/AddOptionPanel.java

@@ -119,7 +119,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
     /**
      * Adds an addable option.
      *
-     * @param optionName Option name
+     * @param setting Setting to add
      */
     protected void addOption(final JComponent setting) {
         ((DefaultComboBoxModel) addOptionComboBox.getModel())
@@ -131,7 +131,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
     /**
      * Removes an addable option.
      *
-     * @param optionName Option name
+     * @param setting Setting to add
      */
     protected void delOption(final JComponent setting) {
         ((DefaultComboBoxModel) addOptionComboBox.getModel())

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

@@ -41,6 +41,7 @@ public class AppleJFrame extends JFrame {
      * Create a new Apple JFrame
      *
      * @param parentWindow Main Window
+     * @param controller Parent swing controller
      */
     public AppleJFrame(final MainFrame parentWindow,
             final SwingController controller) {

src/com/dmdirc/addons/ui_swing/components/renderers/CertificateChainEntryCellRenderer.java

@@ -47,6 +47,7 @@ public class CertificateChainEntryCellRenderer extends DMDircListCellRenderer {
      * Creates a new renderer.
      *
      * @param iconManager Icon manager
+     * @param renderer Parent renderer
      */
     public CertificateChainEntryCellRenderer(final IconManager iconManager,
             final ListCellRenderer renderer) {
@@ -60,7 +61,7 @@ public class CertificateChainEntryCellRenderer extends DMDircListCellRenderer {
     @Override
     protected void renderValue(final JLabel label, final Object value,
             final int index, final boolean isSelected,
-            final boolean cellHasFocus) {
+            final boolean hasFocus) {
         if (value instanceof CertificateChainEntry) {
             final CertificateChainEntry entry = (CertificateChainEntry) value;
 

src/com/dmdirc/addons/ui_swing/components/validating/ValidatingJTextField.java

@@ -136,7 +136,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
     /**
      * Checks if the text validates.
      *
-     * @see com.dmdirc.ui.swing.components.validating.Validator#validate(Object)
+     * @see com.dmdirc.util.validators.Validator#validate(Object)
      *
      * @return true iif the text validates
      */
@@ -308,7 +308,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
      *
      * @return Specified textfield content
      *
-     * @throws javax.swing.text.BadLocationException
+     * @throws javax.swing.text.BadLocationException if the bounds are wrong
      */
     public String getText(final int offs, final int len) throws BadLocationException {
         return textField.getText(offs, len);

src/com/dmdirc/addons/ui_swing/dialogs/DMDircJOptionPane.java

@@ -60,7 +60,7 @@ public class DMDircJOptionPane extends JOptionPane {
     /**
      * Set the maximum number of characters per line.
      *
-     * @param maxCharactersPerLineCount
+     * @param maxCharactersPerLineCount Maximum characters per line
      */
     public void setMaxCharactersPerLineCount(final int maxCharactersPerLineCount) {
         this.maxCharactersPerLineCount = maxCharactersPerLineCount;

src/com/dmdirc/addons/ui_swing/dialogs/DialogManager.java

@@ -69,6 +69,8 @@ public class DialogManager {
      * this dialog to the user. For more details on what parameters might be
      * required see {@link DialogManager#getDialog(Class, Object...)}
      *
+     * @param <T> Dialog type
+     *
      * @see DialogManager#getDialog(Class, Object...) getDialog
      *
      * @param klass The class of the dialog to show
@@ -108,6 +110,8 @@ public class DialogManager {
      *   <li>DialogManager</li>
      * </ul>
      *
+     * @param <T> Dialog type
+     *
      * @param klass The class of the dialog to show
      * @param params Any non standard parameters required
      *
@@ -209,10 +213,9 @@ public class DialogManager {
      * Removes a previously created instance of a dialog from the dialog
      * manager.
      *
-     * @param klass The class of the dialog to show
+     * @param dialog Dialog to dispose of
      *
-     * @return Instance of the dialog that has been removed or null if there
-     * was no dialog created
+     * @return Instance of the dialog that has been removed or null if there was no dialog created
      */
     public StandardDialog dispose(final StandardDialog dialog) {
         if (dialogs.containsKey(dialog.getClass())) {

src/com/dmdirc/addons/ui_swing/dialogs/FeedbackDialog.java

@@ -250,7 +250,7 @@ public final class FeedbackDialog extends StandardDialog implements
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      *
      * @param e Document event
      */

src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceLoader.java

@@ -35,12 +35,14 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Map;
-import java.util.TreeMap;
 import java.util.Map.Entry;
+import java.util.TreeMap;
 
 import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.TreeNode;
 
 /**
  * Background loader of licences into a list.
@@ -57,6 +59,7 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
     /**
      * Instantiates a new licence loader.
      *
+     * @param controller to get plugin manager from to get plugin list from to read licenses
      * @param tree Tree
      * @param model Model to load licences into
      */
@@ -105,8 +108,7 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
 
     private void addCoreLicences(final ResourceManager rm) {
         final DefaultMutableTreeNode root = new DefaultMutableTreeNode("DMDirc");
-        final Map<String, InputStream> licences =
-                new TreeMap<String, InputStream>(String.CASE_INSENSITIVE_ORDER);
+        final Map<String, InputStream> licences = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         licences.putAll(rm.getResourcesStartingWithAsInputStreams(
                 "com/dmdirc/licences/"));
         addLicensesToNode(licences, root);
@@ -130,7 +132,7 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                model.insertNodeInto(root, (DefaultMutableTreeNode) model.
+                model.insertNodeInto(root, (MutableTreeNode) model.
                         getRoot(), model.getChildCount(model.getRoot()));
             }
         });
@@ -154,7 +156,7 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
     /** {@inheritDoc} */
     @Override
     protected void done() {
-        model.nodeStructureChanged((DefaultMutableTreeNode) model.getRoot());
+        model.nodeStructureChanged((TreeNode) model.getRoot());
         for (int i = 0; i < tree.getRowCount(); i++) {
             tree.expandRow(i);
         }

src/com/dmdirc/addons/ui_swing/dialogs/about/LicencesPanel.java

@@ -71,7 +71,7 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
     /**
      * Creates a new instance of LicencesPanel.
      *
-     * @param config Config manager
+     * @param controller Controller to pass to LicenseLoader (should be PluginManager)
      */
     public LicencesPanel(final SwingController controller) {
         super();

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsListPanel.java

@@ -89,6 +89,7 @@ public class ActionConditionsListPanel extends JPanel implements
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon manager to retrieve icons
      * @param trigger Action trigger
      * @param conditions List of existing conditions;
      * @param treePanel Condition tree panel.
@@ -99,11 +100,11 @@ public class ActionConditionsListPanel extends JPanel implements
             final ActionConditionsTreePanel treePanel) {
         super();
 
-        validations = new HashMap<ActionConditionDisplayPanel, Boolean>();
+        validations = new HashMap<>();
 
         this.iconManager = iconManager;
         this.trigger = trigger;
-        this.conditions = new ArrayList<ActionConditionDisplayPanel>(conditions);
+        this.conditions = new ArrayList<>(conditions);
         this.treePanel = treePanel;
 
         initComponents();
@@ -215,7 +216,7 @@ public class ActionConditionsListPanel extends JPanel implements
      */
     public List<ActionCondition> getConditions() {
         final List<ActionCondition> conditionList =
-                new ArrayList<ActionCondition>();
+                new ArrayList<>();
 
         synchronized (conditions) {
             for (final ActionConditionDisplayPanel condition : conditions) {

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialog.java

@@ -85,6 +85,7 @@ public class ActionEditorDialog extends StandardDialog implements
      * Instantiates the panel.
      *
      * @param controller Swing controller
+     * @param parentWindow Parent window
      * @param group Action's group
      */
     public ActionEditorDialog(final SwingController controller,
@@ -110,8 +111,8 @@ public class ActionEditorDialog extends StandardDialog implements
      * Instantiates the panel.
      *
      * @param controller Swing controller
+     * @param parentWindow Parent window
      * @param action Action to be edited
-     * @param group Action's group
      */
     public ActionEditorDialog(final SwingController controller,
             final Window parentWindow, final Action action) {
@@ -203,7 +204,7 @@ public class ActionEditorDialog extends StandardDialog implements
     }
 
     /**
-     * @{inheritDoc
+     * {@inheritDoc}
      *
      * @param e Action event
      */
@@ -227,7 +228,9 @@ public class ActionEditorDialog extends StandardDialog implements
         }
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void validate() {
         super.validate();
@@ -272,7 +275,9 @@ public class ActionEditorDialog extends StandardDialog implements
         }
     }
 
-    /** @{inheritDoc */
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void propertyChange(final PropertyChangeEvent evt) {
         if (evt.getSource().equals(name)) {

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

@@ -57,7 +57,7 @@ public final class ActionGroupSettingsPanel extends JPanel implements ActionList
     private static final long serialVersionUID = 1;
     /** Settings list. */
     private Collection<PreferencesSetting> settings;
-    /** Button -> Component map. */
+    /** Button to Component map. */
     private Map<JButton, PreferencesSetting> settingMap;
     /** Parent dialog. */
     private Window window;

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

@@ -101,6 +101,9 @@ public final class ActionsManagerDialog extends StandardDialog implements
 
     /**
      * Creates a new instance of ActionsManagerDialog.
+     *
+     * @param parentWindow Parent window
+     * @param controller Parent controller
      */
     @SuppressWarnings("unchecked")
     public ActionsManagerDialog(final Window parentWindow,
@@ -110,7 +113,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
                 controller) : null, ModalityType.MODELESS);
 
         initComponents();
-        validator = new ValidatorChain<String>(
+        validator = new ValidatorChain<>(
                 new ActionGroupNoDuplicatesInListValidator(groups,
                 (DefaultListModel) groups.getModel()), new FileNameValidator());
         addListeners();
@@ -131,11 +134,11 @@ public final class ActionsManagerDialog extends StandardDialog implements
                 + " intelligently respond to various events.  Action groups are"
                 + " there for you to organise groups, add or remove them"
                 + " to suit your needs.");
-        groups = new JList(new SortedListModel<ActionGroup>(
+        groups = new JList(new SortedListModel<>(
                 new ActionGroupNameComparator()));
         actions = new ActionsGroupPanel(getController(), this, null);
         info = new ActionGroupInformationPanel(null);
-        settings = new HashMap<ActionGroup, ActionGroupSettingsPanel>();
+        settings = new HashMap<>();
         activeSettings = new ActionGroupSettingsPanel(getController()
                 .getPrefsComponentFactory(), null, this);
         settings.put(null, activeSettings);

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

@@ -44,7 +44,7 @@ public class SettingsRevertButton extends JButton implements SettingChangeListen
     /**
      * Instantiates a new settings revert button.
      *
-     * @param setting
+     * @param setting Setting to revert
      */
     public SettingsRevertButton(final PreferencesSetting setting) {
         super("Revert");

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

@@ -249,7 +249,7 @@ public class CategoryPanel extends JPanel {
     /**
      * Sets this panel to a waiting to load state.
      *
-     * @param b
+     * @param b Loading state
      */
     public void setWaiting(final boolean b) {
         UIUtilities.invokeLater(new Runnable() {

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

@@ -51,25 +51,26 @@ public class PreferencesListCellRenderer extends JLabel implements ListCellRende
     /** Number of categories shown. */
     private final int numCats;
     /** Icon manager. */
-    private IconManager iconManager;
+    private final IconManager iconManager;
     /** Label map. */
-    private Map<PreferencesCategory, JLabel> labelMap;
+    private final Map<PreferencesCategory, JLabel> labelMap;
 
     /**
      * Instantiates a new prefs list cell renderer.
      *
+     * @param iconManager Icon manager to load icons
      * @param numCats Number of categories in the list
      */
     public PreferencesListCellRenderer(final IconManager iconManager,
             final int numCats) {
-        labelMap = new HashMap<PreferencesCategory, JLabel>();
+        labelMap = new HashMap<>();
         this.numCats = numCats;
         this.iconManager = iconManager;
     }
 
     /** {@inheritDoc} */
     @Override
-    public final Component getListCellRendererComponent(final JList list,
+    public Component getListCellRendererComponent(final JList list,
             final Object value, final int index, final boolean isSelected,
             final boolean cellHasFocus) {
         final PreferencesCategory cat = (PreferencesCategory) value;

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/FrameToggleButton.java

@@ -23,6 +23,7 @@ package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.ui.Window;
+
 import javax.swing.Icon;
 import javax.swing.JToggleButton;
 
@@ -43,7 +44,13 @@ public class FrameToggleButton extends JToggleButton {
     /** Contains the window associated with this button. */
     private final Window window;
 
-    /** Create a new instance of FrameToggleButton. */
+    /**
+     * Create a new instance of FrameToggleButton.
+     *
+     * @param text Text to show
+     * @param icon Icon to show
+     * @param window Parent window
+     */
     public FrameToggleButton(final String text, final Icon icon, final Window window) {
         super(text, icon);
         this.window = window;

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewTreeCellRenderer.java

@@ -61,6 +61,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
     /**
      * Creates a new instance of TreeViewTreeCellRenderer.
      *
+     * @param config Config manager to retrieve settings from
      * @param manager Parent TreeFrameManager
      */
     public TreeViewTreeCellRenderer(final AggregateConfigProvider config,
@@ -90,7 +91,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
      * @return RendererComponent for this node.
      */
     @Override
-    public final Component getTreeCellRendererComponent(final JTree tree,
+    public Component getTreeCellRendererComponent(final JTree tree,
             final Object value, final boolean sel, final boolean expanded,
             final boolean leaf, final int row, final boolean hasFocus) {
 
@@ -101,7 +102,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
         if (label == null) {
             return new JLabel("Label == null");
         }
-        boolean bold = false;
+        boolean bold;
         Color background = tree.getBackground();
         Color foreground = tree.getForeground();
 

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -73,7 +73,7 @@ public final class WindowMenuFrameManager extends JMenu implements
     private final AtomicBoolean enabledMenuItems = new AtomicBoolean(false);
     /** Swing controller. */
     private final SwingController controller;
-    /** Window -> menu map. */
+    /** Window to menu map. */
     private final Map<FrameContainer, FrameContainerMenu> menus;
     private final Map<FrameContainer, FrameContainerMenuItem> items;
     private final Map<FrameContainer, FrameContainerMenuItem> menuItems;

src/com/dmdirc/addons/ui_swing/textpane/BackgroundPainter.java

@@ -98,6 +98,7 @@ public class BackgroundPainter extends LayerUI<JComponent> {
      * Creates a new background painter.
      *
      * @param configManager Config manager to retrieve settings from
+     * @param urlBuilder URL Builder
      * @param domain Domain to retrieve settings from
      * @param imageKey Key for background image
      * @param optionKey Key for background type

src/com/dmdirc/addons/ui_swing/wizard/WizardDialog.java

@@ -37,14 +37,14 @@ import javax.swing.JButton;
 /**
  * Basic wizard container.
  */
-public final class WizardDialog extends StandardDialog implements ActionListener {
+public class WizardDialog extends StandardDialog implements ActionListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** Wizard. */
     private final WizardPanel wizard;
     /** Parent container. */
-    private Window parentWindow;
+    private final Window parentWindow;
 
     /**
      * Creates a new instance of WizardFrame that requires a mainframe.
@@ -165,7 +165,7 @@ public final class WizardDialog extends StandardDialog implements ActionListener
     /**
      * Adds a step listener to the list.
      *
-     * @param listener
+     * @param listener Listener to add
      */
     public void addStepListener(final StepListener listener) {
         wizard.addStepListener(listener);
@@ -174,7 +174,7 @@ public final class WizardDialog extends StandardDialog implements ActionListener
     /**
      * Removes a step listener from the list.
      *
-     * @param listener
+     * @param listener Listener to remove
      */
     public void removeStepListener(final StepListener listener) {
         wizard.removeStepListener(listener);
@@ -183,7 +183,7 @@ public final class WizardDialog extends StandardDialog implements ActionListener
     /**
      * Adds a wizard listener to the list.
      *
-     * @param listener
+     * @param listener Listener to add
      */
     public void addWizardListener(final WizardListener listener) {
         wizard.addWizardListener(listener);
@@ -192,7 +192,7 @@ public final class WizardDialog extends StandardDialog implements ActionListener
     /**
      * Removes a wizard listener from the list.
      *
-     * @param listener
+     * @param listener Listener to remove
      */
     public void removeWizardListener(final WizardListener listener) {
         wizard.removeWizardListener(listener);

src/com/dmdirc/addons/ui_swing/wizard/WizardFrame.java

@@ -32,7 +32,7 @@ import javax.swing.JFrame;
 /**
  * Basic wizard container.
  */
-public final class WizardFrame extends JFrame {
+public class WizardFrame extends JFrame {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -128,7 +128,7 @@ public final class WizardFrame extends JFrame {
     /**
      * Adds a step listener to the list.
      *
-     * @param listener
+     * @param listener Listener to add
      */
     public void addStepListener(final StepListener listener) {
         wizard.addStepListener(listener);
@@ -137,7 +137,7 @@ public final class WizardFrame extends JFrame {
     /**
      * Removes a step listener from the list.
      *
-     * @param listener
+     * @param listener Listener to remove
      */
     public void removeStepListener(final StepListener listener) {
         wizard.removeStepListener(listener);
@@ -146,7 +146,7 @@ public final class WizardFrame extends JFrame {
     /**
      * Adds a wizard listener to the list.
      *
-     * @param listener
+     * @param listener Listener to add
      */
     public void addWizardListener(final WizardListener listener) {
         wizard.addWizardListener(listener);
@@ -155,7 +155,7 @@ public final class WizardFrame extends JFrame {
     /**
      * Removes a wizard listener from the list.
      *
-     * @param listener
+     * @param listener Listener to remove
      */
     public void removeWizardListener(final WizardListener listener) {
         wizard.removeWizardListener(listener);

src/com/dmdirc/addons/ui_swing/wizard/WizardPanel.java

@@ -19,7 +19,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package com.dmdirc.addons.ui_swing.wizard;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -82,7 +81,7 @@ public class WizardPanel extends JPanel implements ActionListener {
         super();
 
         stepListeners = new ListenerList();
-        this.steps = new ArrayList<Step>(steps);
+        this.steps = new ArrayList<>(steps);
 
         this.title = title;
 
@@ -190,22 +189,25 @@ public class WizardPanel extends JPanel implements ActionListener {
 
     /** Moves to the next step. */
     protected void nextStep() {
-        if ("Next \u00BB".equals(next.getText())) {
-            prev.setEnabled(true);
-            fireStepAboutToBeDisplayed(steps.get(currentStep + 1));
-            stepsPanel.setVisible(false);
-            stepsPanel.removeAll();
-            stepsPanel.add(steps.get(currentStep + 1));
-            stepsPanel.setVisible(true);
-            fireStepHidden(steps.get(currentStep));
-            currentStep++;
-            if (currentStep == steps.size() - 1) {
-                next.setText("Finish");
-            }
-            titleLabel.setText(steps.get(currentStep).getTitle());
-            updateProgressLabel();
-        } else if ("Finish".equals(next.getText())) {
-            fireWizardFinished();
+        switch (next.getText()) {
+            case "Next \u00BB":
+                prev.setEnabled(true);
+                fireStepAboutToBeDisplayed(steps.get(currentStep + 1));
+                stepsPanel.setVisible(false);
+                stepsPanel.removeAll();
+                stepsPanel.add(steps.get(currentStep + 1));
+                stepsPanel.setVisible(true);
+                fireStepHidden(steps.get(currentStep));
+                currentStep++;
+                if (currentStep == steps.size() - 1) {
+                    next.setText("Finish");
+                }
+                titleLabel.setText(steps.get(currentStep).getTitle());
+                updateProgressLabel();
+                break;
+            case "Finish":
+                fireWizardFinished();
+                break;
         }
     }
 
@@ -248,14 +250,14 @@ public class WizardPanel extends JPanel implements ActionListener {
 
     /** Updates the progress label. */
     private void updateProgressLabel() {
-        progressLabel.setText("Step " + (currentStep + 1) + " of " +
-                steps.size());
+        progressLabel.setText("Step " + (currentStep + 1) + " of "
+                + steps.size());
     }
 
     /**
      * Adds a step listener to the list.
      *
-     * @param listener
+     * @param listener Listener to add
      */
     public void addStepListener(final StepListener listener) {
         stepListeners.add(StepListener.class, listener);
@@ -264,7 +266,7 @@ public class WizardPanel extends JPanel implements ActionListener {
     /**
      * Removes a step listener from the list.
      *
-     * @param listener
+     * @param listener Listener to remove
      */
     public void removeStepListener(final StepListener listener) {
         stepListeners.remove(StepListener.class, listener);
@@ -273,7 +275,7 @@ public class WizardPanel extends JPanel implements ActionListener {
     /**
      * Adds a wizard listener to the list.
      *
-     * @param listener
+     * @param listener Listener to add
      */
     public void addWizardListener(final WizardListener listener) {
         stepListeners.add(WizardListener.class, listener);
@@ -282,7 +284,7 @@ public class WizardPanel extends JPanel implements ActionListener {
     /**
      * Removes a wizard listener from the list.
      *
-     * @param listener
+     * @param listener Listener to remove
      */
     public void removeWizardListener(final WizardListener listener) {
         stepListeners.remove(WizardListener.class, listener);

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

@@ -45,23 +45,22 @@ import java.util.Map;
 public class WebWindowManager implements FrameListener {
 
     /** A map of known implementations of window interfaces. */
-    private static final Map<Collection<String>, Class<? extends Window>> IMPLEMENTATIONS
-            = new HashMap<Collection<String>, Class<? extends Window>>();
+    private static final Map<Collection<String>, Class<? extends Window>> IMPLEMENTATIONS = new HashMap<>();
 
     static {
-        IMPLEMENTATIONS.put(new HashSet<String>(
+        IMPLEMENTATIONS.put(new HashSet<>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier())),
                 WebWindow.class);
-        IMPLEMENTATIONS.put(new HashSet<String>(
+        IMPLEMENTATIONS.put(new HashSet<>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier())),
                 WebInputWindow.class);
-        IMPLEMENTATIONS.put(new HashSet<String>(
+        IMPLEMENTATIONS.put(new HashSet<>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier(),
                 WindowComponent.CERTIFICATE_VIEWER.getIdentifier())),
                 WebInputWindow.class);
-        IMPLEMENTATIONS.put(new HashSet<String>(
+        IMPLEMENTATIONS.put(new HashSet<>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier(),
                 WindowComponent.TOPICBAR.getIdentifier(),
@@ -76,17 +75,16 @@ public class WebWindowManager implements FrameListener {
     private long nextId = 0l;
 
     /** Map of known windows. */
-    private final Map<FrameContainer, WebWindow> windows
-            = new HashMap<FrameContainer, WebWindow>();
+    private final Map<FrameContainer, WebWindow> windows = new HashMap<>();
 
     /** A map of window IDs to their windows. */
-    private final Map<String, WebWindow> windowsById
-            = new HashMap<String, WebWindow>();
+    private final Map<String, WebWindow> windowsById = new HashMap<>();
 
     /**
      * Creates a new window manager for the specified controller.
      *
      * @param controller The Web UI controller that owns this manager
+     * @param windowManager Window manager to add/remove windows
      */
     public WebWindowManager(final WebInterfaceUI controller, final WindowManager windowManager) {
         this.controller = controller;
@@ -181,7 +179,7 @@ public class WebWindowManager implements FrameListener {
 
             windows.put(window, frame);
             windowsById.put(id, frame);
-        } catch (Exception ex) {
+        } catch (ReflectiveOperationException ex) {
             Logger.appError(ErrorLevel.MEDIUM, "Unable to create window of type "
                     + clazz.getCanonicalName() + " for web ui", ex);
         }