Misc style fixes

Change-Id: I08ec70d6f469892c62a20147a279b9d5e7dc643d
Reviewed-on: http://gerrit.dmdirc.com/1533
Automatic-Compile: Greg Holmes <greg@dmdirc.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 /**
  * DCC CommandParser
  */
-public class DCCCommandParser extends GlobalCommandParser {
+public final class DCCCommandParser extends GlobalCommandParser {
 
     /** The singleton instance of the DCC command parser. */
     private static DCCCommandParser me;

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

@@ -54,7 +54,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 class KFileChooser extends JFileChooser {
+public final class KFileChooser extends JFileChooser {
 
     /**
      * A version number for this class.

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

@@ -27,6 +27,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.LocalClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.Plugin;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -74,21 +75,23 @@ public class TwitterClientInfo implements LocalClientInfo {
      * @param plugin Plugin to use to get domain from.
      * @return String array of nick, ident and host.
      */
-    static String[] parseHostFull(String hostname, final Plugin plugin, final Twitter parser) {
+    static String[] parseHostFull(final String hostname, final Plugin plugin, final Twitter parser) {
         boolean hadAt = false;
-        if (plugin != null && parser != null && parser.getConfigManager().getOptionBool(plugin.getDomain(), "autoAt")) {
-            if (!hostname.isEmpty() && hostname.charAt(0) == '@') {
-                hostname = hostname.substring(1);
-                hadAt = true;
-            }
+        String sanitisedHostname = hostname;
+
+        if (plugin != null && parser != null
+                && parser.getConfigManager().getOptionBool(plugin.getDomain(), "autoAt")
+                && !sanitisedHostname.isEmpty() && sanitisedHostname.charAt(0) == '@') {
+            sanitisedHostname = sanitisedHostname.substring(1);
+            hadAt = true;
         }
 
         String[] temp = null;
         final String[] result = new String[3];
-        if (!hostname.isEmpty() && hostname.charAt(0) == ':') {
-            hostname = hostname.substring(1);
+        if (!sanitisedHostname.isEmpty() && sanitisedHostname.charAt(0) == ':') {
+            sanitisedHostname = sanitisedHostname.substring(1);
         }
-        temp = hostname.split("@", 2);
+        temp = sanitisedHostname.split("@", 2);
         if (temp.length == 1) {
             result[2] = "";
         } else {
@@ -153,11 +156,7 @@ public class TwitterClientInfo implements LocalClientInfo {
     /** {@inheritDoc} */
     @Override
     public void setNickname(final String name) {
-        if (this == myParser.getLocalClient()) {
-            // TODO: throw new UnsupportedOperationException("Not supported yet.");
-        } else {
-            // TODO: throw new UnsupportedOperationException("Can not set nickname on non-local clients");
-        }
+        // TODO: Implement?
     }
 
     /**
@@ -217,25 +216,25 @@ public class TwitterClientInfo implements LocalClientInfo {
     /** {@inheritDoc} */
     @Override
     public void setAway(final String reason) {
-        return;
+        // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
     public void setBack() {
-        return;
+        // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
     public void alterMode(final boolean add, final Character mode) {
-        return;
+        // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
     public void flushModes() {
-        return;
+        // Do nothing
     }
 
     /** {@inheritDoc} */
@@ -278,7 +277,7 @@ public class TwitterClientInfo implements LocalClientInfo {
 
     /**
      * Get a list of all the channel clients associated with this user.
-     * 
+     *
      * @return Channel Clients for this Client.
      */
     public List<ChannelClientInfo> getChannelClients() {
@@ -301,7 +300,7 @@ public class TwitterClientInfo implements LocalClientInfo {
 
     /**
      * Add a channelClient to this Client.
-     * 
+     *
      * @param channelClient channelClient to add as us.
      */
     public void addChannelClient(final TwitterChannelClientInfo channelClient) {

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

@@ -283,14 +283,13 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                     TextFrame.super.setVisible(true);
                 }
                 try {
-                    if (pref || controller.getMainFrame().getMaximised()) {
-                        if (!isMaximum()) {
-                            setMaximum(true);
-                        }
+                    if ((pref || controller.getMainFrame().getMaximised()) && !isMaximum()) {
+                        setMaximum(true);
                     }
                 } catch (PropertyVetoException ex) {
                     //Ignore
                 }
+
                 try {
                     if (!isSelected()) {
                         setSelected(true);
@@ -679,7 +678,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
             /** {@inheritDoc} */
             @Override
-            protected Object doInBackground() throws Exception {
+            protected Object doInBackground() {
                 frameParent.windowClosing();
                 return null;
             }
@@ -738,7 +737,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
             /** {@inheritDoc} */
             @Override
-            protected Object doInBackground() throws Exception {
+            protected Object doInBackground() {
                 LOGGER.finer(getName()
                         + ": internalFrameActivated(): doInBackground");
                 frameParent.windowActivated();

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

@@ -31,11 +31,13 @@ import com.dmdirc.ui.IconManager;
 
 import java.awt.Dimension;
 import java.util.concurrent.ExecutionException;
+
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.UIManager;
+
 import net.miginfocom.layout.PlatformDefaults;
 
 /**
@@ -50,11 +52,9 @@ public class CategoryLabel extends JLabel {
      */
     private static final long serialVersionUID = -1659415238166842265L;
     /** Panel gap. */
-    private final int padding = (int) (1.5 * PlatformDefaults.getUnitValueX(
-            "related").getValue());
-    private PreferencesCategory category;
+    private final int padding = (int)
+            (1.5 * PlatformDefaults.getUnitValueX("related").getValue());
     private JList parentList;
-    private int index;
 
     /**
      * 
@@ -66,8 +66,6 @@ public class CategoryLabel extends JLabel {
     public CategoryLabel(final JList parentList,
             final PreferencesCategory category, final int numCats, final int index) {
         this.parentList = parentList;
-        this.category = category;
-        this.index = index;
 
         setText(category.getTitle());
         new IconLoader(this, category.getIcon()).executeInExecutor();

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

@@ -76,11 +76,11 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     /** Preferences Manager. */
     private PreferencesManager manager;
     /** Manager loading swing worker. */
-    private LoggingSwingWorker worker;
+    private LoggingSwingWorker<PreferencesManager, Void> worker;
     /** Parent window. */
     private MainFrame parentWindow;
     /** Panel size. */
-    protected int panelSize = 0;
+    private int panelSize = 0;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.
@@ -272,10 +272,10 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             saveOptions();
         }
 
-        new LoggingSwingWorker() {
+        new LoggingSwingWorker<Void, Void>() {
 
             @Override
-            protected Object doInBackground() throws Exception {
+            protected Void doInBackground() {
                 if (manager != null) {
                     manager.dismiss();
                 }

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

@@ -37,7 +37,7 @@ import javax.swing.JButton;
 import net.miginfocom.swing.MigLayout;
 
 /** URL Protocol dialog. */
-public class URLDialog extends StandardDialog implements ActionListener {
+public final class URLDialog extends StandardDialog implements ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class