Merge "Bug 259908: Double click listeners are notified now on table.doubleclick:  Changed Table.doubleClickXY() to send SWT.DefaultSelection in order to notify double click listener as suggested in bug comment."
diff --git a/org.eclipse.swtbot.generator.feature/feature.xml b/org.eclipse.swtbot.generator.feature/feature.xml
index 295a8b3..1440ace 100644
--- a/org.eclipse.swtbot.generator.feature/feature.xml
+++ b/org.eclipse.swtbot.generator.feature/feature.xml
@@ -34,4 +34,11 @@
          version="0.0.0"
          unpack="false"/>
 
+ <plugin
+         id="org.eclipse.swtbot.generator.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.eclipse.swtbot.generator.ui/.classpath b/org.eclipse.swtbot.generator.ui/.classpath
new file mode 100644
index 0000000..798048d
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.swtbot.generator.ui/.project b/org.eclipse.swtbot.generator.ui/.project
new file mode 100644
index 0000000..4b19d76
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.swtbot.generator.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.swtbot.generator.ui/LICENSE.EPL b/org.eclipse.swtbot.generator.ui/LICENSE.EPL
new file mode 100644
index 0000000..3d967ae
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/LICENSE.EPL
@@ -0,0 +1,70 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+b) its license agreement:
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the Program.
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/org.eclipse.swtbot.generator.ui/META-INF/MANIFEST.MF b/org.eclipse.swtbot.generator.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5b1a2ea
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.swtbot.generator.ui;singleton:=true
+Bundle-Version: 2.1.2.qualifier
+Bundle-Vendor: %bundleVendor
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ClassPath: .
+Require-Bundle: org.eclipse.swtbot.generator,
+ org.eclipse.core.runtime,
+ org.eclipse.debug.core,
+ org.eclipse.jdt.launching,
+ org.eclipse.pde.launching,
+ org.eclipse.jface,
+ org.eclipse.swt,
+ org.eclipse.ui,
+ org.eclipse.debug.ui,
+ org.eclipse.pde.ui
+Bundle-Activator: org.eclipse.swtbot.generator.GeneratorPlugin
diff --git a/org.eclipse.swtbot.generator.ui/build.properties b/org.eclipse.swtbot.generator.ui/build.properties
new file mode 100644
index 0000000..36dd267
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/build.properties
@@ -0,0 +1,17 @@
+###############################################################################
+# Copyright (c) 2008 Ketan Padegaonkar and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Ketan Padegaonkar - initial API and implementation
+###############################################################################
+source.. = src/
+output.. = bin/
+src.inclues = *
+bin.includes = plugin.xml,\
+               META-INF/,\
+               plugin.properties,\
+               .,
diff --git a/org.eclipse.swtbot.generator.ui/plugin.properties b/org.eclipse.swtbot.generator.ui/plugin.properties
new file mode 100644
index 0000000..fa8c83a
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/plugin.properties
@@ -0,0 +1,6 @@
+pluginName=SWTBot Code Generator UI Plug-in (incubation)
+bundleVendor=Eclipse.org - SWTBot
+wizardName=Run Test Recorder
+configurationDescription=Create a configuration that will launch a Test Recorder
+configurationName=Test Recorder
+recorderDelegateName=Test Recorder launcher
diff --git a/org.eclipse.swtbot.generator.ui/plugin.xml b/org.eclipse.swtbot.generator.ui/plugin.xml
new file mode 100644
index 0000000..0bc3355
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/plugin.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+  	
+  	<extension point="org.eclipse.ui.newWizards">
+    	<wizard name= "%wizardName" class="org.eclipse.swtbot.generator.ui.launcher.TestRecorderWizard" id="org.eclipse.faq.examples.addingWizard"
+				category="org.eclipse.swtbot.wizards" icon="platform:/plugin/org.eclipse.swtbot.generator/icons/swtbot_rec16.png"/>
+	</extension>
+	
+	<extension point="org.eclipse.debug.core.launchConfigurationTypes">
+        <launchConfigurationType
+        	delegate="org.eclipse.swtbot.generator.ui.launcher.TestRecorderLaunchConfiguration"
+           	delegateDescription="description"
+           	delegateName="%recorderDelegateName"
+           	id="org.eclipse.swtbot.generator.ui.launcher.TestRecorderLaunchConfiguration"
+           	migrationDelegate="org.eclipse.pde.internal.launching.launcher.PDEMigrationDelegate"
+           	modes="run"
+           	name="%configurationName"
+           	sourceLocatorId="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"
+           	sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
+    	</launchConfigurationType>
+    </extension>
+    
+    <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+  		<launchConfigurationTypeImage id="org.eclipse.swtbot.generator.ui.launcher.TestRecorderLaunchConfigurationImage"
+     		configTypeID="org.eclipse.swtbot.generator.ui.launcher.TestRecorderLaunchConfiguration"
+     		icon="platform:/plugin/org.eclipse.swtbot.generator/icons/swtbot_rec16.png">
+  		</launchConfigurationTypeImage>
+ 	</extension>
+           
+    <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+    	<launchConfigurationTabGroup
+        	type="org.eclipse.swtbot.generator.ui.launcher.TestRecorderLaunchConfiguration"
+            class="org.eclipse.pde.ui.launcher.EclipseLauncherTabGroup"
+            id="org.eclipse.swtbot.generator.ui.launcher.TestRecorder">
+        	<launchMode
+           		description="%configurationDescription"
+               	mode="run">
+         	</launchMode>
+      	</launchConfigurationTabGroup>
+   	</extension>
+   
+</plugin>
\ No newline at end of file
diff --git a/org.eclipse.swtbot.generator.ui/pom.xml b/org.eclipse.swtbot.generator.ui/pom.xml
new file mode 100644
index 0000000..85fe2c8
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/pom.xml
@@ -0,0 +1,21 @@
+<!--
+All rights reserved.
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v1.0 which accompanies this distribution,
+and is available at http://www.eclipse.org/legal/epl-v10.html
+
+Authors:
+* Rastislav Wagner (Red Hat)
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.eclipse.swtbot.plugins</groupId>
+  <artifactId>org.eclipse.swtbot.generator.ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <parent>
+  	<groupId>org.eclipse.swtbot</groupId>
+  	<artifactId>parent</artifactId>
+  	<version>2.1.2-SNAPSHOT</version>
+  	<relativePath>../pom.xml</relativePath>
+  </parent>
+</project>
\ No newline at end of file
diff --git a/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/GeneratorUIPlugin.java b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/GeneratorUIPlugin.java
new file mode 100644
index 0000000..514b59e
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/GeneratorUIPlugin.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Mickael Istria (Red Hat) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swtbot.generator.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class GeneratorUIPlugin extends AbstractUIPlugin {
+
+	private static GeneratorUIPlugin plugin;
+
+	public GeneratorUIPlugin() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	public static GeneratorUIPlugin getDefault() {
+		return plugin;
+	}
+}
diff --git a/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/Messages.java b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/Messages.java
new file mode 100644
index 0000000..e91ae71
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/Messages.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Rastislav Wagner (Red Hat) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swtbot.generator.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+  private static final String BUNDLE_NAME
+    = "org.eclipse.swtbot.generator.ui.messages"; //$NON-NLS-1$
+  public static String newEclipseInstance;
+  public static String currentEclipseInstance;
+  public static String eclipseGroup;
+  public static String recorderDialog;
+  public static String recorderDialogTitle;
+  public static String recorderDescription;
+  public static String errorWhileConfiguratingRuntime;
+
+  static {
+    // initialize resource bundle
+    NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+  }
+
+  private Messages() {
+  }
+}
\ No newline at end of file
diff --git a/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/launcher/TestRecorderLaunchConfiguration.java b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/launcher/TestRecorderLaunchConfiguration.java
new file mode 100644
index 0000000..04453ed
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/launcher/TestRecorderLaunchConfiguration.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Rastislav Wagner (Red Hat) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swtbot.generator.ui.launcher;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Properties;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.pde.launching.EclipseApplicationLaunchConfiguration;
+import org.eclipse.swtbot.generator.SWTBotGeneratorPlugin;
+import org.eclipse.swtbot.generator.ui.GeneratorUIPlugin;
+import org.eclipse.swtbot.generator.ui.Messages;
+import org.eclipse.swtbot.generator.ui.StartupRecorder;
+import org.osgi.framework.Bundle;
+
+public class TestRecorderLaunchConfiguration extends EclipseApplicationLaunchConfiguration{
+
+	public static final String RECORDER_ENABLEMENT = " -D" + StartupRecorder.ENABLEMENT_PROPERTY + "=" + Boolean.toString(true); //$NON-NLS-1$ //$NON-NLS-2$
+
+//	public TestRecorderLaunchConfiguration(List<String> additionalBundles) {
+//		super();
+//		this.additionalBundles = additionalBundles;
+//	}
+
+	@Override
+    public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException{
+		ILaunchConfigurationWorkingCopy c=configuration.getWorkingCopy();
+		String currentAttributes = (String)c.getAttributes().get(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS);
+        c.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,currentAttributes+ RECORDER_ENABLEMENT);
+        super.launch(c, mode, launch, monitor);
+    }
+
+	/**
+	 * This methods override the default implementation by adding a tweak the the generated
+	 * config.ini in order to add recorder bundles to the launch configuration.
+	 */
+	@Override
+	public String[] getProgramArguments(ILaunchConfiguration configuration) throws CoreException {
+		String[] res = super.getProgramArguments(configuration);
+		File configFile = new File(getConfigDir(configuration), "config.ini"); //$NON-NLS-1$
+		Properties configProperties = new Properties();
+		InputStream configInputStream = null;
+		try {
+			configInputStream = new FileInputStream(configFile);
+			configProperties.load(configInputStream);
+		} catch (Exception ex) {
+			throw new CoreException(new Status(IStatus.ERROR, GeneratorUIPlugin.getDefault().getBundle().getSymbolicName(),
+					Messages.errorWhileConfiguratingRuntime, ex));
+		} finally {
+			if (configInputStream != null) {
+				try {
+					configInputStream.close();
+				} catch (Exception ex) {
+					// Ignore
+				}
+			}
+		}
+
+		HashSet<String> additionalBundles = new HashSet<String>();
+		additionalBundles.add(SWTBotGeneratorPlugin.PLUGIN_ID);
+		// TODO this should also add the bundle containing the selected dialog + dependencies
+
+		StringBuilder bundles = new StringBuilder(configProperties.getProperty("osgi.bundles", "")); //$NON-NLS-1$ //$NON-NLS-2$
+		for (String additionalBundle : additionalBundles) {
+			Bundle bundle = Platform.getBundle(additionalBundle);
+			try {
+				URL rootUrl= bundle.getEntry("/"); //$NON-NLS-1$
+				URL fileRootUrl= FileLocator.toFileURL(rootUrl);
+				bundles.append(",reference:file:"); //$NON-NLS-1$
+				bundles.append(fileRootUrl.getFile());
+			} catch (IOException ex) {
+				throw new CoreException(new Status(IStatus.ERROR, GeneratorUIPlugin.getDefault().getBundle().getSymbolicName(), ex.getMessage(), ex));
+			}
+		}
+		configProperties.put("osgi.bundles", bundles.toString());
+
+		OutputStream configOutputStream = null;
+		try {
+			configOutputStream = new FileOutputStream(configFile);
+			configProperties.store(configOutputStream, "Test Recorder");
+		} catch (Exception ex) {
+			throw new CoreException(new Status(IStatus.ERROR, GeneratorUIPlugin.getDefault().getBundle().getSymbolicName(),
+					Messages.errorWhileConfiguratingRuntime, ex));
+		} finally {
+			if (configOutputStream != null) {
+				try {
+					configOutputStream.close();
+				} catch (Exception ex) {
+					// Ignore
+				}
+			}
+		}
+
+		return res;
+	}
+
+
+}
\ No newline at end of file
diff --git a/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/launcher/TestRecorderWizard.java b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/launcher/TestRecorderWizard.java
new file mode 100644
index 0000000..416dbaf
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/launcher/TestRecorderWizard.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Rastislav Wagner (Red Hat) - initial API and implementation
+ *    Mickael Istria (Red Hat) - Automatically configure bundles
+ *******************************************************************************/
+package org.eclipse.swtbot.generator.ui.launcher;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swtbot.generator.ui.Messages;
+import org.eclipse.swtbot.generator.ui.StartupRecorder;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.ui.DebugUITools;
+
+public class TestRecorderWizard extends Wizard implements INewWizard {
+
+	private TestRecorderWizardPage firstPage;
+
+	@Override
+	public void addPages() {
+		setWindowTitle(Messages.recorderDialogTitle);
+		firstPage = new TestRecorderWizardPage();
+		addPage(firstPage);
+	}
+
+	@Override
+	public boolean performFinish() {
+		if (this.firstPage.runNewInstance()) {
+			ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
+			ILaunchConfigurationType type = manager.getLaunchConfigurationType(TestRecorderLaunchConfiguration.class.getName());
+
+			try {
+				ILaunchConfiguration[] lcs = manager.getLaunchConfigurations(type);
+				ILaunchConfigurationWorkingCopy workingCopy = null;
+				for (int i = 0; i < lcs.length; ++i) {
+					if (lcs[i].getName().equals("Test Recorder " + this.firstPage.getSelectedDialogName())) {
+						workingCopy = lcs[i].getWorkingCopy();
+						break;
+					}
+				}
+				if (workingCopy == null) {
+					workingCopy = type.newInstance(null, "Test Recorder " + this.firstPage.getSelectedDialogName());
+					String recorderDialog = " -D" + StartupRecorder.DIALOG_PROPERTY + "=" + this.firstPage.getSelectedDialogId(); //$NON-NLS-1$ //$NON-NLS-2$
+					workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, recorderDialog);
+
+				}
+				final ILaunchConfiguration config = workingCopy.doSave();
+				Display.getCurrent().syncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						DebugUITools.openLaunchConfigurationDialog(PlatformUI
+								.getWorkbench().getActiveWorkbenchWindow()
+								.getShell(), config,
+								"org.eclipse.debug.ui.launchGroup.run", null);
+
+					}
+				});
+
+			} catch (CoreException ex) {
+				ex.printStackTrace();
+			}
+		} else {
+			StartupRecorder.openRecorder(this.firstPage.getSelectedDialogId());
+		}
+		return true;
+	}
+
+	@Override
+	public void init(IWorkbench arg0, IStructuredSelection arg1) {
+		// Nothing to do
+	}
+
+}
diff --git a/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/launcher/TestRecorderWizardPage.java b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/launcher/TestRecorderWizardPage.java
new file mode 100644
index 0000000..f7c8330
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/launcher/TestRecorderWizardPage.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Rastislav Wagner (Red Hat) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swtbot.generator.ui.launcher;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swtbot.generator.framework.IRecorderDialog;
+import org.eclipse.swtbot.generator.ui.GeneratorExtensionPointManager;
+import org.eclipse.swtbot.generator.ui.Messages;
+
+public class TestRecorderWizardPage extends WizardPage {
+
+	private ComboViewer combo;
+	private Composite container;
+	private Button newInstance;
+	private Button currentInstance;
+
+	protected TestRecorderWizardPage() {
+		super(Messages.recorderDialogTitle);
+		setDescription(Messages.recorderDescription);
+		setTitle(Messages.recorderDialogTitle);
+		URL imageUrl = null;
+		try {
+			imageUrl = new URL("platform:/plugin/org.eclipse.swtbot.generator/icons/swtbot_rec64.png");
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		}
+		if(imageUrl != null) {
+			setImageDescriptor(ImageDescriptor.createFromURL(imageUrl));
+		}
+	}
+
+	public void createControl(Composite parent) {
+		container = new Composite(parent, SWT.NONE);
+
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		layout.numColumns = 2;
+		Label label1 = new Label(container, SWT.NONE);
+		label1.setText(Messages.recorderDialog);
+
+		combo = new ComboViewer(container, SWT.DROP_DOWN | SWT.READ_ONLY);
+		List<IRecorderDialog> dialogs = GeneratorExtensionPointManager.loadDialogs();
+		combo.setContentProvider(new ArrayContentProvider());
+		combo.setInput(dialogs);
+		combo.setLabelProvider(new LabelProvider() {
+			public String getText(Object element) {
+				return ((IRecorderDialog) element).getName();
+			}
+		});
+		combo.setSelection(new StructuredSelection(dialogs.get(0)));
+
+		Group eclipseGroup = new Group(container, SWT.NONE);
+		eclipseGroup.setText(Messages.eclipseGroup);
+		layout = new GridLayout();
+		eclipseGroup.setLayout(layout);
+		GridData gridData = new GridData(GridData.FILL, GridData.CENTER, true,false);
+		gridData.horizontalSpan = 2;
+		eclipseGroup.setLayoutData(gridData);
+
+		currentInstance = new Button(eclipseGroup, SWT.RADIO);
+		currentInstance.setText(Messages.currentEclipseInstance);
+		currentInstance.setSelection(true);
+
+		newInstance = new Button(eclipseGroup, SWT.RADIO);
+		newInstance.setText(Messages.newEclipseInstance);
+
+		hookListeners();
+
+		setControl(container);
+		setPageComplete(true);
+
+	}
+
+	private void hookListeners() {
+
+		combo.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			public void selectionChanged(SelectionChangedEvent arg0) {
+				IStructuredSelection selection = (IStructuredSelection) arg0.getSelection();
+				if (!selection.isEmpty()) {
+					setPageComplete(true);
+				} else {
+					setPageComplete(false);
+				}
+
+			}
+		});
+	}
+
+	public String getSelectedDialogId() {
+		ISelection selection = combo.getSelection();
+		if (!selection.isEmpty()) {
+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			return ((IRecorderDialog) structuredSelection.getFirstElement()).getId();
+		}
+		return null;
+	}
+	
+	public String getSelectedDialogName() {
+		ISelection selection = combo.getSelection();
+		if (!selection.isEmpty()) {
+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			return ((IRecorderDialog) structuredSelection.getFirstElement()).getName();
+		}
+		return null;
+	}
+
+	public boolean runNewInstance() {
+		return newInstance.getSelection();
+	}
+
+}
diff --git a/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/messages.properties b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/messages.properties
new file mode 100644
index 0000000..a9edf20
--- /dev/null
+++ b/org.eclipse.swtbot.generator.ui/src/org/eclipse/swtbot/generator/ui/messages.properties
@@ -0,0 +1,7 @@
+recorderDescription=Run Test  Recorder with current or new Eclipse instance with chosen dialog.
+recorderDialogTitle=Run Test Recorder
+recorderDialog=Recorder dialog\:
+eclipseGroup=Eclipse instance
+currentEclipseInstance=Run with current Eclipse instance
+newEclipseInstance=Run with new Eclipse instance (Opens launch configuration dialog)
+errorWhileConfiguratingRuntime=Error while configurating runtime.
diff --git a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/framework/rules/SWTBotGeneratorRules.java b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/framework/rules/SWTBotGeneratorRules.java
index 9d35c30..54c40c4 100644
--- a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/framework/rules/SWTBotGeneratorRules.java
+++ b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/framework/rules/SWTBotGeneratorRules.java
@@ -81,4 +81,4 @@
 		// TODO SWTBot has no logo ?
 		return null;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/StartupRecorder.java b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/StartupRecorder.java
