New installer UI

src/com/dmdirc/installer/DefaultSettings.java

@@ -24,49 +24,42 @@ package com.dmdirc.installer;
 
 import com.dmdirc.installer.cliparser.CLIParser;
 
+/**
+ * Default settings for the installer.
+ */
 public class DefaultSettings implements Settings {
-	/**
-	 * Returns the state of the shortcutMenu checkbox.
-	 *
-	 * @return shortcutMenu checkbox state
-	 */
-	public boolean getShortcutMenuState() {
-		return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-menu") == 0);
-	}
 
-	/**
-	 * Returns the state of the shortcutDesktop checkbox.
-	 *
-	 * @return shortcutDesktop checkbox state
-	 */
-	public boolean getShortcutDesktopState() {
-		return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-desktop") == 0);
-	}
+    /** {@inheritDoc} */
+    @Override
+    public boolean getShortcutMenuState() {
+        return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-menu") ==
+                0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean getShortcutDesktopState() {
+        return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-desktop") ==
+                0);
+    }
 
-	/**
-	 * Returns the state of the shortcutDesktop checkbox.
-	 *
-	 * @return shortcutDesktop checkbox state
-	 */
-	public boolean getShortcutQuickState() {
-		return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-quicklaunch") == 0);
-	}
+    /** {@inheritDoc} */
+    @Override
+    public boolean getShortcutQuickState() {
+        return (CLIParser.getCLIParser().getParamNumber(
+                "-no-shortcut-quicklaunch") == 0);
+    }
 
-	/**
-	 * Returns the state of the shortcutProtocol checkbox.
-	 *
-	 * @return shortcutDesktop checkbox state
-	 */
-	public boolean getShortcutProtocolState() {
-		return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-protocol") == 0);
-	}
+    /** {@inheritDoc} */
+    @Override
+    public boolean getShortcutProtocolState() {
+        return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-protocol") ==
+                0);
+    }
 
-	/**
-	 * Returns the location chosen for installation.
-	 *
-	 * @return location chosen for installation.
-	 */
-	public String getInstallLocation() {
-		return Main.getInstaller().defaultInstallLocation();
-	}
+    /** {@inheritDoc} */
+    @Override
+    public String getInstallLocation() {
+        return Main.getInstaller().defaultInstallLocation();
+    }
 }

src/com/dmdirc/installer/Installer.java

@@ -33,218 +33,225 @@ import java.nio.channels.FileChannel;
 
 /**
  * Installs DMDirc.
- *
- * @author Shane Mc Cormack
  */
 public abstract class Installer extends Thread {
-	
-	/** Types of shortcut. */
-	public static enum ShortcutType {
-		/** Desktop shortcut. */
-		DESKTOP,
-		/** Menu (start/k/etc) shortcut. */
-		MENU,
-		/** Quick launch shortcut. */
-		QUICKLAUNCH,
-		/** The actual uninstaller (not a shortcut, as far as I can tell). */
-		UNINSTALLER,
-		/** Associate DMDirc with the irc:// protocol (not a shortcut). */
-		PROTOCOL;
-	}
-	
-	/** Step where the installation output should be. */
-	protected TextStep step;
-	
-	/**
-	 * Create a new Installer.
-	 */
-	public Installer() {
-		super("Installer-Thread");
-	}
-	
-	/**
-	 * Get the default install location.
-	 *
-	 * @return The default install location
-	 */
-	public 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 TextStep step) {
-		this.step = step;
-	}
-		
-	/**
-	 * This performs the installation
-	 */
-	@Override
-	public final void run() {
-		step.setText("Beginning Install..\n");
-		
-		final boolean isUnattended = (CLIParser.getCLIParser().getParamNumber("-unattended") != 0);
-		final Settings settings = (isUnattended) ? new DefaultSettings() : ((Settings) Main.getWizardFrame().getStep(1));
-		
-		final String location = settings.getInstallLocation();
-		step.addText("Installing files to: "+location);
-		if (!doSetup(location)) {
-			step.addText("");
-			step.addText("Installation failed\n");
-			Main.getWizardFrame().enableNextStep(true);
-			return;
-		}
-
-		if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
-			if (settings.getShortcutMenuState()) {
-				step.addText("Setting up "+Main.getInstaller().getMenuName()+" shortcut");
-				setupShortcut(location, ShortcutType.MENU);
-			} else {
-				step.addText("Not setting up "+Main.getInstaller().getMenuName()+" shortcut");
-			}
-		}
-
-		if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
-			if (settings.getShortcutDesktopState()) {
-				step.addText("Setting up Desktop shortcut");
-				setupShortcut(location, ShortcutType.DESKTOP);
-			} else {
-				step.addText("Not setting up Desktop shortcut");
-			}
-		}
-
-		if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
-			if (settings.getShortcutQuickState()) {
-				step.addText("Setting up Quick Launch shortcut");
-				setupShortcut(location, ShortcutType.QUICKLAUNCH);
-			} else {
-				step.addText("Not setting up Quick Launch shortcut");
-			}
-		}
-
-		if (Main.getInstaller().supportsShortcut(ShortcutType.UNINSTALLER)) {
-			step.addText("Creating uninstaller");
-			setupShortcut(location, ShortcutType.UNINSTALLER);
-		}
-
-		if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL)) {
-			if (settings.getShortcutProtocolState()) {
-				step.addText("Setting up irc:// handler");
-				setupShortcut(location, ShortcutType.PROTOCOL);
-			} else {
-				step.addText("Not setting up irc:// handler");
-			}
-		}
-
-		postInstall(location);
-
-		step.addText("");
-		step.addText("Installation finished\n");
-		Main.getWizardFrame().enableNextStep(true);
-	}
-	
-	/**
-	 * Is the given file name vaild to copy to the installation directory?
-	 *
-	 * @param filename File to check
-	 * @return true If the file should be copied, else false.
-	 */
-	public abstract boolean validFile(final String filename);
-	
-	/**
-	 * Main Setup stuff.
-	 *
-	 * @param location Location where app will be installed to.
-	 * @return True if installation passed, else false
-	 */
-	public boolean doSetup(final String location) {
-		// Create the directory
-		final File directory = new File(location);
-		if (!directory.exists()) { directory.mkdir(); }
-	
-		try {
-			final File dir = new File(".");
-			final FilenameFilter filter = new FilenameFilter() {
-				/** {@inheritDoc} */
-				@Override
-				public boolean accept(final File dir, final String name) {
-					return name.charAt(0) != '.' && validFile(name);
-				}
-			};
-			final String[] children = dir.list(filter);
-			if (children != null) {
-				for (String filename : children) {
-					step.addText("Copying " + filename);
-					copyFile(filename, location + File.separator + filename);
-				}
-			}
-		} catch (IOException e) {
-			step.addText("Error copying files: " + e.getMessage());
-			return false;
-		}
-		step.addText("File Copying Complete.");
-		return true;
-	}
-	
-	/**
-	 * 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;
-	}
-	
-	/**
-	 * Check what name to show for the menu shortcut
-	 *
-	 * @return Name for menu shortcutType
-	 */
-	public String getMenuName() {
-		return "menu";
-	}
-	
-	/**
-	 * Setup shortcut.
-	 *
-	 * @param location Location where app will be installed to.
-	 * @param shortcutType Type of shortcut to add.
-	 */
-	protected abstract void setupShortcut(final String location, final ShortcutType shortcutType);
-	
-	/**
-	 * Copy a file from one location to another.
-	 * Based on http://www.exampledepot.com/egs/java.io/CopyFile.html
-	 *
-	 * @param srcFile Original file
-	 * @param dstFile New file
-	 * @throws java.io.IOException If an exception occurs while copying
-	 */
-	protected final void copyFile(final String srcFile, final String dstFile) throws IOException {
-		if (new File(srcFile).exists()) {
-			final FileChannel srcChannel = new FileInputStream(srcFile).getChannel();
-			final FileChannel dstChannel = new FileOutputStream(dstFile).getChannel();
-			
-			dstChannel.transferFrom(srcChannel, 0, srcChannel.size());
-			
-			srcChannel.close();
-			dstChannel.close();
-		} else {
-			throw new IOException(srcFile + " does not exist.");
-		}
-	}
-	
-	
-	/**
-	 * Any post-install tasks should be done here.
-	 *
-	 * @param location Location where app was installed to.
-	 */
-	public void postInstall(final String location) {
-		// Nothing to do by default, installers may override
-	}
+
+    /** Types of shortcut. */
+    public static enum ShortcutType {
+
+        /** Desktop shortcut. */
+        DESKTOP,
+        /** Menu (start/k/etc) shortcut. */
+        MENU,
+        /** Quick launch shortcut. */
+        QUICKLAUNCH,
+        /** The actual uninstaller (not a shortcut, as far as I can tell). */
+        UNINSTALLER,
+        /** Associate DMDirc with the irc:// protocol (not a shortcut). */
+        PROTOCOL;
+    }
+
+    /** Step where the installation output should be. */
+    protected TextStep step;
+
+    /**
+     * Create a new Installer.
+     */
+    public Installer() {
+        super("Installer-Thread");
+    }
+
+    /**
+     * Get the default install location.
+     *
+     * @return The default install location
+     */
+    public 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 TextStep step) {
+        this.step = step;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public final void run() {
+        step.setText("Beginning Install..\n");
+
+        final boolean isUnattended = (CLIParser.getCLIParser().getParamNumber(
+                "-unattended") != 0);
+        final Settings settings = (isUnattended) ? new DefaultSettings() : ((Settings) Main.getWizardFrame().
+                getStep(1));
+
+        final String location = settings.getInstallLocation();
+        step.addText("Installing files to: " + location);
+        if (!doSetup(location)) {
+            step.addText("");
+            step.addText("Installation failed\n");
+            Main.getWizardFrame().enableNextStep(true);
+            return;
+        }
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
+            if (settings.getShortcutMenuState()) {
+                step.addText("Setting up " + Main.getInstaller().getMenuName() +
+                             " shortcut");
+                setupShortcut(location, ShortcutType.MENU);
+            } else {
+                step.addText("Not setting up " +
+                             Main.getInstaller().getMenuName() + " shortcut");
+            }
+        }
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
+            if (settings.getShortcutDesktopState()) {
+                step.addText("Setting up Desktop shortcut");
+                setupShortcut(location, ShortcutType.DESKTOP);
+            } else {
+                step.addText("Not setting up Desktop shortcut");
+            }
+        }
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
+            if (settings.getShortcutQuickState()) {
+                step.addText("Setting up Quick Launch shortcut");
+                setupShortcut(location, ShortcutType.QUICKLAUNCH);
+            } else {
+                step.addText("Not setting up Quick Launch shortcut");
+            }
+        }
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.UNINSTALLER)) {
+            step.addText("Creating uninstaller");
+            setupShortcut(location, ShortcutType.UNINSTALLER);
+        }
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL)) {
+            if (settings.getShortcutProtocolState()) {
+                step.addText("Setting up irc:// handler");
+                setupShortcut(location, ShortcutType.PROTOCOL);
+            } else {
+                step.addText("Not setting up irc:// handler");
+            }
+        }
+
+        postInstall(location);
+
+        step.addText("");
+        step.addText("Installation finished\n");
+        Main.getWizardFrame().enableNextStep(true);
+    }
+
+    /**
+     * Is the given file name vaild to copy to the installation directory?
+     *
+     * @param filename File to check
+     * @return true If the file should be copied, else false.
+     */
+    public abstract boolean validFile(final String filename);
+
+    /**
+     * Main Setup stuff.
+     *
+     * @param location Location where app will be installed to.
+     * @return True if installation passed, else false
+     */
+    public boolean doSetup(final String location) {
+        // Create the directory
+        final File directory = new File(location);
+        if (!directory.exists()) {
+            directory.mkdir();
+        }
+
+        try {
+            final File dir = new File(".");
+            final FilenameFilter filter = new FilenameFilter() {
+
+                /** {@inheritDoc} */
+                @Override
+                public boolean accept(final File dir, final String name) {
+                    return name.charAt(0) != '.' && validFile(name);
+                }
+            };
+            final String[] children = dir.list(filter);
+            if (children != null) {
+                for (String filename : children) {
+                    step.addText("Copying " + filename);
+                    copyFile(filename, location + File.separator + filename);
+                }
+            }
+        } catch (IOException e) {
+            step.addText("Error copying files: " + e.getMessage());
+            return false;
+        }
+        step.addText("File Copying Complete.");
+        return true;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Check what name to show for the menu shortcut
+     *
+     * @return Name for menu shortcutType
+     */
+    public String getMenuName() {
+        return "menu";
+    }
+
+    /**
+     * Setup shortcut.
+     *
+     * @param location Location where app will be installed to.
+     * @param shortcutType Type of shortcut to add.
+     */
+    protected abstract void setupShortcut(final String location,
+                                          final ShortcutType shortcutType);
+
+    /**
+     * Copy a file from one location to another.
+     * Based on http://www.exampledepot.com/egs/java.io/CopyFile.html
+     *
+     * @param srcFile Original file
+     * @param dstFile New file
+     * @throws java.io.IOException If an exception occurs while copying
+     */
+    protected final void copyFile(final String srcFile, final String dstFile)
+            throws IOException {
+        if (new File(srcFile).exists()) {
+            final FileChannel srcChannel = new FileInputStream(srcFile).
+                    getChannel();
+            final FileChannel dstChannel = new FileOutputStream(dstFile).
+                    getChannel();
+
+            dstChannel.transferFrom(srcChannel, 0, srcChannel.size());
+
+            srcChannel.close();
+            dstChannel.close();
+        } else {
+            throw new IOException(srcFile + " does not exist.");
+        }
+    }
+
+    /**
+     * Any post-install tasks should be done here.
+     *
+     * @param location Location where app was installed to.
+     */
+    public void postInstall(final String location) {
+        // Nothing to do by default, installers may override
+    }
 }

