Duplicated 'set-q7-option' command as 'set-option'

Signed-off-by: Viktoria Dlugopolskaya <viksnsk@gmail.com>
diff --git a/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF
index 8317b70..306d3f6 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.rcptt.ecl.core;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core.scenario;visibility:=reexport,
  org.eclipse.rcptt.tesla.core;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.core;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.watson.core;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/BeginReportNode.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/BeginReportNode.java
index fb38e34..e801499 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/BeginReportNode.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/BeginReportNode.java
@@ -22,11 +22,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.BeginReportNode#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.BeginReportNode#getProperties <em>Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getBeginReportNode()
  * @model
@@ -71,7 +71,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Properties</em>' map.
 	 * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getBeginReportNode_Properties()
-	 * @model mapType="org.eclipse.rcptt.sherlock.core.model.sherlock.report.PropertyMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EObject>"
+	 * @model mapType="org.eclipse.rcptt.sherlock.core.model.sherlock.report.PropertyMap&lt;org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EObject&gt;"
 	 * @generated
 	 */
 	EMap<String, EObject> getProperties();
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateContext.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateContext.java
index b80d36a..fa74e31 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateContext.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateContext.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.CreateContext#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.CreateContext#getParam <em>Param</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getCreateContext()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateReport.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateReport.java
index b9da2ec..4ee8a88 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateReport.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateReport.java
@@ -21,11 +21,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.CreateReport#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.CreateReport#getQ7info <em>Q7info</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getCreateReport()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateVerification.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateVerification.java
index 0044053..7cdcdba 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateVerification.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateVerification.java
@@ -21,11 +21,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.CreateVerification#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.CreateVerification#getParam <em>Param</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getCreateVerification()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateWidgetVerificationParam.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateWidgetVerificationParam.java
index a6b681b..1dbcfd9 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateWidgetVerificationParam.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/CreateWidgetVerificationParam.java
@@ -19,10 +19,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.CreateWidgetVerificationParam#getSelector <em>Selector</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getCreateWidgetVerificationParam()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/EndReportNode.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/EndReportNode.java
index f61b0d9..858d96b 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/EndReportNode.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/EndReportNode.java
@@ -24,12 +24,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.EndReportNode#getSnaphots <em>Snaphots</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.EndReportNode#isTakeSnaphots <em>Take Snaphots</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.EndReportNode#getResult <em>Result</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getEndReportNode()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/EnterContext.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/EnterContext.java
index 636d580..7e09ca8 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/EnterContext.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/EnterContext.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.EnterContext#getData <em>Data</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getEnterContext()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ExecVerification.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ExecVerification.java
index 63b9830..77e508d 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ExecVerification.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ExecVerification.java
@@ -21,11 +21,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.ExecVerification#getVerification <em>Verification</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.ExecVerification#getPhase <em>Phase</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getExecVerification()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ExecutionPhase.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ExecutionPhase.java
index 147e8a8..4914747 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ExecutionPhase.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ExecutionPhase.java
@@ -150,6 +150,8 @@
 	 * Returns the '<em><b>Execution Phase</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ExecutionPhase get(String literal) {
@@ -166,6 +168,8 @@
 	 * Returns the '<em><b>Execution Phase</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ExecutionPhase getByName(String name) {
@@ -182,6 +186,8 @@
 	 * Returns the '<em><b>Execution Phase</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ExecutionPhase get(int value) {
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/PerspectiveInfo.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/PerspectiveInfo.java
index fd59f60..a2a91f8 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/PerspectiveInfo.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/PerspectiveInfo.java
@@ -19,13 +19,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.PerspectiveInfo#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.PerspectiveInfo#getImage <em>Image</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.PerspectiveInfo#getLabel <em>Label</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.PerspectiveInfo#getDescription <em>Description</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getPerspectiveInfo()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/PerspectivesList.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/PerspectivesList.java
index 60e7301..07c4963 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/PerspectivesList.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/PerspectivesList.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.PerspectivesList#getPerspectives <em>Perspectives</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getPerspectivesList()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7CoreFactory.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7CoreFactory.java
index d7fc0b7..1b8554d 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7CoreFactory.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7CoreFactory.java
@@ -246,6 +246,15 @@
 	TerminateAut createTerminateAut();
 
 	/**
+	 * Returns a new object of class '<em>Set Option</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Set Option</em>'.
+	 * @generated
+	 */
+	SetOption createSetOption();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7CorePackage.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7CorePackage.java
index 6b1001c..2d4a508 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7CorePackage.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7CorePackage.java
@@ -1180,6 +1180,61 @@
 	int TERMINATE_AUT_FEATURE_COUNT = CorePackage.COMMAND_FEATURE_COUNT + 0;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.rcptt.core.ecl.core.model.impl.SetOptionImpl <em>Set Option</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.rcptt.core.ecl.core.model.impl.SetOptionImpl