index 88730c8..7e106a9 100644
--- a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/StartupRecorder.java
+++ b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/StartupRecorder.java
@@ -122,4 +122,4 @@
 		return recorderStarter.getRecorderDialog();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandBarTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandBarTest.java
index 2f78e28..6b1ed27 100644
--- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandBarTest.java
+++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandBarTest.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Ketan Padegaonkar - initial API and implementation
  *******************************************************************************/
@@ -90,7 +90,7 @@
 			bot.expandBar().getExpandItem(withText("some text"));
 			fail("Expected WNFE");
 		} catch (WidgetNotFoundException e) {
-			assertEquals("Could not find widget.", e.getMessage());
+			assertEquals("Could not find widget matching: (of type 'ExpandItem' and with text 'some text')", e.getMessage());
 			assertEquals("Timeout after: 5000 ms.: Could not find widget matching: (of type 'ExpandItem' and with text 'some text')", e
 					.getCause().getMessage());
 		}
diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotFactory.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotFactory.java
index 01257bd..d937813 100644
--- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotFactory.java
+++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Ketan Padegaonkar and others.
+ * Copyright (c) 2008-2013 Ketan Padegaonkar and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@
  *     Ketan Patel - https://bugs.eclipse.org/bugs/show_bug.cgi?id=259837
  *     Toby Weston - (Bug 259860)
  *     Ketan Patel - (Bug 259860)
