Minor tidying

Change-Id: I37cb3ccfc87eee660d6e9d765b317d18bfbd8d16
Reviewed-on: http://gerrit.dmdirc.com/3689
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java

@@ -237,7 +237,7 @@ public class ConditionalExecuteCommand extends Command {
             } else {
                 // Command to run!
                 if (namespace.canRun(inverse) && origin.isWritable()) {
-                    origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(i++));
+                    origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(i));
                 }
                 return;
             }

src/com/dmdirc/addons/dcc/io/DCCTransfer.java

@@ -455,10 +455,10 @@ public class DCCTransfer extends DCC {
                     // Process all the ack packets that may have been sent.
                     // In true turbo dcc mode, none will have been sent and the socket
                     // will just close, in fast-dcc mode all the acks will be here,
-                    // So keep reading acks untill the socket closes (IOException) or we
-                    // have recieved all the acks.
+                    // So keep reading acks until the socket closes (IOException) or we
+                    // have received all the acks.
                     if (turbo) {
-                        int ack = 0;
+                        int ack;
                         do {
                             try {
                                 ack = in.readInt();

src/com/dmdirc/addons/mediasource_dbus/DBusMediaSource.java

@@ -128,8 +128,7 @@ public class DBusMediaSource extends BasePlugin implements MediaSourceManager {
             reader = new InputStreamReader(process.getInputStream());
             input = new BufferedReader(reader);
 
-            String line = "";
-
+            String line;
             while ((line = input.readLine()) != null) {
                 result.add(line);
             }

src/com/dmdirc/addons/mediasource_mplayer/MplayerMediaSourcePlugin.java

@@ -110,8 +110,7 @@ public class MplayerMediaSourcePlugin extends BasePlugin implements MediaSource
             reader = new InputStreamReader(process.getInputStream());
             input = new BufferedReader(reader);
 
-            String line = "";
-
+            String line;
             while ((line = input.readLine()) != null) {
                 result.add(line);
             }

src/com/dmdirc/addons/time/TimerCommand.java

@@ -73,7 +73,7 @@ public class TimerCommand extends Command implements IntelligentCommand {
         if (args.getArguments().length > 0) {
             switch (args.getArguments()[0]) {
                 case "--cancel":
-                    int timerKey = 0;
+                    int timerKey;
                     try {
                         timerKey = Integer.parseInt(args.getArgumentsAsString(1));
                     } catch (NumberFormatException ex) {
@@ -105,8 +105,8 @@ public class TimerCommand extends Command implements IntelligentCommand {
                     if (args.getArguments().length < 3) {
                         doUsage(origin, args.isSilent());
                     } else {
-                        int repetitions = 0;
-                        int interval = 0;
+                        int repetitions;
+                        int interval;
 
                         final String command = args.getArgumentsAsString(2);
 

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

@@ -30,6 +30,8 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 
 import javax.swing.JLabel;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Simple panel to show when a user is away or not.
  */
@@ -53,13 +55,11 @@ public class AwayLabel extends JLabel implements ConfigChangeListener,
     public AwayLabel(final FrameContainer container) {
         super("(away)");
 
-        this.container = container;
+        this.container = checkNotNull(container);
 
-        container.getConfigManager().addChangeListener("ui", AWAY_INDICATOR,
-                this);
+        container.getConfigManager().addChangeListener("ui", AWAY_INDICATOR, this);
         setVisible(false);
-        useAwayIndicator = container.getConfigManager().getOptionBool("ui",
-                AWAY_INDICATOR);
+        useAwayIndicator = container.getConfigManager().getOptionBool("ui", AWAY_INDICATOR);
 
         if (container.getConnection() != null) {
             setVisible(container.getConnection().isAway());
@@ -112,7 +112,7 @@ public class AwayLabel extends JLabel implements ConfigChangeListener,
 
     @Override
     public void windowClosing(final FrameContainer window) {
-        if (container != null && container.getConnection() != null) {
+        if (container.getConnection() != null) {
             container.getConnection().removeAwayStateListener(this);
         }
     }

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonCell.java

@@ -126,12 +126,8 @@ public class AddonCell extends JPanel implements AddonToggleListener {
 
     @Override
     public void setForeground(final Color fg) {
-        if (name != null) {
-            name.setForeground(fg);
-        }
-        if (status != null) {
-            status.setForeground(fg);
-        }
+        name.setForeground(fg);
+        status.setForeground(fg);
     }
 
     @Override

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonInfoPanel.java

@@ -100,12 +100,12 @@ public class AddonInfoPanel extends JPanel implements ActionListener,
         if (this.addonToggle != null) {
             this.addonToggle.removeListener(this);
         }
-        addonToggle.addListener(this);
         this.addonToggle = addonToggle;
         if (addonToggle == null) {
             description.setText("");
             status.setEnabled(false);
         } else {
+            addonToggle.addListener(this);
             status.setEnabled(true);
             description.setText("<b>" + addonToggle.getName() + "</b> "
                     + addonToggle.getVersion() + " by "

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

@@ -82,7 +82,7 @@ public class ComponentCreator {
         for (String string : names) {
             Object object;
             try {
-                Class<?> clazz = null;
+                Class<?> clazz;
                 if (string.equals(WindowComponent.INPUTFIELD.getIdentifier())) {
                     clazz = SwingInputField.class;
                 } else if (string.equals(WindowComponent.TEXTAREA.getIdentifier())) {

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

@@ -73,7 +73,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
     @Override
     protected void addUpHandler() {
-        JTextComponent localTarget = null;
+        JTextComponent localTarget;
         if (target instanceof JTextComponent) {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {
@@ -103,7 +103,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
     @Override
     protected void addDownHandler() {
-        JTextComponent localTarget = null;
+        JTextComponent localTarget;
         if (target instanceof JTextComponent) {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {
@@ -198,7 +198,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
     @Override
     protected void addEnterHandler() {
-        JTextComponent localTarget = null;
+        JTextComponent localTarget;
         if (target instanceof JTextComponent) {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ArrayListTransferHandler.java

@@ -184,9 +184,6 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
      * @return whether the flavour is supported
      */
     private boolean hasSerialArrayListFlavor(final DataFlavor[] transferFlavors) {
-        if (serialArrayListFlavor == null) {
-            return false;
-        }
         for (DataFlavor transferFlavor : transferFlavors) {
             if (transferFlavor.equals(serialArrayListFlavor)) {
                 return true;

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

@@ -287,10 +287,10 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         triggerList.setEnabled(enabled);
         if (enabled) {
             if (triggerGroup.getModel().getSize() > 0) {
-                triggerGroup.setEnabled(enabled);
+                triggerGroup.setEnabled(true);
             }
             if (triggerItem.getModel().getSize() > 0) {
-                triggerItem.setEnabled(enabled);
+                triggerItem.setEnabled(true);
             }
         } else {
             triggerGroup.setEnabled(false);

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

@@ -27,6 +27,7 @@ import com.dmdirc.ui.IconManager;
 
 import java.awt.Dimension;
 
+import javax.annotation.Nullable;
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JLabel;
@@ -45,6 +46,7 @@ public class CategoryLabel extends JLabel {
     /** Panel gap. */
     private final int padding = (int) (1.5 * PlatformDefaults.getUnitValueX("related").getValue());
     /** Parent list. */
+    @Nullable
     private final JList<? extends PreferencesCategory> parentList;
 
     /**
@@ -57,7 +59,7 @@ public class CategoryLabel extends JLabel {
      * @param index       Index of this label
      */
     public CategoryLabel(final IconManager iconManager,
-            final JList<? extends PreferencesCategory> parentList,
+            @Nullable final JList<? extends PreferencesCategory> parentList,
             final PreferencesCategory category, final int numCats,
             final int index) {
         super();

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

@@ -63,7 +63,7 @@ public class TreeViewModel extends DefaultTreeModel {
      */
     public final void insertNodeInto(final TreeViewNode newChild,
             final TreeViewNode parent) {
-        int index = 0;
+        int index;
         index = getIndex(newChild, parent);
         insertNodeInto(newChild, parent, index);
     }

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

@@ -413,7 +413,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     @Override
     public void mouseClicked(final MouseEvent e) {
-        String clickedText = "";
+        String clickedText;
         final int start;
         final int end;