src/com/dmdirc/installer/InstallerListener.java

@@ -0,0 +1,131 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer;
+
+import com.dmdirc.installer.Installer.ShortcutType;
+import com.dmdirc.installer.ui.InstallerDialog;
+
+/**
+ * Listeners to all wizard and step changes and responds accordingly.
+ */
+public class InstallerListener implements WizardListener, StepListener {
+
+    private Main main;
+
+    /**
+     * Instantiates a new installer listener.
+     *
+     * @param main Installer entry point
+     */
+    public InstallerListener(final Main main) {
+        this.main = main;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void wizardFinished() {
+        main.disposeOfInstaller();
+        Main.getWizardFrame().dispose();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void wizardCancelled() {
+        if (!"Install".equals(Main.getWizardFrame().getCurrentStepName()) && Main.getWizardFrame().
+                showCancelConfirmation()) {
+            Main.getWizardFrame().dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void stepAboutToDisplay(final Step step) {
+        if ("Install".equals(step.getStepName())) {
+            installerToBeDisplayed(step);
+        } else if ("Confirm".equals(step.getStepName())) {
+            confirmToBeDisplayed((TextStep) step);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void stepHidden(final Step step) {
+        //Ignore
+    }
+
+    private void installerToBeDisplayed(final Step step) {
+        final InstallerDialog dialog = Main.getWizardFrame();
+        dialog.enableNextStep(false);
+        dialog.enablePreviousStep(false);
+        Main.getInstaller().setInstallStep((TextStep) dialog.getStep("Install"));
+        Main.getInstaller().start();
+    }
+
+    private void confirmToBeDisplayed(final TextStep step) {
+        String shortcutText = "";
+
+        final Settings settings = (Settings) Main.getWizardFrame().getStep(1);
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.MENU) && settings.
+                getShortcutMenuState()) {
+            shortcutText = shortcutText + " - Create " + Main.getInstaller().
+                    getMenuName() + " shortcut\n";
+        }
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP) &&
+            settings.getShortcutDesktopState()) {
+            shortcutText = shortcutText + " - Create desktop shortcut\n";
+        }
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH) &&
+            settings.getShortcutQuickState()) {
+            shortcutText = shortcutText + " - Create Quick Launch shortcut\n";
+        }
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL) &&
+            settings.getShortcutProtocolState()) {
+            shortcutText = shortcutText +
+                           " - Make DMDirc handle irc:// links\n";
+        }
+
+
+        final String installLocation = settings.getInstallLocation();
+
+
+        if (installLocation.isEmpty()) {
+            step.setText(
+                    "You have chosen an invalid install location\n\n" +
+                    "Please press the \"Previous\" button to go back and correct it.");
+            Main.getWizardFrame().enableNextStep(false);
+        } else {
+            step.setText(
+                    "Please review your chosen settings:\n\n" +
+                    " - Install Location:\n" + "    " + installLocation +
+                    "\n" + shortcutText + "\n" +
+                    "If you wish to change any of these settings, press the \"Previous\" button," +
+                    "otherwise click \"Next\" to begin the installation");
+            Main.getWizardFrame().enableNextStep(true);
+        }
+    }
+}

src/com/dmdirc/installer/LinuxInstaller.java

@@ -41,12 +41,7 @@ public class LinuxInstaller extends Installer {
 		return (CLIParser.getCLIParser().getParamNumber("-isroot") > 0);
 	}
 	