+ *     Mickael Istria (Red Hat Inc.) - Bug 422458
  *******************************************************************************/
 package org.eclipse.swtbot.swt.finder;
 
@@ -354,7 +355,11 @@
 		try {
 			waitUntil(waitForWidget);
 		} catch (TimeoutException e) {
-			throw new WidgetNotFoundException("Could not find widget.", e); //$NON-NLS-1$
+			String message = "Could not find widget"; //$NON-NLS-1$
+			if (waitForWidget.getFailureMessage() != null) {
+				message = waitForWidget.getFailureMessage();
+			}
+			throw new WidgetNotFoundException(message, e);
 		}
 	}
 
diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarDropDownButton.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarDropDownButton.java
index 2eb55a8..b93b0d9 100644
--- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarDropDownButton.java
+++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarDropDownButton.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Ketan Padegaonkar and others.
+ * Copyright (c) 2008-2013 Ketan Padegaonkar and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  *     Ketan Padegaonkar - initial API and implementation
  *     Ketan Padegaonkar - http://swtbot.org/bugzilla/show_bug.cgi?id=88
+ *     Mickael Istria (Red Hat Inc.) - Bug 422458
  *******************************************************************************/
 package org.eclipse.swtbot.swt.finder.widgets;
 
@@ -55,7 +56,7 @@
 
 	/**
 	 * Constructs an new instance of this item.
-	 * 
+	 *
 	 * @param w the tool item.
 	 * @param description the description of the widget, this will be reported by {@link #toString()}
 	 * @throws WidgetNotFoundException if the widget is <code>null</code> or widget has been disposed.
@@ -71,7 +72,7 @@
 	 * <p>
 	 * <b>NOTE:</b>Invoking this keeps the menu open until you click on it.
 	 * </p>
-	 * 
+	 *
 	 * @param menuItem the submenu to search
 	 * @return the menu item with the specified text
 	 * @since 1.0
@@ -86,7 +87,7 @@
 	 * <p>
 	 * <b>NOTE:</b>Invoking this keeps the menu open until you click on it.
 	 * </p>
-	 * 
+	 *
 	 * @param matcher the matcher
 	 * @return the menu item with the specified text
 	 */