+	 * @see org.eclipse.rcptt.core.ecl.core.model.impl.Q7CorePackageImpl#getSetOption()
+	 * @generated
+	 */
+	int SET_OPTION = 24;
+
+	/**
+	 * The feature id for the '<em><b>Host</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_OPTION__HOST = CorePackage.COMMAND__HOST;
+
+	/**
+	 * The feature id for the '<em><b>Bindings</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_OPTION__BINDINGS = CorePackage.COMMAND__BINDINGS;
+
+	/**
+	 * The feature id for the '<em><b>Key</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_OPTION__KEY = CorePackage.COMMAND_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_OPTION__VALUE = CorePackage.COMMAND_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Set Option</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_OPTION_FEATURE_COUNT = CorePackage.COMMAND_FEATURE_COUNT + 2;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.rcptt.core.ecl.core.model.ExecutionPhase <em>Execution Phase</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1187,7 +1242,7 @@
 	 * @see org.eclipse.rcptt.core.ecl.core.model.impl.Q7CorePackageImpl#getExecutionPhase()
 	 * @generated
 	 */
-	int EXECUTION_PHASE = 24;
+	int EXECUTION_PHASE = 25;
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rcptt.core.ecl.core.model.EnterContext <em>Enter Context</em>}'.
@@ -1826,6 +1881,38 @@
 	EClass getTerminateAut();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.rcptt.core.ecl.core.model.SetOption <em>Set Option</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Set Option</em>'.
