Renamed: CallbackNotFound -> CallbackNotFoundException

Renamed: ProcessorNotFound -> ProcessorNotFoundException
pre005 isValidChannelName() now checks if the first character is either #, &, !, or + rather than just returning true regardless
ProcessMessage now allows for messages without a message param (eg ":foo!bar@baz privmsg #qux" is treated as ":foo!bar@baz privmsg #qux :", although I do believe this should enver happen)
ProcessMessage now also checks to see if it has accidentally recieved a NOTICE AUTH message, and forwards it to the correct processor if it has (Checks: Source is server, tokens 1+2 are "NOTICE AUTH")
"Got Join for channel I am not on" message now gives the parsers current host, not the user who joined (That can be seen in "lastline")
General Installer Changes
- Installer is now a thread that StepInstall calls to make the installing information appear as it happens, not all at once
- Shortcuts are now handled using an enum, and "Installers" can now specify which shortcut types apply to them.
Windows Installer Changes:
- Now copes with vista's changes to file locations
- Should in theory work on windows 95 and up (Altho java 6 only works on NT-Based versions of windows from 2000 and up so this is untested)
Linux Installer Changes:
- .desktop files created by root now call themselves DMDirc (Global)
- installing as root will not prompt to create a desktop shortcut


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

src/com/dmdirc/Channel.java

@@ -33,7 +33,7 @@ import com.dmdirc.parser.ChannelInfo;
 import com.dmdirc.parser.ClientInfo;
 import com.dmdirc.parser.IRCParser;
 import com.dmdirc.parser.callbacks.CallbackManager;
-import com.dmdirc.parser.callbacks.CallbackNotFound;
+import com.dmdirc.parser.callbacks.CallbackNotFoundException;
 import com.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
 import com.dmdirc.parser.callbacks.interfaces.IChannelAction;
 import com.dmdirc.parser.callbacks.interfaces.IChannelCTCP;
@@ -164,7 +164,7 @@ public final class Channel extends MessageTarget implements
             for (String callback : CALLBACKS) {
                 callbackManager.addCallback(callback, this, channel);
             }
-        } catch (CallbackNotFound ex) {
+        } catch (CallbackNotFoundException ex) {
             Logger.appError(ErrorLevel.FATAL, "Unable to load channel", ex);
         }
     }

src/com/dmdirc/Query.java

@@ -30,7 +30,7 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.ClientInfo;
 import com.dmdirc.parser.IRCParser;
 import com.dmdirc.parser.callbacks.CallbackManager;
-import com.dmdirc.parser.callbacks.CallbackNotFound;
+import com.dmdirc.parser.callbacks.CallbackNotFoundException;
 import com.dmdirc.parser.callbacks.interfaces.INickChanged;
 import com.dmdirc.parser.callbacks.interfaces.IPrivateAction;
 import com.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
@@ -231,7 +231,7 @@ public final class Query extends MessageTarget implements
             callbackManager.addCallback("onPrivateMessage", this, ClientInfo.parseHost(host));
             callbackManager.addCallback("onQuit", this);
             callbackManager.addCallback("onNickChanged", this);
-        } catch (CallbackNotFound ex) {
+        } catch (CallbackNotFoundException ex) {
             Logger.appError(ErrorLevel.HIGH, "Unable to get query events", ex);
         }
     }
@@ -248,7 +248,7 @@ public final class Query extends MessageTarget implements
             try {
                 callbackManager.addCallback("onPrivateAction", this, cClient.getNickname());
                 callbackManager.addCallback("onPrivateMessage", this, cClient.getNickname());
-            } catch (CallbackNotFound ex) {
+            } catch (CallbackNotFoundException ex) {
                 Logger.appError(ErrorLevel.HIGH, "Unable to get query events", ex);
             }
             

src/com/dmdirc/Raw.java

@@ -25,7 +25,7 @@ package com.dmdirc;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.callbacks.CallbackNotFound;
+import com.dmdirc.parser.callbacks.CallbackNotFoundException;
 import com.dmdirc.parser.callbacks.interfaces.IDataIn;
 import com.dmdirc.parser.callbacks.interfaces.IDataOut;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -80,7 +80,7 @@ public final class Raw extends WritableFrameContainer implements IDataIn,
         try {
             server.getParser().getCallbackManager().addCallback("OnDataIn", this);
             server.getParser().getCallbackManager().addCallback("OnDataOut", this);
-        } catch (CallbackNotFound ex) {
+        } catch (CallbackNotFoundException ex) {
             Logger.appError(ErrorLevel.HIGH, "Unable to register raw callbacks", ex);
         }
     }

src/com/dmdirc/Server.java

