PMD violation fixes

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

src/com/dmdirc/ChannelEventHandler.java

@@ -52,6 +52,8 @@ public final class ChannelEventHandler extends EventHandler implements
      * @param owner The channel that owns this event handler.
      */
     public ChannelEventHandler(final Channel owner) {
+        super();
+        
         this.owner = owner;
     }
 

src/com/dmdirc/actions/ActionGroup.java

@@ -64,6 +64,8 @@ public class ActionGroup extends ArrayList<Action> {
      * @param name The name of this action group
      */
     public ActionGroup(final String name) {
+        super();
+        
         this.name = name;
     }
 

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

@@ -26,11 +26,7 @@ import java.io.File;
 import java.applet.AudioClip;
 import java.applet.Applet;
 
-import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.SourceDataLine;
-import javax.sound.sampled.DataLine;
 
 /**
  * The AudioPlayer handles the playing of the audio
@@ -111,7 +107,7 @@ public final class AudioPlayer implements Runnable {
 	 */
 	private void playWav() {
 		try {
-			final AudioClip ac = (new Applet()).newAudioClip(myFile.toURI().toURL());
+			final AudioClip ac = Applet.newAudioClip(myFile.toURI().toURL());
 			if (ac != null) { ac.play(); }
 		} catch (Exception e) { /* Bad File, can't play */ }
 	}
@@ -120,16 +116,16 @@ public final class AudioPlayer implements Runnable {
 	 * Play the file as a wav file.
 	 * Based on http://www.anyexample.com/programming/java/java_play_wav_sound_file.xml
 	 */
-	private void oldPlayWav() {
+	/*private void oldPlayWav() {
 		final int EXTERNAL_BUFFER_SIZE = 524288; // 128Kb
 		AudioInputStream audioInputStream = null;
 		try {
 			audioInputStream = AudioSystem.getAudioInputStream(myFile);
 		} catch (Exception e) { return; }
-		AudioFormat format = audioInputStream.getFormat();
+		final AudioFormat format = audioInputStream.getFormat();
 		
 		SourceDataLine auline = null;
-		DataLine.Info info = new DataLine.Info(SourceDataLine.class, format);
+		final DataLine.Info info = new DataLine.Info(SourceDataLine.class, format);
 		
 		try {
 			auline = (SourceDataLine) AudioSystem.getLine(info);
@@ -138,7 +134,7 @@ public final class AudioPlayer implements Runnable {
 		
 		auline.start();
 		int nBytesRead = 0;
-		byte[] abData = new byte[EXTERNAL_BUFFER_SIZE];
+		final byte[] abData = new byte[EXTERNAL_BUFFER_SIZE];
 		
 		try {
 			while (nBytesRead != -1) {
@@ -149,7 +145,7 @@ public final class AudioPlayer implements Runnable {
 				}
 			}
 		} catch (Exception e) {
-			/** Do Nothing */
+			/** Do Nothing *
 		} finally {
 			auline.drain();
 			auline.close();
@@ -157,5 +153,5 @@ public final class AudioPlayer implements Runnable {
 		try {
 			audioInputStream.close();
 		} catch (Exception e) { }
-	}
+	}*/
 }

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

@@ -59,7 +59,7 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface {
 		nickname = nick;
 		otherNickname = targetNick;
 		
-		JWrappingLabel label = new JWrappingLabel("This is a placeholder dcc send window.", SwingConstants.CENTER);
+		final JWrappingLabel label = new JWrappingLabel("This is a placeholder dcc send window.", SwingConstants.CENTER);
 		
 		((TextFrame)getFrame()).getContentPane().add(label);
 		plugin.addWindow(this);

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

@@ -66,7 +66,7 @@ public final class IdentClient implements Runnable {
 	 * Process this connection
 	 */
 	public void run() {
-		Thread thisThread = Thread.currentThread();
+		final Thread thisThread = Thread.currentThread();
 		PrintWriter out = null;
 		BufferedReader in = null;
 		try {
@@ -116,10 +116,9 @@ public final class IdentClient implements Runnable {
 		}
 		
 		final Server server = getServerByPort(myPort);
-		if (!IdentityManager.getGlobalConfig().getOptionBool(IdentdPlugin.getDomain(), "advanced.alwaysOn")) {
-			if (server == null || IdentityManager.getGlobalConfig().getOptionBool(IdentdPlugin.getDomain(), "advanced.isNoUser")) {
-				return String.format("%d , %d : ERROR : NO-USER", myPort, theirPort);
-			}
+		if (!IdentityManager.getGlobalConfig().getOptionBool(IdentdPlugin.getDomain(), "advanced.alwaysOn")
+                && (server == null || IdentityManager.getGlobalConfig().getOptionBool(IdentdPlugin.getDomain(), "advanced.isNoUser"))) {
+			return String.format("%d , %d : ERROR : NO-USER", myPort, theirPort);
 		}
 		
 		if (IdentityManager.getGlobalConfig().getOptionBool(IdentdPlugin.getDomain(), "advanced.isHiddenUser")) {
@@ -140,10 +139,10 @@ public final class IdentClient implements Runnable {
 			if (osName.startsWith("windows")) { os = "WIN32"; }
 			else if (osName.startsWith("mac")) { os = "MACOS"; }
 			else if (osName.startsWith("linux")) { os = "UNIX"; }
-			else if (osName.indexOf("bsd") != -1) { os = "UNIX-BSD"; }
-			else if (osName.equals("os/2")) { os = "OS/2"; }
-			else if (osName.indexOf("unix") != -1) { os = "UNIX"; }
-			else if (osName.equals("irix")) { os = "IRIX"; }
+			else if (osName.indexOf("bsd") > -1) { os = "UNIX-BSD"; }
+			else if ("os/2".equals(osName)) { os = "OS/2"; }
+			else if (osName.indexOf("unix") > -1) { os = "UNIX"; }
+			else if ("irix".equals(osName)) { os = "IRIX"; }
 			else { os = "UNKNOWN"; }
 		}
 		
@@ -166,7 +165,7 @@ public final class IdentClient implements Runnable {
 	 */
 	public void close() {
 		if (myThread != null) {
-			Thread tmpThread = myThread;
+			final Thread tmpThread = myThread;
 			myThread = null;
 			if (tmpThread != null) { tmpThread.interrupt(); }
 			try { mySocket.close(); } catch (IOException e) { }

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

@@ -67,7 +67,7 @@ public class IdentdPlugin extends Plugin implements ActionListener {
 		ActionManager.addListener(this, CoreActionType.SERVER_CONNECTED, CoreActionType.SERVER_CONNECTING, CoreActionType.SERVER_CONNECTERROR);
 
 		// Set defaults
-		Properties defaults = new Properties();
+		final Properties defaults = new Properties();
 		defaults.setProperty(getDomain() + ".general.useUsername", "false");
 		defaults.setProperty(getDomain() + ".general.useNickname", "false");
 		defaults.setProperty(getDomain() + ".general.useCustomName", "false");
@@ -83,7 +83,7 @@ public class IdentdPlugin extends Plugin implements ActionListener {
 		defaults.setProperty("identity.name", "Identd Plugin Defaults");
 		IdentityManager.addIdentity(new Identity(defaults));
 		
-		myServer = new IdentdServer(this);
+		myServer = new IdentdServer();
 		if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {
 			myServer.startServer();
 		}
@@ -110,7 +110,7 @@ public class IdentdPlugin extends Plugin implements ActionListener {
 	public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
 		if (type == CoreActionType.SERVER_CONNECTING) {
 			synchronized (servers) {
-				if (servers.size() == 0) {
+				if (servers.isEmpty()) {
 					myServer.startServer();
 				}
 				servers.add((Server) arguments[0]);
@@ -119,10 +119,8 @@ public class IdentdPlugin extends Plugin implements ActionListener {
 			synchronized (servers) {
 				servers.remove(arguments[0]);
 			
-				if (servers.size() == 0) {
-					if (!IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {
-						myServer.stopServer();
-					}
+				if (servers.isEmpty() && !IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {
+					myServer.stopServer();
 				}
 			}
 		}

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

@@ -39,9 +39,8 @@ import java.util.List;
  * @version $Id: IdentdServer.java 969 2007-04-30 18:38:20Z ShaneMcC $
  */
 public final class IdentdServer implements Runnable {
-	/** The IdentdPlugin that owns this Server */
-	private final IdentdPlugin myIdentdPlugin;
-	/** The Thread in use for this server */
+
+    /** The Thread in use for this server */
 	private volatile Thread myThread = null;
 	/** The current socket in use for this server */
 	private ServerSocket serverSocket;
@@ -49,23 +48,21 @@ public final class IdentdServer implements Runnable {
 	private final List<IdentClient> clientList = new ArrayList<IdentClient>();
 	
 	/**
-	 * Create the IdentdServer
-	 *
-	 * @param plugin The plugin that owns this Server
+	 * Create the IdentdServer.
 	 */
-	public IdentdServer(final IdentdPlugin plugin) {
-		myIdentdPlugin = plugin;
+	public IdentdServer() {
+        super();
 	}
 	
 	/**
-	 * Run this IdentdServer
+	 * Run this IdentdServer.
 	 */
 	public void run() {
-		Thread thisThread = Thread.currentThread();
+		final Thread thisThread = Thread.currentThread();
 		while (myThread == thisThread) {
 			try {
-				Socket clientSocket = serverSocket.accept();
-				IdentClient client = new IdentClient(this, clientSocket);
+				final Socket clientSocket = serverSocket.accept();
+				final IdentClient client = new IdentClient(this, clientSocket);
 				addClient(client);
 			} catch (IOException e) {
 				if (myThread == thisThread) {
@@ -132,7 +129,7 @@ public final class IdentdServer implements Runnable {
 	 */
 	public void stopServer() {
 		if (myThread != null) {
-			Thread tmpThread = myThread;
+			final Thread tmpThread = myThread;
 			myThread = null;
 			if (tmpThread != null) { tmpThread.interrupt(); }
 			try { serverSocket.close(); } catch (IOException e) { }

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

@@ -65,7 +65,7 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 		}
 		final Plugin gotPlugin = pluginInfo.getPlugin();
 		
-		if (gotPlugin == null || !(gotPlugin instanceof LoggingPlugin)) {
+		if (!(gotPlugin instanceof LoggingPlugin)) {
 			sendLine(origin, isSilent, FORMAT_ERROR, "Logging Plugin is not loaded.");
 			return;
 		}

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

@@ -61,6 +61,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Hashtable;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Stack;
 
@@ -72,14 +73,15 @@ import java.util.Stack;
  * @version $Id: LoggingPlugin.java 969 2007-04-30 18:38:20Z ShaneMcC $
  */
 public final class LoggingPlugin extends Plugin implements ActionListener {
-	/** What domain do we store all settings in the global config under. */
+
+    /** What domain do we store all settings in the global config under. */
 	private static final String MY_DOMAIN = "plugin-Logging";
 
-	/** The command we registered */
+	/** The command we registered. */
 	private LoggingCommand command;
 
-	/** Hashtable of open files */
-	Hashtable<String,BufferedWriter> openFiles = new Hashtable<String,BufferedWriter>();
+	/** Hashtable of open files. */
+	private final Map<String,BufferedWriter> openFiles = new Hashtable<String,BufferedWriter>();
 
 	/**
 	 * Creates a new instance of the Logging Plugin.
@@ -92,7 +94,7 @@ public final class LoggingPlugin extends Plugin implements ActionListener {
 	@Override
 	public void onLoad() {
 		// Set defaults
-		Properties defaults = new Properties();
+		final Properties defaults = new Properties();
 		defaults.setProperty(MY_DOMAIN + ".general.directory", Main.getConfigDir() + "logs" + System.getProperty("file.separator"));
 		defaults.setProperty(MY_DOMAIN + ".general.networkfolders", "true");
 		defaults.setProperty(MY_DOMAIN + ".advanced.filenamehash", "false");
@@ -109,17 +111,17 @@ public final class LoggingPlugin extends Plugin implements ActionListener {
 		IdentityManager.addIdentity(new Identity(defaults));
 
 		final File dir = new File(IdentityManager.getGlobalConfig().getOption(MY_DOMAIN, "general.directory"));
-		if (!dir.exists()) {
+		if (dir.exists()) {
+			if (!dir.isDirectory()) {
+				Logger.userError(ErrorLevel.LOW, "Unable to create logging dir (file exists instead)");
+			}            
+		} else {
 			try {
 				dir.mkdirs();
 				dir.createNewFile();
 			} catch (IOException ex) {
 				Logger.userError(ErrorLevel.LOW, "Unable to create logging dir");
 			}
-		} else {
-			if (!dir.isDirectory()) {
-				Logger.userError(ErrorLevel.LOW, "Unable to create logging dir (file exists instead)");
-			}
 		}
 
 		command = new LoggingCommand();
@@ -260,7 +262,7 @@ public final class LoggingPlugin extends Plugin implements ActionListener {
 					line = getLogFile(client);
 					if (openFiles.containsKey(line)) {
 						appendLine(line, "*** Query closed at: " + openedAtFormat.format(new Date()));
-						BufferedWriter file = openFiles.get(line);
+						final BufferedWriter file = openFiles.get(line);
 						try {
 							file.close();
 						} catch (IOException e) {
@@ -276,7 +278,7 @@ public final class LoggingPlugin extends Plugin implements ActionListener {
 					line = getLogFile(channel);
 					if (openFiles.containsKey(line)) {
 						appendLine(line, "*** Channel closed at: " + openedAtFormat.format(new Date()));
-						BufferedWriter file = openFiles.get(line);
+						final BufferedWriter file = openFiles.get(line);
 						try {
 							file.close();
 						} catch (IOException e) {
@@ -457,15 +459,15 @@ public final class LoggingPlugin extends Plugin implements ActionListener {
 			return;
 		}
 
-		File testFile = new File(filename);
+		final File testFile = new File(filename);
 		if (testFile.exists()) {
 			try {
-				ReverseFileReader file = new ReverseFileReader(testFile);
+				final ReverseFileReader file = new ReverseFileReader(testFile);
 				// Because the file includes a newline char at the end, an empty line
 				// is returned by getLines. To counter this, we call getLines(1) and do
 				// nothing with the output.
 				file.getLines(1);
-				Stack<String> lines = file.getLines(numLines);
+				final Stack<String> lines = file.getLines(numLines);
 				while (!lines.empty()) {
 					frame.addLine(getColouredString(colour,lines.pop()), showTimestamp);
 				}
@@ -485,7 +487,7 @@ public final class LoggingPlugin extends Plugin implements ActionListener {
 	 * @param line the line to colour
 	 * @return The given line with the appropriate irc codes appended/prepended to colour it.
 	 */
-	private String getColouredString(String colour, String line) {
+	private String getColouredString(final String colour, final String line) {
 		String res = null;
 		if (colour.length() < 3) {
 			int num;
@@ -699,7 +701,13 @@ public final class LoggingPlugin extends Plugin implements ActionListener {
 			result = result + sanitise(networkName.toLowerCase()) + System.getProperty("file.separator");
 			// Check dir exists
 			final File dir = new File(result);
-			if (!dir.exists()) {
+			if (dir.exists()) {
+				if (!dir.isDirectory()) {
+					Logger.userError(ErrorLevel.LOW, "Unable to create networkfolders dir (file exists instead)");
+					// Prepend network name instead.
+					result = input + sanitise(networkName.toLowerCase()) + " -- ";
+				}
+			} else {
 				try {
 					dir.mkdirs();
 					dir.createNewFile();
@@ -708,12 +716,6 @@ public final class LoggingPlugin extends Plugin implements ActionListener {
 					// Prepend network name instead.
 					result = input + sanitise(networkName.toLowerCase()) + " -- ";
 				}
-			} else {
-				if (!dir.isDirectory()) {
-					Logger.userError(ErrorLevel.LOW, "Unable to create networkfolders dir (file exists instead)");
-					// Prepend network name instead.
-					result = input + sanitise(networkName.toLowerCase()) + " -- ";
-				}
 			}
 		}
 		return result;

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

@@ -30,6 +30,7 @@ import java.io.EOFException;
 import java.nio.charset.Charset;
 import java.util.Stack;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Reads a file in reverse.
@@ -41,9 +42,9 @@ public class ReverseFileReader {
 	/** File to manipulate. */
 	private RandomAccessFile file;
 	/** \r Character */
-	private static final byte r = 0X0D;
+	private static final byte R = 0X0D;
 	/** \n Character */
-	private static final byte n = 0X0A;
+	private static final byte N = 0X0A;
 	/** Number of bytes to skip backwards at a time. */
 	private byte seekLength = 50;
 
@@ -97,7 +98,7 @@ public class ReverseFileReader {
 	 *
 	 * @param newValue New value for seekLength
 	 */
-	public void setSeekLength(byte newValue) {
+	public void setSeekLength(final byte newValue) {
 		seekLength = newValue;
 	}
 	
@@ -124,7 +125,7 @@ public class ReverseFileReader {
 		if (file == null) { throw new IOException("File has been closed."); }
 		// Used to store result to output.
 //		StringBuilder line = new StringBuilder();
-		ArrayList<Byte> line = new ArrayList<Byte>(seekLength);
+		final List<Byte> line = new ArrayList<Byte>(seekLength);
 		// Used to store position in file pre-read
 		long fp = 0;
 		// Used to store position in file when this is called
@@ -170,12 +171,12 @@ public class ReverseFileReader {
 			// This uses seekDistance so that only wanted data is checked.
 			for (int i = seekDistance-1; i >= 0; --i) {
 				// Check for New line Character, or a non carraige-return char
-				if (bytes[i] == n) {
+				if (bytes[i] == N) {
 					// Seek to the location of this character and exit this loop.
 					file.seek(fp+i);
 					gotNewLine = true;
 					break;
-				} else if (bytes[i] != r) {
+				} else if (bytes[i] != R) {
 					// Add to the result, the loop will continue going.
 					line.add(0, bytes[i]);
 				}
@@ -217,9 +218,10 @@ public class ReverseFileReader {
 	 * If the file is closed, an empty stack will be returned.
 	 *
 	 * @param numLines Number of lines to try and get.
+     * @return The requested lines
 	 */
-	public Stack<String> getLines(int numLines) {
-		Stack<String> result = new Stack<String>();
+	public Stack<String> getLines(final int numLines) {
+		final Stack<String> result = new Stack<String>();
 		for (int i = 0; i < numLines; ++i) {
 			try {
 				result.push(getNextLine());

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

@@ -117,7 +117,7 @@ public class VlcMediaSourcePlugin extends Plugin implements MediaSource {
                 result = result.substring(sepIndex,
                         extIndex > sepIndex ? extIndex : result.length());
                 
-                int offset = result.indexOf('-');
+                final int offset = result.indexOf('-');
                 if (offset > -1) {
                     result = result.substring(offset + 1).trim();
                 }
@@ -245,7 +245,7 @@ public class VlcMediaSourcePlugin extends Plugin implements MediaSource {
                     if (itemname.endsWith("</a>")) {
                         itemname = itemname.substring(0, itemname.length()-4);
                     }
-                    if (!itemname.equals("")) {
+                    if (!itemname.isEmpty()) {
                         if (isCurrent) {
                             information.put("playlist_current", Integer.toString(playlistItem));
                         }

src/com/dmdirc/commandparser/commands/ExternalCommand.java

@@ -41,7 +41,7 @@ public interface ExternalCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
      */
-    public abstract void execute(InputWindow origin, Server server, String channel,
+    void execute(InputWindow origin, Server server, String channel,
             boolean isSilent, String... args);    
 
 }

src/com/dmdirc/commandparser/commands/PreviousCommand.java

@@ -67,7 +67,7 @@ public final class PreviousCommand {
 
     /** {@inheritDoc} */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj == null) {
             return false;
         }

src/com/dmdirc/config/Identity.java

@@ -43,6 +43,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 
@@ -198,7 +199,7 @@ public class Identity extends ConfigSource implements Serializable,
         assert(file != null);
                
         final InputStream input = new FileInputStream(file);
-        final Hashtable<Object,Object> oldProps = new Hashtable<Object, Object>(properties);
+        final Map<Object,Object> oldProps = new Hashtable<Object, Object>(properties);
         
         properties.clear();
         properties.load(input);

src/com/dmdirc/installer/Main.java

@@ -109,6 +109,8 @@ public final class Main implements WizardListener {
 	
 	/**
 	 * Get the Installer object for this OS.
+     * 
+     * @return The installer for this OS
 	 */
 	public static synchronized Installer getInstaller() {
 		if (myInstaller == null) {

src/com/dmdirc/installer/StepInstall.java

@@ -48,7 +48,7 @@ public final class StepInstall extends Step implements StepListener {
 	private static final long serialVersionUID = 2;
 
 	/** Text area showing the install information */
-	private JTextArea infoLabel = new JTextArea("Beginning Install");
+	private final JTextArea infoLabel = new JTextArea("Beginning Install");
 
 	/** Scroll pane holding text area */
 	final JScrollPane scrollPane;

src/com/dmdirc/installer/cliparser/BooleanParam.java

@@ -82,6 +82,6 @@ public class BooleanParam extends CLIParam {
 	 * @return The value of this param as a string.
 	 */
 	public String getStringValue() {
-		return ""+getValue();
+		return String.valueOf(getValue());
 	}
 }

src/com/dmdirc/installer/cliparser/CLIParser.java

@@ -82,11 +82,11 @@ public class CLIParser {
 	 * @return true if added, false if already exists.
 	 */
 	public boolean add(final CLIParam param) {
-		boolean validChar = (param.getChr() == 0 || !params.containsKey(""+param.getChr()));
-		boolean validString = (param.getString().isEmpty() || !params.containsKey("-"+param.getString()));
+		final boolean validChar = param.getChr() == 0 || !params.containsKey(param.getChr());
+		final boolean validString = param.getString().isEmpty() || !params.containsKey("-"+param.getString());
 		if (validChar && validString) {
 			if (param.getChr() != 0) {
-				params.put(""+param.getChr(), param);
+				params.put(String.valueOf(param.getChr()), param);
 			}
 			if (!param.getString().isEmpty()) {
 				params.put("-"+param.getString(), param);
@@ -189,15 +189,15 @@ public class CLIParser {
 		System.out.println(usage);
 		System.out.println(" ");
 		for (CLIParam param : this.getParamList()) {
-			if (param.getChr() != 0) {
-				System.out.print("-"+param.getChr()+" ");
-			} else {
+			if (param.getChr() == 0) {
 				System.out.print("   ");
-			}
-			if (!param.getString().isEmpty()) {
-				System.out.print("--"+param.getString()+" ");
 			} else {
+				System.out.print("-"+param.getChr()+" ");
+			}
+			if (param.getString().isEmpty()) {
 				System.out.print("\t\t");
+			} else {
+				System.out.print("--"+param.getString()+" ");
 			}
 			System.out.println("\t"+param.getDescription());
 		}
@@ -224,10 +224,10 @@ public class CLIParser {
 						System.out.println("Unknown Param: -"+name);
 						if (helpParam != null) {
 							String command = "";
-							if (!helpParam.getString().isEmpty()) {
-								command = helpParam.getString();
+							if (helpParam.getString().isEmpty()) {
+								command = String.valueOf(helpParam.getChr());
 							} else if (helpParam.getChr() != 0) {
-								command = ""+helpParam.getChr();
+								command = helpParam.getString();
 							}
 							if (!command.isEmpty()) {
 								System.out.println("Use "+command+" to get help.");

src/com/dmdirc/parser/ChannelClientInfo.java

@@ -201,9 +201,9 @@ public final class ChannelClientInfo {
 	 *
 	 * @param sReason Why are they being kicked? "" for no reason
 	 */
-	public void kick(String sReason) {
-		if (!sReason.isEmpty()) { sReason = " :" + sReason; }
-		myParser.sendString("KICK " + myChannel + " " + this.getNickname() + sReason);
+	public void kick(final String sReason) {
+		myParser.sendString("KICK " + myChannel + " " + this.getNickname()
+                + (sReason.isEmpty() ? sReason : " :" + sReason));
 	}
 	
 	/**

src/com/dmdirc/parser/ChannelInfo.java

@@ -243,7 +243,7 @@ public final class ChannelInfo {
 	 *
 	 * @return if false, any new names reply will cause current known channelclients to be removed.
 	 */
-	public boolean getAddingNames() { return bAddingNames; }
+	public boolean isAddingNames() { return bAddingNames; }
 	
 	/**
 	 * Get the name of this channel object.

src/com/dmdirc/parser/ClientInfo.java

@@ -139,13 +139,11 @@ public final class ClientInfo {
 	public static String[] parseHostFull(String sWho) {
 		String[] sTemp = null;
 		final String[] result = new String[3];
-		if (!sWho.isEmpty()) {
-			if (sWho.charAt(0) == ':') { sWho = sWho.substring(1); }
-		}
+		if (!sWho.isEmpty() && sWho.charAt(0) == ':') { sWho = sWho.substring(1); }
 		sTemp = sWho.split("@", 2);
-		if (sTemp.length != 1) { result[2] = sTemp[1]; } else { result[2] = ""; }
+		if (sTemp.length == 1) { result[2] = ""; } else { result[2] = sTemp[1]; }
 		sTemp = sTemp[0].split("!", 2);
-		if (sTemp.length != 1) { result[1] = sTemp[1]; } else { result[1] = ""; }
+		if (sTemp.length == 1) { result[1] = ""; } else { result[1] = sTemp[1]; }
 		result[0] = sTemp[0];
 		
 		return result;

src/com/dmdirc/parser/IRCParser.java

@@ -904,13 +904,13 @@ public class IRCParser implements Runnable {
 		} else if (newLine[0].equalsIgnoreCase("mode") && newLine.length == 3) {
 			// This makes sure we don't add the same item to the LMQ twice, even if its requested twice,
 			// as the ircd will only reply once.
-			LinkedList<Character> foundModes = new LinkedList<Character>();
+			final LinkedList<Character> foundModes = new LinkedList<Character>();
 
-			ChannelInfo channel = getChannelInfo(newLine[1]);
+			final ChannelInfo channel = getChannelInfo(newLine[1]);
 			if (channel != null) {
-				Queue<Character> listModeQueue = channel.getListModeQueue();
+				final Queue<Character> listModeQueue = channel.getListModeQueue();
 				for (int i = 0; i < newLine[2].length() ; ++i) {
-					Character mode = newLine[2].charAt(i);
+					final Character mode = newLine[2].charAt(i);
 					callDebugInfo(DEBUG_LMQ, "Intercepted mode request for "+channel+" for mode "+mode);
 					if (hChanModesOther.containsKey(mode) && hChanModesOther.get(mode) == MODE_LIST) {
 						if (foundModes.contains(mode)) {
@@ -974,13 +974,13 @@ public class IRCParser implements Runnable {
 			if (token[0].equalsIgnoreCase("PING") || token[1].equalsIgnoreCase("PING")) {
 				sendString("PONG :" + sParam);
 			} else if (token[0].equalsIgnoreCase("PONG") || token[1].equalsIgnoreCase("PONG")) {
-				if (!lastPingValue.equals("") && lastPingValue.equals(token[token.length-1])) {
+				if (!lastPingValue.isEmpty() && lastPingValue.equals(token[token.length-1])) {
 					lastPingValue = "";
 					serverLag = System.currentTimeMillis() - pingTime;
 					callPingSuccess();
 				}
 			} else if (token[0].equalsIgnoreCase("ERROR")) {
-				StringBuilder errorMessage = new StringBuilder();
+				final StringBuilder errorMessage = new StringBuilder();
 				for (int i = 1; i < token.length; ++i) { errorMessage.append(token[i]); }
 				callServerError(errorMessage.toString());
 			} else {
@@ -1451,14 +1451,16 @@ public class IRCParser implements Runnable {
 	 */
 	public void joinChannel(final String sChannelName, final String sKey, final boolean autoPrefix) {
 		final String channelName;
-		if (!isValidChannelName(sChannelName)) {
+		if (isValidChannelName(sChannelName)) {
+			channelName = sChannelName;
+        } else {
 			if (autoPrefix) {
 				if (h005Info.containsKey("CHANTYPES")) {
 					final String chantypes = h005Info.get("CHANTYPES");
-					if (!chantypes.isEmpty()) {
-						channelName = chantypes.charAt(0)+sChannelName;
+					if (chantypes.isEmpty()) {
+						channelName = "#" + sChannelName;
 					} else {
-						channelName = "#"+sChannelName;
+						channelName = chantypes.charAt(0) + sChannelName;
 					}
 				} else {
 					return;
@@ -1466,8 +1468,6 @@ public class IRCParser implements Runnable {
 			} else {
 				return;
 			}
-		} else {
-			channelName = sChannelName;
 		}
 		if (sKey.isEmpty()) {
 			sendString("JOIN " + channelName);
@@ -1712,9 +1712,9 @@ public class IRCParser implements Runnable {
 		// Check if we are already on this channel
 		if (getChannelInfo(sChannelName) != null) { return true; }
 		// Check if we know of any valid chan prefixes
-		if (hChanPrefix.size() == 0) {
+		if (hChanPrefix.isEmpty()) {
 			// We don't. Lets check against RFC2811-Specified channel types
-			char first = sChannelName.charAt(0);
+			final char first = sChannelName.charAt(0);
 			return first == '#' || first == '&' || first == '!' || first == '+';
 		}
 		// Otherwise return true if:
@@ -1886,8 +1886,8 @@ public class IRCParser implements Runnable {
 				setPingNeeded(true);
 				pingCountDown = pingCountDownLength;
 				callPingSent();
-				lastPingValue = ""+System.currentTimeMillis();
-				sendLine("PING "+lastPingValue);
+				lastPingValue = String.valueOf(System.currentTimeMillis());
+				sendLine("PING " + lastPingValue);
 			}
 		}
 	}

src/com/dmdirc/parser/MyInfo.java

@@ -59,16 +59,16 @@ public final class MyInfo {
 		} catch (SecurityException e) {
 			result = null;
 		}
-		if (result != null && !result.isEmpty()) {
-			nickname = result;
-			username = nickname;
-			realname = nickname+" - DMDIrc";
-			altNickname = nickname+"-";
-		} else {
+		if (result == null || result.isEmpty()) {
 			nickname = "IRCParser";
 			username = "IRCParser";
 			realname = "DMDIrc IRCParser";
 			altNickname = "IRC-Parser";
+		} else {
+			nickname = result;
+			username = nickname;
+			realname = nickname+" - DMDIrc";
+			altNickname = nickname+"-";
 		}
 	}
 	

src/com/dmdirc/parser/Process001.java

@@ -36,7 +36,7 @@ public class Process001 extends IRCProcessor {
 	 * @param sParam Type of line to process ("001")
 	 * @param token IRCTokenised line to process
 	 */
-	public void process(String sParam, String[] token) {
+	public void process(final String sParam, final String[] token) {
 		myParser.got001 = true;
 		// << :demon1.uk.quakenet.org 001 Java-Test :Welcome to the QuakeNet IRC Network, Java-Test
 		String sNick;
@@ -67,7 +67,7 @@ public class Process001 extends IRCProcessor {
          * @return true if a method was called, false otherwise
 	 */	
 	protected boolean callServerReady() {
-		CallbackOnServerReady cb = (CallbackOnServerReady)getCallbackManager().getCallbackType("OnServerReady");
+		final CallbackOnServerReady cb = (CallbackOnServerReady)getCallbackManager().getCallbackType("OnServerReady");
 		if (cb != null) { return cb.call(); }
 		return false;
 	}

src/com/dmdirc/parser/Process004005.java

@@ -36,7 +36,7 @@ public class Process004005 extends IRCProcessor {
 	 * @param sParam Type of line to process ("005", "004")
 	 * @param token IRCTokenised line to process
 	 */
-	public void process(String sParam, String[] token) {
+	public void process(final String sParam, final String[] token) {
 		if (sParam.equals("003")) {
 			myParser.h005Info.put("003IRCD",token[token.length-1]);
 		} else if (sParam.equals("004")) {
@@ -67,25 +67,14 @@ public class Process004005 extends IRCProcessor {
 					} else if (!sValue.equalsIgnoreCase("rfc1459")) {
 						myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Unknown casemapping: '"+sValue+"' - assuming rfc1459", myParser.getLastLine()));
 					}
-					boolean limitChanged = (myParser.getLastLimit() != limit);
+					final boolean limitChanged = (myParser.getLastLimit() != limit);
 					myParser.updateCharArrays(limit);
-					if (limitChanged) {
-						if (myParser.knownClients() == 1) {
+					if (limitChanged && myParser.knownClients() == 1) {
 							// This means that the casemapping is not rfc1459
 							// We have only added ourselves so far (from 001)
 							// We can fix the hashtable easily.
-							myParser.removeClient(myParser.getMyself());
-							myParser.addClient(myParser.getMyself());
-						} else if (myParser.knownClients() > 1) {
-							// If this happens then something buggered up.
-							// joining channels before 005, when the encoding is not rfc1459
-							// myParser.callErrorInfo(new ParserError(ParserError.ERROR_ERROR, "Casemapping has changed since we have seen other users!", myParser.getLastLine()));
-						}
-						if (myParser.knownChannels() > 0) {
-							// If this happens then something buggered up.
-							// joining channels before 005, when the encoding is not rfc1459
-							// myParser.callErrorInfo(new ParserError(ParserError.ERROR_ERROR, "Casemapping has changed since we joined channels!", myParser.getLastLine()));
-						}
+						myParser.removeClient(myParser.getMyself());
+						myParser.addClient(myParser.getMyself());
 					}
 				} else if (sKey.equals("CHANTYPES")) {
 					myParser.parseChanPrefix();
@@ -129,11 +118,11 @@ public class Process004005 extends IRCProcessor {
          * @return true if a method was called, false otherwise
 	 */
 	protected boolean callGotNetwork() {
-		String networkName = myParser.sNetworkName;
-		String ircdVersion = myParser.getIRCD(false);
-		String ircdType = myParser.getIRCD(true);
+		final String networkName = myParser.sNetworkName;
+		final String ircdVersion = myParser.getIRCD(false);
+		final String ircdType = myParser.getIRCD(true);
 		
-		CallbackOnGotNetwork cb = (CallbackOnGotNetwork)getCallbackManager().getCallbackType("OnGotNetwork");
+		final CallbackOnGotNetwork cb = (CallbackOnGotNetwork)getCallbackManager().getCallbackType("OnGotNetwork");
 		if (cb != null) { return cb.call(networkName, ircdVersion, ircdType); }
 		return false;
 	}
@@ -144,6 +133,6 @@ public class Process004005 extends IRCProcessor {
 	 * @param parser IRCParser That owns this IRCProcessor
 	 * @param manager ProcessingManager that is in charge of this IRCProcessor
 	 */
-	protected Process004005 (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+	protected Process004005 (final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
 
 }

src/com/dmdirc/parser/ProcessNames.java

@@ -62,7 +62,7 @@ public class ProcessNames extends IRCProcessor {
 			if (iChannel == null) { return; }
 			
 			// If we are not expecting names, clear the current known names - this is fresh stuff!
-			if (!iChannel.getAddingNames()) { iChannel.emptyChannel(); }
+			if (!iChannel.isAddingNames()) { iChannel.emptyChannel(); }
 			iChannel.setAddingNames(true);
 			
 			String[] sNames = token[token.length-1].split(" ");