[460403] Creating application under UI Test - update copyright header

Change-Id: I88e4f5bedae34c7b9aa36561e49f44469a32ad43
Signed-off-by: Jérôme Joslet <j.joslet@aegaeon-it.com>

2 files changed, 15 insertions, 14 deletions

diff --git a/org.eclipse.swtbot.eclipse.core/src/org/eclipse/swtbot/eclipse/core/UITestApplication.java b/org.eclipse.swtbot.eclipse.core/src/org/eclipse/swtbot/eclipse/core/UITestApplication.java
index 005dd87c..59388d11 100644
--- a/org.eclipse.swtbot.eclipse.core/src/org/eclipse/swtbot/eclipse/core/UITestApplication.java
+++ b/org.eclipse.swtbot.eclipse.core/src/org/eclipse/swtbot/eclipse/core/UITestApplication.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation 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:
  *     IBM Corporation - initial API and implementation
  *     Ketan Padegaonkar - modification to run tests on non-ui thread
+ *     Jérôme Joslet - Bug 460403
  *******************************************************************************/
 package org.eclipse.swtbot.eclipse.core;
 
@@ -28,6 +29,8 @@ import org.eclipse.ui.testing.TestableObject;
  * so that the tests run in a non-UI thread.
  *
  * @author Ketan Padegaonkar <KetanPadegaonkar [at] gmail [dot] com>
+ * @author Jérôme Joslet
+ * 
  * @version $Id$
  */
 public class UITestApplication implements IApplication, ITestHarness {
@@ -83,12 +86,9 @@ public class UITestApplication implements IApplication, ITestHarness {
 		// Otherwise, return the application object.
 		IConfigurationElement[] elements = extension.getConfigurationElements();
 		if (elements.length > 0) {
-			IConfigurationElement[] runs = elements[0].getChildren("run"); //$NON-NLS-1$
-			if (runs.length > 0) {
-				Object runnable = runs[0].createExecutableExtension("class"); //$NON-NLS-1$
-				if (runnable instanceof IApplication)
-					return runnable;
-			}
+			Object runnable = elements[0].createExecutableExtension("run"); //$NON-NLS-1$
+			if (runnable instanceof IApplication)
+				return runnable;
 		}
 		return null;
 	}
diff --git a/org.eclipse.swtbot.eclipse.junit.headless/src/org/eclipse/swtbot/eclipse/junit/headless/UITestApplication.java b/org.eclipse.swtbot.eclipse.junit.headless/src/org/eclipse/swtbot/eclipse/junit/headless/UITestApplication.java
index 64fafe4d..7165e53b 100644
--- a/org.eclipse.swtbot.eclipse.junit.headless/src/org/eclipse/swtbot/eclipse/junit/headless/UITestApplication.java
+++ b/org.eclipse.swtbot.eclipse.junit.headless/src/org/eclipse/swtbot/eclipse/junit/headless/UITestApplication.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Ketan Padegaonkar and others.
+ * Copyright (c) 2015 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
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Ketan Padegaonkar - initial API and implementation
+ *     Jérôme Joslet - Bug 460403
  *******************************************************************************/
 package org.eclipse.swtbot.eclipse.junit.headless;
 
@@ -28,6 +29,9 @@ import org.eclipse.ui.testing.TestableObject;
  * This is just a copy of org.eclipse.test.UITestApplication from the eclipse test plugin, with {@link #runTests()}
  * overridden to return a custom {@link EclipseTestRunner} that runs in a non-UI thread. A Workbench that runs a test
  * suite specified in the command line arguments.
+ * 
+ * @author Ketan Padegaonkar <KetanPadegaonkar [at] gmail [dot] com>
+ * @author Jérôme Joslet
  */
 public class UITestApplication implements IApplication, ITestHarness {
 
@@ -81,12 +85,9 @@ public class UITestApplication implements IApplication, ITestHarness {
 		// Otherwise, return the application object.
 		IConfigurationElement[] elements = extension.getConfigurationElements();
 		if (elements.length > 0) {
-			IConfigurationElement[] runs = elements[0].getChildren("run"); //$NON-NLS-1$
-			if (runs.length > 0) {
-				Object runnable = runs[0].createExecutableExtension("class"); //$NON-NLS-1$
-				if (runnable instanceof IApplication)
-					return runnable;
-			}
+			Object runnable = elements[0].createExecutableExtension("run"); //$NON-NLS-1$
+			if (runnable instanceof IApplication)
+				return runnable;
 		}
 		return null;
 	}