@@ -36,7 +36,7 @@ import com.dmdirc.parser.IRCParser;
 import com.dmdirc.parser.MyInfo;
 import com.dmdirc.parser.ParserError;
 import com.dmdirc.parser.ServerInfo;
-import com.dmdirc.parser.callbacks.CallbackNotFound;
+import com.dmdirc.parser.callbacks.CallbackNotFoundException;
 import com.dmdirc.parser.callbacks.interfaces.IAwayState;
 import com.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
 import com.dmdirc.parser.callbacks.interfaces.IChannelSelfJoin;
@@ -300,7 +300,7 @@ public final class Server extends WritableFrameContainer implements
             for (String callback : CALLBACKS) {
                 parser.getCallbackManager().addCallback(callback, this);
             }
-        } catch (CallbackNotFound ex) {
+        } catch (CallbackNotFoundException ex) {
             Logger.appError(ErrorLevel.FATAL, "Unable to register server event handlers", ex);
         }
         

src/com/dmdirc/installer/Installer.java

@@ -36,27 +36,50 @@ import java.nio.channels.FileChannel;
  *
  * @author Shane Mc Cormack
  */
-public abstract class Installer {
-	/** Put a shortcut on the desktop */
-	public static final int SHORTCUT_DESKTOP = 1;
-	/** Put a shortcut on the menu (kmenu, start menu etc) */
-	public static final int SHORTCUT_MENU = 2;
-	/** Put a shortcut on the quicklaunch bar (Windows Only) */
-	public static final int SHORTCUT_QUICKLAUNCH = 4;
+public abstract class Installer extends Thread {
+	/** Types of shortcut */
+	public static enum ShortcutType { DESKTOP, MENU, QUICKLAUNCH; }
+	
+	/** Step where things happen. */
+	protected StepInstall step = null;
 	
 	/**
 	 * Get the default install location
 	 */
 	abstract String defaultInstallLocation();
 	
+	/**
+	 * This is what helps actually perform the installation in run().
+	 * This is a hack to keep the installing and the GUI separate.
+	 *
+	 * @param step The step that called this
+	 */
+	public final void setInstallStep(final StepInstall step) {
+		this.step = step;
+	}
+	
+	/**
+	 * Create a new Installer
+	 */
+	public final void Installer() {
+		this.setName("Installer-Thread");
+	}
+	
+	/**
+	 * This step performs the installation, via the StepInstall step.
+	 */
+	public final void run() {
+		step.performInstall(this);
+	}
+	
 	/**
 	 * 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; 
+	 * @return True if installation passed, else false; 
 	 */
-	public boolean doSetup(final String location, final TextStep step) {
+	public boolean doSetup(final String location) {
 		// Create the directory
 		final File directory = new File(location);
 		if (!directory.exists()) { directory.mkdir(); }
@@ -88,13 +111,22 @@ public abstract class Installer {
 	}
 	
 	/**
-	 * Setup shortcuts
+	 * Check if this OS supports a given shortcut Type
+	 *
+	 * @param shortcutType Type of shortcut to check
+	 * @return True if this OS supports a given shortcut Type
+	 */
+	public boolean supportsShortcut(final ShortcutType shortcutType) {
+		return false;
+	}
+	
+	/**
+	 * Setup shortcut
 	 *
 	 * @param location Location where app will be installed to.
-	 * @param step The step that called this
-	 * @param shortcutType TYpe of shortcuts to add.
+	 * @param shortcutType Type of shortcut to add.
 	 */
-	abstract void setupShortcuts(final String location, final TextStep step, final int shortcutType);
+	abstract void setupShortcut(final String location, final ShortcutType shortcutType);
 	
 	/**
 	 * Copy a file from one location to another.

src/com/dmdirc/installer/LinuxInstaller.java

@@ -34,43 +34,84 @@ import java.io.IOException;
  * @author Shane Mc Cormack
  */
 public class LinuxInstaller extends Installer {
+	/**
+	 * Are we running as root?
+	 */
+	private boolean isRoot() {
+		return (CLIParser.getCLIParser().getParamNumber("-isroot") > 0);
+	}
+
 	/**
 	 * Get the default install location
 	 */
 	public String defaultInstallLocation() {
-		if (CLIParser.getCLIParser().getParamNumber("-isroot") > 0) {
+		if (isRoot()) {
 			return "/usr/local/DMDirc";
 		} else {
 			return System.getProperty("user.home") + "/DMDirc";
 		}
 	}
-	 
+	
 	/**
-	 * Setup shortcuts
+	 * Check if this OS supports a given shortcut Type
+	 *
+	 * @param shortcutType Type of shortcut to check
+	 * @return True if this OS supports a given shortcut Type
+	 */
+	public boolean supportsShortcut(final ShortcutType shortcutType) {
+		switch (shortcutType) {
+			case QUICKLAUNCH:
+				return false;
+			case DESKTOP:
+				// No desktop for root
+				return !isRoot();
+			case MENU:
+				// Both root and non-root have a menu
+				return true;
+			default:
+				// Anything else that gets added should be false until the relevent
+				// code is added
+				return false;
+		}
+	}
+
+	/**
+	 * Setup shortcut
 	 *
 	 * @param location Location where app will be installed to.
-	 * @param step The step that called this
-	 * @param shortcutType TYpe of shortcuts to add.
+	 * @param shortcutType Type of shortcut to add.
 	 */
-	public void setupShortcuts(final String location, final TextStep step, final int shortcutType) {
+	public void setupShortcut(final String location, final ShortcutType shortcutType) {
+		if (!supportsShortcut(shortcutType)) {
+			step.addText(" - Error creating shortcut. Not applicable to this Operating System");
+			return;
+		}
+		
 		PrintWriter writer = null;
 		try {
 			String filename;
-			if ((shortcutType & SHORTCUT_DESKTOP) == SHORTCUT_DESKTOP) {
-				filename = System.getProperty("user.home")+"/Desktop/DMDirc.desktop";
-			} else if ((shortcutType & SHORTCUT_MENU) == SHORTCUT_MENU) {
-				if (CLIParser.getCLIParser().getParamNumber("-isroot") > 0) {
-					filename = "/usr/share/applications/DMDirc.desktop";
-				} else {
-					filename = System.getProperty("user.home")+"/.local/share/applications/DMDirc.desktop";
-				}
-			} else {
-				return;
+
+			switch (shortcutType) {
+				case DESKTOP:
+					filename = System.getProperty("user.home")+"/Desktop/DMDirc.desktop";
+					break;
+					
+				case MENU:
+					if (CLIParser.getCLIParser().getParamNumber("-isroot") > 0) {
+						filename = "/usr/share/applications/DMDirc.desktop";
+					} else {
+						filename = System.getProperty("user.home")+"/.local/share/applications/DMDirc.desktop";
+					}
+					break;
+					
+				default:
+					step.addText(" - Error creating shortcut. Not applicable to this Operating System");
+					return;
 			}
 			writer = new PrintWriter(filename);
 			writeFile(writer, location);
 		} catch (Exception e) {
-			step.addText("Error creating shortcuts: "+e.toString());
+			step.addText(" - Error creating shortcut: "+e.toString());
 		} finally {
 			if (writer != null) {
 				writer.close();
@@ -93,7 +134,11 @@ public class LinuxInstaller extends Installer {
 		writer.println("Exec=java -jar "+location+"/DMDirc.jar");
 		writer.println("GenericName=IRC Client");
 		writer.println("Icon="+location+"/icon.svg");
-		writer.println("Name=DMDirc");
+		if (isRoot()) {
+			writer.println("Name=DMDirc (Global)");
+		} else {
+			writer.println("Name=DMDirc");
+		}
 		writer.println("StartupNotify=true");
 		writer.println("Terminal=false");
 		writer.println("TerminalOptions=");

src/com/dmdirc/installer/Main.java

@@ -57,14 +57,14 @@ public final class Main implements Wizard {
 	public void stepChanged(final int oldStep, final int newStep) {	}
 
 	/**
-	 * Called when the wizard finishes. 
+	 * Called when the wizard finishes.
 	 */
 	public void wizardFinished() { }
 
 	/**
-	 * Displays the Installer wizard.
+	 * Creates and Displays the Installer wizard.
 	 */
-	public void display() {
+	private Main() {
 		final List<Step> steps = new ArrayList<Step>();
 		final String osName = System.getProperty("os.name");
 		
@@ -82,9 +82,8 @@ public final class Main implements Wizard {
 			releaseName = " "+cli.getParam("-release").getStringValue();
 		}
 		
-		wizardDialog = new WizardDialog("DMDirc"+releaseName+" Installer", steps, this);
+		setWizardDialog(new WizardDialog("DMDirc"+releaseName+" Installer", steps, this));
 		wizardDialog.setPreferredSize(new Dimension(400, 350));
-		wizardDialog.display();
 	}
 	
 	/**
@@ -111,24 +110,38 @@ public final class Main implements Wizard {
 	 */
 	private static void setupCLIParser() {
 		cli.clear();
-		cli.add(new BooleanParam((char)0, "isRoot", "Installing as Root"));
+		cli.add(new BooleanParam((char)0, "isroot", "Installing as Root"));
 		cli.add(new StringParam('r', "release", "Release Name"));
 	}
 	
 	/**
 	 * Get the WizardDialog
+	 *
+	 * @return The current wizardDialog
 	 */
-	public static WizardDialog getWizardDialog () {
+	public static synchronized WizardDialog getWizardDialog() {
+		if (wizardDialog == null) {
+			new Main();
+		}
 		return wizardDialog;
 	}
+	
+	/**
+	 * Set the WizardDialog
+	 *
+	 * @return Set the current wizardDialog to the given one
+	 */
+	private static void setWizardDialog(final WizardDialog dialog) {
+		wizardDialog = dialog;
+	}
 
 	/**
 	 * Run the installer
 	 */
 	public static void main (String[] args) {
+		System.out.println("");
 		setupCLIParser();
 		cli.parseArgs(args, false);
-		
-		new Main().display();
+		getWizardDialog().display();
 	}
 }

src/com/dmdirc/installer/StepConfirm.java

@@ -22,6 +22,7 @@
 
 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;
@@ -73,19 +74,23 @@ public final class StepConfirm extends Step implements SpecialStep {
 		
 		StepSettings settings = ((StepSettings) Main.getWizardDialog().getStep(1));
 		
-		if (settings.getShortcutMenuState()) {
-			shortcutText = shortcutText + " - Do Set up Menu shortcuts"+ "\n";
-		} else {
-			shortcutText = shortcutText + " - Do Not Set up Menu shortcuts"+ "\n";
+		if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
+			if (settings.getShortcutMenuState()) {
+				shortcutText = shortcutText + " - Do Set up Menu shortcuts"+ "\n";
+			} else {
+				shortcutText = shortcutText + " - Do Not Set up Menu shortcuts"+ "\n";
+			}
 		}
 		
-		if (settings.getShortcutDesktopState()) {
-			shortcutText = shortcutText + " - Do Set up Desktop shortcuts"+ "\n";
-		} else {
-			shortcutText = shortcutText + " - Do Not Set up Desktop shortcuts"+ "\n";
+		if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
+			if (settings.getShortcutDesktopState()) {
+				shortcutText = shortcutText + " - Do Set up Desktop shortcuts"+ "\n";
+			} else {
+				shortcutText = shortcutText + " - Do Not Set up Desktop shortcuts"+ "\n";
+			}
 		}
 		
-		if (Main.getInstaller() instanceof WindowsInstaller && ((WindowsInstaller)Main.getInstaller()).showQuicklaunch()) {
+		if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
 			if (settings.getShortcutQuickState()) {
 				shortcutText = shortcutText + " - Do Set up Quick Launch shortcuts"+ "\n";
 			} else {

src/com/dmdirc/installer/StepInstall.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.installer;
 
-import com.dmdirc.installer.WindowsInstaller;
+import com.dmdirc.installer.Installer.ShortcutType;
 import com.dmdirc.ui.swing.dialogs.wizard.SpecialStep;
 import com.dmdirc.ui.swing.dialogs.wizard.TextStep;
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
@@ -80,34 +80,47 @@ public final class StepInstall extends Step implements SpecialStep, TextStep {
 	 */
 	public void showStep() {
 		Main.getWizardDialog().enableNextStep(false);
+		Main.getWizardDialog().enablePreviousStep(false);
+		Main.getInstaller().setInstallStep(this);
+		Main.getInstaller().start();
+	}
+	
+	/**
+	 * Perform the installation.
+	 */
+	public void performInstall(final Installer myInstaller) {
 		infoLabel.setText("Beginning Install..\n");
 		final String location = ((StepSettings) Main.getWizardDialog().getStep(1)).getInstallLocation();
 		
 		addText("Installing files to: "+location);
-		Main.getInstaller().doSetup(location, this);
+		myInstaller.doSetup(location);
 		
 		StepSettings settings = ((StepSettings) Main.getWizardDialog().getStep(1));
 		
-		if (settings.getShortcutMenuState()) {
-			addText("Setting up Menu shortcuts");
-			Main.getInstaller().setupShortcuts(location, this, Installer.SHORTCUT_MENU);
-		} else {
-			addText("Not setting up Menu shortcuts");
+		if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
+			if (settings.getShortcutMenuState()) {
+				addText("Setting up Menu shortcut");
+				myInstaller.setupShortcut(location, ShortcutType.MENU);
+			} else {
+				addText("Not setting up Menu shortcut");
+			}
 		}
 		
-		if (settings.getShortcutDesktopState()) {
-			addText("Setting up Desktop shortcuts");
-			Main.getInstaller().setupShortcuts(location, this, Installer.SHORTCUT_DESKTOP);
-		} else {
-			addText("Not setting up Desktop shortcuts");
+		if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
+			if (settings.getShortcutDesktopState()) {
+				addText("Setting up Desktop shortcut");
+				myInstaller.setupShortcut(location, ShortcutType.DESKTOP);
+			} else {
+				addText("Not setting up Desktop shortcut");
+			}
 		}
 		
-		if (Main.getInstaller() instanceof WindowsInstaller && ((WindowsInstaller)Main.getInstaller()).showQuicklaunch()) {
+		if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
 			if (settings.getShortcutQuickState()) {
-				addText("Setting up QuickLaunch shortcuts");
-				Main.getInstaller().setupShortcuts(location, this, Installer.SHORTCUT_QUICKLAUNCH);
+				addText("Setting up QuickLaunch shortcut");
+				myInstaller.setupShortcut(location, ShortcutType.QUICKLAUNCH);
 			} else {
-				addText("Not setting up QuickLaunch shortcuts");
+				addText("Not setting up QuickLaunch shortcut");
 			}
 		}
 		

src/com/dmdirc/installer/StepSettings.java

@@ -22,6 +22,7 @@
 
 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;
@@ -97,16 +98,21 @@ public final class StepSettings extends Step {
 		add(location, constraints);
 		
 		constraints.gridwidth = 2;
-		constraints.gridy = 3;
 		constraints.gridx = 0;
 		constraints.insets = new Insets(SMALL_BORDER, 0, 0, 0);
-		add(shortcutMenu, constraints);
 		
-		constraints.gridy = 4;
-		add(shortcutDesktop, constraints);
+		if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
+			constraints.gridy = (constraints.gridy + 1);
+			add(shortcutMenu, constraints);
+		}
+		
+		if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
+			constraints.gridy = (constraints.gridy + 1);
+			add(shortcutDesktop, constraints);
+		}
 		
-		if (Main.getInstaller() instanceof WindowsInstaller && ((WindowsInstaller)Main.getInstaller()).showQuicklaunch()) {
-			constraints.gridy = 5;
+		if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
+			constraints.gridy = (constraints.gridy + 1);
 			add(shortcutQuick, constraints);
 		}
 		

src/com/dmdirc/installer/StreamReader.java

@@ -31,6 +31,9 @@ public class StreamReader extends Thread {
 	/** This is the Input Stream we are reading */
 	private InputStream stream;
 	
+	/** This is the Input Stream we are reading */
+	private String prefix = null;
+	
 	/**
 	 * Create a new Stream Reader
 	 *
@@ -39,12 +42,26 @@ public class StreamReader extends Thread {
 	public StreamReader(final InputStream stream) {
 		this.stream = stream;
 	}
+	
+	/**
+	 * Create a new Stream Reader that outputs to the console
+	 *
+	 * @param stream The stream to read
+	 * @param prefix Prefix of outputed messages
+	 */
+	public StreamReader(final InputStream stream, final String prefix) {
+		this.stream = stream;
+		this.prefix = prefix;
+	}
 
 	public void run() {
 		BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
 		try {
-			while (reader.readLine() != null) {
-				/* Do Nothing */
+			String line;
+			while ((line = reader.readLine()) != null) {
+				if (prefix != null) {
+					System.out.printf("[%s] %s%n", prefix, line);
+				}
 			}
 		} catch (IOException e) {
 			e.printStackTrace();

src/com/dmdirc/installer/WindowsInstaller.java

@@ -67,56 +67,78 @@ public class WindowsInstaller extends Installer {
 	}
 	
 	/**
-	 * Check if this OS has quicklaunch
+	 * Check if this OS supports a given shortcut Type
 	 *
-	 * @return True if this OS hash a quick launch toolbar
+	 * @param shortcutType Type of shortcut to check
+	 * @return True if this OS supports a given shortcut Type
 	 */
-	public boolean showQuicklaunch() {
-		// return !(System.getProperty("os.name").indexOf("95") >= 0);
-		
-		// Disabled due to quicklaunch not being in a fixed location/language
-		return false;
+	public boolean supportsShortcut(final ShortcutType shortcutType) {
+		switch (shortcutType) {
+			case QUICKLAUNCH:
+				// Only windows 95 doesn't have quick launch
+				return !(System.getProperty("os.name").indexOf("95") >= 0);
+			case DESKTOP:
+			case MENU:
+				// All versions of windows have desktop and menu
+				return true;
+			default:
+				// Anything else that gets added should be false until the relevent
+				// code is added
+				return false;
+		}
 	}
 	
 	/**
-	 * Setup shortcuts
+	 * Setup shortcut
 	 *
 	 * @param location Location where app will be installed to.
-	 * @param step The step that called this
-	 * @param shortcutType TYpe of shortcuts to add.
+	 * @param shortcutType Type of shortcut to add.
 	 */
-	public void setupShortcuts(final String location, final TextStep step, final int shortcutType) {
+	public void setupShortcut(final String location, final ShortcutType shortcutType) {
 		// Shortcut.exe is from http://www.optimumx.com/download/#Shortcut
+		
+		if (!supportsShortcut(shortcutType)) {
+			step.addText(" - Error creating shortcut. Not applicable to this Operating System");
+			return;
+		}
+		
 		if (new File("Shortcut.exe").exists()) {
 			String filename = "";
 			File dir;
 			
-			if ((shortcutType & SHORTCUT_DESKTOP) == SHORTCUT_DESKTOP) {
-				if (isNT() || isVista()) {
-					filename = System.getProperty("user.home")+"\\Desktop";
-				} else {
-					filename = System.getenv("WINDIR")+"\\Desktop";
-				}
-			} else if ((shortcutType & SHORTCUT_MENU) == SHORTCUT_MENU) {
-				if (isVista()) {
-					filename = System.getenv("APPDATA")+"\\Roaming\\Microsoft\\Windows";
-				} else {
-					filename = System.getProperty("user.home");
-				}
-				filename = filename+"\\Start Menu\\Programs\\DMDirc";
-			
-			} else if ((shortcutType & SHORTCUT_QUICKLAUNCH) == SHORTCUT_QUICKLAUNCH && showQuicklaunch()) {
-				if (isVista()) {
-				
-				} else {
-					filename = System.getProperty("user.home")+"\\Application Data\\Microsoft\\Internet Explorer\\Quick Launch";
-				}
-			} else {
-				return;
+			switch (shortcutType) {
+				case DESKTOP:
+					if (isNT() || isVista()) {
+						filename = System.getProperty("user.home")+"\\Desktop";
+					} else {
+						filename = System.getenv("WINDIR")+"\\Desktop";
+					}
+					break;
+					
+				case MENU:
+					if (isVista()) {
+						filename = System.getenv("APPDATA")+"\\Microsoft\\Windows";
+					} else {
+						filename = System.getProperty("user.home");
+					}
+					filename = filename+"\\Start Menu\\Programs\\DMDirc";
+					break;
+					
+				case QUICKLAUNCH:
+					if (isVista()) {
+						filename = System.getProperty("user.home")+"\\AppData\\Roaming\\Microsoft\\Internet Explorer\\Quick Launch";
+					} else {
+						filename = System.getProperty("user.home")+"\\Application Data\\Microsoft\\Internet Explorer\\Quick Launch";
+					}
+					break;
+					
+				default:
+					step.addText(" - Error creating shortcut. Not applicable to this Operating System");
+					return;
 			}
 			
 			if (filename.length() == 0) {
-				step.addText("Error creating shortcut. Not applicable to this System");
+				step.addText(" - Error creating shortcut. Not applicable to this System");
 				return;
 			}
 			
@@ -130,7 +152,7 @@ public class WindowsInstaller extends Installer {
 			
 			try {
 //				final String thisDirName = new File("").getAbsolutePath();
-				final Process shortcutProcess = Runtime.getRuntime().exec(new String[] {
+					final String[] command = new String[] {
 //				                      thisDirName+"/Shortcut.exe",
 				                      "Shortcut.exe",
 				                      "/F:"+filename+"\\DMDirc.lnk",
@@ -141,18 +163,25 @@ public class WindowsInstaller extends Installer {
 				                      "/W:"+location,
 				                      "/I:"+location+"\\icon.ico",
 				                      "/D:DMDirc IRC Client"
-				                      });
+				                      };
+				final Process shortcutProcess = Runtime.getRuntime().exec(command);
 				new StreamReader(shortcutProcess.getInputStream()).start();
 				new StreamReader(shortcutProcess.getErrorStream()).start();
 				shortcutProcess.waitFor();
 				if (shortcutProcess.exitValue() != 0) {
-					step.addText("Error creating shortcuts: Unknown Reason");
+					step.addText(" - Error creating shortcut: Unknown Reason");
+					System.out.println(java.util.Arrays.toString(command));
+					System.out.println("");
+					for (String bit : command) {
+						System.out.print(bit+' ');
+					}
+					System.out.println("");
 				}
 			} catch (Exception e) {
-				step.addText("Error creating shortcut: "+e.getMessage());
+				step.addText(" - Error creating shortcut: "+e.getMessage());
 			}
 		} else {
-			step.addText("Error creating shortcuts: Unable to find Shortcut.exe");
+			step.addText(" - Error creating shortcut: Unable to find Shortcut.exe");
 		}
 	}
 }

src/com/dmdirc/parser/IRCParser.java

@@ -1474,11 +1474,16 @@ public final class IRCParser implements Runnable {
 		if (sChannelName == null || sChannelName.isEmpty()) { return false; }
 		// Check its not ourself (PM recieved before 005)
 		if (equalsIgnoreCase(getMyNickname(), sChannelName)) { return false; }
+		// Check if we know of any valid chan prefixes
+		if (hChanPrefix.size() == 0) {
+			// We don't. Lets check against RFC2811-Specified channel types
+			char first = sChannelName.charAt(0);
+			return first == '#' || first == '&' || first == '!' || first == '+';
+		}
 		// Otherwise return true if:
-		// 005 has not been recieved yet
 		// Channel equals "0"
 		// first character of the channel name is a valid channel prefix.
-		return hChanPrefix.size() == 0 || hChanPrefix.containsKey(sChannelName.charAt(0)) || sChannelName.equals("0");
+		return hChanPrefix.containsKey(sChannelName.charAt(0)) || sChannelName.equals("0");
 	}
 	
 	/**

src/com/dmdirc/parser/ProcessJoin.java

@@ -56,7 +56,7 @@ public class ProcessJoin extends IRCProcessor {
 		if (iClient.getHost().isEmpty()) { iClient.setUserBits(token[0],false); }
 		if (iChannel == null) { 
 			if (iClient != myParser.cMyself) {
-				callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got join for channel ("+token[token.length-1]+") that I am not on. [User: "+token[0]+"]", myParser.getLastLine()));
+				callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got join for channel ("+token[token.length-1]+") that I am not on. [Me: "+myParser.getMyself()+"]", myParser.getLastLine()));
 			}
 			iChannel = new ChannelInfo(myParser, token[token.length-1]);
 			myParser.hChannelList.put(myParser.toLowerCase(iChannel.getName()),iChannel);

src/com/dmdirc/parser/ProcessMessage.java

@@ -69,14 +69,27 @@ public class ProcessMessage extends IRCProcessor {
 		if (myParser.getIgnoreList().matches(sMessage) > -1) { return; }
 		
 		// Lines such as:
-		// "nick!user@host PRIVMSG #channel"
+		// "nick!user@host PRIVMSG"
 		// are invalid, stop processing.
-		if (token.length < 4) { return; }
+		if (token.length < 3) { return; }
+		
+		// Is this actually a notice auth?
+		if (token[0].indexOf('!') == -1 && token[1].equalsIgnoreCase("NOTICE") && token[2].equalsIgnoreCase("AUTH")) {
+			try {
+				myParser.getProcessingManager().process("Notice Auth", token);
+			} catch (ProcessorNotFoundException e) { }
+			return;
+		}
 		
 		ChannelClientInfo iChannelClient = null;
 		ChannelInfo iChannel = null;
 		ClientInfo iClient = null;
-		sMessage = token[token.length-1];
+		// "nick!user@host PRIVMSG #Channel" should be processed as "nick!user@host PRIVMSG #Channel :"
+		if (token.length < 4) {
+			sMessage = "";
+		} else {
+			sMessage = token[token.length-1];
+		}
 		String bits[] = sMessage.split(" ", 2);
 		final Character Char1 = Character.valueOf((char)1);
 		String sCTCP = "";

src/com/dmdirc/parser/ProcessingManager.java

@@ -189,11 +189,11 @@ public class ProcessingManager {
 	 * @param sParam Type of line to process ("005", "PRIVMSG" etc)
 	 * @return IRCProcessor for the given param.
 	 */
-	public IRCProcessor getProcessor(final String sParam) throws ProcessorNotFound {
+	public IRCProcessor getProcessor(final String sParam) throws ProcessorNotFoundException {
 		if (processHash.containsKey(sParam.toLowerCase())) {
 			return processHash.get(sParam.toLowerCase());
 		} else {
-			throw new ProcessorNotFound("No processors will handle "+sParam);
+			throw new ProcessorNotFoundException("No processors will handle "+sParam);
 		}
 	}
 	
@@ -202,14 +202,14 @@ public class ProcessingManager {
 	 *
 	 * @param sParam Type of line to process ("005", "PRIVMSG" etc)
 	 * @param token IRCTokenised line to process
-	 * @throws ProcessorNotFound exception if no processors exists to handle the line
+	 * @throws ProcessorNotFoundException exception if no processors exists to handle the line
 	 */
-	public void process(final String sParam, final String[] token) throws ProcessorNotFound {
+	public void process(final String sParam, final String[] token) throws ProcessorNotFoundException {
 		IRCProcessor messageProcessor = null;
 		try {
 			messageProcessor = getProcessor(sParam);
 			messageProcessor.process(sParam, token);
-		} catch (ProcessorNotFound p) {
+		} catch (ProcessorNotFoundException p) {
 			throw p;
 		} catch (Exception e) {
 			final StringBuilder line = new StringBuilder();

src/com/dmdirc/parser/ProcessorNotFound.java → src/com/dmdirc/parser/ProcessorNotFoundException.java

@@ -30,7 +30,7 @@ package com.dmdirc.parser;
  * @author Shane Mc Cormack
  * @version $Id$
  */
-public class ProcessorNotFound extends Exception {
+public class ProcessorNotFoundException extends Exception {
 	/**
 	 * A version number for this class. It should be changed whenever the class
 	 * structure is changed (or anything else that would prevent serialized
@@ -43,7 +43,7 @@ public class ProcessorNotFound extends Exception {
 	 *
 	 * @param message Reason for exception
 	 */
-	public ProcessorNotFound(final String message) { super(message); }
+	public ProcessorNotFoundException(final String message) { super(message); }
 	
 	/**
 	 * Get SVN Version information.

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

@@ -177,35 +177,35 @@ public final class CallbackManager {
 	
 	/**
 	 * Add a callback.
- 	 * This method will throw a CallbackNotFound Exception if the callback does not exist.
+ 	 * This method will throw a CallbackNotFoundException if the callback does not exist.
 	 *
 	 * @param callbackName Name of callback object.
 	 * @param o instance of ICallbackInterface to add.
-	 * @throws CallbackNotFound If callback is not found.
+	 * @throws CallbackNotFoundException If callback is not found.
 	 * @throws NullPointerException If 'o' is null
 	 */
-	public void addCallback(final String callbackName, final ICallbackInterface o) throws CallbackNotFound {
+	public void addCallback(final String callbackName, final ICallbackInterface o) throws CallbackNotFoundException {
 		if (o == null) { throw new NullPointerException("CallbackInterface is null"); }
 		final CallbackObject cb = getCallbackType(callbackName);
 		if (cb != null) { cb.add(o); }
-		else { throw new CallbackNotFound("Callback '"+callbackName+"' could not be found."); }
+		else { throw new CallbackNotFoundException("Callback '"+callbackName+"' could not be found."); }
 	}
 	
 	/**
 	 * Add a callback with a specific target.
- 	 * This method will throw a CallbackNotFound Exception if the callback does not exist.
+ 	 * This method will throw a CallbackNotFoundException if the callback does not exist.
 	 *
 	 * @param callbackName Name of callback object.
 	 * @param o instance of ICallbackInterface to add.
 	 * @param target Parameter to specify that a callback should only fire for specific things
-	 * @throws CallbackNotFound If callback is not found.
+	 * @throws CallbackNotFoundException If callback is not found.
 	 * @throws NullPointerException If 'o' is null
 	 */
-	public void addCallback(final String callbackName, final ICallbackInterface o, final String target) throws CallbackNotFound {
+	public void addCallback(final String callbackName, final ICallbackInterface o, final String target) throws CallbackNotFoundException {
 		if (o == null) { throw new NullPointerException("CallbackInterface is null"); }
 		CallbackObjectSpecific cb = (CallbackObjectSpecific)getCallbackType(callbackName);
 		if (cb != null) { cb.add(o,target); }
-		else { throw new CallbackNotFound("Callback '"+callbackName+"' could not be found."); }
+		else { throw new CallbackNotFoundException("Callback '"+callbackName+"' could not be found."); }
 	}
 	
 	/**
@@ -230,7 +230,7 @@ public final class CallbackManager {
 	 * @param callbackName Name of callback object.
 	 * @param o instance of ICallbackInterface to add.
 	 * @param target Parameter to specify that a callback should only fire for specific things
-	 * @throws CallbackNotFound If callback is not found.
+	 * @throws CallbackNotFoundException If callback is not found.
 	 */
 	public boolean addNonCriticalCallback(final String callbackName, final ICallbackInterface o, final String target) {
 		try {

src/com/dmdirc/parser/callbacks/CallbackNotFound.java → src/com/dmdirc/parser/callbacks/CallbackNotFoundException.java

@@ -30,7 +30,7 @@ package com.dmdirc.parser.callbacks;
  * @author            Shane Mc Cormack
  * @version           $Id$
  */
-public class CallbackNotFound extends Exception {
+public class CallbackNotFoundException extends Exception {
 	/**
 	 * A version number for this class. It should be changed whenever the class
 	 * structure is changed (or anything else that would prevent serialized
@@ -43,7 +43,7 @@ public class CallbackNotFound extends Exception {
 	 *
 	 * @param message Reason for exception
 	 */
-	public CallbackNotFound(final String message) { super(message); }
+	public CallbackNotFoundException(final String message) { super(message); }
 	
 	/**
 	 * Get SVN Version information.

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

@@ -253,6 +253,15 @@ public final class WizardDialog extends JFrame implements ActionListener,
         next.setEnabled(newValue);
     }
     
+    /**
+     * Enables or disables the "previous step" button.
+     *
+     * @param newValue boolean true to make "previous" button enabled, else false
+     */
+    public void enablePreviousStep(final boolean newValue) {
+        prev.setEnabled(newValue);
+    }
+    
     /** Moves to the next step. */
     private void nextStep() {
         steps.get(currentStep).setVisible(false);