Load more code tidying

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

src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java

@@ -60,11 +60,13 @@ public class DcopMediaSourcePlugin extends Plugin
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
+        // Nothing to do
     }
     
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
+        // Nothing to do
     }
     
     /** {@inheritDoc} */

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

@@ -66,7 +66,8 @@ public class NickColourPanel extends JPanel implements ActionListener,
     private final transient NickColourPlugin plugin;
     
     /** The table headings. */
-    private final String[] headers = {"Network", "Nickname", "Text colour", "Nicklist colour"};
+    private static final String[] headers
+            = {"Network", "Nickname", "Text colour", "Nicklist colour"};
     
     /**
      * Creates a new instance of NickColourPanel.
@@ -223,13 +224,13 @@ public class NickColourPanel extends JPanel implements ActionListener,
     public void save() {
         // Remove all old config entries
         for (Object[] parts : plugin.getData()) {
-            IdentityManager.getConfigIdentity().unsetOption(plugin.DOMAIN,
+            IdentityManager.getConfigIdentity().unsetOption(NickColourPlugin.DOMAIN,
                     "color:" + parts[0] + ":" + parts[1]);
         }
  	
         // And write the new ones
         for (Object[] row : getData()) {
-            IdentityManager.getConfigIdentity().setOption(plugin.DOMAIN,
+            IdentityManager.getConfigIdentity().setOption(NickColourPlugin.DOMAIN,
                     "color:" + row[0] + ":" + row[1], row[2] + ":" + row[3]);
         }
     }

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -47,6 +47,7 @@ import com.dmdirc.ui.interfaces.Window;
 import net.miginfocom.swing.MigLayout;
 
 import java.util.Hashtable;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 
@@ -85,7 +86,7 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener {
 	 */
 	public void onLoad() {
 		// Set defaults
-		Properties defaults = new Properties();
+		final Properties defaults = new Properties();
 		defaults.setProperty(MY_DOMAIN + ".channel.shownone", "true");
 		defaults.setProperty(MY_DOMAIN + ".channel.noneprefix", "None:");
 		defaults.setProperty(MY_DOMAIN + ".client.showname", "false");
@@ -124,11 +125,10 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener {
 	 * Update the window status using the current active window.
 	 */
 	public void updateStatus() {
-		Window active = Main.getUI().getActiveWindow();
+		final Window active = Main.getUI().getActiveWindow();
 
 		if (active != null) {
-			FrameContainer activeFrame = ((InputWindow) active).getContainer();
-			updateStatus(activeFrame);
+			updateStatus(((InputWindow) active).getContainer());
 		}
 	}
 
@@ -139,23 +139,23 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener {
 	 */
 	public void updateStatus(final FrameContainer current) {
 		if (current == null) { return; }
-		StringBuffer textString = new StringBuffer("");
+		final StringBuffer textString = new StringBuffer();
 
 		if (current instanceof Server) {
-			Server frame = (Server)current;
+			final Server frame = (Server)current;
 
 			textString.append(frame.getName());
 		} else if (current instanceof Channel) {
 			final Channel frame = (Channel)current;
 			final ChannelInfo chan = frame.getChannelInfo();
-			final Hashtable<Long,String> names = new Hashtable<Long,String>();
-			final Hashtable<Long,Integer> types = new Hashtable<Long,Integer>();
+			final Map<Long,String> names = new Hashtable<Long,String>();
+			final Map<Long,Integer> types = new Hashtable<Long,Integer>();
 
 			textString.append(chan.getName());
 			textString.append(" - Nicks: "+chan.getUserCount()+" (");
 
 			for (ChannelClientInfo client : chan.getChannelClients()) {
-				Long im = client.getImportantModeValue();
+				final Long im = client.getImportantModeValue();
 
 				if (!names.containsKey(im)) {
 					String mode = client.getImportantModePrefix();
@@ -187,11 +187,12 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener {
 			boolean isFirst = true;
 
 			for (Entry<Long, Integer> entry : types.entrySet()) {
-				if (isFirst) { isFirst = false; } else { textString.append(" "); }
-				textString.append(names.get(entry.getKey())+entry.getValue());
+				if (isFirst) { isFirst = false; } else { textString.append(' '); }
+				textString.append(names.get(entry.getKey()));
+                textString.append(entry.getValue());
 			}
 
-			textString.append(")");
+			textString.append(')');
 		} else if (current instanceof Query) {
 			final Query frame = (Query)current;
 
@@ -201,7 +202,8 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener {
 				if (client != null) {
 					final String realname = client.getRealName();
 					if (!realname.isEmpty()) {
-						textString.append(" - "+client.getRealName());
+						textString.append(" - ");
+                        textString.append(client.getRealName());
 					}
 				}
 			}

src/com/dmdirc/commandline/RemoteServer.java

@@ -62,9 +62,9 @@ public class RemoteServer implements RemoteInterface {
     public static void bind() {
         try {
             final RemoteServer server = new RemoteServer();
-            RemoteInterface stub =
+            final RemoteInterface stub =
                 (RemoteInterface) UnicastRemoteObject.exportObject(server, 0);
-            Registry registry = LocateRegistry.createRegistry(1099);
+            final Registry registry = LocateRegistry.createRegistry(1099);
             registry.rebind("DMDirc", stub);
         } catch (RemoteException ex) {
             // Do nothing

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

@@ -105,7 +105,7 @@ public abstract class Command extends CommandInfo implements Comparable<Command>
      * @return A string containing an ASCII table
      */
     protected static String doTable(final String[] headers, final String[][] data) {
-        StringBuilder res = new StringBuilder();
+        final StringBuilder res = new StringBuilder();
         res.append(Styliser.CODE_FIXED);
         res.append(Styliser.CODE_BOLD);
         

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

@@ -89,7 +89,7 @@ public final class PreviousCommand {
     @Override
     public int hashCode() {
         int hash = 5;
-        hash = 97 * hash + (this.line != null ? this.line.hashCode() : 0);
+        hash = 97 * hash + (this.line == null ? 0 : this.line.hashCode());
         return hash;
     }
     

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -50,11 +50,11 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
         if (args.length == 0) {
             final ChannelInfo cChannel = channel.getChannelInfo();
 
-            if (!cChannel.getTopic().isEmpty()) {
+            if (cChannel.getTopic().isEmpty()) {
+                sendLine(origin, isSilent, "channelNoTopic", cChannel);
+            } else {
                 sendLine(origin, isSilent, "channelJoinTopic", cChannel.getTopic(),
                         cChannel.getTopicUser(), 1000 * cChannel.getTopicTime(), cChannel);
-            } else {
-                sendLine(origin, isSilent, "channelNoTopic", cChannel);
             }
         } else {
             channel.setTopic(implodeArgs(args));

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

@@ -29,8 +29,8 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
+
 import java.util.List;
 
 /**

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

@@ -84,7 +84,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
         } else if ("serverinfo".equals(args[0])) {
             doServerInfo(origin, isSilent);
         } else if ("benchmark".equals(args[0])) {
-            doBenchmark(origin, isSilent);
+            doBenchmark(origin);
         } else if ("firstrun".equals(args[0])) {
             Main.getUI().showFirstRunWizard();
         } else if ("migration".equals(args[0])) {
@@ -261,19 +261,18 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * Benchmarks the textpane.
      * 
      * @param origin The window this command was executed in
-     * @param isSilent Whether this command has been silenced or not
      */
-    private void doBenchmark(final InputWindow origin, final boolean isSilent) {
+    private void doBenchmark(final InputWindow origin) {
         long[] results = new long[10];
         
         for (int i = 0; i < results.length; i++) {
-            long start = System.nanoTime();
+            final long start = System.nanoTime();
             
             for (int j = 0; j < 5000; j++) {
                 origin.addLine(FORMAT_OUTPUT, "This is a benchmark. Lorem ipsum doler...");
             }
             
-            long end = System.nanoTime();
+            final long end = System.nanoTime();
             
             results[i] = end - start;
         }
@@ -303,7 +302,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(int arg, List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         res.excludeAll();

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

@@ -59,15 +59,15 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
             PluginManager.getPluginManager().getPluginInfo(args[0]).loadPlugin();
             sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin loaded.");
         } else {
-            PluginInfo plugin = PluginManager.getPluginManager().getPluginInfo(args[0]);
+            final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfo(args[0]);
             if (plugin == null) {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Loading failed");
             } else {
-                if (!plugin.isLoaded()) {
+                if (plugin.isLoaded()) {
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin already loaded.");
+                } else {
                     PluginManager.getPluginManager().getPluginInfo(args[0]).loadPlugin();
                     sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin loaded.");
-                } else {
-                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin already loaded.");
                 }
             }
         }

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

@@ -57,7 +57,7 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
             return;
         }
         
-        PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args[0]);
+        final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args[0]);
         if (plugin == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Reloading failed - Plugin not loaded");
         } else {

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

@@ -57,7 +57,7 @@ public final class UnloadPlugin extends GlobalCommand implements IntelligentComm
             return;
         }
         
-        PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args[0]);
+        final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args[0]);
         if (plugin == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Plugin unloading failed - Plugin not loaded");
         } else {

src/com/dmdirc/commandparser/commands/server/Ignore.java

@@ -66,7 +66,11 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
             if (identity.hasOption("network", "ignorelist")) {
                 final List<String> list = identity.getOptionList("network", "ignorelist");
                 
-                if (!list.isEmpty()) {
+                if (list.isEmpty()) {
+                    sendLine(origin, isSilent, FORMAT_ERROR,
+                            "No ignore list entries for this network.");
+
+                } else {
                     sendLine(origin, isSilent, FORMAT_OUTPUT, "Ignore list:");
                     
                     int i = 0;
@@ -75,11 +79,7 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
                             i++;
                             sendLine(origin, isSilent, FORMAT_OUTPUT, i + ". " + line);
                         }
-                    }
-                    
-                } else {
-                    sendLine(origin, isSilent, FORMAT_ERROR,
-                            "No ignore list entries for this network.");
+                    }                    
                 }
                 
             } else {

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

@@ -119,7 +119,7 @@ public class PreferencesCategory {
      * 
      * @return True if subcats should be displayed first, false otherwise.
      */
-    public boolean getInlineBefore() {
+    public boolean isInlineBefore() {
         return inlineBefore;
     }
     

src/com/dmdirc/installer/Installer.java

@@ -66,6 +66,7 @@ public abstract class Installer extends Thread {
 	/**
 	 * This step performs the installation, via the StepInstall step.
 	 */
+    @Override
 	public final void run() {
 		step.performInstall(this);
 	}
@@ -82,7 +83,6 @@ public abstract class Installer extends Thread {
 	 * Main Setup stuff
 	 *
 	 * @param location Location where app will be installed to.
-	 * @param step The step that called this
 	 * @return True if installation passed, else false; 
 	 */
 	public boolean doSetup(final String location) {
@@ -91,15 +91,15 @@ public abstract class Installer extends Thread {
 		if (!directory.exists()) { directory.mkdir(); }
 	
 		try {
-			File dir = new File(".");
-			FilenameFilter filter = new FilenameFilter() {
-				public boolean accept(File dir, String name) {
-					return !name.startsWith(".") &&
+			final File dir = new File(".");
+			final FilenameFilter filter = new FilenameFilter() {
+				public boolean accept(final File dir, final String name) {
+					return name.charAt(0) != '.' &&
 					       !name.equalsIgnoreCase("installer.jar") &&
 					       validFile(name);
 				}
 			};
-			String[] children = dir.list(filter);
+			final String[] children = dir.list(filter);
 			if (children != null) {
 				for (String filename : children) {
 					step.addText("Copying "+filename);
@@ -141,8 +141,8 @@ public abstract class Installer extends Thread {
 	 */
 	protected final void copyFile(final String srcFile, final String dstFile) throws IOException {
 		if (new File(srcFile).exists()) {
-			FileChannel srcChannel = new FileInputStream(srcFile).getChannel();
-			FileChannel dstChannel = new FileOutputStream(dstFile).getChannel();
+			final FileChannel srcChannel = new FileInputStream(srcFile).getChannel();
+			final FileChannel dstChannel = new FileOutputStream(dstFile).getChannel();
 			
 			dstChannel.transferFrom(srcChannel, 0, srcChannel.size());
 			

src/com/dmdirc/installer/StepConfirm.java

@@ -46,7 +46,7 @@ public final class StepConfirm extends Step implements StepListener {
 	private static final long serialVersionUID = 2;
 
 	/** Text area showing the install information */
-	private JWrappingLabel infoLabel = new JWrappingLabel("");
+	private final JWrappingLabel infoLabel = new JWrappingLabel("");
 
 	/**
 	* Creates a new instance of StepConfirm.
@@ -70,30 +70,22 @@ public final class StepConfirm extends Step implements StepListener {
 		if (step != this) { return; }
 		String shortcutText = "";
 
-		StepSettings settings = ((StepSettings) Main.getWizardFrame().getStep(1));
+		final StepSettings settings = ((StepSettings) Main.getWizardFrame().getStep(1));
 
-		if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
-			if (settings.getShortcutMenuState()) {
-				shortcutText = shortcutText + " - Create menu shortcut"+ "\n";
-			}
+		if (Main.getInstaller().supportsShortcut(ShortcutType.MENU) && settings.getShortcutMenuState()) {
+			shortcutText = shortcutText + " - Create menu shortcut\n";
 		}
 
-		if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
-			if (settings.getShortcutDesktopState()) {
-				shortcutText = shortcutText + " - Create desktop shortcut"+ "\n";
-			}
+		if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP) && settings.getShortcutDesktopState()) {
+			shortcutText = shortcutText + " - Create desktop shortcut\n";
 		}
 
-		if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
-			if (settings.getShortcutQuickState()) {
-				shortcutText = shortcutText + " - Create Quick Launch shortcut"+ "\n";
-			}
+		if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH) && settings.getShortcutQuickState()) {
+			shortcutText = shortcutText + " - Create Quick Launch shortcut\n";
 		}
 
-		if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL)) {
-			if (settings.getShortcutProtocolState()) {
-				shortcutText = shortcutText + " - Make DMDirc handle irc:// links"+ "\n";
-			}
+		if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL) && settings.getShortcutProtocolState()) {
+			shortcutText = shortcutText + " - Make DMDirc handle irc:// links\n";
 		}
 
 

src/com/dmdirc/installer/StreamReader.java

@@ -28,8 +28,9 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 
 public class StreamReader extends Thread {
+    
 	/** This is the Input Stream we are reading */
-	private InputStream stream;
+	private final InputStream stream;
 	
 	/** This is the output Prefix */
 	private String prefix = null;
@@ -58,23 +59,25 @@ public class StreamReader extends Thread {
 		this.prefix = prefix;
 		this.step = step;
 		
-		if (step != null) {
-			step.addText(String.format(" - -[%s] Started", prefix));
-		} else {
+		if (step == null) {
 			System.out.printf("[%s] Started%n", prefix);
+		} else {
+			step.addText(String.format(" - -[%s] Started", prefix));
 		}
 	}
 
+    /** {@inheritDoc} */
+    @Override
 	public void run() {
-		BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+		final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
 		try {
 			String line;
 			while ((line = reader.readLine()) != null) {
 				if (prefix != null) {
-					if (step != null) {
-						step.addText(String.format(" - -[%s] %s", prefix, line));
-					} else {
+					if (step == null) {
 						System.out.printf("[%s] %s%n", prefix, line);
+					} else {
+						step.addText(String.format(" - -[%s] %s", prefix, line));
 					}
 				}
 			}

src/com/dmdirc/installer/WindowsInstaller.java

@@ -158,15 +158,15 @@ public class WindowsInstaller extends Installer {
 		params.add("add");
 		params.add(key);
 		params.add("/f");
-		if (!value.isEmpty()) {
+		if (value.isEmpty()) {
+			params.add("/ve");
+		} else {
 			params.add("/v");
 			params.add(value);
-		} else {
-			params.add("/ve");
 		}
 		params.add("/t");
 		params.add(type);
-		if (!data.equals("")) {
+		if (!data.isEmpty()) {
 			params.add("/d");
 			params.add(data);
 		}
@@ -273,7 +273,7 @@ public class WindowsInstaller extends Installer {
 			if (!dir.exists()) { dir.mkdir(); }
 
 			// Delete an older shortcut
-			File oldFile = new File(filename+"\\DMDirc.lnk");
+			final File oldFile = new File(filename+"\\DMDirc.lnk");
 			if (oldFile.exists()) { oldFile.delete(); }
 
 			try {

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

@@ -29,11 +29,11 @@ package com.dmdirc.installer.cliparser;
  */
 public abstract class CLIParam {
 	/** Single Character flag for this param. */
-	private char charFlag;
+	private final char charFlag;
 	/** String flag for this param. */
-	private String stringFlag;
+	private final String stringFlag;
 	/** Description of this flag. */
-	private String description;
+	private final String description;
 	/** Number of times this param has been given. */
 	private int number;
 	

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

@@ -26,6 +26,8 @@ package com.dmdirc.installer.cliparser;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Command Line argument parser.
@@ -41,19 +43,19 @@ public class CLIParser {
 	 * Known arguments.
 	 * This hashtable stores the arguments with their flags as the key.
 	 */
-	private Hashtable<String, CLIParam> params = new Hashtable<String, CLIParam>();
+	private final Map<String, CLIParam> params = new Hashtable<String, CLIParam>();
 	
 	/**
 	 * Known arguments.
 	 * This ArrayList stores every param type. (used for help)
 	 */
-	private ArrayList<CLIParam> paramList = new ArrayList<CLIParam>();
+	private final List<CLIParam> paramList = new ArrayList<CLIParam>();
 	
 	/**
 	 * Redundant Strings.
 	 * This ArrayList stores redundant strings found whilst parsing the params.
 	 */
-	private ArrayList<String> redundant = new ArrayList<String>();
+	private final List<String> redundant = new ArrayList<String>();
 	
 	/**
 	 * Get a reference to the CLIParser.
@@ -131,7 +133,7 @@ public class CLIParser {
 	 *
 	 * @return list of params.
 	 */
-	public ArrayList<CLIParam> getParamList() {
+	public List<CLIParam> getParamList() {
 		return paramList;
 	}
 	
@@ -140,8 +142,8 @@ public class CLIParser {
 	 *
 	 * @return list of redundant strings.
 	 */
-	public ArrayList<String> getRedundant() {
-		ArrayList<String> result = new ArrayList<String>();
+	public List<String> getRedundant() {
+		final List<String> result = new ArrayList<String>();
 		for (String item : redundant) {
 			result.add(item);
 		}
@@ -160,15 +162,15 @@ public class CLIParser {
 	/**
 	 * Check if the help parameter has been passed to the CLI.
 	 */
-	public boolean wantsHelp(String[] args) {
+	public boolean wantsHelp(final String[] args) {
 		if (helpParam == null) { return false; }
 		for (String arg : args) {
 			if (arg.length() > 1 && arg.charAt(0) == '-') {
-				String name = arg.substring(1);
+				final String name = arg.substring(1);
 				if (name.equals("-")) {
 					return false;
 				} else {
-					CLIParam param = getParam(name);
+					final CLIParam param = getParam(name);
 					if (param == helpParam) {
 						return true;
 					}
@@ -213,14 +215,12 @@ public class CLIParser {
 		for (String arg : args) {
 			if (arg.length() > 1 && arg.charAt(0) == '-' && !allRedundant) {
 				if (lastParam != null) { lastParam.setValue(""); }
-				String name = arg.substring(1);
+				final String name = arg.substring(1);
 				if (name.equals("-")) {
 					allRedundant = true;
 				} else {
 					lastParam = getParam(name);
-					if (lastParam != null) {
-						lastParam.incNumber();
-					} else {
+					if (lastParam == null) {
 						System.out.println("Unknown Param: -"+name);
 						if (helpParam != null) {
 							String command = "";
@@ -236,6 +236,8 @@ public class CLIParser {
 						if (strict) {
 							System.exit(1);
 						}
+					} else {
+						lastParam.incNumber();
 					}
 				}
 			} else {

src/com/dmdirc/logger/ErrorManager.java

@@ -177,16 +177,16 @@ public final class ErrorManager implements Serializable, Runnable {
             }
         }
         
-        if (!errors.containsValue(error)) {
+        if (errors.containsValue(error)) {
+            error.setReportStatus(ErrorReportStatus.FINISHED);
+            error.setFixedStatus(ErrorFixedStatus.UNREPORTED);
+        } else {
             reportQueue.add(error);
         
             if (reportThread == null || !reportThread.isAlive()) {
                 reportThread = new Thread(this, "Error reporting thread");
                 reportThread.start();
             }
-        } else {
-            error.setReportStatus(ErrorReportStatus.FINISHED);
-            error.setFixedStatus(ErrorFixedStatus.UNREPORTED);
         }
     }
     
@@ -194,7 +194,7 @@ public final class ErrorManager implements Serializable, Runnable {
     /** {@inheritDoc} */
     @Override
     public void run() {
-        while (reportQueue.size() > 0) {
+        while (!reportQueue.isEmpty()) {
             sendErrorInternal(reportQueue.remove(0));
             
             try {

src/com/dmdirc/logger/Logger.java

@@ -233,8 +233,8 @@ public final class Logger {
             }
             
             if (throwable.getCause() != null) {
-                String[] causeTrace = exceptionToStringArray(throwable.getCause());
-                String[] newTrace = new String[trace.length + causeTrace.length];
+                final String[] causeTrace = exceptionToStringArray(throwable.getCause());
+                final String[] newTrace = new String[trace.length + causeTrace.length];
                 trace[0] = "\nWhich caused: " + trace[0];
                 
                 System.arraycopy(causeTrace, 0, newTrace, 0, causeTrace.length);

src/com/dmdirc/logger/ProgramError.java

@@ -190,7 +190,7 @@ public final class ProgramError implements Serializable {
 
     /** {@inheritDoc} */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj == null) {
             return false;
         }
@@ -214,9 +214,9 @@ public final class ProgramError implements Serializable {
     @Override
     public int hashCode() {
         int hash = 7;
-        hash = 67 * hash + (this.level != null ? this.level.hashCode() : 0);
-        hash = 67 * hash + (this.message != null ? this.message.hashCode() : 0);
-        hash = 67 * hash + (this.trace != null ? Arrays.hashCode(this.trace) : 0);
+        hash = 67 * hash + (this.level == null ? 0 : this.level.hashCode());
+        hash = 67 * hash + (this.message == null ? 0 : this.message.hashCode());
+        hash = 67 * hash + (this.trace == null ? 0 : Arrays.hashCode(this.trace));
         return hash;
     }
     

src/com/dmdirc/parser/ChannelClientInfo.java

@@ -37,13 +37,13 @@ import java.util.Map;
  */
 public final class ChannelClientInfo {
 	/** Reference to ClientInfo object this represents. */
-	private ClientInfo cClient;
+	private final ClientInfo cClient;
 	/** Integer representation of the channel modes assocated with this user. */
 	private long nModes;
 	/** Reference to the parser object that owns this channelclient, Used for modes. */
-	private IRCParser myParser;
+	private final IRCParser myParser;
 	/** Reference to the channel object that owns this channelclient. */
-	private ChannelInfo myChannel;
+	private final ChannelInfo myChannel;
 	/** A Map to allow applications to attach misc data to this object */
 	private Map myMap;
 	
@@ -68,7 +68,7 @@ public final class ChannelClientInfo {
 	 * @param newMap New Map to attatch.
 	 * @see #getMap
 	 */
-	public void setMap(Map newMap) {
+	public void setMap(final Map newMap) {
 		myMap = newMap;
 	}
 	
@@ -170,7 +170,7 @@ public final class ChannelClientInfo {
 	 */
 	public String getImportantMode() {
 		String sModes = this.getChanModeStr(false);
-		if (!sModes.equals("")) { sModes = "" + sModes.charAt(0); }
+		if (!sModes.isEmpty()) { sModes = "" + sModes.charAt(0); }
 		return sModes;
 	}
 	
@@ -191,6 +191,7 @@ public final class ChannelClientInfo {
 	 *
 	 * @return String Value of user (inc prefix) (ie @Nickname)
 	 */
+    @Override
 	public String toString() { 
 		return this.getImportantModePrefix() + this.getNickname();
 	}	

src/com/dmdirc/parser/ChannelInfo.java

@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 
@@ -59,28 +60,29 @@ public final class ChannelInfo {
 	/** Known boolean-modes for channel. */
 	private long nModes;
 	/** Reference to the parser object that owns this channel, Used for modes. */
-	private IRCParser myParser; // Reference to parser object that owns this channel. Used for Modes
+	private final IRCParser myParser; // Reference to parser object that owns this channel. Used for Modes
 	
 	/** Channel Name. */
-	private String sName = "";
+	private final String sName;
+    
 	/** Hashtable containing references to ChannelClients. */
-	private Hashtable<String, ChannelClientInfo> hChannelUserList = new Hashtable<String, ChannelClientInfo>();
+	private final Map<String, ChannelClientInfo> hChannelUserList = new Hashtable<String, ChannelClientInfo>();
 	/** Hashtable storing values for modes set in the channel that use parameters. */
-	private Hashtable<Character, String> hParamModes = new Hashtable<Character, String>();
+	private final Map<Character, String> hParamModes = new Hashtable<Character, String>();
 	/** Hashtable storing list modes. */
-	private Hashtable<Character, ArrayList<ChannelListModeItem>> hListModes = new Hashtable<Character, ArrayList<ChannelListModeItem>>();
+	private final Map<Character, ArrayList<ChannelListModeItem>> hListModes = new Hashtable<Character, ArrayList<ChannelListModeItem>>();
 	/**
 	 * LinkedList storing status of mode adding.
 	 * if an item is in this list for a mode, we are expecting new items for the list
 	 */
-	private LinkedList<Character> lAddingModes = new LinkedList<Character>();
+	private final List<Character> lAddingModes = new LinkedList<Character>();
 	/** Modes waiting to be sent to the server. */
-	private LinkedList<String> lModeQueue = new LinkedList<String>();
+	private final List<String> lModeQueue = new LinkedList<String>();
 	/** A Map to allow applications to attach misc data to this object */
 	private Map myMap;
 	
 	/** Queue of requested list modes */
-	private Queue<Character> listModeQueue = new LinkedList<Character>();
+	private final Queue<Character> listModeQueue = new LinkedList<Character>();
 	/** Listmode Queue Time */
 	private long listModeQueueTime = System.currentTimeMillis();
 	/** Have we asked the server for the list modes for this channel yet? */
@@ -112,7 +114,7 @@ public final class ChannelInfo {
 		// 60 seconds ago, we reset the list.
 		if (now-(30*1000) > listModeQueueTime) {
 			result = new LinkedList<Character>();
-			myParser.callDebugInfo(myParser.DEBUG_LMQ, "Resetting LMQ");
+			myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Resetting LMQ");
 		}
 		listModeQueueTime = now;
 		return result;
@@ -157,8 +159,8 @@ public final class ChannelInfo {
 		String listmodes = "";
 		int i = 0;
 		for (Character cTemp : myParser.hChanModesOther.keySet()) {
-			int nTemp = myParser.hChanModesOther.get(cTemp);
-			if (nTemp == myParser.MODE_LIST) {
+			final int nTemp = myParser.hChanModesOther.get(cTemp);
+			if (nTemp == IRCParser.MODE_LIST) {
 				if ((isFreenode || isHybrid) && (cTemp == 'e' || cTemp == 'I') && !isOpped) {
 					// IRCD doesn't allow non-ops to ask for these modes.
 					continue;
@@ -176,10 +178,10 @@ public final class ChannelInfo {
 			}
 		}
 		if (i > 0) {
-			if (!supportLISTMODE) {
-				myParser.sendString("MODE "+getName()+" "+listmodes);
-			} else {
+			if (supportLISTMODE) {
 				myParser.sendString("LISTMODE "+getName()+" "+listmodes);
+			} else {
+				myParser.sendString("MODE "+getName()+" "+listmodes);
 			}
 		}
 	}
@@ -216,7 +218,7 @@ public final class ChannelInfo {
 	 *
 	 * @param newMap New Map to attatch.
 	 */
-	public void setMap(Map newMap) {
+	public void setMap(final Map newMap) {
 		myMap = newMap;
 	}
 	
@@ -261,8 +263,8 @@ public final class ChannelInfo {
 	 *
 	 * @return ArrayList of ChannelClients
 	 */
-	public ArrayList<ChannelClientInfo> getChannelClients() {
-		final ArrayList<ChannelClientInfo> lClients = new ArrayList<ChannelClientInfo>();
+	public List<ChannelClientInfo> getChannelClients() {
+		final List<ChannelClientInfo> lClients = new ArrayList<ChannelClientInfo>();
 		for (ChannelClientInfo client : hChannelUserList.values()) {
 			lClients.add(client);
 		}
@@ -338,7 +340,7 @@ public final class ChannelInfo {
 		ChannelClientInfo cTemp = null;
 		cTemp = getUser(cClient);
 		if (cTemp != null) {
-			ClientInfo clTemp = cTemp.getClient();
+			final ClientInfo clTemp = cTemp.getClient();
 			clTemp.delChannelClientInfo(cTemp);
 			if (clTemp != myParser.getMyself() && !clTemp.checkVisibility()) {
 				myParser.removeClient(clTemp);
@@ -496,8 +498,7 @@ public final class ChannelInfo {
 	protected void setListModeParam(final Character givenMode, final ChannelListModeItem givenItem, final boolean bAdd) { 
 		Character cMode = givenMode;
 		ChannelListModeItem newItem = givenItem;
-		if (!myParser.hChanModesOther.containsKey(cMode)) { return; }
-		else if (myParser.hChanModesOther.get(cMode) != myParser.MODE_LIST) { return; }
+		if (!myParser.hChanModesOther.containsKey(cMode) || myParser.hChanModesOther.get(cMode) != IRCParser.MODE_LIST) { return; }
 		
 		// Hyperion sucks.
 		if (cMode == 'b' || cMode == 'q') {
@@ -536,9 +537,8 @@ public final class ChannelInfo {
 	 * @param cMode Character representing mode
 	 * @return ArrayList containing ChannelListModeItem in the list, or null if mode is invalid
 	 */
-	public ArrayList<ChannelListModeItem> getListModeParam(final Character cMode) { 
-		if (!myParser.hChanModesOther.containsKey(cMode)) { return null; }
-		else if (myParser.hChanModesOther.get(cMode) != myParser.MODE_LIST) { return null; }
+	public List<ChannelListModeItem> getListModeParam(final Character cMode) { 
+		if (!myParser.hChanModesOther.containsKey(cMode) || myParser.hChanModesOther.get(cMode) != myParser.MODE_LIST) { return null; }
 		
 		if (!hListModes.containsKey(cMode)) { 
 			hListModes.put(cMode, new ArrayList<ChannelListModeItem>());
@@ -634,7 +634,7 @@ public final class ChannelInfo {
 	 * Modes are always sent negative then positive and not mixed.
 	 */
 	public void sendModes() { 
-		if (lModeQueue.size() == 0) { return; }
+		if (lModeQueue.isEmpty()) { return; }
 		final StringBuilder positivemode = new StringBuilder();
 		final StringBuilder positiveparam = new StringBuilder();
 		final StringBuilder negativemode = new StringBuilder();
@@ -659,7 +659,7 @@ public final class ChannelInfo {
 		if (positivemode.length() > 0) { sendModeStr.append("+").append(positivemode); }
 		if (negativeparam.length() > 0) { sendModeStr.append(negativeparam); }
 		if (positiveparam.length() > 0) { sendModeStr.append(positiveparam); }
-		myParser.callDebugInfo(myParser.DEBUG_INFO, "Sending mode: %s", sendModeStr.toString());
+		myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Sending mode: %s", sendModeStr.toString());
 		myParser.sendLine("MODE " + sName + " " + sendModeStr.toString());
 		clearModeQueue();
 	}
@@ -734,6 +734,7 @@ public final class ChannelInfo {
 	 *
 	 * @return String representation of the Channel.
 	 */
+    @Override
 	public String toString() { return sName; }
 	
 	/**

src/com/dmdirc/parser/ChannelListModeItem.java

@@ -33,20 +33,15 @@ package com.dmdirc.parser;
  * @see IRCParser
  */
 public final class ChannelListModeItem {
-	/**
-	 * The Item itself.
-	 */
-	private String myItem;
+
+    /** The Item itself. */
+	private final String myItem;
 	
-	/**
-	 * The Time the item was created.
-	 */
-	private long myTime;
+	/** The Time the item was created. */
+	private final long myTime;
 	
-	/**
-	 * The Person who created the item.
-	 */
-	private String myOwner;
+	/** The Person who created the item. */
+	private final String myOwner;
 	
 	/**
 	 * Create a new Item.
@@ -58,8 +53,12 @@ public final class ChannelListModeItem {
 	public ChannelListModeItem(final String item, final String owner, final long time) {
 		myItem = item;
 		myTime = time;
-		myOwner = owner;
-		if (!owner.isEmpty() && owner.charAt(0) == ':') { myOwner = owner.substring(1); }
+
+		if (!owner.isEmpty() && owner.charAt(0) == ':') {
+            myOwner = owner.substring(1);
+        } else {
+            myOwner = owner;
+        }
 	}
 	
 	/**
@@ -88,6 +87,7 @@ public final class ChannelListModeItem {
 	*
 	* @return String representation of this object
 	*/
+    @Override
 	public String toString() {
 			return getItem();
 	}

src/com/dmdirc/parser/ClientInfo.java

@@ -57,13 +57,13 @@ public final class ClientInfo {
 	/** Is this a fake client created just for a callback? */
 	private boolean bIsFake;
 	/** Reference to the parser object that owns this channel, Used for modes. */
-	private IRCParser myParser;
+	private final IRCParser myParser;
 	/** A Map to allow applications to attach misc data to this object */
 	private Map myMap;
 	/** List of ChannelClientInfos that point to this */
-	private Hashtable<String, ChannelClientInfo> myChannelClientInfos = new Hashtable<String, ChannelClientInfo>();
+	private final Map<String, ChannelClientInfo> myChannelClientInfos = new Hashtable<String, ChannelClientInfo>();
 	/** Modes waiting to be sent to the server. */
-	private LinkedList<String> lModeQueue = new LinkedList<String>();
+	private final List<String> lModeQueue = new LinkedList<String>();
 
 	/**
 	 * Create a new client object from a hostmask.
@@ -83,7 +83,7 @@ public final class ClientInfo {
 	 *
 	 * @param newMap New Map to attatch.
 	 */
-	public void setMap(Map newMap) {
+	public void setMap(final Map newMap) {
 		myMap = newMap;
 	}
 	
@@ -107,7 +107,7 @@ public final class ClientInfo {
 	 *
 	 * @return True if this client is actually a server.
 	 */
-	public boolean isServer() { return !(sNickname.indexOf(":") == -1); }
+	public boolean isServer() { return !(sNickname.indexOf(':') == -1); }
 	/**
 	 * Set if this is a fake client.
 	 * This returns "this" and thus can be used in the construction line.
@@ -115,7 +115,7 @@ public final class ClientInfo {
 	 * @param newValue new value for isFake - True if this is a fake client, else false
 	 * @return this Object
 	 */
-	public ClientInfo setFake(boolean newValue) { bIsFake = newValue; return this; }
+	public ClientInfo setFake(final boolean newValue) { bIsFake = newValue; return this; }
 
 	/**
 	 * Get a nickname of a user from a hostmask.
@@ -181,6 +181,7 @@ public final class ClientInfo {
 	 *
 	 * @return String representation of the user.
 	 */
+    @Override
 	public String toString() { return sNickname + "!" + sIdent + "@" + sHost; }
 	
 	/**
@@ -189,12 +190,14 @@ public final class ClientInfo {
 	 * @return Known nickname for user.
 	 */
 	public String getNickname() { return sNickname; }
+    
 	/**
 	 * Get the ident for this user.
 	 *
 	 * @return Known ident for user. (May be "")
 	 */		
 	public String getIdent() { return sIdent; }
+    
 	/**
 	 * Get the hostname for this user.
 	 *
@@ -212,6 +215,7 @@ public final class ClientInfo {
 		bIsAway = bNewState;
 		if (!bIsAway) { myAwayReason = ""; }
 	}
+    
 	/**
 	 * Get the away state of a user.
 	 *
@@ -225,6 +229,7 @@ public final class ClientInfo {
 	 * @return Known away reason for user.
 	 */
 	public String getAwayReason() { return myAwayReason; }
+    
 	/**
 	 * Set the Away Reason for this user.
 	 * Automatically set to "" if awaystate is set to false
@@ -239,6 +244,7 @@ public final class ClientInfo {
 	 * @return Known RealName for user.
 	 */
 	public String getRealName() { return sRealName; }
+    
 	/**
 	 * Set the RealName for this user.
 	 *
@@ -252,6 +258,7 @@ public final class ClientInfo {
 	 * @param nNewMode new long representing channel modes. (Boolean only)
 	 */	
 	protected void setUserMode(final long nNewMode) { nModes = nNewMode; }
+    
 	/**
 	 * Get the user modes (as an integer).
 	 *
@@ -337,7 +344,7 @@ public final class ClientInfo {
 	 * @return int with the count of known channels
 	 */	
 	public List<ChannelClientInfo> getChannelClients() {
-		ArrayList<ChannelClientInfo> result = new ArrayList<ChannelClientInfo>();
+		final List<ChannelClientInfo> result = new ArrayList<ChannelClientInfo>();
 		for (ChannelClientInfo cci : myChannelClientInfos.values()) {
 			result.add(cci);
 		}
@@ -380,7 +387,7 @@ public final class ClientInfo {
 	 * Modes are always sent negative then positive and not mixed.
 	 */
 	public void sendModes() {
-		if (lModeQueue.size() == 0) { return; }
+		if (lModeQueue.isEmpty()) { return; }
 		final StringBuilder positivemode = new StringBuilder();
 		final StringBuilder negativemode = new StringBuilder();
 		final StringBuilder sendModeStr = new StringBuilder();
@@ -397,7 +404,7 @@ public final class ClientInfo {
 		}
 		if (negativemode.length() > 0) { sendModeStr.append("-").append(negativemode); }
 		if (positivemode.length() > 0) { sendModeStr.append("+").append(positivemode); }
-		myParser.callDebugInfo(myParser.DEBUG_INFO, "Sending mode: %s", sendModeStr.toString());
+		myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Sending mode: %s", sendModeStr.toString());
 		myParser.sendLine("MODE " + sNickname + " " + sendModeStr.toString());
 		clearModeQueue();
 	}

src/com/dmdirc/parser/IRCParser.java

@@ -53,6 +53,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Hashtable;
 import java.util.LinkedList;
+import java.util.Map;
 import java.util.Timer;
 import java.util.Queue;
 
@@ -158,16 +159,16 @@ public class IRCParser implements Runnable {
 	boolean hasBegan;
 
 	/** Hashtable storing known prefix modes (ohv). */
-	Hashtable<Character, Long> hPrefixModes = new Hashtable<Character, Long>();
+	final Map<Character, Long> hPrefixModes = new Hashtable<Character, Long>();
 	/**
 	 * Hashtable maping known prefix modes (ohv) to prefixes (@%+) - Both ways.
 	 * Prefix map contains 2 pairs for each mode. (eg @ => o and o => @)
 	 */
-	Hashtable<Character, Character> hPrefixMap = new Hashtable<Character, Character>();
+	final Map<Character, Character> hPrefixMap = new Hashtable<Character, Character>();
 	/** Integer representing the next avaliable integer value of a prefix mode. */
 	long nNextKeyPrefix = 1;
 	/** Hashtable storing known user modes (owxis etc). */
-	Hashtable<Character, Long> hUserModes = new Hashtable<Character, Long>();
+	final Map<Character, Long> hUserModes = new Hashtable<Character, Long>();
 	/** Integer representing the next avaliable integer value of a User mode. */
 	long nNextKeyUser = 1;
 	/**
@@ -178,7 +179,7 @@ public class IRCParser implements Runnable {
 	 * <br>
 	 * Channel modes discovered but not listed in 005 are stored as boolean modes automatically (and a ERROR_WARNING Error is called)
 	 */
-	Hashtable<Character, Long> hChanModesBool = new Hashtable<Character, Long>();
+	final Map<Character, Long> hChanModesBool = new Hashtable<Character, Long>();
 	/** Integer representing the next avaliable integer value of a Boolean mode. */
 
 	long nNextKeyCMBool = 1;
@@ -192,7 +193,7 @@ public class IRCParser implements Runnable {
 	 * see MODE_SET<br>
 	 * see MODE_UNSET<br>
 	 */
-	Hashtable<Character, Byte> hChanModesOther = new Hashtable<Character, Byte>();
+	final Map<Character, Byte> hChanModesOther = new Hashtable<Character, Byte>();
 
 	/** The last line of input recieved from the server */
 	String lastLine = "";
@@ -203,15 +204,15 @@ public class IRCParser implements Runnable {
 	* Channel Prefixes (ie # + etc).
 	* The "value" for these is always true.
 	*/
-	Hashtable<Character, Boolean> hChanPrefix = new Hashtable<Character, Boolean>();
+	final Map<Character, Boolean> hChanPrefix = new Hashtable<Character, Boolean>();
 	/** Hashtable storing all known clients based on nickname (in lowercase). */
-	private Hashtable<String, ClientInfo> hClientList = new Hashtable<String, ClientInfo>();
+	private final Map<String, ClientInfo> hClientList = new Hashtable<String, ClientInfo>();
 	/** Hashtable storing all known channels based on chanel name (inc prefix - in lowercase). */
-	private Hashtable<String, ChannelInfo> hChannelList = new Hashtable<String, ChannelInfo>();
+	private final Map<String, ChannelInfo> hChannelList = new Hashtable<String, ChannelInfo>();
 	/** Reference to the ClientInfo object that references ourself. */
 	private ClientInfo cMyself = new ClientInfo(this, "myself").setFake(true);
 	/** Hashtable storing all information gathered from 005. */
-	Hashtable<String, String> h005Info = new Hashtable<String, String>();
+	final Map<String, String> h005Info = new Hashtable<String, String>();
 
 	/** Ignore List. */
 	RegexStringList myIgnoreList = new RegexStringList();
@@ -787,6 +788,7 @@ public class IRCParser implements Runnable {
 	}
 
 	/** Close socket on destroy. */
+    @Override
 	protected void finalize() throws Throwable {
 		try { socket.close(); }
 		catch (IOException e) {
@@ -1742,7 +1744,7 @@ public class IRCParser implements Runnable {
 	 *
 	 * @return 005Info hashtable.
 	 */
-	public Hashtable<String, String> get005() { return h005Info; }
+	public Map<String, String> get005() { return h005Info; }
 
 	/**
 	 * Get the name of the ircd.

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

@@ -88,7 +88,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     /** Cell renderer. */
     private ListCellRenderer renderer;
     /** Extended info toggle. */
-    private JCheckBox toggle;
+    private final JCheckBox toggle;
 
     /**
      * Creates a new instance of ChannelListModePane.
@@ -146,7 +146,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             existingListItems.add(mode,
                     new ArrayList<ChannelListModeItem>(channel.getChannelInfo().
                     getListModeParam(mode)));
-            final ArrayList<ChannelListModeItem> listItems =
+            final List<ChannelListModeItem> listItems =
                     channel.getChannelInfo().getListModeParam(mode);
             final DefaultListModel model =
                     (DefaultListModel) listModesPanels.get(i).getModel();
@@ -281,7 +281,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     /** Adds a list mode. */
     private void addListMode() {
         final int selectedIndex = listModesMenu.getSelectedIndex();
-        String modeText = "" + listModesArray[selectedIndex];
+        String modeText = String.valueOf(listModesArray[selectedIndex]);
         String modeMask;
         if (channel.getConfigManager().
                 hasOption("server", "mode" + listModesArray[selectedIndex])) {
@@ -329,10 +329,10 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         } else if (removeListModeButton.equals(event.getSource())) {
             removeListMode();
         } else if (toggle.equals(event.getSource())) {
-            if (!toggle.isSelected()) {
-                renderer = new ListModeCellRenderer();
-            } else {
+            if (toggle.isSelected()) {
                 renderer = new ExtendedListModeCellRenderer();
+            } else {
+                renderer = new ListModeCellRenderer();
             }
             for (JList list : listModesPanels) {
                 list.setCellRenderer(renderer);

src/com/dmdirc/ui/swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -423,7 +423,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         }
 
         for (PreferencesCategory child : category.getSubcats()) {
-            if (child.isInline() && category.getInlineBefore()) {
+            if (child.isInline() && category.isInlineBefore()) {
                 addInlineCategory(child, panel);
             } else if (!child.isInline()) {
                 addCategory(child, newNode, path);
@@ -446,7 +446,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             addComponent(category, setting);
         }
 
-        if (!category.getInlineBefore()) {
+        if (!category.isInlineBefore()) {
             for (PreferencesCategory child : category.getSubcats()) {
                 if (child.isInline()) {
                     addInlineCategory(child, panel);