Fixed a bunch of minor code/style issues

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

src/com/dmdirc/Channel.java

@@ -385,7 +385,7 @@ public final class Channel extends MessageTarget implements
      * to send a who request.
      */
     public void checkWho() {
-        if (onChannel && configManager.getOptionBool("channel", "sendwho", false)) {
+        if (onChannel && sendWho) {
             server.getParser().sendLine("WHO :" + channelInfo.getName());
         }
     }

src/com/dmdirc/IconManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc;
 
 import com.dmdirc.config.ConfigChangeListener;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 
 import java.awt.Image;
@@ -94,7 +93,7 @@ public final class IconManager implements ConfigChangeListener {
      */
     public Image getImage(final String type) {
         if (!images.containsKey(type)) {
-            images.put(type, Toolkit.getDefaultToolkit().getDefaultToolkit().createImage(getIconURL(type)));
+            images.put(type, Toolkit.getDefaultToolkit().createImage(getIconURL(type)));
         }
         return images.get(type);
     }

src/com/dmdirc/ServerState.java

@@ -36,4 +36,4 @@ public enum ServerState {
     RECONNECT_WAIT,
     /** Indicates that the server frame and its children are closing. */
     CLOSING,
-};
+}

src/com/dmdirc/actions/Action.java

@@ -118,9 +118,7 @@ public class Action extends ActionModel implements Serializable {
         // Read the triggers
         if (properties.containsKey("trigger")) {
             final String[] triggerStrings = properties.getProperty("trigger").split("\\|");
-            
-            Class[] args = null;
-            
+                        
             triggers = new ActionType[triggerStrings.length];
             
             for (int i = 0; i < triggerStrings.length; i++) {
@@ -130,13 +128,9 @@ public class Action extends ActionModel implements Serializable {
                     error("Invalid trigger specified");
                     return;
                 } else {
-                    if (i == 0) {
-                        args = triggers[i].getType().getArgTypes();
-                    } else {
-                        if (!triggers[i].getType().equals(triggers[0].getType())) {
-                            error("Triggers are not compatible");
-                            return;
-                        }
+                    if (i != 0 && !triggers[i].getType().equals(triggers[0].getType())) {
+                        error("Triggers are not compatible");
+                        return;
                     }
                 }
             }

src/com/dmdirc/actions/ActionManager.java

@@ -194,7 +194,7 @@ public final class ActionManager {
             }
         }
         
-        if (dir == null || dir.listFiles() == null) {
+        if (dir.listFiles() == null) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to load user action files");
         } else {
             for (File file : dir.listFiles()) {

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -24,11 +24,9 @@ package com.dmdirc.addons.audio;
 
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.plugins.Plugin;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.interfaces.InputWindow;
+
 import java.io.File;
-import java.io.IOException;
 
 /**
  * The Audio Command allows playing of audio files.

src/com/dmdirc/addons/audio/AudioPlayer.java

@@ -28,7 +28,6 @@ import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.SourceDataLine;
 import javax.sound.sampled.DataLine;
 import java.io.File;
-import java.io.IOException;
 
 /**
  * The AudioPlayer handles the playing of the audio

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

@@ -152,7 +152,7 @@ public class IdentdPlugin extends Plugin implements EventPlugin, PreferencesInte
 			}
 		} else if (type == CoreActionType.SERVER_CONNECTED || type == CoreActionType.SERVER_CONNECTERROR) {
 			synchronized (servers) {
-				servers.remove((Server) arguments[0]);
+				servers.remove(arguments[0]);
 			
 				if (servers.size() == 0) {
 					if (!IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {

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

@@ -517,6 +517,7 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 		final boolean showTimestamp = IdentityManager.getGlobalConfig().getOptionBool(MY_DOMAIN, "backbuffer.timestamp");
 		if (frame == null) {
 			Logger.userError(ErrorLevel.LOW, "Given a null frame");
+            return;
 		}
 		
 		File testFile = new File(filename);

src/com/dmdirc/addons/nowplaying/plugin/NowPlayingPlugin.java

@@ -206,7 +206,7 @@ public class NowPlayingPlugin extends Plugin implements EventPlugin,
      */
     private void removePlugin(final Plugin target) {
         if (target instanceof MediaSource) {
-            sources.remove((MediaSource) target);
+            sources.remove(target);
         }
         
         if (target instanceof MediaSourceManager) {

src/com/dmdirc/commandparser/CommandManager.java

@@ -414,15 +414,15 @@ public final class CommandManager {
      */
     public static Command getCommand(final String name) {
         if (getGlobalCommandByName(name) != null) {
-            return (Command) getGlobalCommandByName(name);
+            return getGlobalCommandByName(name);
         } else if (getServerCommandByName(name) != null) {
-            return (Command) getServerCommandByName(name);
+            return getServerCommandByName(name);
         } else if (getChannelCommandByName(name) != null) {
-            return (Command) getChannelCommandByName(name);
+            return getChannelCommandByName(name);
         } else if (getChatCommandByName(name) != null) {
-            return (Command) getChatCommandByName(name);
+            return getChatCommandByName(name);
         } else {
-            return (Command) getChannelCommandByName(name);
+            return getChannelCommandByName(name);
         }
     }
     

src/com/dmdirc/commandparser/commands/global/LoadPlugin.java

@@ -30,7 +30,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**

src/com/dmdirc/config/ConfigTarget.java

@@ -36,7 +36,7 @@ public final class ConfigTarget implements Comparable, Serializable {
     /** The possible target types. */
     public static enum TYPE {
         GLOBALDEFAULT, GLOBAL, THEME, PROFILE, IRCD, NETWORK, SERVER, CHANNEL,
-    };
+    }
     
     /**
      * A version number for this class. It should be changed whenever the class

src/com/dmdirc/config/IdentityManager.java

@@ -110,7 +110,7 @@ public final class IdentityManager {
             }
         }
         
-        if (dir == null || dir.listFiles() == null) {
+        if (dir.listFiles() == null) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to load user identity files");
         } else {
             for (File file : dir.listFiles()) {

src/com/dmdirc/installer/LinuxInstaller.java

@@ -23,7 +23,6 @@
 package com.dmdirc.installer;
 
 import com.dmdirc.installer.cliparser.CLIParser;
-import com.dmdirc.ui.swing.dialogs.wizard.TextStep;
 
 import java.io.PrintWriter;
 import java.io.IOException;

src/com/dmdirc/installer/StepConfirm.java

@@ -23,7 +23,6 @@
 package com.dmdirc.installer;
 
 import com.dmdirc.installer.Installer.ShortcutType;
-import com.dmdirc.installer.WindowsInstaller;
 import com.dmdirc.ui.swing.dialogs.wizard.SpecialStep;
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;

src/com/dmdirc/installer/StepSettings.java

@@ -23,7 +23,6 @@
 package com.dmdirc.installer;
 
 import com.dmdirc.installer.Installer.ShortcutType;
-import com.dmdirc.installer.WindowsInstaller;
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;

src/com/dmdirc/installer/WindowsInstaller.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.installer;
 
-import com.dmdirc.ui.swing.dialogs.wizard.TextStep;
-
 import java.io.File;
 
 /**

src/com/dmdirc/parser/callbacks/CallbackOnChannelNickChanged.java

@@ -24,7 +24,6 @@
 
 package com.dmdirc.parser.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
 import com.dmdirc.parser.ChannelClientInfo;
 import com.dmdirc.parser.ChannelInfo;
 import com.dmdirc.parser.IRCParser;

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -23,14 +23,11 @@
  */
 package com.dmdirc.plugins;
 
-import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.DataInputStream;
 import java.io.File;
 import java.io.IOException;
 
-import java.util.Hashtable;
-
 public class PluginClassLoader extends ClassLoader {
 	/** Directory where plugins are stored. */
 	String myDir;

src/com/dmdirc/themes/ThemeManager.java

@@ -69,7 +69,7 @@ public class ThemeManager {
             }
         }
         
-        if (dir == null || dir.listFiles() == null) {
+        if (dir.listFiles() == null) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to load themes");
         } else {
             for (File file : dir.listFiles()) {

src/com/dmdirc/ui/dummy/DummyStatusBar.java

@@ -23,13 +23,10 @@
 package com.dmdirc.ui.dummy;
 
 import com.dmdirc.ui.interfaces.StatusBar;
-import com.dmdirc.ui.interfaces.StatusErrorNotifier;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
 
 import java.awt.Component;
 
-import javax.swing.Icon;
-
 /**
  * Dummy status bar, used for testing.
  */

src/com/dmdirc/ui/interfaces/StatusBar.java

@@ -24,8 +24,6 @@ package com.dmdirc.ui.interfaces;
 
 import java.awt.Component;
 
-import javax.swing.Icon;
-
 /**
  * Status bar interface.
  */

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

@@ -61,7 +61,7 @@ public final class DMDircEventQueue extends EventQueue {
             return;
         }
         
-        if (me == null || me.getComponent() == null) {
+        if (me.getComponent() == null) {
             return;
         }
         

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

@@ -204,7 +204,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
         for (int i = 0; i < listenerList.length; i += 2) {
             if (listenerList[i] == ActionListener.class) {
                 ((ActionListener) listenerList[i + 1]).actionPerformed(
-                        new ActionEvent((Object) this, 
+                        new ActionEvent(this, 
                         ActionEvent.ACTION_PERFORMED, command));
             }
         }

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

@@ -62,7 +62,7 @@ public class PackingTable extends JTable {
      */
     public PackingTable(final Object[][] rows, final Object[] cols,
             final boolean editable, final JScrollPane scrollPane) {
-        this((TableModel) new DefaultTableModel(rows, cols), editable, scrollPane);
+        this(new DefaultTableModel(rows, cols), editable, scrollPane);
     }
     
     /**

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

@@ -86,7 +86,7 @@ public final class SearchBar extends JPanel implements ActionListener,
         UP,
         /** Move down through the document. */
         DOWN,
-    };
+    }
     
     /** Line to search from. */
     private int line;

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

@@ -28,7 +28,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
 import com.dmdirc.ui.interfaces.PreferencesPanel;
-import com.dmdirc.ui.interfaces.PreferencesPanel.OptionType;
 import com.dmdirc.ui.swing.MainFrame;
 import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
@@ -568,7 +567,7 @@ public final class SwingPreferencesPanel extends StandardDialog implements
     /** {@inheritDoc} */
     public void display() {
         for (JPanel panel : categories.values()) {
-            if (!panels.contains((JPanel) panel.getComponent(1))) {
+            if (!panels.contains(panel.getComponent(1))) {
                 layoutGrid((JPanel) panel.getComponent(1), ((JPanel) panel
                         .getComponent(1)).getComponentCount() / 2, 2, SMALL_BORDER,
                         SMALL_BORDER, LARGE_BORDER, LARGE_BORDER);

src/com/dmdirc/ui/swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -31,15 +31,15 @@ import com.dmdirc.ui.swing.components.StandardDialog;
 import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel.OptionType;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
+
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.BorderFactory;
+
 import javax.swing.Box;
 import javax.swing.JButton;
-import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.WindowConstants;
 

src/com/dmdirc/ui/swing/dialogs/wizard/WizardDialog.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.ui.swing.dialogs.wizard;
 
-import com.dmdirc.Main;
-import com.dmdirc.ui.swing.MainFrame;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 import com.dmdirc.ui.swing.components.StandardDialog;
 

src/com/dmdirc/ui/swing/framemanager/ctrltab/CtrlTabFrameManager.java

@@ -30,12 +30,13 @@ import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.swing.components.TreeScroller;
 import com.dmdirc.ui.swing.framemanager.tree.TreeViewModel;
+
 import java.awt.Color;
 import java.awt.event.ActionEvent;
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.swing.AbstractAction;
 import javax.swing.JComponent;
 import javax.swing.JDesktopPane;

src/com/dmdirc/ui/swing/textpane/TextPaneCanvas.java

@@ -80,7 +80,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         DRAG,
         /** Mouse released.*/
         RELEASE,
-    };
+    }
     
     /** position of the scrollbar. */
     private int scrollBarPosition;

src/com/dmdirc/util/CipherUtils.java

@@ -112,9 +112,8 @@ public final class CipherUtils {
             Logger.userError(ErrorLevel.LOW, "Unable to decrypt string: " + e.getMessage());
         } catch (UnsupportedEncodingException e) {
             Logger.userError(ErrorLevel.LOW, "Unable to decrypt string: " + e.getMessage());
-        } catch (IOException e) {
-            Logger.userError(ErrorLevel.LOW, "Unable to decrypt string: " + e.getMessage());
         }
+
         return null;
     }
     

src/com/dmdirc/util/resourcemanager/ResourceManager.java

@@ -50,7 +50,7 @@ public abstract class ResourceManager {
         JAR,
         /** No resource manager. */
         NONE,
-    };
+    }
     
     /**
      * Returns an appropriate instance of ResourceManager.