Style fixes

Change-Id: Ic4b352f4e88a13423babf63543553f0da1b5ece5
Reviewed-on: http://gerrit.dmdirc.com/1576
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -58,14 +58,11 @@ public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
     public void close() {
         int dccs = 0;
         for (FrameContainer<?> window : getChildren()) {
-            if (window instanceof TransferContainer) {
-                if (((TransferContainer) window).getDCC().isActive()) {
-                    dccs++;
-                }
-            } else if (window instanceof ChatContainer) {
-                if (((ChatContainer) window).getDCC().isActive()) {
-                    dccs++;
-                }
+            if ((window instanceof TransferContainer
+                    && ((TransferContainer) window).getDCC().isActive())
+                    || (window instanceof ChatContainer
+                    && ((ChatContainer) window).getDCC().isActive())) {
+                dccs++;
             }
         }
 
@@ -93,6 +90,7 @@ public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
                 /** {@inheritDoc} */
                 @Override
                 public void cancelled() {
+                    // Don't close!
                 }
             }.display();
         } else {

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

@@ -130,10 +130,8 @@ public final class IdentdServer implements Runnable {
                 Logger.userError(ErrorLevel.MEDIUM, "Unable to start identd server: " + e.getMessage());
                 if (e.getMessage().equals("Permission denied")) {
                     final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName("identd");
-                    if (plugin != null) {
-                        if (PluginManager.getPluginManager().delPlugin(plugin.getRelativeFilename())) {
-                            PluginManager.getPluginManager().updateAutoLoad(plugin);
-                        }
+                    if (plugin != null && PluginManager.getPluginManager().delPlugin(plugin.getRelativeFilename())) {
+                        PluginManager.getPluginManager().updateAutoLoad(plugin);
                     }
                 }
             }

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -332,7 +332,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
         final String filename = getLogFile(channel);
 
         final ChannelClientInfo channelClient = (arguments.length > 1 && arguments[1] instanceof ChannelClientInfo) ? (ChannelClientInfo) arguments[1] : null;
-        final ClientInfo client = (channelClient != null) ? channelClient.getClient() : null;
+        final ClientInfo client = channelClient == null ? null : channelClient.getClient();
 
         final String message = (arguments.length > 2 && arguments[2] instanceof String) ? (String) arguments[2] : null;
 

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

@@ -43,10 +43,12 @@ public class AmarokSource implements MediaSource {
     @Override
     public MediaSourceState getState() {
         final List<String> res = DcopMediaSourcePlugin.getDcopResult("dcop amarok player status");
-        if (res.size() > 0) {
+        if (res.isEmpty()) {
+            return MediaSourceState.CLOSED;
+        } else {
             final String result = res.get(0).trim();
             try {
-                final int status = (Integer.parseInt(result));
+                final int status = Integer.parseInt(result);
                 switch (status) {
                     case 0:
                         return MediaSourceState.STOPPED;
@@ -60,8 +62,6 @@ public class AmarokSource implements MediaSource {
             } catch (NumberFormatException nfe) {
                 return MediaSourceState.CLOSED;
             }
-        } else {
-            return MediaSourceState.CLOSED;
         }
     }
     

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

@@ -43,10 +43,12 @@ public class NoatunSource implements MediaSource {
     @Override
     public MediaSourceState getState() {
         final List<String> res = DcopMediaSourcePlugin.getDcopResult("dcop noatun Noatun state");
-        if (res.size() > 0) {
+        if (res.isEmpty()) {
+            return MediaSourceState.CLOSED;
+        } else {
             final String result = res.get(0).trim();
             try {
-                final int status = (Integer.parseInt(result));
+                final int status = Integer.parseInt(result);
                 switch (status) {
                     case 0:
                         return MediaSourceState.STOPPED;
@@ -60,8 +62,6 @@ public class NoatunSource implements MediaSource {
             } catch (NumberFormatException nfe) {
                 return MediaSourceState.CLOSED;
             }
-        } else {
-            return MediaSourceState.CLOSED;
         }
     }
     

src/com/dmdirc/addons/notifications/NotificationCommand.java

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.plugins.ExportedService;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.input.TabCompleter;
 
 import java.util.List;
 

src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -77,11 +77,11 @@ public final class NowPlayingCommand extends Command implements
                 if (source == null) {
                     sendLine(origin, args.isSilent(), FORMAT_ERROR, "Source not found.");
                 } else {
-                    if (source.getState() != MediaSourceState.CLOSED) {
+                    if (source.getState() == MediaSourceState.CLOSED) {
+                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Source is not running.");
+                    } else {
                         target.getCommandParser().parseCommand(origin, context.getSource(),
                                 getInformation(source, args.getArgumentsAsString(2)));
-                    } else {
-                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Source is not running.");
                     }
                 }
             } else {
@@ -120,12 +120,12 @@ public final class NowPlayingCommand extends Command implements
             for (MediaSource source : sources) {
                 data[i][0] = source.getAppName();
 
-                if (source.getState() != MediaSourceState.CLOSED) {
-                    data[i][1] = source.getState().getNiceName().toLowerCase();
-                    data[i][2] = getInformation(source, format);
-                } else {
+                if (source.getState() == MediaSourceState.CLOSED) {
                     data[i][1] = "not running";
                     data[i][2] = "-";
+                } else {
+                    data[i][1] = source.getState().getNiceName().toLowerCase();
+                    data[i][2] = getInformation(source, format);
                 }
 
                 i++;

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

@@ -39,9 +39,6 @@ import com.dmdirc.ui.messages.Styliser;
 public final class OsdCommand extends Command implements 
         IntelligentCommand, CommandInfo {
 
-    /** The plugin that owns this command. */
-    private final OsdPlugin plugin;
-
     /** The OSDManager that this command should use. */
     private final OsdManager osdManager;
     
@@ -54,7 +51,6 @@ public final class OsdCommand extends Command implements
         super();
 
         this.osdManager = osdManager;
-        this.plugin = plugin;
     }
 
     /**

src/com/dmdirc/addons/parser_twitter/Twitter.java

@@ -1215,7 +1215,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
                 long lastId = lastSearchIds.containsKey(channel) ? lastSearchIds.get(channel) : -1;
                 final List<TwitterStatus> statuses = api.getSearchResults(channel.getName(), lastId);
 
-                foundItems = statuses.size() > 0;
+                foundItems = !statuses.isEmpty();
                 for (final TwitterStatus status : statuses) {
                     final ChannelClientInfo cci = channel.getChannelClient(status.getUserName(), true);
                     sendChannelMessage(channel, new Date(status.getTime()), status.getText(), cci, status.getUserName());

src/com/dmdirc/addons/parser_twitter/TwitterChannelInfo.java

@@ -144,7 +144,7 @@ public class TwitterChannelInfo implements ChannelInfo {
     /** {@inheritDoc} */
     @Override
     public void sendWho() {
-        return;
+        // Ignore, twitter parser doesn't support WHOs
     }
 
     /** {@inheritDoc} */
@@ -158,13 +158,12 @@ public class TwitterChannelInfo implements ChannelInfo {
                 myParser.getApi().unblockUser(bits[0]);
             }
         }
-        return;
     }
 
     /** {@inheritDoc} */
     @Override
     public void flushModes() {
-        return;
+        // Ignore, all mode changes are instantaneous
     }
 
     /** {@inheritDoc} */

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

@@ -35,6 +35,7 @@ import com.dmdirc.plugins.Plugin;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * This causes parser debugging to be spammed to the console.
@@ -47,7 +48,7 @@ public final class DebugPlugin extends Plugin implements DebugInfoListener, Acti
     private ParserDebugCommand command = null;
 
     /** Map of parsers registered. */
-    protected final HashMap<Parser, DebugWindow> registeredParsers
+    protected final Map<Parser, DebugWindow> registeredParsers
             = new HashMap<Parser, DebugWindow>();
 
     /**

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

@@ -45,7 +45,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.ReturnableThread;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -84,9 +83,7 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
                 new RelayCallbackManager(this, (IRCParser) parser);
             }
             for (String channel : server.getChannels()) {
-                final Channel chan = server.getChannel(channel);
-                final String channelName = chan.getServer().getParser().getStringConverter().toLowerCase(chan.getName());
-                getHandler(chan);
+                getHandler(server.getChannel(channel));
             }
         }
     }
@@ -123,13 +120,9 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
     @Override
     public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
         if (type == CoreActionType.CHANNEL_OPENED) {
-            final Channel chan = (Channel) arguments[0];
-            
-            final String channelName = chan.getServer().getParser().getStringConverter().toLowerCase(chan.getName());
-            getHandler(chan);
+            getHandler((Channel) arguments[0]);
         } else if (type == CoreActionType.CHANNEL_CLOSED) {
-            final Channel chan = (Channel) arguments[0];
-            removeHandler(chan);
+            removeHandler((Channel) arguments[0]);
         } else if (type == CoreActionType.CHANNEL_QUIT) {
             final Channel chan = (Channel) arguments[0];
             final Parser parser = chan.getServer().getParser();

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

@@ -294,14 +294,12 @@ public class RelayChannelHandler implements ChannelMessageListener {
                         coreChannelHandler.onChannelKick(parser, date, channel, newChannelClient, kickingChannelClient, reason, "");
                         removeChannelClient(channel, newBits[0]);
                         return;
-                    } else if (newBits[2].equalsIgnoreCase("now")) {
+                    } else if (newBits[2].equalsIgnoreCase("now") && newBits.length > 3) {
                         // User changed their nickname in a relayed channel.
-                        if (newBits.length > 3) {
-                            renameChannelClient(newChannelClient, newBits[3]);
+                        renameChannelClient(newChannelClient, newBits[3]);
 
-                            coreChannelHandler.onChannelNickChanged(parser, date, channel, newChannelClient, newBits[0]);
-                            return;
-                        }
+                        coreChannelHandler.onChannelNickChanged(parser, date, channel, newChannelClient, newBits[0]);
+                        return;
                     }
                 }
             } else if (initial.charAt(0) == '*') {

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

@@ -22,13 +22,9 @@
 
 package com.dmdirc.addons.relaybot;
 
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.plugins.Plugin;
-import com.dmdirc.plugins.PluginManager;
-import java.awt.Dialog.ModalityType;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

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

@@ -46,8 +46,6 @@ public class DummyInputWindow implements InputWindow {
     private boolean maximised;
     /** Our container. */
     private final WritableFrameContainer<? extends InputWindow> container;
-    /** Our command parser. */
-    private final CommandParser commandParser;
 
     /**
      * Instantiates a new DummyInputWindow.
@@ -58,7 +56,6 @@ public class DummyInputWindow implements InputWindow {
     public DummyInputWindow(final WritableFrameContainer<? extends InputWindow> owner,
             final CommandParser commandParser) {
         this.container = owner;
-        this.commandParser = commandParser;
     }
 
     /** {@inheritDoc} */

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

@@ -31,9 +31,6 @@ import com.dmdirc.ui.interfaces.ServerWindow;
  */
 public final class DummyServerWindow extends DummyInputWindow implements ServerWindow {
     
-    /** Parent server. */
-    private final Server parent;
-    
     /** 
      * Instantiates this DummyServerWindow. 
      *
@@ -41,8 +38,6 @@ public final class DummyServerWindow extends DummyInputWindow implements ServerW
      */
     public DummyServerWindow(final Server parent) {
         super(parent, new ServerCommandParser());
-        
-        this.parent = parent;
     }
     
 }

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

@@ -524,7 +524,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 /** {@inheritDoc} */
                 @Override
                 public void cancelled() {
-                    return;
+                    // Do nothing
                 }
             }.display();
             return;
@@ -544,7 +544,7 @@ public final class MainFrame extends JFrame implements WindowListener,
 
             /** {@inheritDoc} */
             @Override
-            protected Object doInBackground() throws Exception {
+            protected Object doInBackground() {
                 ActionManager.processEvent(CoreActionType.CLIENT_CLOSING, null);
                 ServerManager.getServerManager().closeAll(IdentityManager.
                         getGlobalConfig().getOption("general", "closemessage"));

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.addons.ui_swing.TreeUI;
 import com.dmdirc.addons.ui_swing.actions.RedoAction;
 import com.dmdirc.addons.ui_swing.actions.UndoAction;
 import com.dmdirc.addons.ui_swing.components.DMDircUndoableEditListener;
@@ -374,7 +373,9 @@ public final class UIUtilities {
             final Rectangle bounds,
             final Image backgroundImage,
             final BackgroundOption backgroundOption) {
-        if (backgroundImage != null) {
+        if (backgroundImage == null) {
+            paintNoBackground(g, bounds);
+        } else {
             switch (backgroundOption) {
                 case TILED:
                     paintTiledBackground(g, bounds, backgroundImage);
@@ -391,8 +392,6 @@ public final class UIUtilities {
                 default:
                     break;
             }
-        } else {
-            paintNoBackground(g, bounds);
         }
     }
 

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

@@ -1,109 +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.components;
-
-import javax.swing.Icon;
-import javax.swing.JToggleButton;
-
-/**
- * JButton that holds an object.
- * 
- * @param <T> Holds an object of this type
- */
-public class ContainerToggleButton<T> 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 = 1;
-    /** Contents. */
-    private T contents;
-
-    /**
-     * Instantiates a new container button.
-     * 
-     * @param contents Contents
-     * @param string Title
-     * @param icon Icon
-     */
-    public ContainerToggleButton(final T contents, final String string,
-            final Icon icon) {
-        super(string, icon);
-    }
-
-    /**
-     * Instantiates a new container button.
-     * 
-     * @param contents Contents
-     * @param string Title
-     */
-    public ContainerToggleButton(final T contents, final String string) {
-        super(string);
-    }
-
-    /**
-     * Instantiates a new container button.
-     * 
-     * @param contents Contents
-     * @param icon Icon
-     */
-    public ContainerToggleButton(final T contents, final Icon icon) {
-        super(icon);
-    }
-
-    /**
-     * Instantiates a new container button.
-     * 
-     * @param contents Contents
-     */
-    public ContainerToggleButton(final T contents) {
-        super();
-    }
-
-    /**
-     * Instantiates a new container button.
-     */
-    public ContainerToggleButton() {
-        super();
-    }
-
-    /**
-     * Gets the button's contents
-     * 
-     * @return Button contents
-     */
-    public T getContents() {
-        return contents;
-    }
-
-    /**
-     * Sets the button's contents
-     * 
-     * @param contents New contents
-     */
-    public void setValue(final T contents) {
-        this.contents = contents;
-    }
-}

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

@@ -57,7 +57,7 @@ public class FontPicker extends JComboBox {
 
             /** {@inheritDoc} */
             @Override
-            protected String[] doInBackground() throws Exception {
+            protected String[] doInBackground() {
                 return GraphicsEnvironment.getLocalGraphicsEnvironment().
                         getAvailableFontFamilyNames();
             }

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

@@ -44,8 +44,6 @@ public class PackingTable extends JTable {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    /** Whether the table should be editable. */
-    private final boolean editable;
     /** Scrollpane. */
     private final JScrollPane scrollPane;
     /** Should the last column fit text (true), or fit viewport (false). */
@@ -107,7 +105,6 @@ public class PackingTable extends JTable {
             final JScrollPane scrollPane, final boolean lastColumnFit) {
         super(tableModel);
 
-        this.editable = editable;
         this.scrollPane = scrollPane;
         this.lastColumnFit = lastColumnFit;
 

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

@@ -43,10 +43,6 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    /** Snap distance. */
-    private final int snapDistance;
-    /** Component to snap to? */
-    private boolean leftComponentSnap = true;
     /** use one touch expandable? */
     private boolean useOneTouchExpandable;
     /** Global config manager. */
@@ -223,9 +219,6 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
         super((orientation.equals(Orientation.HORIZONTAL)) ? HORIZONTAL_SPLIT : VERTICAL_SPLIT,
                 true, leftComponent, rightComponent);
 
-        this.leftComponentSnap = leftComponentSnap;
-        this.snapDistance = snapDistance;
-
         config = IdentityManager.getGlobalConfig();
         useOneTouchExpandable = config.getOptionBool("ui", "useOneTouchExpandable");
 

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

@@ -81,8 +81,6 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
     private final boolean useInsets;
     /** Substitutions panel. */
     private URLSubsitutionsPanel subsPanel;
-    /** The URL Handler to use to open links. */
-    private final URLHandler urlHandler;
 
     /**
      * Instantiates the URLDialog.
@@ -96,7 +94,6 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
 
         this.uri = url;
         this.useInsets = useInsets;
-        this.urlHandler = urlHandler;
 
         initComponents();
         layoutComponents();
@@ -291,6 +288,6 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void changedUpdate(final DocumentEvent e) {
-    //Ignore
+        //Ignore
     }
 }

src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerDialog.java

@@ -44,8 +44,6 @@ public final class ColourPickerDialog extends StandardDialog {
     private static final long serialVersionUID = 1;
     /** Colour chooser panel. */
     private ColourPickerPanel colourChooser;
-    /** Parent window. */
-    private Window window;
 
     /**
      * Creates a new instance of ColourPickerDialog.
@@ -105,8 +103,7 @@ public final class ColourPickerDialog extends StandardDialog {
      * @return Colour picker dialog
      */
     public static ColourPickerDialog showColourPicker() {
-        final ColourPickerDialog cpd = showColourPicker(true, true);
-        return cpd;
+        return showColourPicker(true, true);
     }
 
     /** 
@@ -137,8 +134,6 @@ public final class ColourPickerDialog extends StandardDialog {
      * @param window Parent window
      */
     public void setWindow(final Window window) {
-        this.window = window;
-
         if (window != null) {
             window.addWindowListener(new WindowAdapter() {
 

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

@@ -1,7 +1,32 @@
+/*
+ * 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.components.frames;
 
-import com.dmdirc.addons.ui_swing.*;
+import com.dmdirc.addons.ui_swing.Apple;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.MenuBar;
+
 import javax.swing.JFrame;
 
 /**

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -157,7 +157,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
                     /** {@inheritDoc} */
                     @Override
-                    protected Object doInBackground() throws Exception {
+                    protected Object doInBackground() {
                         localTarget.setEditable(false);
                         doTabCompletion(false);
                         return null;
@@ -187,7 +187,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
                     /** {@inheritDoc} */
                     @Override
-                    protected Object doInBackground() throws Exception {
+                    protected Object doInBackground() {
                         localTarget.setEditable(false);
                         doTabCompletion(true);
                         return null;

src/com/dmdirc/addons/ui_swing/components/statusbar/SwingStatusBar.java

@@ -55,10 +55,6 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
     private final UpdaterLabel updateLabel;
     /** Invite label. */
     private final InviteLabel inviteLabel;
-    /** Swing controller. */
-    private SwingController controller;
-    /** Main frame. */
-    private MainFrame mainFrame;
 
     /**
      * Creates a new instance of SwingStatusBar.
@@ -68,9 +64,6 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
      */
     public SwingStatusBar(final SwingController controller, final MainFrame mainFrame) {
         super();
-        
-        this.controller = controller;
-        this.mainFrame = mainFrame;
 
         messageLabel = new MessageLabel();
         errorPanel = new ErrorPanel(controller, mainFrame, this);

src/com/dmdirc/addons/ui_swing/components/themepanel/ThemePanel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.themepanel;
 
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;

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

@@ -293,7 +293,7 @@ public final class NewServerDialog extends StandardDialog implements
 
                 new LoggingSwingWorker() {
                     @Override
-                    protected Object doInBackground() throws Exception {
+                    protected Object doInBackground() {
                         final Server server = new Server(address, profile);
                         server.connect();
                         return null;
@@ -306,7 +306,7 @@ public final class NewServerDialog extends StandardDialog implements
 
                     /** {@inheritDoc} */
                     @Override
-                    protected Object doInBackground() throws Exception {
+                    protected Object doInBackground() {
                         if (server == null) {
                             final Server newServer = new Server(address, profile);
                             newServer.connect();

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.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
@@ -67,9 +67,9 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
     /** Action trigger. */
     private ActionType trigger;
 
-    /** 
+    /**
      * Instantiates the panel.
-     * 
+     *
      * @param condition Action condition
      * @param trigger Action trigger
      */
@@ -98,7 +98,7 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
 
     /**
      * Sets the action trigger.
-     * 
+     *
      * @param trigger new trigger
      */
     void setTrigger(final ActionType trigger) {
@@ -157,9 +157,9 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
         add(editPanel, "alignx right");
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
@@ -214,42 +214,45 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
 
     /**
      * Updates the condition sentence.
-     * 
+     *
      * @return Updated sentence
      */
     private String updateSentence() {
         if (trigger == null) {
             return "...";
         } else {
-            final StringBuilder sb = new StringBuilder();
-            sb.append("The ");
-            if (condition.getArg() != -1) {
-                sb.append(trigger.getType().getArgNames()[condition.getArg()]);
-            } else {
+            final StringBuilder sb = new StringBuilder("The ");
+
+            if (condition.getArg() == -1) {
                 sb.append(" ...");
                 return sb.toString();
             }
+
+            sb.append(trigger.getType().getArgNames()[condition.getArg()]);
             sb.append("'s ");
-            if (condition.getComponent() != null) {
-                sb.append(condition.getComponent().getName());
-            } else {
+
+            if (condition.getComponent() == null) {
                 sb.append(" ...");
                 return sb.toString();
             }
+
+            sb.append(condition.getComponent().getName());
             sb.append(" ");
-            if (condition.getComparison() != null) {
-                sb.append(condition.getComparison().getName());
-            } else {
+
+            if (condition.getComparison() == null) {
                 sb.append(" ...");
                 return sb.toString();
             }
+
+            sb.append(condition.getComparison().getName());
             sb.append(" '");
-            if (condition.getTarget() != null) {
-                sb.append(condition.getTarget().replace("<", "&lt;"));
-            } else {
+
+            if (condition.getTarget() == null) {
                 sb.append(" ...");
                 return sb.toString();
             }
+
+            sb.append(condition.getTarget().replace("<", "&lt;"));
             sb.append("'");
             return sb.toString();
         }
@@ -257,7 +260,7 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
 
     /**
      * Returns the action condition represented by this panel.
-     * 
+     *
      * @return Action condition
      */
     public ActionCondition getCondition() {
@@ -274,10 +277,10 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
                     evt.getNewValue());
         }
     }
-    
+
     /**
      * Checks if this editor panel has errored.
-     * 
+     *
      * @return true iif the content it valid
      */
     public boolean checkError() {

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 import com.dmdirc.actions.ActionGroup;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import javax.swing.Box;
+
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 

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

@@ -27,11 +27,8 @@ import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.inputfields.ValidatingTextFieldInputField;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionComparisonCellRenderer;
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.commandparser.validators.CommandNameValidator;
 import com.dmdirc.util.validators.FileNameValidator;
 import com.dmdirc.util.validators.ValidatorChain;

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

@@ -95,7 +95,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
      * @throws Exception if unable to compute a result
      */
     @Override
-    protected JPanel doInBackground() throws Exception {
+    protected JPanel doInBackground() {
         return addCategory(category);
     }
 

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_web;
 
-import com.dmdirc.Main;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.UIController;
 
@@ -38,13 +37,6 @@ public class WebInterfacePlugin extends Plugin {
     /** The UI that we're using. */
     private WebInterfaceUI ui;
 
-    /**
-     * Creates a new WebInterfacePlugin, and registers the web UI as the
-     * main client UI.
-     */
-    public WebInterfacePlugin() {
-    }
-
     /** {@inheritDoc} */
     @Override
     public void onLoad() {   

src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java

@@ -79,24 +79,28 @@ public class WebInputHandler extends InputHandler {
 
     /** {@inheritDoc} */
     @Override
+    @SuppressWarnings("PMD")
     public void doTabCompletion(boolean shiftPressed) {
         super.doTabCompletion(shiftPressed);
     }
 
     /** {@inheritDoc} */
     @Override
+    @SuppressWarnings("PMD")
     public void doBufferDown() {
         super.doBufferDown();
     }
 
     /** {@inheritDoc} */
     @Override
+    @SuppressWarnings("PMD")
     public void doBufferUp() {
         super.doBufferUp();
     }
 
     /** {@inheritDoc} */
     @Override
+    @SuppressWarnings("PMD")
     public void handleKeyPressed(final String line, final int keyCode,
             final boolean shiftPressed, final boolean ctrlPressed) {
         super.handleKeyPressed(line, keyCode, shiftPressed, ctrlPressed);