@@ -99,7 +100,7 @@
 	 * <p>
 	 * <b>NOTE:</b>Invoking this keeps the menu open until you click on it.
 	 * </p>
-	 * 
+	 *
 	 * @param matcher the matcher
 	 * @return the menu items matching the matcher.
 	 * @throws WidgetNotFoundException if the menuItem could not be found
@@ -150,13 +151,13 @@
 		}
 
 		if (result.isEmpty())
-			throw new WidgetNotFoundException("Could not find a menu item"); //$NON-NLS-1$
+			throw new WidgetNotFoundException("Could not find a menu item: " + matcher); //$NON-NLS-1$
 		return result;
 	}
 
 	/**
 	 * Gets the arrow event.
-	 * 
+	 *
 	 * @return The event.
 	 */
 	private Event arrowEvent() {
diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTrayItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTrayItem.java
index dd0d7bc..2a7f2cd 100644
--- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTrayItem.java
+++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTrayItem.java
@@ -1,12 +1,13 @@
 /*******************************************************************************
- * Copyright (c) 2009 SWTBot Committers and others.
+ * Copyright (c) 2009-2013 SWTBot Committers and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Toby Weston - initial API and implementation (Bug 259860)
+ *     Mickael Istria (Red Hat Inc.) - Bug 422458
  *******************************************************************************/
 package org.eclipse.swtbot.swt.finder.widgets;
 
@@ -23,7 +24,7 @@
 
 /**
  * Represents a tray item.
- * 
+ *
  * @author Toby Weston (Bug 259860)
  * @version $Id$
  */
@@ -31,7 +32,7 @@
 
 	/**
 	 * Constructs a new instance with the given widget.
-	 * 
+	 *
 	 * @param widget the tray item.
 	 * @throws WidgetNotFoundException if the widget is <code>null</code> or widget has been disposed.
 	 */
@@ -47,7 +48,7 @@
 			Matcher<MenuItem> withMnemonic = withMnemonic(label);
 			List<MenuItem> menus = finder.findMenus(withMnemonic);
 			if (menus.isEmpty())
-				throw new WidgetNotFoundException("Could not find a menu item");
+				throw new WidgetNotFoundException("Could not find a menu item with label: " + label);
 			return new SWTBotMenu(menus.get(0));
 		} finally {
 			finder.unregister();
diff --git a/pom.xml b/pom.xml
index 74973c0..cbe4ebc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
 		<module>org.eclipse.swtbot.forms.finder</module>

 		<module>org.eclipse.swtbot.generator</module>

 		<module>org.eclipse.swtbot.generator.jdt</module>

+		<module>org.eclipse.swtbot.generator.ui</module>

 		<module>org.eclipse.swtbot.go</module>

 		<module>org.eclipse.swtbot.junit4_x</module>

 		<module>org.eclipse.swtbot.swt.demo</module>