Fixed some FindBugs errors

 - Removed some superfluous method invocations
 - Fixed an infinite recursion but in ActionManager
 - Swapped some string concatenation for StringBuilders in ConditionTree
 - Fixed the regex in VLC media source when running under windows
 - Removed some unused/needed variables/code
 - Renamed CategoryChangeListener methods to follow naming conventions
 - Fixed useless string equals checks in the windows installer
 - Fixed some genericity errors in ErrorManager and ButtonBar
 - Fixed some crap primitive coercion in DurationEditor
 - toString in InviteLabel is now useful
 - Fixed some potential NPEs in the equals method in Profile
 - Fixed some casting errors in JWrappingLabel
 - Changed the scope of some fields in CipherUtils

git-svn-id: http://svn.dmdirc.com/trunk@3629 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Main.java

@@ -51,7 +51,7 @@ public final class Main {
     public static final String VERSION = "SVN";
     
     /** The SVN revision that this build was made from. */
-    public static final int SVN_REVISION = 3601;
+    public static final int SVN_REVISION = 3628; // 3601;
     
     /** Stores the update channel that this version came from, if any. */
     public static final UpdateChannel UPDATE_CHANNEL = UpdateChannel.NONE;

src/com/dmdirc/actions/Action.java

@@ -315,7 +315,7 @@ public class Action extends ActionModel implements Serializable {
 
         if (newFormat != null) {
             newConfig.addDomain(DOMAIN_FORMAT, new ArrayList<String>());
-            newConfig.getFlatDomain(DOMAIN_FORMAT).add(newFormat.toString());
+            newConfig.getFlatDomain(DOMAIN_FORMAT).add(newFormat);
         }
 
         int i = 0;

src/com/dmdirc/actions/ActionManager.java

@@ -395,7 +395,7 @@ public final class ActionManager {
      */
     public static void reregisterAction(final Action action) {
         unregisterAction(action);
-        reregisterAction(action);
+        registerAction(action);
     }
 
     /**

src/com/dmdirc/actions/ConditionTree.java

@@ -189,14 +189,14 @@ public class ConditionTree {
             final char m = string.charAt(i);
 
             if (isInt(m)) {
-                String temp = String.valueOf(m);
+                StringBuilder temp = new StringBuilder(String.valueOf(m));
 
                 while (i + 1 < string.length() && isInt(string.charAt(i + 1))) {
-                    temp = temp + string.charAt(i + 1);
+                    temp.append(string.charAt(i + 1));
                     i++;
                 }
 
-                stack.add(new ConditionTree(Integer.parseInt(temp)));
+                stack.add(new ConditionTree(Integer.parseInt(temp.toString())));
             } else if (m != ' ' && m != '\t' && m != '\n' && m != '\r') {
                 stack.add(m);
             }

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -79,7 +79,7 @@ public class VlcMediaSourcePlugin extends Plugin implements MediaSource {
         if (information.containsKey("playlist_current")) {
             try {
                 final int item = Integer.parseInt(information.get("playlist_current"));
-                String[] bits = information.get("playlist_item_" + item).split(File.separator);
+                String[] bits = information.get("playlist_item_" + item).split((File.separatorChar=='\\' ? "\\\\" : File.separator));
                 result = bits[bits.length-1];
                 bits = result.split("-");
                 if (bits.length > 1) {

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -60,9 +60,6 @@ public final class NickColourPlugin extends Plugin implements ActionListener {
         "58ADB3", "9E54B3", "B39875", "3176B3",
     };
     
-    /** The nick colour panel we use for config. */
-    private NickColourPanel nickpanel;
-    
     /** Creates a new instance of NickColourPlugin. */
     public NickColourPlugin() {
         super();
@@ -137,7 +134,8 @@ public final class NickColourPlugin extends Plugin implements ActionListener {
      * by config settings.
      *
      * @param map The map to use
-     * @param colour The colour to be inserted
+     * @param textColour Text colour to be inserted
+     * @param nickColour Nick colour to be inserted
      */
     @SuppressWarnings("unchecked")
     private void putColour(final Map map, final Color textColour, final Color nickColour) {
@@ -222,7 +220,7 @@ public final class NickColourPlugin extends Plugin implements ActionListener {
     @Override
     public void onLoad() {
         if (IdentityManager.getGlobalConfig().hasOption(DOMAIN, "randomcolours")) {
-            randColours =(String[]) IdentityManager.getGlobalConfig().getOptionList(DOMAIN, "randomcolours").toArray();
+            randColours = IdentityManager.getGlobalConfig().getOptionList(DOMAIN, "randomcolours").toArray(new String[0]);
         }
         
         ActionManager.addListener(this, CoreActionType.CHANNEL_GOTNAMES,

src/com/dmdirc/addons/osdplugin/OsdPlugin.java

@@ -122,7 +122,7 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
 
     /** {@inheritDoc} */
     @Override
-    public void CategorySelected(final PreferencesCategory category) {
+    public void categorySelected(final PreferencesCategory category) {
         osdWindow = new OsdWindow("Please drag this OSD to position", true, x, y);
         osdWindow.setBackgroundColour(backgroundSetting.getValue());
         osdWindow.setForegroundColour(foregroundSetting.getValue());
@@ -131,7 +131,7 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
 
     /** {@inheritDoc} */
     @Override
-    public void CategoryDeselected(final PreferencesCategory category) {
+    public void categoryDeselected(final PreferencesCategory category) {
         x = osdWindow.getLocationOnScreen().x;
         y = osdWindow.getLocationOnScreen().y;
         

src/com/dmdirc/config/Identity.java

@@ -202,6 +202,7 @@ public class Identity extends ConfigSource implements Serializable,
         
         properties.clear();
         properties.load(input);
+        input.close();
         
         for (Entry<Object, Object> entry : properties.entrySet()) {
             if (oldProps.containsKey(entry.getKey())) {

src/com/dmdirc/config/prefs/CategoryChangeListener.java

@@ -34,12 +34,12 @@ public interface CategoryChangeListener {
      * 
      * @param category The category that was selected
      */
-    void CategorySelected(final PreferencesCategory category);
+    void categorySelected(final PreferencesCategory category);
     
     /**
      * Called when a category has been deselected.
      * 
      * @param category The category that was deselected
      */
-    void CategoryDeselected(final PreferencesCategory category);
+    void categoryDeselected(final PreferencesCategory category);
 }

src/com/dmdirc/config/prefs/PreferencesCategory.java

@@ -230,7 +230,7 @@ public class PreferencesCategory {
      */
     public void fireCategorySelected() {
         for (CategoryChangeListener listener : listeners.get(CategoryChangeListener.class)) {
-            listener.CategorySelected(this);
+            listener.categorySelected(this);
         }
     }
     
@@ -239,7 +239,7 @@ public class PreferencesCategory {
      */
     public void fireCategoryDeselected() {
         for (CategoryChangeListener listener : listeners.get(CategoryChangeListener.class)) {
-            listener.CategoryDeselected(this);
+            listener.categoryDeselected(this);
         }
     }    
 

src/com/dmdirc/installer/WindowsInstaller.java

@@ -166,7 +166,7 @@ public class WindowsInstaller extends Installer {
 		}
 		params.add("/t");
 		params.add(type);
-		if (data != "") {
+		if (!data.equals("")) {
 			params.add("/d");
 			params.add(data);
 		}

src/com/dmdirc/logger/ErrorManager.java

@@ -146,7 +146,7 @@ public final class ErrorManager implements Serializable, Runnable {
      *
      * @return ProgramError with specified ID
      */
-    public ProgramError getError(final int id) {
+    public ProgramError getError(final long id) {
         return errors.get(id);
     }
     

src/com/dmdirc/ui/swing/JWrappingLabel.java

@@ -273,9 +273,9 @@ public class JWrappingLabel extends JComponent {
 					int x;
 					int alignment = getHorizontalAlignment();
 					if (alignment == SwingConstants.CENTER) {
-						x = (int)((getWidth()/2) - (bounds.getWidth()/2));
+						x = (getWidth() / 2) - ((int) bounds.getWidth() / 2);
 					} else if (alignment == SwingConstants.RIGHT) {
-						x = (int)(getWidth() - bounds.getWidth());
+						x = getWidth() - (int) bounds.getWidth();
 					} else {
 						x = 0;
 					}

src/com/dmdirc/ui/swing/components/InviteLabel.java

@@ -40,6 +40,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -271,6 +272,6 @@ class InviteAction extends AbstractAction {
     /** {@inheritDoc} */
     @Override
     public String toString() {
-        return invite.getChannel() + "(" + invite.getSource() + ")";
+        return invite.getChannel() + "(" + Arrays.toString(invite.getSource()) + ")";
     }
 }

src/com/dmdirc/ui/swing/components/durationeditor/DurationEditor.java

@@ -91,13 +91,13 @@ public class DurationEditor extends StandardDialog implements ActionListener {
         minutesSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 60, 1));
         secondsSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 60, 1));
         
-        daysSpinner.setValue(new Long(duration / 86400).intValue());
+        daysSpinner.setValue((int) duration / 86400);
         duration = (duration % 86400);
-        hoursSpinner.setValue(new Long(duration / 3600).intValue());
+        hoursSpinner.setValue((int) duration / 3600);
         duration = (duration % 3600);
-        minutesSpinner.setValue(new Long(duration / 60).intValue());
+        minutesSpinner.setValue((int) duration / 60);
         duration = (duration % 60);
-        secondsSpinner.setValue(new Long(duration).intValue());
+        secondsSpinner.setValue((int) duration);
     }
 
     /**

src/com/dmdirc/ui/swing/dialogs/profiles/Profile.java

@@ -48,7 +48,7 @@ public class Profile {
     public Profile() {
         this("");
     }
-    
+
     /**
      * Creates a new profile.
      *
@@ -316,23 +316,23 @@ public class Profile {
             profile.setOption(profileString, "altnicks", altNicknames);
         }
     }
-    
+
     /** Deletes the profile. */
     public void delete() {
-            final List<Identity> identities = IdentityManager.getProfiles();
-            Identity profile = null;
+        final List<Identity> identities = IdentityManager.getProfiles();
+        Identity profile = null;
 
-            for (Identity identity : identities) {
-                if (identity.getName().equals(name)) {
-                    profile = identity;
-                    break;
-                }
+        for (Identity identity : identities) {
+            if (identity.getName().equals(name)) {
+                profile = identity;
+                break;
             }
+        }
 
-            if (profile == null) {
-                return;
-            }
-            profile.delete();
+        if (profile == null) {
+            return;
+        }
+        profile.delete();
     }
 
     /** {@inheritDoc} */
@@ -346,27 +346,27 @@ public class Profile {
         }
 
         final Profile other = (Profile) obj;
-        
-        if (!this.name.equals(other.name) &&
-                (this.name == null || !this.name.equals(other.name))) {
+
+        if (!this.name.equals(other.name)) {
+            return false;
+        }
+        if (!this.nickname.equals(other.nickname)) {
+            return false;
+        }
+        if (!this.realname.equals(other.realname)) {
             return false;
         }
-        if (!this.nickname.equals(other.nickname) &&
-                (this.nickname == null || !this.nickname.equals(other.nickname))) {
+        if (this.ident == null && other.ident != null) {
             return false;
         }
-        if (!this.realname.equals(other.realname) &&
-                (this.realname == null || !this.realname.equals(other.realname))) {
+        if (this.ident != null && !this.ident.equals(other.ident)) {
             return false;
         }
-        if ((this.ident == null && other.ident != null) && 
-                !this.ident.equals(other.ident) &&
-                (this.ident == null || !this.ident.equals(other.ident))) {
+        if (this.altNicknames != other.altNicknames) {
             return false;
         }
-        if (this.altNicknames != other.altNicknames &&
-                (this.altNicknames == null ||
-                !this.altNicknames.equals(other.altNicknames))) {
+        if (this.altNicknames == null ||
+                !this.altNicknames.equals(other.altNicknames)) {
             return false;
         }
 
@@ -378,12 +378,12 @@ public class Profile {
     public int hashCode() {
         int hash = 5;
         hash = 79 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash =  79 * hash +
+        hash = 79 * hash +
                 (this.nickname != null ? this.nickname.hashCode() : 0);
-        hash =  79 * hash +
+        hash = 79 * hash +
                 (this.realname != null ? this.realname.hashCode() : 0);
         hash = 79 * hash + (this.ident != null ? this.ident.hashCode() : 0);
-        hash =  79 * hash +
+        hash = 79 * hash +
                 (this.altNicknames != null ? this.altNicknames.hashCode() : 0);
 
         return hash;

src/com/dmdirc/ui/swing/dialogs/serversetting/IgnoreListPanel.java

@@ -33,7 +33,6 @@ import com.dmdirc.ui.swing.components.StandardInputDialog;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.List;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -140,14 +139,6 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
     
     /** Populates the ignore list. */
     private void populateList() {        
-        List<String> results;
-        
-        if (viewToggle.isSelected()) {
-            results = cachedIgnoreList.getRegexList();
-        } else {
-            results = cachedIgnoreList.getSimpleList();
-        }
-        
         if (list.getSelectedIndex() == -1) {
             delButton.setEnabled(false);
         }

src/com/dmdirc/ui/swing/framemanager/buttonbar/ButtonBar.java

@@ -346,7 +346,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     /** {@inheritDoc} */
     @Override
     public void notificationSet(final Window window, final Color colour) {
-        if (buttons.containsKey(window)) {
+        if (buttons.containsKey(window.getContainer())) {
             buttons.get(window.getContainer()).setForeground(colour);
         }
     }

src/com/dmdirc/util/CipherUtils.java

@@ -38,7 +38,6 @@ import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.KeySpec;
 
-import java.util.logging.Level;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
@@ -55,28 +54,28 @@ import net.miginfocom.Base64;
 public class CipherUtils {
     
     /** Singleton instance. */
-    protected static CipherUtils me;
+    private static CipherUtils me;
     
     /** Encryption cipher. */
-    protected Cipher ecipher;
+    private Cipher ecipher;
     
     /** Decryption cipher. */
-    protected Cipher dcipher;
+    private Cipher dcipher;
     
     /** Salt. */
-    protected final byte[] SALT = {
+    private final byte[] SALT = {
         (byte) 0xA9, (byte) 0x9B, (byte) 0xC8, (byte) 0x32,
         (byte) 0x56, (byte) 0x35, (byte) 0xE3, (byte) 0x03,
     };
     
     /** Iteration count. */
-    protected final int ITERATIONS = 19;
+    private static final int ITERATIONS = 19;
     
     /** Number of auth attemps before failing the attempt. */
-    protected final int AUTH_TRIES = 4;
+    private static final int AUTH_TRIES = 4;
     
     /** User password. */
-    protected String password;
+    private String password;
     
     /**
      * Prevents creation of a new instance of Encipher.