+	 * @see org.eclipse.rcptt.core.ecl.core.model.SetOption
+	 * @generated
+	 */
+	EClass getSetOption();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.core.ecl.core.model.SetOption#getKey <em>Key</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Key</em>'.
+	 * @see org.eclipse.rcptt.core.ecl.core.model.SetOption#getKey()
+	 * @see #getSetOption()
+	 * @generated
+	 */
+	EAttribute getSetOption_Key();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.core.ecl.core.model.SetOption#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Value</em>'.
+	 * @see org.eclipse.rcptt.core.ecl.core.model.SetOption#getValue()
+	 * @see #getSetOption()
+	 * @generated
+	 */
+	EAttribute getSetOption_Value();
+
+	/**
 	 * Returns the meta object for enum '{@link org.eclipse.rcptt.core.ecl.core.model.ExecutionPhase <em>Execution Phase</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2386,6 +2473,32 @@
 		EClass TERMINATE_AUT = eINSTANCE.getTerminateAut();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.rcptt.core.ecl.core.model.impl.SetOptionImpl <em>Set Option</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.rcptt.core.ecl.core.model.impl.SetOptionImpl
+		 * @see org.eclipse.rcptt.core.ecl.core.model.impl.Q7CorePackageImpl#getSetOption()
+		 * @generated
+		 */
+		EClass SET_OPTION = eINSTANCE.getSetOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SET_OPTION__KEY = eINSTANCE.getSetOption_Key();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SET_OPTION__VALUE = eINSTANCE.getSetOption_Value();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.rcptt.core.ecl.core.model.ExecutionPhase <em>Execution Phase</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7Information.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7Information.java
index 690d5c6..edfce00 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7Information.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/Q7Information.java
@@ -19,6 +19,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.Q7Information#getVersion <em>Version</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.Q7Information#isTeslaActive <em>Tesla Active</em>}</li>
@@ -26,7 +27,6 @@
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.Q7Information#isClientActive <em>Client Active</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.Q7Information#getWindowCount <em>Window Count</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getQ7Information()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ReportAppend.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ReportAppend.java
index b2a89a0..612a1b5 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ReportAppend.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ReportAppend.java
@@ -23,10 +23,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.ReportAppend#getObjects <em>Objects</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getReportAppend()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetCommandsDelay.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetCommandsDelay.java
index f331572..14cb9c3 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetCommandsDelay.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetCommandsDelay.java
@@ -19,10 +19,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.SetCommandsDelay#getDelay <em>Delay</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getSetCommandsDelay()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetOption.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetOption.java
new file mode 100644
index 0000000..63925df
--- /dev/null
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetOption.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2017 Xored Software Inc 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:
+ *     Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.core.ecl.core.model;
+
+import org.eclipse.rcptt.ecl.core.Command;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Set Option</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.SetOption#getKey <em>Key</em>}</li>
+ *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.SetOption#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getSetOption()
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Sets RCPTT runtime option.' example='&lt;code&gt;set-option eclExecutionDelay 0&lt;/code&gt;'"
+ * @generated
+ */
+public interface SetOption extends Command {
+	/**
+	 * Returns the value of the '<em><b>Key</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Key</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Key</em>' attribute.
+	 * @see #setKey(String)
+	 * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getSetOption_Key()
+	 * @model required="true"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='&lt;br/&gt;\r\nAvailable keys:\r\n&lt;ul&gt;\r\n    &lt;li&gt; &lt;b&gt;jobDebugjobTimeout&lt;/b&gt; Eclipse job debug plugin jobs timeout (def: 300000 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobSleepingStepTime&lt;/b&gt; Step in step mode (def: 200 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobSleepingStepTimeout&lt;/b&gt; Stepping job timeout (def: 120000 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobTreatAsSleepingTimeout&lt;/b&gt; Enable Job step mode timeout (def: 10000 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobHangTimeout&lt;/b&gt; Job skip timeout (def: 30000 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobScheduleDelayedMaxtime&lt;/b&gt; Wait for jobs with delay less timeout (def: 600 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;eclExecutionDelay&lt;/b&gt; Wait for time between each ECL command (def: 0 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;workspaceClearForceGc&lt;/b&gt; Forces garbage collection on workspace cleanup (def: true) &lt;/li&gt;\r\n&lt;/ul&gt;'"
+	 * @generated
+	 */
+	String getKey();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.rcptt.core.ecl.core.model.SetOption#getKey <em>Key</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Key</em>' attribute.
+	 * @see #getKey()
+	 * @generated
+	 */
+	void setKey(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Value</em>' attribute.
+	 * @see #setValue(String)
+	 * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getSetOption_Value()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.rcptt.core.ecl.core.model.SetOption#getValue <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(String value);
+
+} // SetOption
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetQ7Features.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetQ7Features.java
index 13b7bad..7f60c39 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetQ7Features.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetQ7Features.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.SetQ7Features#getFeatures <em>Features</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getSetQ7Features()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetQ7Option.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetQ7Option.java
index 67778cc..af0a085 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetQ7Option.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/SetQ7Option.java
@@ -19,14 +19,14 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.SetQ7Option#getKey <em>Key</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.SetQ7Option#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getSetQ7Option()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Sets Q7 runtime option.' example='<code>set-q7-option eclExecutionDelay 0</code>'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Sets Q7 runtime option.' example='&lt;code&gt;set-q7-option eclExecutionDelay 0&lt;/code&gt;'"
  * @generated
  */
 public interface SetQ7Option extends Command {
@@ -42,7 +42,7 @@
 	 * @see #setKey(String)
 	 * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getSetQ7Option_Key()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='<br/>\r\nAvailable keys:\r\n<ul>\r\n    <li> <b>jobDebugjobTimeout</b> Eclipse job debug plugin jobs timeout (def: 300000 ms) </li>\r\n    <li> <b>jobSleepingStepTime</b> Step in step mode (def: 200 ms) </li>\r\n    <li> <b>jobSleepingStepTimeout</b> Stepping job timeout (def: 120000 ms) </li>\r\n    <li> <b>jobTreatAsSleepingTimeout</b> Enable Job step mode timeout (def: 10000 ms) </li>\r\n    <li> <b>jobHangTimeout</b> Job skip timeout (def: 30000 ms) </li>\r\n    <li> <b>jobScheduleDelayedMaxtime</b> Wait for jobs with delay less timeout (def: 600 ms) </li>\r\n    <li> <b>eclExecutionDelay</b> Wait for time between each ECL command (def: 0 ms) </li>\r\n    <li> <b>workspaceClearForceGc</b> Forces garbage collection on workspace cleanup (def: true) </li>\r\n</ul>'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='&lt;br/&gt;\r\nAvailable keys:\r\n&lt;ul&gt;\r\n    &lt;li&gt; &lt;b&gt;jobDebugjobTimeout&lt;/b&gt; Eclipse job debug plugin jobs timeout (def: 300000 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobSleepingStepTime&lt;/b&gt; Step in step mode (def: 200 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobSleepingStepTimeout&lt;/b&gt; Stepping job timeout (def: 120000 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobTreatAsSleepingTimeout&lt;/b&gt; Enable Job step mode timeout (def: 10000 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobHangTimeout&lt;/b&gt; Job skip timeout (def: 30000 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;jobScheduleDelayedMaxtime&lt;/b&gt; Wait for jobs with delay less timeout (def: 600 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;eclExecutionDelay&lt;/b&gt; Wait for time between each ECL command (def: 0 ms) &lt;/li&gt;\r\n    &lt;li&gt; &lt;b&gt;workspaceClearForceGc&lt;/b&gt; Forces garbage collection on workspace cleanup (def: true) &lt;/li&gt;\r\n&lt;/ul&gt;'"
 	 * @generated
 	 */
 	String getKey();
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ViewInfo.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ViewInfo.java
index eef5c38..368b2ea 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ViewInfo.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ViewInfo.java
@@ -20,6 +20,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.ViewInfo#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.ViewInfo#getImage <em>Image</em>}</li>
@@ -27,7 +28,6 @@
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.ViewInfo#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.ViewInfo#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getViewInfo()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ViewList.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ViewList.java
index 40c6800..41d62bc 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ViewList.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/ViewList.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.ViewList#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage#getViewList()
  * @model
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/BeginReportNodeImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/BeginReportNodeImpl.java
index fc92781..524c82a 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/BeginReportNodeImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/BeginReportNodeImpl.java
@@ -33,11 +33,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.BeginReportNodeImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.BeginReportNodeImpl#getProperties <em>Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateContextImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateContextImpl.java
index 1fd13b5..1e7ef6e 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateContextImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateContextImpl.java
@@ -29,11 +29,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.CreateContextImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.CreateContextImpl#getParam <em>Param</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateReportImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateReportImpl.java
index 1eb2eba..2b2342a 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateReportImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateReportImpl.java
@@ -27,11 +27,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.CreateReportImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.CreateReportImpl#getQ7info <em>Q7info</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateVerificationImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateVerificationImpl.java
index 04b2667..32690ce 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateVerificationImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateVerificationImpl.java
@@ -29,11 +29,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.CreateVerificationImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.CreateVerificationImpl#getParam <em>Param</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateWidgetVerificationParamImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateWidgetVerificationParamImpl.java
index 8e000be..f0bce3a 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateWidgetVerificationParamImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/CreateWidgetVerificationParamImpl.java
@@ -26,10 +26,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.CreateWidgetVerificationParamImpl#getSelector <em>Selector</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/EndReportNodeImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/EndReportNodeImpl.java
index 160dd35..a9ed246 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/EndReportNodeImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/EndReportNodeImpl.java
@@ -36,12 +36,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.EndReportNodeImpl#getSnaphots <em>Snaphots</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.EndReportNodeImpl#isTakeSnaphots <em>Take Snaphots</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.EndReportNodeImpl#getResult <em>Result</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/EnterContextImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/EnterContextImpl.java
index 8f237cd..abd4d80 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/EnterContextImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/EnterContextImpl.java
@@ -31,10 +31,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.EnterContextImpl#getData <em>Data</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ExecVerificationImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ExecVerificationImpl.java
index 53f203f..2cfe555 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ExecVerificationImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ExecVerificationImpl.java
@@ -32,11 +32,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.ExecVerificationImpl#getVerification <em>Verification</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.ExecVerificationImpl#getPhase <em>Phase</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetPerspectivesImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetPerspectivesImpl.java
index 8984879..0fd1ea8 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetPerspectivesImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetPerspectivesImpl.java
@@ -19,8 +19,6 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
  * <em><b>Get Perspectives</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetQ7InformationImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetQ7InformationImpl.java
index dd5c166..5f5e0d5 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetQ7InformationImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetQ7InformationImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Get Q7 Information</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetReportImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetReportImpl.java
index 68797c6..c5976cc 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetReportImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetReportImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Get Report</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetViewsImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetViewsImpl.java
index 784cc8f..e540315 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetViewsImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/GetViewsImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Get Views</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PerspectiveInfoImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PerspectiveInfoImpl.java
index 0db3011..0e58bbb 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PerspectiveInfoImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PerspectiveInfoImpl.java
@@ -26,13 +26,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.PerspectiveInfoImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.PerspectiveInfoImpl#getImage <em>Image</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.PerspectiveInfoImpl#getLabel <em>Label</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.PerspectiveInfoImpl#getDescription <em>Description</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PerspectivesListImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PerspectivesListImpl.java
index 2ded3ab..4067367 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PerspectivesListImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PerspectivesListImpl.java
@@ -34,10 +34,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.PerspectivesListImpl#getPerspectives <em>Perspectives</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PrepareEnvironmentImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PrepareEnvironmentImpl.java
index d4a2dca..9922533 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PrepareEnvironmentImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/PrepareEnvironmentImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Prepare Environment</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7CoreFactoryImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7CoreFactoryImpl.java
index 5b8096d..6cc8261 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7CoreFactoryImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7CoreFactoryImpl.java
@@ -89,6 +89,7 @@
 			case Q7CorePackage.CREATE_VERIFICATION: return createCreateVerification();
 			case Q7CorePackage.CREATE_WIDGET_VERIFICATION_PARAM: return createCreateWidgetVerificationParam();
 			case Q7CorePackage.TERMINATE_AUT: return createTerminateAut();
+			case Q7CorePackage.SET_OPTION: return createSetOption();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -369,6 +370,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public SetOption createSetOption() {
+		SetOptionImpl setOption = new SetOptionImpl();
+		return setOption;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ExecutionPhase createExecutionPhaseFromString(EDataType eDataType, String initialValue) {
 		ExecutionPhase result = ExecutionPhase.get(initialValue);
 		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7CorePackageImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7CorePackageImpl.java
index f2997e6..0f5518f 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7CorePackageImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7CorePackageImpl.java
@@ -42,6 +42,7 @@
 import org.eclipse.rcptt.core.ecl.core.model.ReportAppend;
 import org.eclipse.rcptt.core.ecl.core.model.ResetVerifications;
 import org.eclipse.rcptt.core.ecl.core.model.SetCommandsDelay;
+import org.eclipse.rcptt.core.ecl.core.model.SetOption;
 import org.eclipse.rcptt.core.ecl.core.model.SetQ7Features;
 import org.eclipse.rcptt.core.ecl.core.model.SetQ7Option;
 import org.eclipse.rcptt.core.ecl.core.model.TerminateAut;
@@ -205,6 +206,13 @@
 	private EClass terminateAutEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass setOptionEClass = null;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -259,6 +267,8 @@
 		isInited = true;
 
 		// Initialize simple dependencies
+		CorePackage.eINSTANCE.eClass();
+		EcorePackage.eINSTANCE.eClass();
 		ScenarioPackage.eINSTANCE.eClass();
 		ReportPackage.eINSTANCE.eClass();
 		ReportingPackage.eINSTANCE.eClass();
@@ -769,6 +779,33 @@
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getSetOption() {
+		return setOptionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getSetOption_Key() {
+		return (EAttribute)setOptionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getSetOption_Value() {
+		return (EAttribute)setOptionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -886,6 +923,10 @@
 
 		terminateAutEClass = createEClass(TERMINATE_AUT);
 
+		setOptionEClass = createEClass(SET_OPTION);
+		createEAttribute(setOptionEClass, SET_OPTION__KEY);
+		createEAttribute(setOptionEClass, SET_OPTION__VALUE);
+
 		// Create enums
 		executionPhaseEEnum = createEEnum(EXECUTION_PHASE);
 	}
@@ -942,6 +983,7 @@
 		resetVerificationsEClass.getESuperTypes().add(theCorePackage.getCommand());
 		createVerificationEClass.getESuperTypes().add(theCorePackage.getCommand());
 		terminateAutEClass.getESuperTypes().add(theCorePackage.getCommand());
+		setOptionEClass.getESuperTypes().add(theCorePackage.getCommand());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(enterContextEClass, EnterContext.class, "EnterContext", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1028,6 +1070,10 @@
 
 		initEClass(terminateAutEClass, TerminateAut.class, "TerminateAut", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+		initEClass(setOptionEClass, SetOption.class, "SetOption", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getSetOption_Key(), theEcorePackage.getEString(), "key", null, 1, 1, SetOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSetOption_Value(), theEcorePackage.getEString(), "value", null, 1, 1, SetOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Initialize enums and add enum literals
 		initEEnum(executionPhaseEEnum, ExecutionPhase.class, "ExecutionPhase");
 		addEEnumLiteral(executionPhaseEEnum, ExecutionPhase.AUTO);
@@ -1175,6 +1221,19 @@
 		   source, 
 		   new String[] {
 			 "description", "<br/>\r\nAvailable keys:\r\n<ul>\r\n    <li> <b>jobDebugjobTimeout</b> Eclipse job debug plugin jobs timeout (def: 300000 ms) </li>\r\n    <li> <b>jobSleepingStepTime</b> Step in step mode (def: 200 ms) </li>\r\n    <li> <b>jobSleepingStepTimeout</b> Stepping job timeout (def: 120000 ms) </li>\r\n    <li> <b>jobTreatAsSleepingTimeout</b> Enable Job step mode timeout (def: 10000 ms) </li>\r\n    <li> <b>jobHangTimeout</b> Job skip timeout (def: 30000 ms) </li>\r\n    <li> <b>jobScheduleDelayedMaxtime</b> Wait for jobs with delay less timeout (def: 600 ms) </li>\r\n    <li> <b>eclExecutionDelay</b> Wait for time between each ECL command (def: 0 ms) </li>\r\n    <li> <b>workspaceClearForceGc</b> Forces garbage collection on workspace cleanup (def: true) </li>\r\n</ul>"
+		   });	
+		addAnnotation
+		  (setOptionEClass, 
+		   source, 
+		   new String[] {
+			 "description", "Sets RCPTT runtime option.",
+			 "example", "<code>set-option eclExecutionDelay 0</code>"
+		   });	
+		addAnnotation
+		  (getSetOption_Key(), 
+		   source, 
+		   new String[] {
+			 "description", "<br/>\r\nAvailable keys:\r\n<ul>\r\n    <li> <b>jobDebugjobTimeout</b> Eclipse job debug plugin jobs timeout (def: 300000 ms) </li>\r\n    <li> <b>jobSleepingStepTime</b> Step in step mode (def: 200 ms) </li>\r\n    <li> <b>jobSleepingStepTimeout</b> Stepping job timeout (def: 120000 ms) </li>\r\n    <li> <b>jobTreatAsSleepingTimeout</b> Enable Job step mode timeout (def: 10000 ms) </li>\r\n    <li> <b>jobHangTimeout</b> Job skip timeout (def: 30000 ms) </li>\r\n    <li> <b>jobScheduleDelayedMaxtime</b> Wait for jobs with delay less timeout (def: 600 ms) </li>\r\n    <li> <b>eclExecutionDelay</b> Wait for time between each ECL command (def: 0 ms) </li>\r\n    <li> <b>workspaceClearForceGc</b> Forces garbage collection on workspace cleanup (def: true) </li>\r\n</ul>"
 		   });
 	}
 
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7InformationImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7InformationImpl.java
index 8f7d54b..f1fcfc3 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7InformationImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/Q7InformationImpl.java
@@ -26,6 +26,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.Q7InformationImpl#getVersion <em>Version</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.Q7InformationImpl#isTeslaActive <em>Tesla Active</em>}</li>
@@ -33,7 +34,6 @@
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.Q7InformationImpl#isClientActive <em>Client Active</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.Q7InformationImpl#getWindowCount <em>Window Count</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ReportAppendImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ReportAppendImpl.java
index 6af04df..453f1db 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ReportAppendImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ReportAppendImpl.java
@@ -30,10 +30,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.ReportAppendImpl#getObjects <em>Objects</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ResetVerificationsImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ResetVerificationsImpl.java
index 7dd3e5f..5f7ecae 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ResetVerificationsImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ResetVerificationsImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Reset Verifications</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetCommandsDelayImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetCommandsDelayImpl.java
index f0ec45a..dd67e47 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetCommandsDelayImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetCommandsDelayImpl.java
@@ -27,10 +27,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.SetCommandsDelayImpl#getDelay <em>Delay</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetOptionImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetOptionImpl.java
new file mode 100644
index 0000000..138c36c
--- /dev/null
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetOptionImpl.java
@@ -0,0 +1,222 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2017 Xored Software Inc 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:
+ *     Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.core.ecl.core.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.rcptt.core.ecl.core.model.Q7CorePackage;
+import org.eclipse.rcptt.core.ecl.core.model.SetOption;
+import org.eclipse.rcptt.ecl.core.impl.CommandImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Set Option</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.SetOptionImpl#getKey <em>Key</em>}</li>
+ *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.SetOptionImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SetOptionImpl extends CommandImpl implements SetOption {
+	/**
+	 * The default value of the '{@link #getKey() <em>Key</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getKey()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String KEY_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getKey() <em>Key</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getKey()
+	 * @generated
+	 * @ordered
+	 */
+	protected String key = KEY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SetOptionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return Q7CorePackage.Literals.SET_OPTION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getKey() {
+		return key;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setKey(String newKey) {
+		String oldKey = key;
+		key = newKey;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Q7CorePackage.SET_OPTION__KEY, oldKey, key));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Q7CorePackage.SET_OPTION__VALUE, oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case Q7CorePackage.SET_OPTION__KEY:
+				return getKey();
+			case Q7CorePackage.SET_OPTION__VALUE:
+				return getValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case Q7CorePackage.SET_OPTION__KEY:
+				setKey((String)newValue);
+				return;
+			case Q7CorePackage.SET_OPTION__VALUE:
+				setValue((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case Q7CorePackage.SET_OPTION__KEY:
+				setKey(KEY_EDEFAULT);
+				return;
+			case Q7CorePackage.SET_OPTION__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case Q7CorePackage.SET_OPTION__KEY:
+				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+			case Q7CorePackage.SET_OPTION__VALUE:
+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (key: ");
+		result.append(key);
+		result.append(", value: ");
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+} //SetOptionImpl
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetQ7FeaturesImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetQ7FeaturesImpl.java
index e006114..33d5ebb 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetQ7FeaturesImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetQ7FeaturesImpl.java
@@ -29,10 +29,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.SetQ7FeaturesImpl#getFeatures <em>Features</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetQ7OptionImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetQ7OptionImpl.java
index 2602b1e..4dbe325 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetQ7OptionImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/SetQ7OptionImpl.java
@@ -27,11 +27,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.SetQ7OptionImpl#getKey <em>Key</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.SetQ7OptionImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/TerminateAutImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/TerminateAutImpl.java
index 72d001e..8034a6e 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/TerminateAutImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/TerminateAutImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Terminate Aut</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ViewInfoImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ViewInfoImpl.java
index b676957..7a5f4bf 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ViewInfoImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ViewInfoImpl.java
@@ -32,6 +32,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.ViewInfoImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.ViewInfoImpl#getImage <em>Image</em>}</li>
@@ -39,7 +40,6 @@
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.ViewInfoImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.ViewInfoImpl#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ViewListImpl.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ViewListImpl.java
index 4a323fe..da27926 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ViewListImpl.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/impl/ViewListImpl.java
@@ -30,10 +30,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.core.ecl.core.model.impl.ViewListImpl#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/util/Q7CoreAdapterFactory.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/util/Q7CoreAdapterFactory.java
index 514cb13..c48deea 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/util/Q7CoreAdapterFactory.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/util/Q7CoreAdapterFactory.java
@@ -174,6 +174,10 @@
 				return createTerminateAutAdapter();
 			}
 			@Override
+			public Adapter caseSetOption(SetOption object) {
+				return createSetOptionAdapter();
+			}
+			@Override
 			public Adapter caseCommand(Command object) {
 				return createCommandAdapter();
 			}
@@ -534,6 +538,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.core.ecl.core.model.SetOption <em>Set Option</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.rcptt.core.ecl.core.model.SetOption
+	 * @generated
+	 */
+	public Adapter createSetOptionAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.ecl.core.Command <em>Command</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/util/Q7CoreSwitch.java b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/util/Q7CoreSwitch.java
index c6ee7fa..f3ec445 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/util/Q7CoreSwitch.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/gen-src/org/eclipse/rcptt/core/ecl/core/model/util/Q7CoreSwitch.java
@@ -255,6 +255,13 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case Q7CorePackage.SET_OPTION: {
+				SetOption setOption = (SetOption)theEObject;
+				T result = caseSetOption(setOption);
+				if (result == null) result = caseCommand(setOption);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -620,6 +627,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Set Option</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Set Option</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSetOption(SetOption object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Command</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/core/org.eclipse.rcptt.core.ecl.core/model/model.ecore b/core/org.eclipse.rcptt.core.ecl.core/model/model.ecore
index 8a9c67f..9c43bf6 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/model/model.ecore
+++ b/core/org.eclipse.rcptt.core.ecl.core/model/model.ecore
@@ -130,4 +130,16 @@
   <eClassifiers xsi:type="ecore:EClass" name="TerminateAut" eSuperTypes="../../org.eclipse.rcptt.ecl.core/model/ecl.ecore#//Command">
     <eAnnotations source="http://www.eclipse.org/ecl/internal"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SetOption" eSuperTypes="../../org.eclipse.rcptt.ecl.core/model/ecl.ecore#//Command">
+    <eAnnotations source="http://www.eclipse.org/ecl/docs">
+      <details key="description" value="Sets RCPTT runtime option."/>
+      <details key="example" value="&lt;code>set-option eclExecutionDelay 0&lt;/code>"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/ecl/docs">
+        <details key="description" value="&lt;br/>&#xD;&#xA;Available keys:&#xD;&#xA;&lt;ul>&#xD;&#xA;    &lt;li> &lt;b>jobDebugjobTimeout&lt;/b> Eclipse job debug plugin jobs timeout (def: 300000 ms) &lt;/li>&#xD;&#xA;    &lt;li> &lt;b>jobSleepingStepTime&lt;/b> Step in step mode (def: 200 ms) &lt;/li>&#xD;&#xA;    &lt;li> &lt;b>jobSleepingStepTimeout&lt;/b> Stepping job timeout (def: 120000 ms) &lt;/li>&#xD;&#xA;    &lt;li> &lt;b>jobTreatAsSleepingTimeout&lt;/b> Enable Job step mode timeout (def: 10000 ms) &lt;/li>&#xD;&#xA;    &lt;li> &lt;b>jobHangTimeout&lt;/b> Job skip timeout (def: 30000 ms) &lt;/li>&#xD;&#xA;    &lt;li> &lt;b>jobScheduleDelayedMaxtime&lt;/b> Wait for jobs with delay less timeout (def: 600 ms) &lt;/li>&#xD;&#xA;    &lt;li> &lt;b>eclExecutionDelay&lt;/b> Wait for time between each ECL command (def: 0 ms) &lt;/li>&#xD;&#xA;    &lt;li> &lt;b>workspaceClearForceGc&lt;/b> Forces garbage collection on workspace cleanup (def: true) &lt;/li>&#xD;&#xA;&lt;/ul>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/runtime/org.eclipse.rcptt.runtime.ui/plugin.xml b/runtime/org.eclipse.rcptt.runtime.ui/plugin.xml
index eef103b..c40d138 100644
--- a/runtime/org.eclipse.rcptt.runtime.ui/plugin.xml
+++ b/runtime/org.eclipse.rcptt.runtime.ui/plugin.xml
@@ -48,7 +48,7 @@
             namespace="http://eclipse.org/rcptt/core/ecl">
       </scriptlet>
       <scriptlet
-            class="org.eclipse.rcptt.internal.runtime.ui.SetQ7OptionService"
+            class="org.eclipse.rcptt.internal.runtime.ui.SetOptionService"
             name="SetQ7Option"
             namespace="http://eclipse.org/rcptt/core/ecl">
       </scriptlet>
@@ -57,6 +57,11 @@
             name="AutReconnect"
             namespace="http://eclipse.org/rcptt/core/launching.ecore">
       </scriptlet>
+      <scriptlet
+            class="org.eclipse.rcptt.internal.runtime.ui.SetOptionService"
+            name="SetOption"
+            namespace="http://eclipse.org/rcptt/core/ecl">
+      </scriptlet>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
diff --git a/runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetQ7OptionService.java b/runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetOptionService.java
similarity index 68%
rename from runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetQ7OptionService.java
rename to runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetOptionService.java
index 37def85..2a6364d 100644
--- a/runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetQ7OptionService.java
+++ b/runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetOptionService.java
@@ -13,26 +13,34 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.rcptt.core.OptionsHandler;
+import org.eclipse.rcptt.core.ecl.core.model.SetOption;
+import org.eclipse.rcptt.core.ecl.core.model.SetQ7Option;
 import org.eclipse.rcptt.ecl.core.Command;
 import org.eclipse.rcptt.ecl.runtime.ICommandService;
 import org.eclipse.rcptt.ecl.runtime.IProcess;
-
-import org.eclipse.rcptt.core.OptionsHandler;
-import org.eclipse.rcptt.core.ecl.core.model.SetQ7Option;
 import org.eclipse.rcptt.tesla.core.TeslaFeatures;
 import org.eclipse.rcptt.tesla.swt.events.TeslaEventManager;
 
-public class SetQ7OptionService implements ICommandService {
+public class SetOptionService implements ICommandService {
 
 	public IStatus service(Command command, IProcess context)
 			throws InterruptedException, CoreException {
-		SetQ7Option s = (SetQ7Option) command;
-		new OptionsHandler().applyOption(s.getKey(), s.getValue());
-		
-		if (s.getKey().equals(TeslaFeatures.STATUS_DIALOG_ALLOWED)) {
-			TeslaEventManager.getManager().setStatusDialogModeAllowed(Boolean.valueOf(s.getValue()));
+		if (command instanceof SetOption) {
+			SetOption setOption = (SetOption) command;
+			applyOption(setOption.getKey(), setOption.getValue());
+		} else if (command instanceof SetQ7Option) {
+			SetQ7Option setQ7Option = (SetQ7Option) command;
+			applyOption(setQ7Option.getKey(), setQ7Option.getValue());
 		}
-		
 		return Status.OK_STATUS;
 	}
+
+	private static void applyOption(String name, String value) {
+		new OptionsHandler().applyOption(name, value);
+		if (name.equals(TeslaFeatures.STATUS_DIALOG_ALLOWED)) {
+			TeslaEventManager.getManager().setStatusDialogModeAllowed(Boolean.valueOf(value));
+		}
+	}
+
 }