-	/**
-	 * Is the given file name vaild to copy to the installation directory?
-	 *
-	 * @param filename File to check
-	 * @return true If the file should be copied, else false.
-	 */
+	/** {@inheritDoc} */
 	@Override
 	public boolean validFile(final String filename) {
 		return (!filename.equalsIgnoreCase("setup.sh") &&
@@ -74,12 +69,7 @@ public class LinuxInstaller extends Installer {
 		return result;
 	}
 
-	/**
-	 * 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
-	 */
+	/** {@inheritDoc} */
 	@Override
 	public boolean supportsShortcut(final ShortcutType shortcutType) {
 		switch (shortcutType) {
@@ -100,12 +90,8 @@ public class LinuxInstaller extends Installer {
 		}
 	}
 
-	/**
-	 * Setup shortcut.
-	 *
-	 * @param location Location where app will be installed to.
-	 * @param shortcutType Type of shortcut to add.
-	 */
+	/** {@inheritDoc} */
+	@Override
 	public void setupShortcut(final String location, final ShortcutType shortcutType) {
 		if (!supportsShortcut(shortcutType)) {
 			step.addText(" - Error creating shortcut. Not applicable to this Operating System");
@@ -397,11 +383,8 @@ public class LinuxInstaller extends Installer {
 		writer.println("Type=Application");
 	}
 
-	/**
-	 * Any post-install tasks should be done here.
-	 *
-	 * @param location Location where app was installed to.
-	 */
+	/** {@inheritDoc} */
+	@Override
 	public void postInstall(final String location) {
 		new File(location+"/DMDirc.sh").setExecutable(true, !isRoot());
 	}

src/com/dmdirc/installer/Main.java

@@ -25,165 +25,148 @@ package com.dmdirc.installer;
 import com.dmdirc.installer.cliparser.BooleanParam;
 import com.dmdirc.installer.cliparser.CLIParser;
 import com.dmdirc.installer.cliparser.StringParam;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.dialogs.wizard.Step;
-import com.dmdirc.addons.ui_swing.dialogs.wizard.WizardFrame;
-import com.dmdirc.addons.ui_swing.dialogs.wizard.WizardListener;
 
-import com.dmdirc.addons.ui_swing.installer.StepWelcome;
-import com.dmdirc.addons.ui_swing.installer.StepError;
-import com.dmdirc.addons.ui_swing.installer.StepSettings;
-import com.dmdirc.addons.ui_swing.installer.StepConfirm;
-import com.dmdirc.addons.ui_swing.installer.StepInstall;
-
-import java.awt.Dimension;
-import java.util.ArrayList;
-
-import javax.swing.JOptionPane;
+import com.dmdirc.installer.ui.InstallerDialog;
+import com.dmdirc.installer.ui.StepWelcome;
+import com.dmdirc.installer.ui.StepError;
+import com.dmdirc.installer.ui.StepSettings;
+import com.dmdirc.installer.ui.StepConfirm;
+import com.dmdirc.installer.ui.StepInstall;
 
 /**
- * Main installer window.
- *
- * @author Shane Mc Cormack
+ * Main installer entry point.
  */
-public final class Main implements WizardListener {
-	
-	/** Wizard dialog. */
-	private static WizardFrame wizardDialog;
-	
-	/** Installer. */
-	private static Installer myInstaller;
-	
-	/** CLI Parser. */
-	private static CLIParser cli = CLIParser.getCLIParser();
-	
-	/**
-	 * Creates and Displays the Installer wizard.
-	 */
-	private Main() {
-		try {
-			UIUtilities.initUISettings();
-		} catch (UnsupportedOperationException ex) {
-			//Ignore, revert to default
-		}
-		
-		String releaseName = "DMDirc";
-		if (cli.getParamNumber("-release") > 0) {
-			releaseName = releaseName + " " + cli.getParam("-release").getStringValue();
-		}
-		
-		setWizardFrame(new WizardFrame(releaseName + " Installer", new ArrayList<Step>(), this));
-		wizardDialog.setIconImage(IconManager.getIconManager().getImage("icon"));
-		wizardDialog.setPreferredSize(new Dimension(400, 350));
-		wizardDialog.setMaximumSize(new Dimension(400, 350));
-		wizardDialog.addWizardListener(this);
-
-		final String osName = System.getProperty("os.name");
-		wizardDialog.addStep(new StepWelcome(releaseName));
-		if (osName.startsWith("Mac OS")) {
-			wizardDialog.addStep(new StepError("Sorry, OSX Installation should be done using the downloadable dmg file, not this installer.\n\n"));
-		} else {
-			if (CLIParser.getCLIParser().getParamNumber("-unattended") == 0) {
-				wizardDialog.addStep(new StepSettings());
-				wizardDialog.addStep(new StepConfirm(wizardDialog));
-			}
-			wizardDialog.addStep(new StepInstall(wizardDialog));
-		}
-	}
-		
-	/**
-	 * Called when the wizard finishes.
-	 */
-	@Override
-	public void wizardFinished() {
-		final Thread temp = myInstaller;
-		myInstaller = null;
-		if (temp != null) { temp.interrupt(); }
-		wizardDialog.dispose();
-	}
-	
-	/**
-	 * Called when the wizard is cancelled.
-	 */
-	@Override
-	public void wizardCancelled() {	
-		if (wizardDialog.getCurrentStep() != 3 && JOptionPane.showConfirmDialog(wizardDialog, "Are you sure you want to cancel?", "Cancel confirmation", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
-			wizardDialog.dispose();
-		}
-	}
-	
-	/**
-	 * Get the Installer object for this OS.
-	 *
-	 * @return The installer for this OS
-	 */
-	public static synchronized Installer getInstaller() {
-		if (myInstaller == null) {
-			final String osName = System.getProperty("os.name");
-			if (osName.startsWith("Mac OS")) {
-				// myInstaller = new MacInstaller();
-			} else if (osName.startsWith("Windows")) {
-				myInstaller = new WindowsInstaller();
-			} else {
-				myInstaller = new LinuxInstaller();
-			}
-		}
-		
-		return myInstaller;
-	}
-
-	/**
-	 * Setup the cli parser.
-	 * This clears the current CLIParser params and creates new ones.
-	 */
-	private static void setupCLIParser() {
-		cli.clear();
-		cli.add(new StringParam('h', "help", "Get Help"));
-		cli.setHelp(cli.getParam("-help"));
-		cli.add(new BooleanParam((char) 0, "isroot", "Installing as Root"));
-		cli.add(new StringParam('r', "release", "Release Name"));
-		cli.add(new StringParam('d', "directory", "Default install directory"));
-		cli.add(new BooleanParam('u', "unattended", "Perform an unattended installation"));
-		cli.add(new BooleanParam((char) 0, "no-shortcut-desktop", "Don't offer a desktop shortcut as the default"));
-		cli.add(new BooleanParam((char) 0, "no-shortcut-menu", "Don't offer a menu shortcut as the default"));
-		cli.add(new BooleanParam((char) 0, "no-shortcut-quicklaunch", "Don't offer a quick launch shortcut as the default"));
-		cli.add(new BooleanParam((char) 0, "no-shortcut-protocol", "Don't offer to handle irc:// links as the default"));
-	}
-	
-	/**
-	 * Get the WizardFrame.
-	 *
-	 * @return The current wizardDialog
-	 */
-	public static synchronized WizardFrame getWizardFrame() {
-		if (wizardDialog == null) {
-			new Main();
-		}
-		return wizardDialog;
-	}
-	
-	/**
-	 * Set the WizardFrame.
-	 *
-	 * @param dialog The new WizardDialog
-	 */
-	private static void setWizardFrame(final WizardFrame dialog) {
-		wizardDialog = dialog;
-	}
-
-	/**
-	 * Run the installer.
-	 *
-	 * @param args Command line arguments
-	 */
-	public static void main(final String[] args) {
-		setupCLIParser();
-		if (cli.wantsHelp(args)) {
-			cli.showHelp("DMDirc installer Help", "[options [--]]");
-			System.exit(0);
-		}
-		cli.parseArgs(args, false);
-		getWizardFrame().display();
-	}
+public final class Main {
+
+    /** Wizard dialog. */
+    private static InstallerDialog wizardDialog;
+    /** Installer. */
+    private static Installer myInstaller;
+    /** CLI Parser. */
+    private static CLIParser cli = CLIParser.getCLIParser();
+
+    /**
+     * Creates and Displays the Installer wizard.
+     */
+    private Main() {
+        try {
+            InstallerDialog.initUISettings();
+        } catch (UnsupportedOperationException ex) {
+            //Ignore, revert to default
+        }
+
+        String releaseName = "DMDirc";
+        if (cli.getParamNumber("-release") > 0) {
+            releaseName = releaseName + " " + cli.getParam("-release").
+                    getStringValue();
+        }
+
+        setWizardFrame(new InstallerDialog(releaseName + " Installer"));
+        getWizardFrame().addWizardListener(new InstallerListener(this));
+        getWizardFrame().addStepListener(new InstallerListener(this));
+
+        final String osName = System.getProperty("os.name");
+        wizardDialog.addStep(new StepWelcome(releaseName));
+        if (osName.startsWith("Mac OS")) {
+            wizardDialog.addStep(
+                    new StepError(
+                    "Sorry, OSX Installation should be done using the downloadable dmg file, not this installer.\n\n"));
+        } else {
+            if (CLIParser.getCLIParser().getParamNumber("-unattended") == 0) {
+                wizardDialog.addStep(new StepSettings());
+                wizardDialog.addStep(new StepConfirm());
+            }
+            wizardDialog.addStep(new StepInstall());
+        }
+    }
+
+    /**
+     * Disposes of the current installer.
+     */
+    public void disposeOfInstaller() {
+        final Thread temp = myInstaller;
+        myInstaller = null;
+        if (temp != null) {
+            temp.interrupt();
+        }
+    }
+
+    /**
+     * Get the Installer object for this OS.
+     *
+     * @return The installer for this OS
+     */
+    public static synchronized Installer getInstaller() {
+        if (myInstaller == null) {
+            final String osName = System.getProperty("os.name");
+            if (osName.startsWith("Mac OS")) {
+                // myInstaller = new MacInstaller();
+            } else if (osName.startsWith("Windows")) {
+                myInstaller = new WindowsInstaller();
+            } else {
+                myInstaller = new LinuxInstaller();
+            }
+        }
+
+        return myInstaller;
+    }
+
+    /**
+     * Setup the cli parser.
+     * This clears the current CLIParser params and creates new ones.
+     */
+    private static void setupCLIParser() {
+        cli.clear();
+        cli.add(new StringParam('h', "help", "Get Help"));
+        cli.setHelp(cli.getParam("-help"));
+        cli.add(new BooleanParam((char) 0, "isroot", "Installing as Root"));
+        cli.add(new StringParam('r', "release", "Release Name"));
+        cli.add(new StringParam('d', "directory", "Default install directory"));
+        cli.add(new BooleanParam('u', "unattended",
+                                 "Perform an unattended installation"));
+        cli.add(new BooleanParam((char) 0, "no-shortcut-desktop",
+                                 "Don't offer a desktop shortcut as the default"));
+        cli.add(new BooleanParam((char) 0, "no-shortcut-menu",
+                                 "Don't offer a menu shortcut as the default"));
+        cli.add(new BooleanParam((char) 0, "no-shortcut-quicklaunch",
+                                 "Don't offer a quick launch shortcut as the default"));
+        cli.add(new BooleanParam((char) 0, "no-shortcut-protocol",
+                                 "Don't offer to handle irc:// links as the default"));
+    }
+
+    /**
+     * Get the WizardFrame.
+     *
+     * @return The current wizardDialog
+     */
+    public static synchronized InstallerDialog getWizardFrame() {
+        if (wizardDialog == null) {
+            new Main();
+        }
+        return wizardDialog;
+    }
+
+    /**
+     * Set the WizardFrame.
+     *
+     * @param dialog The new WizardDialog
+     */
+    private static void setWizardFrame(final InstallerDialog dialog) {
+        wizardDialog = dialog;
+    }
+
+    /**
+     * Run the installer.
+     *
+     * @param args Command line arguments
+     */
+    public static void main(final String[] args) {
+        setupCLIParser();
+        if (cli.wantsHelp(args)) {
+            cli.showHelp("DMDirc installer Help", "[options [--]]");
+            System.exit(0);
+        }
+        cli.parseArgs(args, false);
+        getWizardFrame().display();
+    }
 }

src/com/dmdirc/installer/Settings.java

@@ -22,39 +22,43 @@
 
 package com.dmdirc.installer;
 
+/**
+ * Simple interface describing available settings for the installer.
+ */
 public interface Settings {
-	/**
-	 * Returns the state of the shortcutMenu checkbox.
-	 *
-	 * @return shortcutMenu checkbox state
-	 */
-	public boolean getShortcutMenuState();
 
-	/**
-	 * Returns the state of the shortcutDesktop checkbox.
-	 *
-	 * @return shortcutDesktop checkbox state
-	 */
-	public boolean getShortcutDesktopState();
+    /**
+     * Returns the state of the shortcutMenu checkbox.
+     *
+     * @return shortcutMenu checkbox state
+     */
+    public boolean getShortcutMenuState();
+
+    /**
+     * Returns the state of the shortcutDesktop checkbox.
+     *
+     * @return shortcutDesktop checkbox state
+     */
+    public boolean getShortcutDesktopState();
 
-	/**
-	 * Returns the state of the shortcutDesktop checkbox.
-	 *
-	 * @return shortcutDesktop checkbox state
-	 */
-	public boolean getShortcutQuickState();
+    /**
+     * Returns the state of the shortcutDesktop checkbox.
+     *
+     * @return shortcutDesktop checkbox state
+     */
+    public boolean getShortcutQuickState();
 
-	/**
-	 * Returns the state of the shortcutProtocol checkbox.
-	 *
-	 * @return shortcutDesktop checkbox state
-	 */
-	public boolean getShortcutProtocolState();
+    /**
+     * Returns the state of the shortcutProtocol checkbox.
+     *
+     * @return shortcutDesktop checkbox state
+     */
+    public boolean getShortcutProtocolState();
 
-	/**
-	 * Returns the location chosen for installation.
-	 *
-	 * @return location chosen for installation.
-	 */
-	public String getInstallLocation();
+    /**
+     * Returns the location chosen for installation.
+     *
+     * @return location chosen for installation.
+     */
+    public String getInstallLocation();
 }

src/com/dmdirc/installer/Step.java

@@ -0,0 +1,37 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer;
+
+/**
+ * Simple step interface.
+ */
+public interface Step {
+
+    /**
+     * Returns the name of this step.
+     * 
+     * @return Step name
+     */
+    public abstract String getStepName();
+}

src/com/dmdirc/installer/StepListener.java

@@ -0,0 +1,44 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer;
+
+/**
+ * Step listeners, listens for changes regarding steps.
+ */
+public interface StepListener {
+
+    /**
+     * Called when a step is about to be displayed.
+     * 
+     * @param step Step to be displayed
+     */
+    void stepAboutToDisplay(final Step step);
+
+    /**
+     * Called when a step is hidden.
+     * 
+     * @param step
+     */
+    void stepHidden(final Step step);
+}

src/com/dmdirc/installer/StreamReader.java

@@ -27,87 +27,91 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+/**
+ * Simple stream reader to read a stream and add it to a text step
+ */
 public class StreamReader extends Thread {
-	
-	/** This is the Input Stream we are reading */
-	private final InputStream stream;
-	
-	/** This is the output Prefix */
-	private String prefix = null;
-	
-	/** This is the StringBuffer to store data in if wanted */
-	private StringBuffer data = null;
-	
-	/** This is the Step we are outputting to, */
-	private TextStep step = null;
-	
-	/**
-	 * Create a new Stream Reader
-	 *
-	 * @param stream The stream to read
-	 */
-	public StreamReader(final InputStream stream) {
-		this.stream = stream;
-	}
-	
-	/**
-	 * Create a new Stream Reader that saves what it reads
-	 *
-	 * @param stream The stream to read
-	 * @param data The stringbuffer to store the output in
-	 * @since 0.6
-	 */
-	public StreamReader(final InputStream stream, final StringBuffer data) {
-		this.stream = stream;
-		this.data = data;
-	}
-	
-	/**
-	 * Create a new Stream Reader that outputs what it reads
-	 *
-	 * @param stream The stream to read
-	 * @param prefix Prefix of outputed messages
-	 * @param step Step to output to (null = console)
-	 */
-	public StreamReader(final InputStream stream, final String prefix, final TextStep step) {
-		this.stream = stream;
-		this.prefix = prefix;
-		this.step = step;
-		
-		if (step == null) {
-			System.out.printf("[%s] Started%n", prefix);
-		} else {
-			step.addText(String.format(" - -[%s] Started", prefix));
-		}
-	}
 
-	/** {@inheritDoc} */
-	@Override
-	public void run() {
-		final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
-		try {
-			String line;
-			while ((line = reader.readLine()) != null) {
-				if (data != null) {
-					if (data.length() > 0) { data.append("\n"); }
-					data.append(line);
-				}
-				if (prefix != null) {
-					if (step == null) {
-						System.out.printf("[%s] %s%n", prefix, line);
-					} else {
-						step.addText(String.format(" - -[%s] %s", prefix, line));
-					}
-				}
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				stream.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-	}
+    /** This is the Input Stream we are reading */
+    private final InputStream stream;
+    /** This is the output Prefix */
+    private String prefix = null;
+    /** This is the StringBuffer to store data in if wanted */
+    private StringBuffer data = null;
+    /** This is the Step we are outputting to, */
+    private TextStep step = null;
+
+    /**
+     * Create a new Stream Reader
+     *
+     * @param stream The stream to read
+     */
+    public StreamReader(final InputStream stream) {
+        this.stream = stream;
+    }
+
+    /**
+     * Create a new Stream Reader that saves what it reads
+     *
+     * @param stream The stream to read
+     * @param data The stringbuffer to store the output in
+     * @since 0.6
+     */
+    public StreamReader(final InputStream stream, final StringBuffer data) {
+        this.stream = stream;
+        this.data = data;
+    }
+
+    /**
+     * Create a new Stream Reader that outputs what it reads
+     *
+     * @param stream The stream to read
+     * @param prefix Prefix of outputed messages
+     * @param step Step to output to (null = console)
+     */
+    public StreamReader(final InputStream stream, final String prefix,
+                        final TextStep step) {
+        this.stream = stream;
+        this.prefix = prefix;
+        this.step = step;
+
+        if (step == null) {
+            System.out.printf("[%s] Started%n", prefix);
+        } else {
+            step.addText(String.format(" - -[%s] Started", prefix));
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void run() {
+        final BufferedReader reader = new BufferedReader(new InputStreamReader(
+                stream));
+        try {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (data != null) {
+                    if (data.length() > 0) {
+                        data.append("\n");
+                    }
+                    data.append(line);
+                }
+                if (prefix != null) {
+                    if (step == null) {
+                        System.out.printf("[%s] %s%n", prefix, line);
+                    } else {
+                        step.addText(String.format(" - -[%s] %s", prefix, line));
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                stream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 }

src/com/dmdirc/installer/TextStep.java

@@ -22,6 +22,9 @@
 
 package com.dmdirc.installer;
 
+/**
+ * Quick access methods for a step to have a controllable text field.
+ */
 public interface TextStep {
 	/**
 	 * Add text to the infolabel on this step

src/com/dmdirc/installer/WindowsInstaller.java

@@ -23,6 +23,7 @@
 package com.dmdirc.installer;
 
 import com.dmdirc.installer.cliparser.CLIParser;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,283 +34,298 @@ import java.util.ArrayList;
  * @author Shane Mc Cormack
  */
 public class WindowsInstaller extends Installer {
-	/**
-	 * Get the default install location
-	 */
-	public String defaultInstallLocation() {
-		String result = "";
-		if (CLIParser.getCLIParser().getParamNumber("-directory") > 0) {
-			result = CLIParser.getCLIParser().getParam("-directory").getStringValue();
-		}
-		if (result.isEmpty()) {
-			String filename = System.getenv("PROGRAMFILES");
-			if (filename == null) {
-				if (isVista()) {
-					filename = System.getProperty("user.home")+"\\Desktop\\DMDirc";
-				} else {
-					filename = "C:\\Program Files";
-				}
-			}
-			result = filename+"\\DMDirc";
-		}
-		return result;
-	}
-	
-	/**
-	 * Is the given file name vaild to copy to the installation directory?
-	 *
-	 * @param filename File to check
-	 * @return true If the file should be copied, else false.
-	 */
-	public boolean validFile(final String filename) {
-		return (!filename.equalsIgnoreCase("setup.exe") &&
-		        !filename.equalsIgnoreCase("jre.exe") &&
-		        !filename.equalsIgnoreCase("wget.exe") &&
-		        !filename.equalsIgnoreCase("wgetoutput") &&
-		        !filename.equalsIgnoreCase("shortcut.exe"));
-	}
 
-	/**
-	 * Are we running vista? -_-
-	 *
-	 * @return True if this is vista.
-	 */
-	public boolean isVista() {
-		return System.getProperty("os.name").indexOf("Vista") >= 0;
-	}
+    /** {@inheritDoc} */
+    @Override
+    public String defaultInstallLocation() {
+        String result = "";
+        if (CLIParser.getCLIParser().getParamNumber("-directory") > 0) {
+            result = CLIParser.getCLIParser().getParam("-directory").
+                    getStringValue();
+        }
+        if (result.isEmpty()) {
+            String filename = System.getenv("PROGRAMFILES");
+            if (filename == null) {
+                if (isVista()) {
+                    filename = System.getProperty("user.home") +
+                               "\\Desktop\\DMDirc";
+                } else {
+                    filename = "C:\\Program Files";
+                }
+            }
+            result = filename + "\\DMDirc";
+        }
+        return result;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean validFile(final String filename) {
+        return (!filename.equalsIgnoreCase("setup.exe") &&
+                !filename.equalsIgnoreCase("jre.exe") &&
+                !filename.equalsIgnoreCase("wget.exe") &&
+                !filename.equalsIgnoreCase("wgetoutput") &&
+                !filename.equalsIgnoreCase("shortcut.exe"));
+    }
+
+    /**
+     * Are we running vista? -_-
+     *
+     * @return True if this is vista.
+     */
+    public boolean isVista() {
+        return System.getProperty("os.name").indexOf("Vista") >= 0;
+    }
+
+    /**
+     * Are we running NT?
+     *
+     * @return True if this is NT.
+     */
+    public boolean isNT() {
+        final String osName = System.getProperty("os.name");
+        return (osName.indexOf("NT") >= 0 || osName.indexOf("2000") >= 0 ||
+                osName.indexOf("2003") >= 0 || osName.indexOf("XP") >= 0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    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:
+            case UNINSTALLER:
+            case PROTOCOL:
+                // All versions of windows have desktop, menu, uninstaller and protocol
+                return true;
+            default:
+                // Anything else that gets added should be false until the relevent
+                // code is added
+                return false;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMenuName() {
+        return "Start menu";
+    }
+
+    /**
+     * Add a registry key.
+     *
+     * @param key Key to add.
+     */
+    public void addRegistryKey(final String key) {
+        step.addText(" - Adding Key: " + key);
+        final String[] addKey = new String[]{"reg.exe", "add", key, "/f"};
+        execAndWait(addKey);
+    }
 
-	/**
-	 * Are we running NT?
-	 *
-	 * @return True if this is NT.
-	 */
-	public boolean isNT() {
-		final String osName = System.getProperty("os.name");
-		return (osName.indexOf("NT") >= 0  || osName.indexOf("2000") >= 0 || osName.indexOf("2003") >= 0 || osName.indexOf("XP") >= 0);
-	}
+    /**
+     * Modify a registry value.
+     *
+     * @param key Key to use.
+     * @param value Value to modify.
+     * @param data Data for key.
+     */
+    public void editRegistryValue(final String key, final String value,
+                                  final String data) {
+        editRegistryValue(key, value, "REG_SZ", data);
+    }
 
-	/**
-	 * 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:
-				// Only windows 95 doesn't have quick launch
-				return !(System.getProperty("os.name").indexOf("95") >= 0);
-			case DESKTOP:
-			case MENU:
-			case UNINSTALLER:
-			case PROTOCOL:
-				// All versions of windows have desktop, menu, uninstaller and protocol
-				return true;
-			default:
-				// Anything else that gets added should be false until the relevent
-				// code is added
-				return false;
-		}
-	}
-	
-	/**
-	 * Check what name to show for the menu shortcut
-	 *
-	 * @return Name for menu shortcutType
-	 */
-	public String getMenuName() {
-		return "Start menu";
-	}
+    /**
+     * Modify a registry value.
+     *
+     * @param key Key to use.
+     * @param value Value to modify.
+     * @param type Type of data.
+     * @param data Data for key.
+     */
+    public void editRegistryValue(final String key, final String value,
+                                  final String type, final String data) {
+        final ArrayList<String> params = new ArrayList<String>();
+        step.addText(" - Editing value: " + key + "\\" + value);
+        params.add("reg.exe");
+        params.add("add");
+        params.add(key);
+        params.add("/f");
+        if (value.isEmpty()) {
+            params.add("/ve");
+        } else {
+            params.add("/v");
+            params.add(value);
+        }
+        params.add("/t");
+        params.add(type);
+        if (!data.isEmpty()) {
+            params.add("/d");
+            params.add(data);
+        }
 
-	/**
-	 * Add a registry key.
-	 *
-	 * @param key Key to add.
-	 */
-	public void addRegistryKey(final String key) {
-		step.addText(" - Adding Key: "+key);
-		final String[] addKey = new String[] {"reg.exe", "add", key, "/f"};
-		execAndWait(addKey);
-	}
+        execAndWait(params.toArray(new String[params.size()]));
+    }
 
-	/**
-	 * Modify a registry value.
-	 *
-	 * @param key Key to use.
-	 * @param value Value to modify.
-	 * @param data Data for key.
-	 */
-	public void editRegistryValue(final String key, final String value, final String data) {
-		editRegistryValue(key, value, "REG_SZ", data);
-	}
+    /**
+     * Execute and wait for the requested command
+     *
+     * @param cmd Command array to execute/
+     * @return return value from command, or -1 if there was an error.
+     */
+    private int execAndWait(final String cmd[]) {
+        try {
+            final Process myProcess = Runtime.getRuntime().exec(cmd);
+            new StreamReader(myProcess.getInputStream()).start();
+            new StreamReader(myProcess.getErrorStream()).start();
+            try {
+                myProcess.waitFor();
+            } catch (InterruptedException e) {
+            }
+            if (myProcess.exitValue() != 0) {
+                step.addText("\t - Error: Unknown Reason");
+            }
+            return myProcess.exitValue();
+        } catch (SecurityException e) {
+            step.addText("\t - Error: " + e.getMessage());
+        } catch (IOException e) {
+            step.addText("\t - Error: " + e.getMessage());
+        }
 
-	/**
-	 * Modify a registry value.
-	 *
-	 * @param key Key to use.
-	 * @param value Value to modify.
-	 * @param type Type of data.
-	 * @param data Data for key.
-	 */
-	public void editRegistryValue(final String key, final String value, final String type, final String data) {
-		final ArrayList<String> params = new ArrayList<String>();
-		step.addText(" - Editing value: "+key+"\\"+value);
-		params.add("reg.exe");
-		params.add("add");
-		params.add(key);
-		params.add("/f");
-		if (value.isEmpty()) {
-			params.add("/ve");
-		} else {
-			params.add("/v");
-			params.add(value);
-		}
-		params.add("/t");
-		params.add(type);
-		if (!data.isEmpty()) {
-			params.add("/d");
-			params.add(data);
-		}
-		
-		execAndWait(params.toArray(new String[params.size()]));
-	}
-	
-	/**
-	 * Execute and wait for the requested command
-	 *
-	 * @param cmd Command array to execute/
-	 * @return return value from command, or -1 if there was an error.
-	 */
-	private int execAndWait(final String cmd[]) {
-		try {
-			final Process myProcess = Runtime.getRuntime().exec(cmd);
-			new StreamReader(myProcess.getInputStream()).start();
-			new StreamReader(myProcess.getErrorStream()).start();
-			try {
-				myProcess.waitFor();
-			} catch (InterruptedException e) { }
-			if (myProcess.exitValue() != 0) {
-				step.addText("\t - Error: Unknown Reason");
-			}
-			return myProcess.exitValue();
-		} catch (SecurityException e) {
-			step.addText("\t - Error: "+e.getMessage());
-		} catch (IOException e) {
-			step.addText("\t - Error: "+e.getMessage());
-		}
-		
-		return -1;
-	}
+        return -1;
+    }
 
-	/**
-	 * Setup shortcut
-	 *
-	 * @param location Location where app will be installed to.
-	 * @param shortcutType Type of shortcut to add.
-	 */
-	public void setupShortcut(final String location, final ShortcutType shortcutType) {
-		// Shortcut.exe is from http://www.optimumx.com/download/#Shortcut
+    /** {@inheritDoc} */
+    @Override
+    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 (!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 (new File("Shortcut.exe").exists()) {
+            String filename = "";
+            File dir;
 
-			switch (shortcutType) {
-				case DESKTOP:
-					if (isNT() || isVista()) {
-						filename = System.getProperty("user.home")+"\\Desktop";
-					} else {
-						filename = System.getenv("WINDIR")+"\\Desktop";
-					}
-					break;
+            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 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;
+                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;
 
-				case UNINSTALLER:
-					// Registry hax!
-					final String key = "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DMDirc";
-					addRegistryKey(key);
-					editRegistryValue(key, "Comments", "DMDirc IRC Client");
-					editRegistryValue(key, "DisplayName", "DMDirc IRC Client");
-					editRegistryValue(key, "DisplayIcon", location+"\\icon.ico");
-					editRegistryValue(key, "UninstallString", location+"\\Uninstaller.exe");
-					editRegistryValue(key, "Publisher", "DMDirc.com");
-					editRegistryValue(key, "URLInfoAbout", "http://www.DMDirc.com/");
-					editRegistryValue(key, "URLUpdateInfo", "http://www.DMDirc.com/");
-					editRegistryValue(key, "InstallDir", location);
-					editRegistryValue(key, "InstalledTime", String.valueOf(System.currentTimeMillis()));
-					return;
+                case UNINSTALLER:
+                    // Registry hax!
+                    final String key =
+                                 "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DMDirc";
+                    addRegistryKey(key);
+                    editRegistryValue(key, "Comments", "DMDirc IRC Client");
+                    editRegistryValue(key, "DisplayName", "DMDirc IRC Client");
+                    editRegistryValue(key, "DisplayIcon", location +
+                                                          "\\icon.ico");
+                    editRegistryValue(key, "UninstallString",
+                                      location + "\\Uninstaller.exe");
+                    editRegistryValue(key, "Publisher", "DMDirc.com");
+                    editRegistryValue(key, "URLInfoAbout",
+                                      "http://www.DMDirc.com/");
+                    editRegistryValue(key, "URLUpdateInfo",
+                                      "http://www.DMDirc.com/");
+                    editRegistryValue(key, "InstallDir", location);
+                    editRegistryValue(key, "InstalledTime", String.valueOf(
+                            System.currentTimeMillis()));
+                    return;
 
-				case PROTOCOL:
-					// Add needed keys.
-					addRegistryKey("HKCR\\irc");
-					addRegistryKey("HKCR\\irc\\DefaultIcon");
-					addRegistryKey("HKCR\\irc\\Shell");
-					addRegistryKey("HKCR\\irc\\Shell\\open");
-					addRegistryKey("HKCR\\irc\\Shell\\open\\command");
-					// Now the values
-					editRegistryValue("HKCR\\irc", "", "URL:IRC Protocol");
-					editRegistryValue("HKCR\\irc", "URL Protocol", "");
-					editRegistryValue("HKCR\\irc", "EditFlags", "REG_BINARY", "02000000");
-					editRegistryValue("HKCR\\irc\\DefaultIcon", "", location+"\\icon.ico");
-					editRegistryValue("HKCR\\irc\\Shell\\open\\command", "", "\\\""+location+"\\DMDirc.exe\\\" -e -c %1");
-					return;
+                case PROTOCOL:
+                    // Add needed keys.
+                    addRegistryKey("HKCR\\irc");
+                    addRegistryKey("HKCR\\irc\\DefaultIcon");
+                    addRegistryKey("HKCR\\irc\\Shell");
+                    addRegistryKey("HKCR\\irc\\Shell\\open");
+                    addRegistryKey("HKCR\\irc\\Shell\\open\\command");
+                    // Now the values
+                    editRegistryValue("HKCR\\irc", "", "URL:IRC Protocol");
+                    editRegistryValue("HKCR\\irc", "URL Protocol", "");
+                    editRegistryValue("HKCR\\irc", "EditFlags", "REG_BINARY",
+                                      "02000000");
+                    editRegistryValue("HKCR\\irc\\DefaultIcon", "", location +
+                                                                    "\\icon.ico");
+                    editRegistryValue("HKCR\\irc\\Shell\\open\\command", "",
+                                      "\\\"" + location +
+                                      "\\DMDirc.exe\\\" -e -c %1");
+                    return;
 
-				default:
-					step.addText(" - Error creating shortcut. Not applicable to this Operating System");
-					return;
-			}
+                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");
-				return;
-			}
+            if (filename.length() == 0) {
+                step.addText(
+                        " - Error creating shortcut. Not applicable to this System");
+                return;
+            }
 
-			// Check the dir exists
-			dir = new File(filename);
-			if (!dir.exists()) { dir.mkdir(); }
+            // Check the dir exists
+            dir = new File(filename);
+            if (!dir.exists()) {
+                dir.mkdir();
+            }
 
-			// Delete an older shortcut
-			final File oldFile = new File(filename+"\\DMDirc.lnk");
-			if (oldFile.exists()) { oldFile.delete(); }
+            // Delete an older shortcut
+            final File oldFile = new File(filename + "\\DMDirc.lnk");
+            if (oldFile.exists()) {
+                oldFile.delete();
+            }
 
 //			final String thisDirName = new File("").getAbsolutePath();
-			final String[] command = new String[] {
-//			                      thisDirName+"/Shortcut.exe",
-			                      "Shortcut.exe",
-			                      "/F:"+filename+"\\DMDirc.lnk",
-			                      "/A:C",
-//			                      "/T:"+location+"\\DMDirc.bat",
-//			                      "/T:javaw.exe",
-//			                      "/P:-jar DMDirc.jar",
-			                      "/T:"+location+"\\DMDirc.exe",
-			                      "/W:"+location,
-			                      "/I:"+location+"\\icon.ico",
-			                      "/D:DMDirc IRC Client"
-			                      };
-				execAndWait(command);
-		} else {
-			step.addText(" - Error creating shortcut: Unable to find Shortcut.exe");
-		}
-	}
+            final String[] command = new String[]{
+                //			                      thisDirName+"/Shortcut.exe",
+                "Shortcut.exe",
+                "/F:" + filename + "\\DMDirc.lnk",
+                "/A:C",
+                //			                      "/T:"+location+"\\DMDirc.bat",
+                //			                      "/T:javaw.exe",
+                //			                      "/P:-jar DMDirc.jar",
+                "/T:" + location + "\\DMDirc.exe",
+                "/W:" + location,
+                "/I:" + location + "\\icon.ico",
+                "/D:DMDirc IRC Client"
+            };
+            execAndWait(command);
+        } else {
+            step.addText(
+                    " - Error creating shortcut: Unable to find Shortcut.exe");
+        }
+    }
 }

src/com/dmdirc/installer/WizardListener.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer;
+
+/**
+ * Wizard interface, notifications on change of step and closing.
+ */
+public interface WizardListener {
+    
+    /** 
+     * Called when the wizard finishes. 
+     */
+    void wizardFinished();
+    
+    /**
+     * Called when the wizard is cancelled.
+     */
+    void wizardCancelled();
+}

src/com/dmdirc/installer/ui/EtchedLineBorder.java

@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import java.awt.Component;
+import java.awt.Graphics;
+
+import javax.swing.border.EtchedBorder;
+
+/**
+ * An etched line border.
+ */
+public class EtchedLineBorder extends EtchedBorder {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+    /** Border side. */
+    private final BorderSide side;
+
+    /** Border side. */
+    public enum BorderSide {
+
+        /** Creates a border at the top. */
+        TOP,
+        /** Creates a border at the bottom. */
+        BOTTOM,
+    };
+
+    /**
+     * Creates a new etched line border.
+     * 
+     * @param type Etch type
+     * @param side Border side
+     */
+    public EtchedLineBorder(final int type, final BorderSide side) {
+        super(type);
+
+        this.side = side;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void paintBorder(final Component c, final Graphics g, final int x,
+                            final int y, final int width, final int height) {
+        g.translate(x, y);
+
+        g.setColor(
+                etchType == LOWERED ? getShadowColor(c) : getHighlightColor(c));
+        switch (side) {
+            case TOP:
+                g.drawLine(0, 0, width - 2, 0);
+                break;
+            case BOTTOM:
+                g.drawLine(0, height - 1, width - 2, height - 1);
+                break;
+            default:
+                break;
+        }
+
+        g.setColor(
+                etchType == LOWERED ? getHighlightColor(c) : getShadowColor(c));
+        switch (side) {
+            case TOP:
+                g.drawLine(0, 1, width - 2, 1);
+                break;
+            case BOTTOM:
+                g.drawLine(0, height, width - 2, height);
+                break;
+            default:
+                break;
+        }
+
+        g.translate(-x, -y);
+    }
+}

src/com/dmdirc/installer/ui/InstallerDialog.java

@@ -0,0 +1,339 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import com.dmdirc.installer.Step;
+import com.dmdirc.installer.StepListener;
+import com.dmdirc.installer.WizardListener;
+import com.dmdirc.util.ListenerList;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+/**
+ *
+ */
+public class InstallerDialog extends JFrame implements ActionListener {
+
+    private static final long serialVersionUID = -2001827768443747849L;
+    private final TitlePanel title;
+    private final WizardPanel wizard;
+    private final WizardControlPanel control;
+    private final ListenerList listeners;
+
+    /**
+     *
+     * @param dialogTitle
+     */
+    public InstallerDialog(final String dialogTitle) {
+        title = new TitlePanel(dialogTitle);
+        wizard = new WizardPanel(this);
+        control = new WizardControlPanel();
+        listeners = new ListenerList();
+
+        setLayout(new BorderLayout());
+
+        add(title, BorderLayout.NORTH);
+        add(wizard, BorderLayout.CENTER);
+        add(control, BorderLayout.SOUTH);
+
+        //setIconImage(IconManager.getIconManager().getImage("icon"));
+        setPreferredSize(new Dimension(400, 350));
+        setMaximumSize(new Dimension(400, 350));
+
+        control.getPrevButton().addActionListener(this);
+        control.getNextButton().addActionListener(this);
+    }
+
+    /**
+     *
+     * 
+     * @param step
+     */
+    public void addStep(final SwingStep step) {
+        wizard.addStep(step);
+    }
+
+    /**
+     *
+     */
+    public void display() {
+        wizard.display();
+        control.setTotal(wizard.getTotalSteps());
+        control.setProgress(wizard.getCurrentStepIndex());
+        addWindowListener(new WindowAdapter() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void windowClosing(final WindowEvent e) {
+                fireWizardCancelled();
+            }
+        });
+
+        pack();
+        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+        setVisible(true);
+        fireStepAboutToBeDisplayed(wizard.getStep(wizard.getCurrentStepIndex()));
+    }
+
+    /**
+     *
+     * @param steps 
+     */
+    public void display(final List<Step> steps) {
+        final List<SwingStep> swingSteps = new ArrayList<SwingStep>();
+        for (Step step : steps) {
+            if (step instanceof SwingStep) {
+                swingSteps.add((SwingStep) step);
+            }
+        }
+        display();
+    }
+
+    /**
+     *
+     *
+     * @param enable
+     */
+    public void enableNextStep(final boolean enable) {
+        control.getNextButton().setEnabled(enable);
+    }
+
+    /**
+     *
+     *
+     * @param enable
+     */
+    public void enablePreviousStep(final boolean enable) {
+        control.getPrevButton().setEnabled(enable);
+    }
+
+    /**
+     *
+     * 
+     * @return
+     */
+    public boolean showCancelConfirmation() {
+        return JOptionPane.showConfirmDialog(this,
+                                             "Are you sure you want to cancel?",
+                                             "Cancel confirmation",
+                                             JOptionPane.YES_NO_OPTION,
+                                             JOptionPane.WARNING_MESSAGE) ==
+               JOptionPane.YES_OPTION;
+    }
+
+    /**
+     *
+     *
+     * @param step
+     * @return
+     */
+    public Step getStep(final int step) {
+        return wizard.getStep(step);
+    }
+
+    /**
+     *
+     * @param name
+     * @return
+     */
+    public Step getStep(final String name) {
+        return wizard.getStep(name);
+    }
+
+    /**
+     *
+     *
+     * @return
+     */
+    public Step getCurrentStep() {
+        return wizard.getCurrentStep();
+    }
+
+    /**
+     *
+     *
+     * @return
+     */
+    public int getCurrentStepIndex() {
+        return wizard.getCurrentStepIndex();
+    }
+
+    /**
+     *
+     *
+     * @return
+     */
+    public String getCurrentStepName() {
+        return wizard.getCurrentStepName();
+    }
+
+    /**
+     *
+     *
+     * @param step
+     */
+    void fireStepAboutToBeDisplayed(final Step step) {
+        for (StepListener listener : listeners.get(StepListener.class)) {
+            listener.stepAboutToDisplay(step);
+        }
+    }
+
+    /**
+     *
+     * 
+     * @param step
+     */
+    void fireStepHidden(final Step step) {
+        for (StepListener listener : listeners.get(StepListener.class)) {
+            listener.stepHidden(step);
+        }
+    }
+
+    /**
+     *
+     * 
+     * @param listener
+     */
+    public void addStepListener(final StepListener listener) {
+        listeners.add(StepListener.class, listener);
+    }
+
+    /**
+     *
+     *
+     * @param listener
+     */
+    public void removeStepListener(final StepListener listener) {
+        listeners.remove(StepListener.class, listener);
+
+    }
+
+    /**
+     *
+     */
+    void fireWizardCancelled() {
+        for (WizardListener listener : listeners.get(WizardListener.class)) {
+            listener.wizardCancelled();
+        }
+    }
+
+    /**
+     * 
+     */
+    void fireWizardFinished() {
+        for (WizardListener listener : listeners.get(WizardListener.class)) {
+            listener.wizardFinished();
+        }
+    }
+
+    /**
+     *
+     *
+     * @param listener
+     */
+    public void addWizardListener(final WizardListener listener) {
+        listeners.add(WizardListener.class, listener);
+    }
+
+    /**
+     *
+     * 
+     * @param listener
+     */
+    public void removeWizardListener(final WizardListener listener) {
+        listeners.remove(WizardListener.class, listener);
+    }
+
+    /**
+     * Initialises any settings required by this UI (this is always called
+     * before any aspect of the UI is instansiated).
+     *
+     * @throws UnsupportedOperationException If unable to switch to the system
+     * look and feel
+     */
+    public static void initUISettings() {
+
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch (InstantiationException ex) {
+            throw new UnsupportedOperationException("Unable to switch to the " +
+                                                    "system look and feel", ex);
+        } catch (ClassNotFoundException ex) {
+            throw new UnsupportedOperationException("Unable to switch to the " +
+                                                    "system look and feel", ex);
+        } catch (UnsupportedLookAndFeelException ex) {
+            throw new UnsupportedOperationException("Unable to switch to the " +
+                                                    "system look and feel", ex);
+        } catch (IllegalAccessException ex) {
+            throw new UnsupportedOperationException("Unable to switch to the " +
+                                                    "system look and feel", ex);
+        }
+
+        UIManager.put("swing.useSystemFontSettings", true);
+        UIManager.put("swing.boldMetal", false);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        final int currentStep = wizard.getCurrentStepIndex();
+        Step hiddenStep = null;
+        Step shownStep = null;
+        if (e.getSource() == control.getPrevButton()) {
+            wizard.previousStep();
+            hiddenStep = wizard.getStep(currentStep);
+            shownStep = wizard.getStep(currentStep - 1);
+        } else if (e.getSource() == control.getNextButton()) {
+            if ("Finish".equals(control.getNextButton().getText())) {
+                fireWizardFinished();
+                shownStep = wizard.getStep(currentStep);
+                dispose();
+            } else {
+                wizard.nextStep();
+                hiddenStep = wizard.getStep(currentStep);
+                shownStep = wizard.getStep(currentStep + 1);
+            }
+        } else {
+            return;
+        }
+        if (shownStep != null) {
+            fireStepAboutToBeDisplayed(shownStep);
+        }
+        if (hiddenStep != null) {
+            fireStepHidden(hiddenStep);
+        }
+        control.setProgress(wizard.getCurrentStepIndex());
+    }
+}

src/com/dmdirc/installer/ui/StepConfirm.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import com.dmdirc.installer.TextStep;
+
+import java.awt.BorderLayout;
+import javax.swing.SwingUtilities;
+
+/**
+ * This confirms the settings chosen in the previous step
+ */
+public final class StepConfirm extends SwingStep implements TextStep {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 2;
+    /** Text area showing the install information */
+    private final TextLabel infoLabel = new TextLabel("");
+
+    /**
+     * Creates a new instance of StepConfirm.
+     */
+    public StepConfirm() {
+        super();
+        setLayout(new BorderLayout());
+        add(infoLabel, BorderLayout.CENTER);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepName() {
+        return "Confirm";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addText(final String text) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                infoLabel.setText(infoLabel.getText() + text);
+            }
+        });
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setText(final String text) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                infoLabel.setText(text);
+            }
+        });
+    }
+}

src/com/dmdirc/installer/ui/StepError.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import java.awt.BorderLayout;
+
+/**
+ * This step shows an unable to install error
+ */
+public final class StepError extends SwingStep {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 2;
+
+    /**
+     * Creates a new instance of StepError with a default error message.
+     */
+    public StepError() {
+        this("Sorry, it is not possible to install DMDirc on this system at this time.\n\n");
+    }
+
+    /**
+     * Creates a new instance of StepError with a given error message.
+     *
+     * @param message Error message to show.
+     */
+    public StepError(final String message) {
+        super();
+        setLayout(new BorderLayout());
+        add(new TextLabel(message), BorderLayout.CENTER);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepName() {
+        return "Error";
+    }
+}

src/com/dmdirc/installer/ui/StepInstall.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import com.dmdirc.installer.TextStep;
+
+import java.awt.BorderLayout;
+
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+
+/**
+ * This confirms the settings chosen in the previous step
+ */
+public final class StepInstall extends SwingStep implements TextStep {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 2;
+    /** Text area showing the install information */
+    private final TextLabel infoLabel = new TextLabel("Beginning Install");
+    /** Scroll pane holding text area */
+    final JScrollPane scrollPane;
+
+    /**
+     * Creates a new instance of StepInstall.
+     */
+    public StepInstall() {
+        super();
+        setLayout(new BorderLayout());
+        scrollPane = new JScrollPane(infoLabel,
+                                     JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+                                     JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        add(scrollPane, BorderLayout.CENTER);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepName() {
+        return "Install";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public synchronized void addText(final String text) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                infoLabel.setText(infoLabel.getText() + text + "\n");
+            }
+        });
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public synchronized void setText(final String text) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                infoLabel.setText(text);
+            }
+        });
+    }
+}

src/com/dmdirc/installer/ui/StepLayout.java

@@ -0,0 +1,426 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import com.dmdirc.installer.Step;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Insets;
+import java.awt.LayoutManager2;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Adjusted Card layout.
+ */
+public class StepLayout implements LayoutManager2, Serializable {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 2;
+    /** Parent container. */
+    private Container parent;
+    /** Cards vector. */
+    private final List<SwingStep> steps;
+    /** Current step. */
+    private int currentStep;
+    /** Vertical gap. */
+    private int vGap;
+    /** Horiontal gap. */
+    private int hGap;
+
+    /**
+     * Instantiates a new step layout.
+     */
+    public StepLayout() {
+        this(0, 0);
+    }
+
+    /**
+     * Instantiates a new step layout.
+     * 
+     * @param parent Parent component
+     */
+    public StepLayout(final Container parent) {
+        this(0, 0, parent);
+    }
+
+    /**
+     * Instantiates a new step layout with the specified gaps.
+     * 
+     * @param hGap Horizontal gap
+     * @param vGap Vertical gap
+     */
+    public StepLayout(final int hGap, final int vGap) {
+        this(hGap, vGap, null);
+    }
+
+    /**
+     * Instantiates a new step layout with the specified gaps.
+     * 
+     * @param hGap Horizontal gap
+     * @param vGap Vertical gap
+     * @param parent Parent component
+     */
+    public StepLayout(final int hGap, final int vGap, final Container parent) {
+        steps = new ArrayList<SwingStep>();
+        currentStep = -1;
+        this.hGap = hGap;
+        this.vGap = vGap;
+        this.parent = parent;
+    }
+
+    /**
+     * Returns the number of steps in the layout.
+     * 
+     * @return number of steps >= 0
+     */
+    public int size() {
+        return steps.size();
+    }
+
+    /**
+     * Checks if the layout is empty
+     * 
+     * @return true iif the layout has no steps
+     */
+    public boolean isEmpty() {
+        return steps.isEmpty();
+    }
+
+    /**
+     * Returns the specified step from the layout.
+     * 
+     * @param index Step to retrieve
+     * 
+     * @return Step
+     */
+    public Step getStep(final int index) {
+        return steps.get(index);
+    }
+
+    /**
+     * Returns the step list.
+     * 
+     * @return List of steps
+     */
+    public List<SwingStep> getSteps() {
+        return steps;
+    }
+
+    /**
+     * Returns the current step index.
+     *
+     * @return Current step index
+     */
+    public int getCurrentStepIndex() {
+        return currentStep;
+    }
+
+    /**
+     * Returns the current step name.
+     *
+     * @return Current step name
+     */
+    public String getCurrentStepName() {
+        return steps.get(currentStep).getStepName();
+    }
+
+    /**
+     * Returns the current step name.
+     *
+     * @return Current step name
+     */
+    public Step getCurrentStep() {
+        return steps.get(currentStep);
+    }
+
+    /**
+     * Show the first step.
+     * 
+     * @param parent Parent container
+     */
+    public void first(final Container parent) {
+        show(0, parent);
+    }
+
+    /**
+     * Show the last step.
+     * 
+     * @param parent Parent container
+     */
+    public void last(final Container parent) {
+        show(parent.getComponentCount() - 1, parent);
+    }
+
+    /**
+     * Show the next step.
+     * 
+     * @param parent Parent container
+     */
+    public void next(final Container parent) {
+        show(currentStep + 1, parent);
+    }
+
+    /** 
+     * Show the previous step.
+     * 
+     * @param parent Parent container
+     */
+    public void previous(final Container parent) {
+        show(currentStep - 1, parent);
+    }
+
+    /**
+     * Show the specified step.
+     * 
+     * @param step Step to show
+     * @param parent Parent container
+     */
+    public void show(final Step step, final Container parent) {
+        show(steps.indexOf(step), parent);
+    }
+
+    /**
+     * Show the step at the specified index.
+     * 
+     * @param step Step to show
+     * @param parent Parent container
+     */
+    public void show(final int step, final Container parent) {
+        int stepNumber = step;
+        if (stepNumber == -1) {
+            if (stepNumber >= steps.size()) {
+                stepNumber = steps.size() - 1;
+            } else {
+                stepNumber = 0;
+            }
+        }
+        synchronized (parent.getTreeLock()) {
+            int componentCount = parent.getComponentCount();
+            for (int i = 0; i < componentCount; i++) {
+                Component comp = parent.getComponent(i);
+                if (comp.isVisible()) {
+                    comp.setVisible(false);
+                    break;
+                }
+            }
+            if (componentCount > 0) {
+                currentStep = stepNumber;
+                parent.getComponent(currentStep).setVisible(true);
+                parent.validate();
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addLayoutComponent(final Component comp,
+                                   final Object constraints) {
+        if (!(comp instanceof Step)) {
+            throw new IllegalArgumentException(
+                    "Component must be an instance of Step");
+        }
+        addLayoutComponent((SwingStep) comp);
+    }
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @deprecated Use addLayoutComponent(Component, Object) or 
+     * addLayoutComponent(Component)
+     * 
+     * @see addLayoutComponent(Component)
+     * @see addLayoutComponent(Component, Object)
+     */
+    @Override
+    @Deprecated
+    public void addLayoutComponent(final String name, final Component comp) {
+        if (!(comp instanceof Step)) {
+            throw new IllegalArgumentException(
+                    "Component must be an instance of Step");
+        }
+        addLayoutComponent((SwingStep) comp);
+    }
+
+    /**
+     * Adds a component to the layout.
+     * 
+     * @param step Component to add
+     */
+    public void addLayoutComponent(final SwingStep step) {
+        synchronized (step.getTreeLock()) {
+            if (!steps.isEmpty()) {
+                step.setVisible(false);
+            }
+            steps.add(step);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void removeLayoutComponent(final Component comp) {
+        synchronized (comp.getTreeLock()) {
+            if (comp.isVisible()) {
+                comp.setVisible(false);
+            }
+            next(comp.getParent());
+            steps.remove(comp);
+        }
+    }
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @return Returns the preferred size of the container
+     */
+    @Override
+    public Dimension preferredLayoutSize(final Container parent) {
+        synchronized (parent.getTreeLock()) {
+            Insets insets = parent.getInsets();
+            int componentCount = parent.getComponentCount();
+            int width = 0;
+            int height = 0;
+
+            for (int i = 0; i < componentCount; i++) {
+                Component comp = parent.getComponent(i);
+                Dimension preferredDimension = comp.getPreferredSize();
+                if (preferredDimension.width > width) {
+                    width = preferredDimension.width;
+                }
+                if (preferredDimension.height > height) {
+                    height = preferredDimension.height;
+                }
+            }
+            return new Dimension(insets.left + insets.right + width + hGap * 2,
+                                 insets.top + insets.bottom + height + vGap * 2);
+        }
+    }
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @return Returns the minimum size of the container
+     */
+    @Override
+    public Dimension minimumLayoutSize(final Container parent) {
+        synchronized (parent.getTreeLock()) {
+            Insets insets = parent.getInsets();
+            int componentCount = parent.getComponentCount();
+            int width = 0;
+            int height = 0;
+
+            for (int i = 0; i < componentCount; i++) {
+                Component comp = parent.getComponent(i);
+                Dimension minimumDimension = comp.getMinimumSize();
+                if (minimumDimension.width > width) {
+                    width = minimumDimension.width;
+                }
+                if (minimumDimension.height > height) {
+                    height = minimumDimension.height;
+                }
+            }
+            return new Dimension(insets.left + insets.right + width + hGap * 2,
+                                 insets.top + insets.bottom + height + vGap * 2);
+        }
+    }
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param parent Container to get the size for
+     * 
+     * @return Returns the maximum size of the container
+     */
+    @Override
+    public Dimension maximumLayoutSize(final Container parent) {
+        return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
+    }
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param target Container to get the alignment from
+     * 
+     * @return Alignment
+     */
+    @Override
+    public float getLayoutAlignmentX(final Container target) {
+        return 0.5f;
+    }
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param target Container to get the alignment from
+     * 
+     * @return Alignment
+     */
+    @Override
+    public float getLayoutAlignmentY(final Container target) {
+        return 0.5f;
+    }
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param target  Container to invalidate
+     */
+    @Override
+    public void invalidateLayout(final Container target) {
+        //Ignore
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void layoutContainer(final Container parent) {
+        synchronized (parent.getTreeLock()) {
+            Insets insets = parent.getInsets();
+            int componentCount = parent.getComponentCount();
+            Component comp = null;
+            boolean currentFound = false;
+
+            for (int i = 0; i < componentCount; i++) {
+                comp = parent.getComponent(i);
+                comp.setBounds(hGap + insets.left, vGap + insets.top,
+                               parent.getWidth() - (hGap * 2 + insets.left +
+                                                    insets.right), parent.
+                        getHeight() - (vGap * 2 +
+                                       insets.top + insets.bottom));
+                if (comp.isVisible()) {
+                    currentFound = true;
+                }
+            }
+
+            if (!currentFound && componentCount > 0) {
+                parent.getComponent(0).setVisible(true);
+            }
+        }
+    }
+}

src/com/dmdirc/installer/ui/StepSettings.java

@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import com.dmdirc.installer.Main;
+import com.dmdirc.installer.Settings;
+import com.dmdirc.installer.DefaultSettings;
+import com.dmdirc.installer.Installer.ShortcutType;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JCheckBox;
+import javax.swing.JTextField;
+
+/**
+ * Queries the user for where to install dmdirc, and if they want to setup shortcuts
+ */
+public final class StepSettings extends SwingStep implements Settings {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 3;
+    /** Menu Shorcuts checkbox. */
+    private final JCheckBox shortcutMenu = new JCheckBox("Create " + Main.
+            getInstaller().getMenuName() + " shortcut");
+    /** Desktop Shorcuts checkbox. */
+    private final JCheckBox shortcutDesktop = new JCheckBox(
+            "Create desktop shortcut");
+    /** Quick-Launch Shorcuts checkbox. */
+    private final JCheckBox shortcutQuick = new JCheckBox(
+            "Create Quick Launch shortcut");
+    /** Register IRC:// protocol. */
+    private final JCheckBox shortcutProtocol = new JCheckBox(
+            "Make DMDirc handle irc:// links");
+    /** Install Location input. */
+    private final JTextField location = new JTextField(Main.getInstaller().
+            defaultInstallLocation(), 20);
+
+    /**
+     * Creates a new instance of StepSettings.
+     */
+    public StepSettings() {
+        super();
+
+        setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
+
+        DefaultSettings defaultSettings = new DefaultSettings();
+        shortcutMenu.setSelected(defaultSettings.getShortcutMenuState());
+        shortcutDesktop.setSelected(defaultSettings.getShortcutDesktopState());
+        shortcutQuick.setSelected(defaultSettings.getShortcutQuickState());
+        shortcutProtocol.setSelected(defaultSettings.getShortcutProtocolState());
+
+        add(new TextLabel("Here you can choose options for the install." +
+                          "\n\nInstall Location: \n"));
+        add(location);
+
+        if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
+            add(shortcutMenu);
+        }
+        if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
+            add(shortcutDesktop);
+        }
+        if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
+            add(shortcutQuick);
+        }
+        if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL)) {
+            add(shortcutProtocol);
+        }
+        add(Box.createVerticalGlue());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepName() {
+        return "Settings";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean getShortcutMenuState() {
+        return shortcutMenu.isSelected();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean getShortcutDesktopState() {
+        return shortcutDesktop.isSelected();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean getShortcutQuickState() {
+        return shortcutQuick.isSelected();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean getShortcutProtocolState() {
+        return shortcutProtocol.isSelected();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getInstallLocation() {
+        return location.getText().trim();
+    }
+}

src/com/dmdirc/installer/ui/StepWelcome.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import java.awt.BorderLayout;
+
+/**
+ * Tells the user what this application does
+ */
+public final class StepWelcome extends SwingStep {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 2;
+
+    /**
+     * Creates a new instance of StepWelcome.
+     *
+     * @param releaseName 
+     */
+    public StepWelcome(final String releaseName) {
+        super();
+
+        setLayout(new BorderLayout());
+
+        add(new TextLabel(
+                "Welcome to the " + releaseName + " installer. This program " +
+                "will install DMDirc on this computer.\n\nDMDirc is a " +
+                "cross-platform IRC client developed by Chris Smith, Shane " +
+                "Mc Cormack and Gregory Holmes. DMDirc is released for free " +
+                "under the MIT license; for more information, please visit " +
+                "www.DMDirc.com.\n\nClick \"Next\" to continue, or close " +
+                "this program to cancel the installation."), BorderLayout.CENTER);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepName() {
+        return "Welcome";
+    }
+}

src/com/dmdirc/installer/ui/SwingStep.java

@@ -0,0 +1,34 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import com.dmdirc.installer.Step;
+
+import javax.swing.JPanel;
+
+/**
+ * Extention of basic Step to make it a JPanel.
+ */
+public abstract class SwingStep extends JPanel implements Step {
+}

src/com/dmdirc/installer/ui/TextLabel.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import java.awt.Insets;
+
+import javax.swing.JTextPane;
+import javax.swing.text.DefaultStyledDocument;
+
+/**
+ * Dyamnic text label.
+ */
+public class TextLabel extends JTextPane {
+
+    /**
+     * A version number for this class. It should be changed whenever the
+     * class structure is changed (or anything else that would prevent
+     * serialized objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+
+    /**
+     * Creates a new instance of TextLabel.
+     */
+    public TextLabel() {
+        this(null, true);
+    }
+
+    /**
+     * Creates a new instance of TextLabel.
+     *
+     * @param text Text to display
+     */
+    public TextLabel(final String text) {
+        this(text, true);
+    }
+
+    /**
+     * Creates a new instance of TextLabel.
+     *
+     * @param text Text to display
+     * @param justified Justify the text?
+     */
+    public TextLabel(final String text, final boolean justified) {
+        super(new DefaultStyledDocument());
+
+        setOpaque(false);
+        setEditable(false);
+        setHighlighter(null);
+        setMargin(new Insets(0, 0, 0, 0));
+
+        setText(text);
+    }
+}

src/com/dmdirc/installer/ui/TitlePanel.java

@@ -0,0 +1,69 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import com.dmdirc.installer.ui.EtchedLineBorder.BorderSide;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.border.EtchedBorder;
+
+/**
+ * Simple title panel for a wizard.
+ */
+public class TitlePanel extends JPanel {
+
+    private static final long serialVersionUID = 7173184984913948951L;
+    private final JLabel title;
+
+    /**
+     * Instantiates a new title panel.
+     * 
+     * @param titleText Initial title text
+     */
+    public TitlePanel(final String titleText) {
+        super(new BorderLayout());
+        title = new JLabel(titleText);
+
+        title.setFont(title.getFont().deriveFont((float) (title.getFont().
+                getSize() * 1.5)));
+        add(title, BorderLayout.CENTER);
+        setBackground(Color.WHITE);
+        setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, Color.BLACK));
+        setBorder(new EtchedLineBorder(EtchedBorder.LOWERED, BorderSide.BOTTOM));
+    }
+
+    /**
+     * Sets the title text.
+     *
+     * @param titleText new title text
+     */
+    public void setText(final String titleText) {
+        title.setText(titleText);
+    }
+}

src/com/dmdirc/installer/ui/WizardControlPanel.java

@@ -0,0 +1,129 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/**
+ * Simple Panel representing the control buttons for a wizard.
+ */
+public class WizardControlPanel extends JPanel {
+
+    private static final long serialVersionUID = 7903362315297158222L;
+    private final JButton prev;
+    private final JButton next;
+    private final JLabel progress;
+    private int total;
+    private int step;
+
+    /**
+     * Instantiates a new wizard control panel.
+     */
+    public WizardControlPanel() {
+        this(0);
+    }
+
+    /**
+     * Instantiates a new wizard control panel using the specified number of
+     * steps.
+     * 
+     * @param total Total number of steps
+     */
+    public WizardControlPanel(final int total) {
+        this.total = total;
+        this.step = 0;
+        
+        prev = new JButton("\u00AB Previous");
+        next = new JButton("Next \u00BB");
+        progress = new JLabel();
+        updateProgressLabel();
+
+        add(progress);
+        add(Box.createHorizontalGlue());
+        add(prev);
+        add(next);
+    }
+
+    /**
+     * Returns the previous button.
+     *
+     * @return Previous button
+     */
+    public JButton getPrevButton() {
+        return prev;
+    }
+
+    /**
+     * Returns the next button.
+     * 
+     * @return Next button
+     */
+    public JButton getNextButton() {
+        return next;
+    }
+
+    /**
+     * Returns the progress label.
+     * 
+     * @return Progress Label
+     */
+    public JLabel getProgressLabel() {
+        return progress;
+    }
+
+    /**
+     * Updates the progress label.
+     */
+    public void updateProgressLabel() {
+        progress.setText("Step " + step + " of " + total);
+    }
+
+    /**
+     * Sets the new total number of steps.
+     * 
+     * @param total New total number of steps
+     */
+    public void setTotal(final int total) {
+        this.total = total;
+        updateProgressLabel();
+    }
+
+    /**
+     * Sets the current progress step.
+     * 
+     * @param step Progress step
+     */
+    public void setProgress(final int step) {
+        this.step = step + 1;
+        updateProgressLabel();
+        if (step + 1 == total) {
+            next.setText("Finish");
+        } else {
+            next.setText("Next \u00BB");
+        }
+    }
+}

src/com/dmdirc/installer/ui/WizardPanel.java

@@ -0,0 +1,181 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.installer.ui;
+
+import com.dmdirc.installer.Step;
+
+import java.util.List;
+import javax.swing.JPanel;
+
+/**
+ * Wizard panel, displays and controls the flow of steps.
+ */
+public class WizardPanel extends JPanel {
+
+    private static final long serialVersionUID = 7903362315297158222L;
+    private final StepLayout layout;
+    private final InstallerDialog dialog;
+
+    /**
+     * Instantiates a new wizard panel.
+     *
+     * @param dialog Parent installer dialog
+     */
+    public WizardPanel(final InstallerDialog dialog) {
+        super();
+
+        this.dialog = dialog;
+        layout = new StepLayout();
+        setLayout(layout);
+    }
+
+    /**
+     * Displays this panel with the specified steps.
+     * 
+     * @param steps Steps to display
+     */
+    public void display(final List<SwingStep> steps) {
+       for (SwingStep step : steps) {
+           addStep(step);
+       }
+       display();
+    }
+
+    /**
+     * Displays this panel with the existing steps.
+     */
+    public void display() {
+        showFirst();
+    }
+
+    /**
+     * Returns the step specified.
+     *
+     * @param step Step index
+     * 
+     * @return Step
+     */
+    public Step getStep(final int step) {
+        return layout.getStep(step);
+    }
+
+    /**
+     * Returns the step specified.
+     *
+     * @param stepName Step name
+     *
+     * @return Step
+     */
+    public Step getStep(final String stepName) {
+        Step step = null;
+        for (SwingStep loopStep : layout.getSteps()) {
+            if (stepName.equals(loopStep.getStepName())) {
+                return loopStep;
+            }
+        }
+        return step;
+    }
+
+    /**
+     * Returns the current Step.
+     *
+     * @return Current step index
+     */
+    public int getCurrentStepIndex() {
+        return layout.getCurrentStepIndex();
+    }
+
+    /**
+     * Returns the current Step.
+     *
+     * @return Current step index
+     */
+    public String getCurrentStepName() {
+        return layout.getCurrentStepName();
+    }
+
+    /**
+     * Returns the current Step.
+     *
+     * @return Current step index
+     */
+    public Step getCurrentStep() {
+        return layout.getCurrentStep();
+    }
+
+    /**
+     * Returns the total number of steps.
+     *
+     * @return Total number of steps
+     */
+    public int getTotalSteps() {
+        return layout.getSteps().size();
+    }
+
+    /**
+     * Adds a step to this panel.
+     *
+     * @param step Step to add
+     */
+    public void addStep(final SwingStep step) {
+        add(step, step.getStepName());
+    }
+
+    /**
+     * Shows the first step.
+     */
+    public void showFirst() {
+        layout.first(this);
+    }
+
+    /**
+     * Shows the last step.
+     */
+    public void showLast() {
+        layout.last(this);
+    }
+
+    /**
+     * Shows the next step.
+     */
+    public void nextStep() {
+        layout.next(this);
+    }
+
+    /**
+     * Shows the previous step.
+     */
+    public void previousStep() {
+        layout.previous(this);
+    }
+
+    /**
+     * Shows the specified step.
+     * 
+     * @param step Step index
+     */
+    public void showStep(final int step) {
+        layout.show(step, this);
+    }
+}