Merge branch 'master' into uijobcollector
diff --git a/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/protocol/TextUIElement.java b/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/protocol/TextUIElement.java
index cdae5e8..20afee6 100644
--- a/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/protocol/TextUIElement.java
+++ b/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/protocol/TextUIElement.java
@@ -13,6 +13,7 @@
import org.eclipse.rcptt.tesla.core.protocol.raw.Element;
import org.eclipse.rcptt.tesla.core.protocol.raw.Response;
import org.eclipse.rcptt.tesla.core.protocol.raw.ResponseStatus;
+import org.eclipse.rcptt.tesla.core.utils.Cryptography;
public class TextUIElement extends ControlUIElement {
@@ -30,7 +31,7 @@
public void setText(String text, boolean select, boolean hide) {
SetText cmd = factory.createSetText();
cmd.setElement(getElement());
- cmd.setValue(text);
+ cmd.setValue(hide ? Cryptography.INSTANCE.encrypt(text) : text);
cmd.setSelect(select);
cmd.setHidden(hide);
player.safeExecuteCommand(cmd);
diff --git a/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/utils/Cryptography.java b/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/utils/Cryptography.java
new file mode 100644
index 0000000..f2d831a
--- /dev/null
+++ b/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/utils/Cryptography.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2014 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.tesla.core.utils;
+
+import java.security.Key;
+import java.security.spec.KeySpec;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.eclipse.rcptt.util.Base64;
+import org.eclipse.rcptt.util.StringUtils;
+
+public class Cryptography {
+ private static final byte[] IV_PARAMETER_SPEC = new byte[]{1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8};
+ private static final byte[] SALT = new byte[]{0, 0, 0, 0, 0, 0, 0, 0};
+ private static final String CIPHER_MODE = "AES/CBC/PKCS5Padding";
+ private static final String PROPERTY = "org.eclipse.rcptt.cryptoKey";
+ private Key key;
+
+ public Cryptography(Key key) {
+ this.key = key;
+ if (key == null)
+ throw new NullPointerException();
+ }
+
+ public String decrypt(String input) {
+ try {
+ Cipher cipher = Cipher.getInstance(CIPHER_MODE);
+ cipher.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(IV_PARAMETER_SPEC));
+ return new String(cipher.doFinal(Base64
+ .decode(input)), "UTF-8");
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public String encrypt(String input) {
+ try {
+ Cipher cipher = Cipher.getInstance(CIPHER_MODE);
+ cipher.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(IV_PARAMETER_SPEC));
+ return Base64.encode(cipher.doFinal(input
+ .getBytes("UTF-8")));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ static public final Cryptography INSTANCE = new Cryptography(
+ getConfiguredKey());
+
+ private static Key getConfiguredKey() {
+ String keyString = System.getProperty(PROPERTY);
+ if (StringUtils.isEmpty(keyString))
+ keyString = "gjdlm7JIO.UOLNE/EOL<FPUWX MI<KMG2TYIL";
+ try {
+ SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+ KeySpec spec = new PBEKeySpec(keyString.toCharArray(), SALT, 256, 128);
+ byte[] encoded = factory.generateSecret(spec).getEncoded();
+ assert encoded.length*8 == 128;
+ Key rv = new SecretKeySpec(encoded, "AES");
+ //Testing key
+ Cipher cipher = Cipher.getInstance(CIPHER_MODE);
+ cipher.init(Cipher.DECRYPT_MODE, rv, new IvParameterSpec(IV_PARAMETER_SPEC));
+ return rv;
+ } catch (Exception e) {
+ throw new RuntimeException("Cryptography key failure.", e);
+ }
+
+ }
+}
diff --git a/core/org.eclipse.rcptt.tesla.recording.core.ecl/src/org/eclipse/rcptt/tesla/recording/core/ecl/parser/TeslaParser.java b/core/org.eclipse.rcptt.tesla.recording.core.ecl/src/org/eclipse/rcptt/tesla/recording/core/ecl/parser/TeslaParser.java
index b72f5e8..167a7f3 100644
--- a/core/org.eclipse.rcptt.tesla.recording.core.ecl/src/org/eclipse/rcptt/tesla/recording/core/ecl/parser/TeslaParser.java
+++ b/core/org.eclipse.rcptt.tesla.recording.core.ecl/src/org/eclipse/rcptt/tesla/recording/core/ecl/parser/TeslaParser.java
@@ -30,7 +30,6 @@
import org.eclipse.rcptt.ecl.core.Sequence;
import org.eclipse.rcptt.ecl.core.util.EclRefactoring;
import org.eclipse.swt.dnd.DND;
-
import org.eclipse.rcptt.util.Base64;
import org.eclipse.rcptt.util.swt.KeysAndButtons;
import org.eclipse.rcptt.tesla.core.protocol.ActivateCellEditor;
@@ -97,6 +96,7 @@
import org.eclipse.rcptt.tesla.ecl.TeslaEclUtils;
import org.eclipse.rcptt.tesla.ecl.TeslaScriptletFactory;
import org.eclipse.rcptt.tesla.ecl.model.Button;
+import org.eclipse.rcptt.tesla.ecl.model.Decrypt;
import org.eclipse.rcptt.tesla.ecl.model.ExecWithOptions;
import org.eclipse.rcptt.tesla.ecl.model.FromRawKey;
import org.eclipse.rcptt.tesla.ecl.model.GetProperty;
@@ -296,16 +296,29 @@
}
@TeslaCommand(packageUri = ProtocolPackage.eNS_URI, classifier = "SetText")
- protected Command setText(SetText c) {
- if (c.getElement().getKind().equals(ElementKind.DateTime.name())
- || c.getElement().getKind().equals(ElementKind.Slider.name())) {
- return TeslaScriptletFactory.makePipe(selectorOf(c.getElement()),
- TeslaScriptletFactory.makeSetValue(c.getValue()));
+ protected Command setText(SetText c) {
+ if (c.getElement().getKind().equals(ElementKind.DateTime.name())
+ || c.getElement().getKind().equals(ElementKind.Slider.name())) {
+ return TeslaScriptletFactory.makePipe(selectorOf(c.getElement()),
+ TeslaScriptletFactory.makeSetValue(c.getValue()));
+ }
+
+ org.eclipse.rcptt.tesla.ecl.model.SetText cmd = TeslaFactory.eINSTANCE.createSetText();
+ if (c.isHidden()) {
+ bind(cmd, TeslaPackage.eINSTANCE.getSetText_Text(), decrypt(c.getValue()));
+ } else {
+ cmd.setText(c.getValue());
}
- return TeslaScriptletFactory.makePipe(selectorOf(c.getElement()),
- TeslaScriptletFactory.makeSetText(c.getValue()));
+ return TeslaScriptletFactory.makePipe(selectorOf(c.getElement()),
+ cmd);
}
-
+
+ protected Command decrypt(String rawdata) {
+ Decrypt cmd = TeslaFactory.eINSTANCE.createDecrypt();
+ cmd.setValue(rawdata);
+ return cmd;
+ }
+
@TeslaCommand(packageUri = ProtocolPackage.eNS_URI, classifier = "SetTextSelection")
protected Command setTextSelection(SetTextSelection c) {
if (c.getEndline() != null && c.getEndoffset() != null) {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF
index 5240309..6852161 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF
@@ -1,10 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: ECL Core
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rcptt.ecl.core;singleton:=true
Bundle-Version: 1.5.2.qualifier
Bundle-ClassPath: .
-Bundle-Vendor: Eclipse RCP Testing Tool Project
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.rcptt.ecl.core,
org.eclipse.rcptt.ecl.core.impl,
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore
index 2e78493..eea77bb 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore
@@ -318,13 +318,6 @@
<details key="returns" value="An internal object describing the case."/>
<details key="example" value="list 1 2 3 | get 0 | switch [case 1 {
	log -message "First item is 1"
}] [case 2 {
	log -message "First item is 2"
}]"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="input" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/ecl/input"/>
- <eAnnotations source="http://www.eclipse.org/ecl/docs">
- <details key="description" value="The input value to compare."/>
- </eAnnotations>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="condition" lowerBound="1"
eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject">
<eAnnotations source="http://www.eclipse.org/ecl/docs">
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/plugin.properties b/ecl/plugins/org.eclipse.rcptt.ecl.core/plugin.properties
index 69c8776..2538b5e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/plugin.properties
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/plugin.properties
@@ -8,3 +8,5 @@
# Contributors:
# Xored Software Inc - initial API and implementation and/or initial documentation
###############################################################################
+pluginName = Ecl Model
+providerName = www.example.org
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java
index 52b9a06..ba0f7ec 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java
@@ -12,7 +12,6 @@
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.rcptt.ecl.core.Case#getInput <em>Input</em>}</li>
* <li>{@link org.eclipse.rcptt.ecl.core.Case#getCondition <em>Condition</em>}</li>
* <li>{@link org.eclipse.rcptt.ecl.core.Case#getThen <em>Then</em>}</li>
* </ul>
@@ -77,31 +76,4 @@
*/
void setThen(Command value);
- /**
- * Returns the value of the '<em><b>Input</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Input</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Input</em>' containment reference.
- * @see #setInput(EObject)
- * @see org.eclipse.rcptt.ecl.core.CorePackage#getCase_Input()
- * @model containment="true" required="true"
- * annotation="http://www.eclipse.org/ecl/docs description='The input value to compare.'"
- * @generated
- */
- EObject getInput();
-
- /**
- * Sets the value of the '{@link org.eclipse.rcptt.ecl.core.Case#getInput <em>Input</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Input</em>' containment reference.
- * @see #getInput()
- * @generated
- */
- void setInput(EObject value);
-
} // Case
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java
index 09505e4..52edeae 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java
@@ -2019,22 +2019,13 @@
int CASE__BINDINGS = COMMAND__BINDINGS;
/**
- * The feature id for the '<em><b>Input</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CASE__INPUT = COMMAND_FEATURE_COUNT + 0;
-
- /**
* The feature id for the '<em><b>Condition</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int CASE__CONDITION = COMMAND_FEATURE_COUNT + 1;
+ int CASE__CONDITION = COMMAND_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Then</b></em>' containment reference.
@@ -2043,7 +2034,7 @@
* @generated
* @ordered
*/
- int CASE__THEN = COMMAND_FEATURE_COUNT + 2;
+ int CASE__THEN = COMMAND_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>Case</em>' class.
@@ -2052,7 +2043,7 @@
* @generated
* @ordered
*/
- int CASE_FEATURE_COUNT = COMMAND_FEATURE_COUNT + 3;
+ int CASE_FEATURE_COUNT = COMMAND_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link org.eclipse.rcptt.ecl.core.impl.SwitchImpl <em>Switch</em>}' class.
@@ -3226,17 +3217,6 @@
EReference getCase_Then();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.rcptt.ecl.core.Case#getInput <em>Input</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Input</em>'.
- * @see org.eclipse.rcptt.ecl.core.Case#getInput()
- * @see #getCase()
- * @generated
- */
- EReference getCase_Input();
-
- /**
* Returns the meta object for class '{@link org.eclipse.rcptt.ecl.core.Switch <em>Switch</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4408,14 +4388,6 @@
EReference CASE__THEN = eINSTANCE.getCase_Then();
/**
- * The meta object literal for the '<em><b>Input</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference CASE__INPUT = eINSTANCE.getCase_Input();
-
- /**
* The meta object literal for the '{@link org.eclipse.rcptt.ecl.core.impl.SwitchImpl <em>Switch</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Nullable.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Nullable.java
index 5c945ab..6255844 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Nullable.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Nullable.java
@@ -8,78 +8,78 @@
* Contributors:
* Xored Software Inc - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.rcptt.ecl.core;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Nullable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.rcptt.ecl.core.Nullable#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.rcptt.ecl.core.Nullable#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.rcptt.ecl.core.CorePackage#getNullable()
- * @model
- * @generated
- */
-public interface Nullable extends EObject {
- /**
- * Returns the value of the '<em><b>Value</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value</em>' containment reference.
- * @see #setValue(EObject)
- * @see org.eclipse.rcptt.ecl.core.CorePackage#getNullable_Value()
- * @model containment="true"
- * @generated
- */
- EObject getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.rcptt.ecl.core.Nullable#getValue <em>Value</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value</em>' containment reference.
- * @see #getValue()
- * @generated
- */
- void setValue(EObject value);
-
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Type</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(String)
- * @see org.eclipse.rcptt.ecl.core.CorePackage#getNullable_Type()
- * @model
- * @generated
- */
- String getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.rcptt.ecl.core.Nullable#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(String value);
-
-} // Nullable
+package org.eclipse.rcptt.ecl.core;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Nullable</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.rcptt.ecl.core.Nullable#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.rcptt.ecl.core.Nullable#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.rcptt.ecl.core.CorePackage#getNullable()
+ * @model
+ * @generated
+ */
+public interface Nullable extends EObject {
+ /**
+ * Returns the value of the '<em><b>Value</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Value</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Value</em>' containment reference.
+ * @see #setValue(EObject)
+ * @see org.eclipse.rcptt.ecl.core.CorePackage#getNullable_Value()
+ * @model containment="true"
+ * @generated
+ */
+ EObject getValue();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.rcptt.ecl.core.Nullable#getValue <em>Value</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Value</em>' containment reference.
+ * @see #getValue()
+ * @generated
+ */
+ void setValue(EObject value);
+
+ /**
+ * Returns the value of the '<em><b>Type</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Type</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Type</em>' attribute.
+ * @see #setType(String)
+ * @see org.eclipse.rcptt.ecl.core.CorePackage#getNullable_Type()
+ * @model
+ * @generated
+ */
+ String getType();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.rcptt.ecl.core.Nullable#getType <em>Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Type</em>' attribute.
+ * @see #getType()
+ * @generated
+ */
+ void setType(String value);
+
+} // Nullable
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Serialized.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Serialized.java
index 8ba3fa9..9301c85 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Serialized.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Serialized.java
@@ -8,51 +8,51 @@
* Contributors:
* Xored Software Inc - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.rcptt.ecl.core;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Serialized</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.rcptt.ecl.core.Serialized#getBytes <em>Bytes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.rcptt.ecl.core.CorePackage#getSerialized()
- * @model
- * @generated
- */
-public interface Serialized extends EObject {
- /**
- * Returns the value of the '<em><b>Bytes</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Bytes</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Bytes</em>' attribute.
- * @see #setBytes(byte[])
- * @see org.eclipse.rcptt.ecl.core.CorePackage#getSerialized_Bytes()
- * @model
- * @generated
- */
- byte[] getBytes();
-
- /**
- * Sets the value of the '{@link org.eclipse.rcptt.ecl.core.Serialized#getBytes <em>Bytes</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Bytes</em>' attribute.
- * @see #getBytes()
- * @generated
- */
- void setBytes(byte[] value);
-
-} // Serialized
+package org.eclipse.rcptt.ecl.core;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Serialized</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.rcptt.ecl.core.Serialized#getBytes <em>Bytes</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.rcptt.ecl.core.CorePackage#getSerialized()
+ * @model
+ * @generated
+ */
+public interface Serialized extends EObject {
+ /**
+ * Returns the value of the '<em><b>Bytes</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Bytes</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Bytes</em>' attribute.
+ * @see #setBytes(byte[])
+ * @see org.eclipse.rcptt.ecl.core.CorePackage#getSerialized_Bytes()
+ * @model
+ * @generated
+ */
+ byte[] getBytes();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.rcptt.ecl.core.Serialized#getBytes <em>Bytes</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Bytes</em>' attribute.
+ * @see #getBytes()
+ * @generated
+ */
+ void setBytes(byte[] value);
+
+} // Serialized
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java
index 5df016b..c33f152 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java
@@ -22,7 +22,6 @@
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.rcptt.ecl.core.impl.CaseImpl#getInput <em>Input</em>}</li>
* <li>{@link org.eclipse.rcptt.ecl.core.impl.CaseImpl#getCondition <em>Condition</em>}</li>
* <li>{@link org.eclipse.rcptt.ecl.core.impl.CaseImpl#getThen <em>Then</em>}</li>
* </ul>
@@ -32,16 +31,6 @@
*/
public class CaseImpl extends CommandImpl implements Case {
/**
- * The cached value of the '{@link #getInput() <em>Input</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getInput()
- * @generated
- * @ordered
- */
- protected EObject input;
-
- /**
* The cached value of the '{@link #getCondition() <em>Condition</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -166,54 +155,9 @@
* <!-- end-user-doc -->
* @generated
*/
- public EObject getInput() {
- return input;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetInput(EObject newInput, NotificationChain msgs) {
- EObject oldInput = input;
- input = newInput;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CorePackage.CASE__INPUT, oldInput, newInput);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setInput(EObject newInput) {
- if (newInput != input) {
- NotificationChain msgs = null;
- if (input != null)
- msgs = ((InternalEObject)input).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CorePackage.CASE__INPUT, null, msgs);
- if (newInput != null)
- msgs = ((InternalEObject)newInput).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CorePackage.CASE__INPUT, null, msgs);
- msgs = basicSetInput(newInput, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.CASE__INPUT, newInput, newInput));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case CorePackage.CASE__INPUT:
- return basicSetInput(null, msgs);
case CorePackage.CASE__THEN:
return basicSetThen(null, msgs);
}
@@ -228,8 +172,6 @@
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case CorePackage.CASE__INPUT:
- return getInput();
case CorePackage.CASE__CONDITION:
if (resolve) return getCondition();
return basicGetCondition();
@@ -247,9 +189,6 @@
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case CorePackage.CASE__INPUT:
- setInput((EObject)newValue);
- return;
case CorePackage.CASE__CONDITION:
setCondition((EObject)newValue);
return;
@@ -268,9 +207,6 @@
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case CorePackage.CASE__INPUT:
- setInput((EObject)null);
- return;
case CorePackage.CASE__CONDITION:
setCondition((EObject)null);
return;
@@ -289,8 +225,6 @@
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case CorePackage.CASE__INPUT:
- return input != null;
case CorePackage.CASE__CONDITION:
return condition != null;
case CorePackage.CASE__THEN:
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java
index a2141c6..4d3733f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java
@@ -1296,7 +1296,7 @@
* @generated
*/
public EReference getCase_Condition() {
- return (EReference)caseEClass.getEStructuralFeatures().get(1);
+ return (EReference)caseEClass.getEStructuralFeatures().get(0);
}
/**
@@ -1305,16 +1305,7 @@
* @generated
*/
public EReference getCase_Then() {
- return (EReference)caseEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getCase_Input() {
- return (EReference)caseEClass.getEStructuralFeatures().get(0);
+ return (EReference)caseEClass.getEStructuralFeatures().get(1);
}
/**
@@ -1704,7 +1695,6 @@
createEReference(eclMapEntryEClass, ECL_MAP_ENTRY__VALUE);
caseEClass = createEClass(CASE);
- createEReference(caseEClass, CASE__INPUT);
createEReference(caseEClass, CASE__CONDITION);
createEReference(caseEClass, CASE__THEN);
@@ -1947,7 +1937,6 @@
initEReference(getEclMapEntry_Value(), theEcorePackage.getEObject(), null, "value", null, 0, 1, EclMapEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(caseEClass, Case.class, "Case", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCase_Input(), theEcorePackage.getEObject(), null, "input", null, 1, 1, Case.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getCase_Condition(), theEcorePackage.getEObject(), null, "condition", null, 1, 1, Case.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getCase_Then(), this.getCommand(), null, "then", null, 0, 1, Case.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2018,7 +2007,7 @@
(restoreStateEClass,
source,
new String[] {
- });
+ });
}
/**
@@ -2037,12 +2026,7 @@
(getGet_Input(),
source,
new String[] {
- });
- addAnnotation
- (getCase_Input(),
- source,
- new String[] {
- });
+ });
addAnnotation
(getSwitch_Input(),
source,
@@ -2223,12 +2207,6 @@
"description", "Corresponds command from <code>then</code> branch if an object from the <code>input</code> matches the <code>condition</code> object.",
"returns", "An internal object describing the case.",
"example", "list 1 2 3 | get 0 | switch [case 1 {\r\n\tlog -message \"First item is 1\"\r\n}] [case 2 {\n\tlog -message \"First item is 2\"\n}]"
- });
- addAnnotation
- (getCase_Input(),
- source,
- new String[] {
- "description", "The input value to compare."
});
addAnnotation
(getCase_Condition(),
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java
index e2d2ae5..00ecb1c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java
@@ -8,245 +8,245 @@
* Contributors:
* Xored Software Inc - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.rcptt.ecl.core.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
+package org.eclipse.rcptt.ecl.core.impl;
+
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.rcptt.ecl.core.CorePackage;
import org.eclipse.rcptt.ecl.core.Nullable;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Nullable</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.rcptt.ecl.core.impl.NullableImpl#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.rcptt.ecl.core.impl.NullableImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NullableImpl extends EObjectImpl implements Nullable {
- /**
- * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected EObject value;
-
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final String TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected String type = TYPE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected NullableImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return CorePackage.Literals.NULLABLE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetValue(EObject newValue, NotificationChain msgs) {
- EObject oldValue = value;
- value = newValue;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CorePackage.NULLABLE__VALUE, oldValue, newValue);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValue(EObject newValue) {
- if (newValue != value) {
- NotificationChain msgs = null;
- if (value != null)
- msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CorePackage.NULLABLE__VALUE, null, msgs);
- if (newValue != null)
- msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CorePackage.NULLABLE__VALUE, null, msgs);
- msgs = basicSetValue(newValue, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.NULLABLE__VALUE, newValue, newValue));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(String newType) {
- String oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.NULLABLE__TYPE, oldType, type));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case CorePackage.NULLABLE__VALUE:
- return basicSetValue(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case CorePackage.NULLABLE__VALUE:
- return getValue();
- case CorePackage.NULLABLE__TYPE:
- return getType();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case CorePackage.NULLABLE__VALUE:
- setValue((EObject)newValue);
- return;
- case CorePackage.NULLABLE__TYPE:
- setType((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case CorePackage.NULLABLE__VALUE:
- setValue((EObject)null);
- return;
- case CorePackage.NULLABLE__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case CorePackage.NULLABLE__VALUE:
- return value != null;
- case CorePackage.NULLABLE__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- }
- 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(" (type: ");
- result.append(type);
- result.append(')');
- return result.toString();
- }
-
-} //NullableImpl
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Nullable</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.rcptt.ecl.core.impl.NullableImpl#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.rcptt.ecl.core.impl.NullableImpl#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class NullableImpl extends EObjectImpl implements Nullable {
+ /**
+ * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected EObject value;
+
+ /**
+ * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getType()
+ * @generated
+ * @ordered
+ */
+ protected static final String TYPE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getType()
+ * @generated
+ * @ordered
+ */
+ protected String type = TYPE_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected NullableImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return CorePackage.Literals.NULLABLE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EObject getValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetValue(EObject newValue, NotificationChain msgs) {
+ EObject oldValue = value;
+ value = newValue;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CorePackage.NULLABLE__VALUE, oldValue, newValue);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setValue(EObject newValue) {
+ if (newValue != value) {
+ NotificationChain msgs = null;
+ if (value != null)
+ msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CorePackage.NULLABLE__VALUE, null, msgs);
+ if (newValue != null)
+ msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CorePackage.NULLABLE__VALUE, null, msgs);
+ msgs = basicSetValue(newValue, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.NULLABLE__VALUE, newValue, newValue));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setType(String newType) {
+ String oldType = type;
+ type = newType;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.NULLABLE__TYPE, oldType, type));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case CorePackage.NULLABLE__VALUE:
+ return basicSetValue(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case CorePackage.NULLABLE__VALUE:
+ return getValue();
+ case CorePackage.NULLABLE__TYPE:
+ return getType();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case CorePackage.NULLABLE__VALUE:
+ setValue((EObject)newValue);
+ return;
+ case CorePackage.NULLABLE__TYPE:
+ setType((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case CorePackage.NULLABLE__VALUE:
+ setValue((EObject)null);
+ return;
+ case CorePackage.NULLABLE__TYPE:
+ setType(TYPE_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case CorePackage.NULLABLE__VALUE:
+ return value != null;
+ case CorePackage.NULLABLE__TYPE:
+ return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+ }
+ 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(" (type: ");
+ result.append(type);
+ result.append(')');
+ return result.toString();
+ }
+
+} //NullableImpl
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java
index 6a4d3a6..4f776ca 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java
@@ -8,164 +8,164 @@
* Contributors:
* Xored Software Inc - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.rcptt.ecl.core.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
+package org.eclipse.rcptt.ecl.core.impl;
+
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.rcptt.ecl.core.CorePackage;
import org.eclipse.rcptt.ecl.core.Serialized;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Serialized</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.rcptt.ecl.core.impl.SerializedImpl#getBytes <em>Bytes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SerializedImpl extends EObjectImpl implements Serialized {
- /**
- * The default value of the '{@link #getBytes() <em>Bytes</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBytes()
- * @generated
- * @ordered
- */
- protected static final byte[] BYTES_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getBytes() <em>Bytes</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBytes()
- * @generated
- * @ordered
- */
- protected byte[] bytes = BYTES_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SerializedImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return CorePackage.Literals.SERIALIZED;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public byte[] getBytes() {
- return bytes;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setBytes(byte[] newBytes) {
- byte[] oldBytes = bytes;
- bytes = newBytes;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.SERIALIZED__BYTES, oldBytes, bytes));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case CorePackage.SERIALIZED__BYTES:
- return getBytes();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case CorePackage.SERIALIZED__BYTES:
- setBytes((byte[])newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case CorePackage.SERIALIZED__BYTES:
- setBytes(BYTES_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case CorePackage.SERIALIZED__BYTES:
- return BYTES_EDEFAULT == null ? bytes != null : !BYTES_EDEFAULT.equals(bytes);
- }
- 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(" (bytes: ");
- result.append(bytes);
- result.append(')');
- return result.toString();
- }
-
-} //SerializedImpl
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Serialized</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.rcptt.ecl.core.impl.SerializedImpl#getBytes <em>Bytes</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SerializedImpl extends EObjectImpl implements Serialized {
+ /**
+ * The default value of the '{@link #getBytes() <em>Bytes</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getBytes()
+ * @generated
+ * @ordered
+ */
+ protected static final byte[] BYTES_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBytes() <em>Bytes</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getBytes()
+ * @generated
+ * @ordered
+ */
+ protected byte[] bytes = BYTES_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected SerializedImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return CorePackage.Literals.SERIALIZED;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public byte[] getBytes() {
+ return bytes;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setBytes(byte[] newBytes) {
+ byte[] oldBytes = bytes;
+ bytes = newBytes;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.SERIALIZED__BYTES, oldBytes, bytes));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case CorePackage.SERIALIZED__BYTES:
+ return getBytes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case CorePackage.SERIALIZED__BYTES:
+ setBytes((byte[])newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case CorePackage.SERIALIZED__BYTES:
+ setBytes(BYTES_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case CorePackage.SERIALIZED__BYTES:
+ return BYTES_EDEFAULT == null ? bytes != null : !BYTES_EDEFAULT.equals(bytes);
+ }
+ 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(" (bytes: ");
+ result.append(bytes);
+ result.append(')');
+ return result.toString();
+ }
+
+} //SerializedImpl
diff --git a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/EditorContent.java b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/EditorContent.java
index 165933c..9cebcbd 100644
--- a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/EditorContent.java
+++ b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/EditorContent.java
@@ -26,21 +26,6 @@
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.views.properties.IPropertySource;
-
import org.eclipse.rcptt.core.model.IQ7NamedElement;
import org.eclipse.rcptt.core.model.ITestCase;
import org.eclipse.rcptt.core.model.ModelException;
@@ -55,6 +40,20 @@
import org.eclipse.rcptt.ui.controls.VerificationsTable;
import org.eclipse.rcptt.ui.editors.NamedElementEditorActions.INamedElementActions;
import org.eclipse.rcptt.ui.editors.ecl.EclSourceViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.program.Program;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.views.properties.IPropertySource;
public class EditorContent implements INamedElementActions {
@@ -71,7 +70,7 @@
private StyledText externalRefControl;
private boolean scenarioEditor;
- private boolean supportRefs;
+ private final boolean supportRefs;
private VerificationsTable verificationsTable;
private Section verificationsSection;
@@ -465,7 +464,7 @@
public void doTextCommand(int fAction) {
if (descriptionComposite.getDescriptionControl().isFocusControl()) {
descriptionComposite.getDescriptionControl().invokeAction(fAction);
- } else if (externalRefControl.isFocusControl()) {
+ } else if (externalRefControl != null && externalRefControl.isFocusControl()) {
externalRefControl.invokeAction(fAction);
}
}
diff --git a/rcpttTests/ECL_IDE_module/Contexts/Ecl Script Context/Bug 442685 NullPointerException.test b/rcpttTests/ECL_IDE_module/Contexts/Ecl Script Context/Bug 442685 NullPointerException.test
new file mode 100644
index 0000000..bffa412
--- /dev/null
+++ b/rcpttTests/ECL_IDE_module/Contexts/Ecl Script Context/Bug 442685 NullPointerException.test
@@ -0,0 +1,55 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _ymiyse5IEeCU6db9MgIBkA,_IeEQkPSUEeCE1L2j6bYoFw
+Element-Name: Bug 442685 NullPointerException
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: https://bugs.eclipse.org/bugs/show_bug.cgi?id=442685
+Id: _NjJO0C3YEeSo8tQHjhwDDw
+Runtime-Version: 1.5.2.qualifier
+Save-Time: 8/27/14 6:23 PM
+Testcase-Type: ecl
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Copyright (c) 2009, 2014 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 creation and/or initial documentation
+--------------------------------------------------------------------------------
+
+TEST STEPS
+
+1. Open Ecl Script context editor;
+2. Type Home/End in Name field;
+3. Make sure there are no error.
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+get-view "Test Explorer" | get-tree | select "Q7Project/EclContext" | double-click
+
+exec-with-options {
+ get-editor EclContext | get-editbox -after [get-label "Name:"] | key-type Home
+ verify-error { get-window "Problem Occurred" }
+} -allowStatusDialog
+
+
+exec-with-options {
+ get-editor EclContext | get-editbox -after [get-label "Name:"] | key-type End
+ verify-error { get-window "Problem Occurred" }
+} -allowStatusDialog
+
+exec-with-options {
+ get-editor EclContext | get-editbox -after [get-label "Name:"] | key-type "M1+ARROW_RIGHT"
+ verify-error { get-window "Problem Occurred" }
+} -allowStatusDialog
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/Editing/ProjectAndFolder/Copy/CopyFolderToAnotherProject.test b/rcpttTests/platform_tests/Editing/ProjectAndFolder/Copy/CopyFolderToAnotherProject.test
index 1f25822..dea9f14 100644
--- a/rcpttTests/platform_tests/Editing/ProjectAndFolder/Copy/CopyFolderToAnotherProject.test
+++ b/rcpttTests/platform_tests/Editing/ProjectAndFolder/Copy/CopyFolderToAnotherProject.test
@@ -1,14 +1,13 @@
--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
-Contexts: _4zI9AWpgEeCzId1Gnkds9A,_LhMUsNH1EeCvZZdPZOPlnw
+Contexts: _LhMUsNH1EeCvZZdPZOPlnw,_4zI9AWpgEeCzId1Gnkds9A
Element-Name: CopyFolderToAnotherProject
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _nB3MsNH7EeCvZZdPZOPlnw
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:04 PM
+Runtime-Version: 1.5.2.201408180747
+Save-Time: 8/25/14 12:16 PM
Tags: Project, Folder, CopyPaste
Testcase-Type: ecl
diff --git a/rcpttTests/platform_tests/Editing/TestCase/ContextList/CopyContextToTestFromNotReferencedProject.test b/rcpttTests/platform_tests/Editing/TestCase/ContextList/CopyContextToTestFromNotReferencedProject.test
index d062398..f6fae28 100644
--- a/rcpttTests/platform_tests/Editing/TestCase/ContextList/CopyContextToTestFromNotReferencedProject.test
+++ b/rcpttTests/platform_tests/Editing/TestCase/ContextList/CopyContextToTestFromNotReferencedProject.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference: http://jira4.xored.com/browse/QS-1135
Id: _gusGANIdEeCSSY3GE2xBfQ
-Runtime-Version: 1.5.2.qualifier
-Save-Time: 8/19/14 5:15 PM
+Runtime-Version: 1.5.2.201408180747
+Save-Time: 8/28/14 3:06 PM
Tags: TestCase, Context, Reference
Testcase-Type: ecl
@@ -107,9 +107,6 @@
get-editor scenario3 | get-section Contexts | get-table | get-item "Possible resolution -> context1 \\(p1\\)"
| get-property caption | equals "Possible resolution -> context1 (p1)" | verify-true
-// Dummy editor switch (see 442038):
-get-editor scenario2 | click
-get-editor scenario3 | click
get-editor scenario3 | get-section Script | get-text-viewer | key-type "M1+M2+s"
get-view "Test Explorer" | get-tree | select p3 | get-menu Properties | click
diff --git a/rcpttTests/platform_tests/ecl/GetChildrenFromFile.test b/rcpttTests/platform_tests/ecl/GetChildrenFromFile.test
index 268f5fb..42bac24 100644
--- a/rcpttTests/platform_tests/ecl/GetChildrenFromFile.test
+++ b/rcpttTests/platform_tests/ecl/GetChildrenFromFile.test
@@ -1,22 +1,21 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: GetChildrenFromFile
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _AeqkweZvEeOF0oJ66JQZLA
-Q7-Runtime-Version: 1.3.12.201405281649
-Save-Time: 5/29/14 11:23 AM
+Runtime-Version: 1.5.2.201408180747
+Save-Time: 8/27/14 12:39 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
Content-Type: text/ecl
Entry-Name: .content
-get-file "file:/c:/" | get children | assert-non-empty
+get-file [get-by-os -win "file:/c:/" -macosx "file:/Users" -linux "file:/Home"] | get children | assert-non-empty
-get-file "file:/c:/" | get children | foreach {
+get-file [get-by-os -win "file:/c:/" -macosx "file:/Users" -linux "file:/Home"] | get children | foreach {
trace [get "name"]
}
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/ecl/GetExistsFromFile.test b/rcpttTests/platform_tests/ecl/GetExistsFromFile.test
index 78a6e81..bb2d27f 100644
--- a/rcpttTests/platform_tests/ecl/GetExistsFromFile.test
+++ b/rcpttTests/platform_tests/ecl/GetExistsFromFile.test
@@ -1,19 +1,18 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: GetExistsFromFile
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _DzrNwOboEeOPh_ngj33FOg
-Q7-Runtime-Version: 1.3.12.201405281649
-Save-Time: 5/29/14 11:18 AM
+Runtime-Version: 1.5.2.201408180747
+Save-Time: 8/27/14 12:39 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
Content-Type: text/ecl
Entry-Name: .content
-get-file "file:/c:/" | get exists | verify-true
+get-file [get-by-os -win "file:/c:/" -macosx "file:/Users" -linux "file:/Home"] | get exists | verify-true
get-file "file:/shurumburumc:/" | get exists | verify-false
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/ecl/GetFile.test b/rcpttTests/platform_tests/ecl/GetFile.test
index 8f5eb68..4c5d34c 100644
--- a/rcpttTests/platform_tests/ecl/GetFile.test
+++ b/rcpttTests/platform_tests/ecl/GetFile.test
@@ -1,13 +1,12 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: GetFile
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _l6ADIOTVEeOShsjP9M9CMw
-Q7-Runtime-Version: 1.3.12.201405231548
-Save-Time: 5/26/14 8:00 PM
+Runtime-Version: 1.5.2.201408180747
+Save-Time: 8/27/14 12:41 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
diff --git a/rcpttTests/platform_tests/ecl/GetIsDirectoryFromFile.test b/rcpttTests/platform_tests/ecl/GetIsDirectoryFromFile.test
index fa0276f..e710ab0 100644
--- a/rcpttTests/platform_tests/ecl/GetIsDirectoryFromFile.test
+++ b/rcpttTests/platform_tests/ecl/GetIsDirectoryFromFile.test
@@ -1,19 +1,18 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: GetIsDirectoryFromFile
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _wyOEIObpEeOPh_ngj33FOg
-Q7-Runtime-Version: 1.3.12.201405281649
-Save-Time: 5/29/14 11:29 AM
+Runtime-Version: 1.5.2.201408180747
+Save-Time: 8/27/14 12:41 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
Content-Type: text/ecl
Entry-Name: .content
-get-file "file:/c:/" | get isDirectory | verify-true
+get-file [get-by-os -win "file:/c:/" -macosx "file:/Users" -linux "file:/Home"] | get isDirectory | verify-true
get-file "file:/casf:/" | get isDirectory | verify-false
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/ecl/Switch.test b/rcpttTests/platform_tests/ecl/Switch.test
index d00dbbd..7cf06da 100644
--- a/rcpttTests/platform_tests/ecl/Switch.test
+++ b/rcpttTests/platform_tests/ecl/Switch.test
@@ -1,19 +1,24 @@
--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: Switch
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _gKwkEPd7EeOUrIHOddLXDg
-Q7-Runtime-Version: 1.5.0.qualifier
-Save-Time: 6/19/14 1:45 PM
+Runtime-Version: 1.5.2.201408180747
+Save-Time: 8/28/14 2:24 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
Content-Type: text/ecl
Entry-Name: .content
+
+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=442016
+switch foo
+ [case foo { bool true }]
+ -default { bool false } | assert-true
+
// Without default
echo "right"
| switch
@@ -51,4 +56,6 @@
| equals "Correct" | verify-true
+
+
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/ecl/UriFromPath.test b/rcpttTests/platform_tests/ecl/UriFromPath.test
index 0c7fe89..d1fd6e4 100644
--- a/rcpttTests/platform_tests/ecl/UriFromPath.test
+++ b/rcpttTests/platform_tests/ecl/UriFromPath.test
@@ -1,18 +1,18 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: UriFromPath
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _zG1GQOTUEeOShsjP9M9CMw
-Q7-Runtime-Version: 1.3.12.201405231548
-Save-Time: 5/26/14 7:59 PM
+Runtime-Version: 1.5.2.201408180747
+Save-Time: 8/27/14 12:53 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
Content-Type: text/ecl
Entry-Name: .content
-uri-from-path "C:\Windows\System32" | equals "file:/C:/Windows/System32/" | verify-true
+uri-from-path [get-by-os -win "C:\Windows\System32" -macosx "Users" -linux "Home"] |
+contains [get-by-os -win "file:/C:/Windows/System32/" -macosx "file:/Users/" -linux "file:/Home/"] | verify-true
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/src/org/eclipse/rcptt/tesla/ecl/internal/impl/AdapterFactory.java b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/src/org/eclipse/rcptt/tesla/ecl/internal/impl/AdapterFactory.java
index c7645fc..4d9a111 100644
--- a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/src/org/eclipse/rcptt/tesla/ecl/internal/impl/AdapterFactory.java
+++ b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/src/org/eclipse/rcptt/tesla/ecl/internal/impl/AdapterFactory.java
@@ -11,14 +11,22 @@
package org.eclipse.rcptt.tesla.ecl.internal.impl;
import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.rcptt.tesla.core.utils.Cryptography;
+import org.eclipse.rcptt.tesla.ecl.model.DecryptResult;
public class AdapterFactory implements IAdapterFactory {
- private static final Class<?>[] adapters = new Class[]{String.class};
+ private static final Class<?>[] adapters = new Class[] { String.class };
@SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
+ @Override
public Object getAdapter(Object adaptableObject, Class adapterType) {
+ if (adaptableObject instanceof DecryptResult) {
+ if (adapterType.isAssignableFrom(String.class)) {
+ return Cryptography.INSTANCE.decrypt(((DecryptResult) adaptableObject).getValue());
+ }
+ }
+
return null;
}
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/.classpath b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/.classpath
deleted file mode 100644
index 121e527..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/.project b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/.project
deleted file mode 100644
index 8670c12..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.rcptt.tesla.recording.aspects.ui.ide</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.ajdt.core.ajbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.ajdt.ui.ajnature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/META-INF/MANIFEST.MF
deleted file mode 100644
index 48c34ee..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Q7 Runtime Workbencg Recording Support
-Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.ui.ide;singleton:=true
-Bundle-Version: 1.5.2.qualifier
-Bundle-Vendor: Eclipse RCP Testing Tool Project
-Require-Bundle: org.aspectj.runtime;visibility:=reexport,
- org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[1.5.2,1.6.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[1.5.2,1.6.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[1.5.2,1.6.0)",
- org.eclipse.ui.ide
-onEnvironment: JavaSE-1.6
-Import-Package: org.osgi.framework
-Eclipse-SupplementBundle: org.eclipse.ui.ide
-Export-Package: org.eclipse.rcptt.tesla.recording.aspects
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.rcptt.tesla.recording.aspects.UIIDEWorkbenchActivator
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/META-INF/aop.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/META-INF/aop.xml
deleted file mode 100644
index e0d4fd2..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/META-INF/aop.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aspectj>
- <aspects>
- <aspect name="org.eclipse.rcptt.tesla.recording.aspects.UIIDERecordingAspect" />
- </aspects>
- <weaver options="-verbose -Xset:typeDemotion=true" />
-</aspectj>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/about.html b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/about.html
deleted file mode 100644
index 692eebb..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2014</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/build.properties b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/build.properties
deleted file mode 100644
index dfb6a4f..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2014 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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/epl-v10.html b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/epl-v10.html
deleted file mode 100644
index 84ec251..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
- body {
- size: 8.5in 11.0in;
- margin: 0.25in 0.5in 0.25in 0.5in;
- tab-interval: 0.5in;
- }
- p {
- margin-left: auto;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- }
- p.list {
- margin-left: 0.5in;
- margin-top: 0.05em;
- margin-bottom: 0.05em;
- }
- </style>
-
-</head>
-
-<body lang="EN-US">
-
-<p align=center><b>Eclipse Public License - v 1.0</b></p>
-
-<p>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.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">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.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"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.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">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.</p>
-
-<p class="list">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.</p>
-
-<p class="list">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.</p>
-
-<p class="list">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.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">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;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">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.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>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.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>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.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>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.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-</body>
-
-</html>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/pom.xml
deleted file mode 100644
index 5c1c5d5..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <parent>
- <artifactId>tesla</artifactId>
- <groupId>org.eclipse.rcptt.tesla</groupId>
- <version>1.5.2-SNAPSHOT</version>
- </parent>
- <groupId>org.eclipse.rcptt.tesla</groupId>
- <artifactId>org.eclipse.rcptt.tesla.recording.aspects.ui.ide</artifactId>
- <version>1.5.2-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <dependencies>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>${aspectj_dep}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>${tycho-groupid}</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <excludeResources>
- <exludeResource>**/*.aj</exludeResource>
- </excludeResources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
- <version>${aspectj_version}</version>
- <executions>
- <execution>
- <id>compile</id>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <aspectDirectory>src</aspectDirectory>
- <Xlint>ignore</Xlint>
- <Xreweavable>true</Xreweavable>
- <deprecation>true</deprecation>
- <!--ajdtBuildDefFile>build-1-5.ajproperties</ajdtBuildDefFile-->
- </configuration>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/IUIIDEEventListener.java b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/IUIIDEEventListener.java
deleted file mode 100644
index 53a4cd0..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/IUIIDEEventListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 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.tesla.recording.aspects;
-
-
-public interface IUIIDEEventListener {
- void restartEclipse();
-}
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/UIIDEEventManager.java b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/UIIDEEventManager.java
deleted file mode 100644
index 36844c5..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/UIIDEEventManager.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 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.tesla.recording.aspects;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public final class UIIDEEventManager {
-
- private static Set<IUIIDEEventListener> listeners = new HashSet<IUIIDEEventListener>();
-
- private static boolean freezeState;
-
- private UIIDEEventManager() {
- }
-
- public static void addListener(IUIIDEEventListener listener) {
- listeners.add(listener);
- }
-
- public static void removeListener(IUIIDEEventListener listener) {
- listeners.remove(listener);
- }
-
- public static boolean getFreeze() {
- return freezeState;
- }
-
- public static void setFreeze(boolean value) {
- freezeState = value;
- }
-
- public static void restartEclipse() {
- for (IUIIDEEventListener listener : listeners) {
- listener.restartEclipse();
- }
- }
-}
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/UIIDERecordingAspect.aj b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/UIIDERecordingAspect.aj
deleted file mode 100644
index 8a2e256..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/UIIDERecordingAspect.aj
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.rcptt.tesla.recording.aspects;
-
-import org.aspectj.lang.annotation.SuppressAjWarnings;
-
-import org.eclipse.rcptt.tesla.core.am.AspectManager;
-
-
-public privileged aspect UIIDERecordingAspect {
-
- public UIIDERecordingAspect() {
- AspectManager.activateAspect(UIIDEWorkbenchActivator.PLUGIN_ID, this
- .getClass().getName());
- }
-
- @SuppressAjWarnings("adviceDidNotMatch")
- before(String location):
- execution(void org.eclipse.ui.internal.ide.actions.OpenWorkspaceAction.restart(String)) && args(location) {
- UIIDEEventManager.restartEclipse();
- }
-}
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/UIIDEWorkbenchActivator.java b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/UIIDEWorkbenchActivator.java
deleted file mode 100644
index 87ea935..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.ui.ide/src/org/eclipse/rcptt/tesla/recording/aspects/UIIDEWorkbenchActivator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 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.tesla.recording.aspects;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.rcptt.tesla.core.am.AspectManager;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class UIIDEWorkbenchActivator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.rcptt.tesla.recording.aspects.ui.ide";
-
- // The shared instance
- private static UIIDEWorkbenchActivator plugin;
-
- /**
- * The constructor
- */
- public UIIDEWorkbenchActivator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
- * )
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- AspectManager.activateBundle(PLUGIN_ID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
- * )
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static UIIDEWorkbenchActivator getDefault() {
- return plugin;
- }
-
- public static void log(Throwable t) {
- getDefault().getLog().log(
- new Status(Status.ERROR, PLUGIN_ID,
- "Tesla Recording SWT ERROR", t));
- }
-
-}
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/META-INF/MANIFEST.MF
index 84c8667..2f0b09b 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@
org.eclipse.rcptt.logging;bundle-version="1.1.0",
org.eclipse.rcptt.util.swt;bundle-version="1.0.0",
org.eclipse.rcptt.tesla.ecl,
- org.eclipse.rcptt.tesla.recording.aspects.ui.ide;bundle-version="1.1.0";resolution:=optional,
org.eclipse.rcptt.util;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/plugin.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/plugin.xml
index 03be923..f9c0e6d 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/plugin.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/plugin.xml
@@ -19,9 +19,6 @@
<recorder
class="org.eclipse.rcptt.tesla.recording.core.swt.JFaceRecordingProcessor">
</recorder>
- <recorder
- class="org.eclipse.rcptt.tesla.recording.core.swt.UIIDERecordingProcessor">
- </recorder>
</extension>
<extension
point="org.eclipse.rcptt.tesla.recording.swt.describerExtensions">
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/DNDSupport.java b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/DNDSupport.java
index f9572b8..b597754 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/DNDSupport.java
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/DNDSupport.java
@@ -10,6 +10,12 @@
*******************************************************************************/
package org.eclipse.rcptt.tesla.recording.core.swt;
+import org.eclipse.rcptt.tesla.core.protocol.ControlUIElement;
+import org.eclipse.rcptt.tesla.core.protocol.DragKind;
+import org.eclipse.rcptt.tesla.core.protocol.raw.Element;
+import org.eclipse.rcptt.tesla.internal.core.TeslaCore;
+import org.eclipse.rcptt.tesla.internal.ui.player.FindResult;
+import org.eclipse.rcptt.tesla.recording.core.TeslaRecorder;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DragSource;
import org.eclipse.swt.dnd.DropTarget;
@@ -19,13 +25,6 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Widget;
-import org.eclipse.rcptt.tesla.core.protocol.ControlUIElement;
-import org.eclipse.rcptt.tesla.core.protocol.DragKind;
-import org.eclipse.rcptt.tesla.core.protocol.raw.Element;
-import org.eclipse.rcptt.tesla.internal.core.TeslaCore;
-import org.eclipse.rcptt.tesla.internal.ui.player.FindResult;
-import org.eclipse.rcptt.tesla.recording.core.TeslaRecorder;
-
public class DNDSupport {
private TeslaRecorder recorder;
@@ -34,9 +33,15 @@
public DNDSupport() {
}
+ public void setRecorder(TeslaRecorder recorder) {
+ this.recorder = recorder;
+ }
+
public void processUniversalDND(Event event) {
- if (recorder == null)
- recorder = TeslaRecorder.getInstance();
+ if (recorder == null) {
+ return;
+ }
+
SWTWidgetLocator locator = SWTRecordingHelper.getHelper().getLocator();
String style = "";
@@ -66,8 +71,8 @@
} else if (event.widget instanceof DropTarget) {
DropTarget target = (DropTarget) event.widget;
Control widget = target.getControl();
-
- if( widget instanceof Shell) {
+
+ if (widget instanceof Shell) {
return;
}
@@ -102,7 +107,7 @@
public void processDND(Event event) {
if (recorder == null) {
- recorder = TeslaRecorder.getInstance();
+ return;
}
Control realWidget = null;
if (event.widget instanceof DropTarget) {
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/SWTEventRecorder.java b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/SWTEventRecorder.java
index c0fc002..bec6b61 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/SWTEventRecorder.java
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/SWTEventRecorder.java
@@ -36,6 +36,55 @@
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.rcptt.tesla.core.am.RecordingModeFeature;
+import org.eclipse.rcptt.tesla.core.context.ContextManagement;
+import org.eclipse.rcptt.tesla.core.context.ContextManagement.Context;
+import org.eclipse.rcptt.tesla.core.protocol.Click;
+import org.eclipse.rcptt.tesla.core.protocol.CompositeUIElement;
+import org.eclipse.rcptt.tesla.core.protocol.ControlUIElement;
+import org.eclipse.rcptt.tesla.core.protocol.ElementKind;
+import org.eclipse.rcptt.tesla.core.protocol.LinkUIElement;
+import org.eclipse.rcptt.tesla.core.protocol.MouseEvent;
+import org.eclipse.rcptt.tesla.core.protocol.MouseEventKind;
+import org.eclipse.rcptt.tesla.core.protocol.PartUIElement;
+import org.eclipse.rcptt.tesla.core.protocol.ProtocolFactory;
+import org.eclipse.rcptt.tesla.core.protocol.SWTDialogKind;
+import org.eclipse.rcptt.tesla.core.protocol.SelectCommand;
+import org.eclipse.rcptt.tesla.core.protocol.SelectData;
+import org.eclipse.rcptt.tesla.core.protocol.SetSWTDialogInfo;
+import org.eclipse.rcptt.tesla.core.protocol.SetSelection;
+import org.eclipse.rcptt.tesla.core.protocol.SetTextOffset;
+import org.eclipse.rcptt.tesla.core.protocol.SetTextSelection;
+import org.eclipse.rcptt.tesla.core.protocol.TextUIElement;
+import org.eclipse.rcptt.tesla.core.protocol.Type;
+import org.eclipse.rcptt.tesla.core.protocol.ViewerUIElement;
+import org.eclipse.rcptt.tesla.core.protocol.raw.Command;
+import org.eclipse.rcptt.tesla.core.protocol.raw.RawEvent;
+import org.eclipse.rcptt.tesla.core.protocol.raw.RawFactory;
+import org.eclipse.rcptt.tesla.core.protocol.raw.SetMode;
+import org.eclipse.rcptt.tesla.core.utils.TeslaUtils;
+import org.eclipse.rcptt.tesla.internal.core.TeslaCore;
+import org.eclipse.rcptt.tesla.internal.ui.player.FindResult;
+import org.eclipse.rcptt.tesla.internal.ui.player.ISWTModelMapperExtension;
+import org.eclipse.rcptt.tesla.internal.ui.player.PlayerTextUtils;
+import org.eclipse.rcptt.tesla.internal.ui.player.SWTModelMapper;
+import org.eclipse.rcptt.tesla.internal.ui.player.SWTUIElement;
+import org.eclipse.rcptt.tesla.internal.ui.player.SWTUIPlayer;
+import org.eclipse.rcptt.tesla.internal.ui.player.TeslaSWTAccess;
+import org.eclipse.rcptt.tesla.internal.ui.player.viewers.Viewers;
+import org.eclipse.rcptt.tesla.recording.aspects.IExtendedSWTEventListener;
+import org.eclipse.rcptt.tesla.recording.aspects.SWTEventManager;
+import org.eclipse.rcptt.tesla.recording.core.IRecordingHelper;
+import org.eclipse.rcptt.tesla.recording.core.IRecordingModeListener;
+import org.eclipse.rcptt.tesla.recording.core.IRecordingProcessor;
+import org.eclipse.rcptt.tesla.recording.core.IRecordingProcessorExtension;
+import org.eclipse.rcptt.tesla.recording.core.TeslaRecorder;
+import org.eclipse.rcptt.tesla.recording.core.swt.peg.CommandPostProcessor;
+import org.eclipse.rcptt.tesla.recording.core.swt.util.LastEvents;
+import org.eclipse.rcptt.tesla.recording.core.swt.util.RecordedEvent;
+import org.eclipse.rcptt.tesla.swt.workbench.EclipseWorkbenchProvider;
+import org.eclipse.rcptt.util.swt.StringLines;
+import org.eclipse.rcptt.util.swt.TableTreeUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.custom.CCombo;
@@ -97,56 +146,6 @@
import org.eclipse.ui.keys.IBindingService;
import org.osgi.framework.Bundle;
-import org.eclipse.rcptt.util.swt.StringLines;
-import org.eclipse.rcptt.util.swt.TableTreeUtil;
-import org.eclipse.rcptt.tesla.core.am.RecordingModeFeature;
-import org.eclipse.rcptt.tesla.core.context.ContextManagement;
-import org.eclipse.rcptt.tesla.core.context.ContextManagement.Context;
-import org.eclipse.rcptt.tesla.core.protocol.Click;
-import org.eclipse.rcptt.tesla.core.protocol.CompositeUIElement;
-import org.eclipse.rcptt.tesla.core.protocol.ControlUIElement;
-import org.eclipse.rcptt.tesla.core.protocol.ElementKind;
-import org.eclipse.rcptt.tesla.core.protocol.LinkUIElement;
-import org.eclipse.rcptt.tesla.core.protocol.MouseEvent;
-import org.eclipse.rcptt.tesla.core.protocol.MouseEventKind;
-import org.eclipse.rcptt.tesla.core.protocol.PartUIElement;
-import org.eclipse.rcptt.tesla.core.protocol.ProtocolFactory;
-import org.eclipse.rcptt.tesla.core.protocol.SWTDialogKind;
-import org.eclipse.rcptt.tesla.core.protocol.SelectCommand;
-import org.eclipse.rcptt.tesla.core.protocol.SelectData;
-import org.eclipse.rcptt.tesla.core.protocol.SetSWTDialogInfo;
-import org.eclipse.rcptt.tesla.core.protocol.SetSelection;
-import org.eclipse.rcptt.tesla.core.protocol.SetTextOffset;
-import org.eclipse.rcptt.tesla.core.protocol.SetTextSelection;
-import org.eclipse.rcptt.tesla.core.protocol.TextUIElement;
-import org.eclipse.rcptt.tesla.core.protocol.Type;
-import org.eclipse.rcptt.tesla.core.protocol.ViewerUIElement;
-import org.eclipse.rcptt.tesla.core.protocol.raw.Command;
-import org.eclipse.rcptt.tesla.core.protocol.raw.RawEvent;
-import org.eclipse.rcptt.tesla.core.protocol.raw.RawFactory;
-import org.eclipse.rcptt.tesla.core.protocol.raw.SetMode;
-import org.eclipse.rcptt.tesla.core.utils.TeslaUtils;
-import org.eclipse.rcptt.tesla.internal.core.TeslaCore;
-import org.eclipse.rcptt.tesla.internal.ui.player.FindResult;
-import org.eclipse.rcptt.tesla.internal.ui.player.ISWTModelMapperExtension;
-import org.eclipse.rcptt.tesla.internal.ui.player.PlayerTextUtils;
-import org.eclipse.rcptt.tesla.internal.ui.player.SWTModelMapper;
-import org.eclipse.rcptt.tesla.internal.ui.player.SWTUIElement;
-import org.eclipse.rcptt.tesla.internal.ui.player.SWTUIPlayer;
-import org.eclipse.rcptt.tesla.internal.ui.player.TeslaSWTAccess;
-import org.eclipse.rcptt.tesla.internal.ui.player.viewers.Viewers;
-import org.eclipse.rcptt.tesla.recording.aspects.IExtendedSWTEventListener;
-import org.eclipse.rcptt.tesla.recording.aspects.SWTEventManager;
-import org.eclipse.rcptt.tesla.recording.core.IRecordingHelper;
-import org.eclipse.rcptt.tesla.recording.core.IRecordingModeListener;
-import org.eclipse.rcptt.tesla.recording.core.IRecordingProcessor;
-import org.eclipse.rcptt.tesla.recording.core.IRecordingProcessorExtension;
-import org.eclipse.rcptt.tesla.recording.core.TeslaRecorder;
-import org.eclipse.rcptt.tesla.recording.core.swt.peg.CommandPostProcessor;
-import org.eclipse.rcptt.tesla.recording.core.swt.util.LastEvents;
-import org.eclipse.rcptt.tesla.recording.core.swt.util.RecordedEvent;
-import org.eclipse.rcptt.tesla.swt.workbench.EclipseWorkbenchProvider;
-
/**
* Simple event collector Each used widget will be added as variable.
*
@@ -288,7 +287,7 @@
}
public TeslaRecorder getRecorder() {
- return TeslaRecorder.getInstance();
+ return recorder;
}
public SWTEventRecorder() {
@@ -1551,7 +1550,7 @@
|| !beforeTextState.equals(currentText)) {
if (widget != JFaceRecordingProcessor.lastCellEditorControl) {
if (!(widget instanceof Combo)) {
- e.setText(currentText, false, (widget.getStyle() & SWT.PASSWORD ) != 0);
+ e.setText(currentText, false, isPasswordField(widget));
} else {
processComboSelection(e,
((Combo) widget).getItems(), currentText);
@@ -1582,6 +1581,15 @@
}
}
+ private static boolean isPasswordField(Widget widget) {
+ if ((widget.getStyle() & SWT.PASSWORD) != 0)
+ return true;
+ if (widget instanceof Text) {
+ return ((Text) widget).getEchoChar() != '\0';
+ }
+ return false;
+ }
+
private void processMenuShow(Widget widget, RecordedEvent toRecording) {
Object menuSource = null;
@@ -1760,19 +1768,17 @@
// detecting assert/record mode shortcuts
if (event.detail == SWT.TRAVERSE_MNEMONIC) {
- String[] assertShortcuts = TeslaRecorder.getInstance()
- .getAssertModeShortcuts();
- String[] recordShortcuts = TeslaRecorder.getInstance()
- .getRecordModeShortcuts();
- String[] startRecordShortcuts = TeslaRecorder.getInstance()
- .getStartRecordShortcuts();
- String[] stopRecordShortcuts = TeslaRecorder.getInstance()
- .getStopRecordShortcuts();
- String[] replayShortcuts = TeslaRecorder.getInstance()
- .getReplayShortcuts();
+ TeslaRecorder recorder = getRecorder();
+ if (recorder == null) {
+ return;
+ }
+ String[] assertShortcuts = recorder.getAssertModeShortcuts();
+ String[] recordShortcuts = recorder.getRecordModeShortcuts();
+ String[] startRecordShortcuts = recorder.getStartRecordShortcuts();
+ String[] stopRecordShortcuts = recorder.getStopRecordShortcuts();
+ String[] replayShortcuts = recorder.getReplayShortcuts();
- SWTAssertManager assertManager = TeslaRecorder.getInstance()
- .getProcessor(SWTAssertManager.class);
+ SWTAssertManager assertManager = recorder.getProcessor(SWTAssertManager.class);
if (assertManager != null) {
boolean assertRequest = assertManager.isShortcutRequest(event,
@@ -2593,7 +2599,7 @@
int offsetAtLine = text.getOffsetAtLine(lineAtOffset);
if (!(last instanceof SetTextSelection && EcoreUtil.equals(
((SetTextSelection) last).getElement(),
- element.element))) {
+ element.element))) {
// Ignore after setSelection
textCtrl.setTextOffset(lineAtOffset, offset
- offsetAtLine);
@@ -2611,7 +2617,11 @@
inStyledTextAction = true;
}
+ private TeslaRecorder recorder = null;
+
public void initialize(final TeslaRecorder teslaRecorder) {
+ this.recorder = teslaRecorder;
+ this.dragSupport.setRecorder(teslaRecorder);
// getLocator();// .initialize(teslaRecorder);
teslaRecorder.addListener(this);
final CommandPostProcessor pp = new CommandPostProcessor(teslaRecorder);
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/UIIDERecordingProcessor.java b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/UIIDERecordingProcessor.java
deleted file mode 100644
index 1336ecf..0000000
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/src/org/eclipse/rcptt/tesla/recording/core/swt/UIIDERecordingProcessor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 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.tesla.recording.core.swt;
-
-import org.eclipse.rcptt.tesla.core.protocol.raw.SetMode;
-import org.eclipse.rcptt.tesla.recording.aspects.IUIIDEEventListener;
-import org.eclipse.rcptt.tesla.recording.aspects.UIIDEEventManager;
-import org.eclipse.rcptt.tesla.recording.core.IRecordingHelper;
-import org.eclipse.rcptt.tesla.recording.core.IRecordingProcessor;
-import org.eclipse.rcptt.tesla.recording.core.TeslaRecorder;
-
-public class UIIDERecordingProcessor implements IRecordingProcessor,
- IUIIDEEventListener {
- private TeslaRecorder recorder;
-
- public UIIDERecordingProcessor() {
- UIIDEEventManager.addListener(this);
- }
-
- @SuppressWarnings("unused")
- private SWTEventRecorder getSWTProcessor() {
- return recorder.getProcessor(SWTEventRecorder.class);
- }
-
- public void restartEclipse() {
- // WaitForRestart command is created by
- // WorkbenchRecordingProcessor.restartEclipse()
- // it must not be added here
-
- // getSWTProcessor().getRecorder().safeExecuteCommand(
- // ProtocolFactory.eINSTANCE.createWaitForRestart());
- }
-
- public void initialize(TeslaRecorder teslaRecorder) {
- this.recorder = teslaRecorder;
- }
-
- public int getInitLevel() {
- return 1000;
- };
-
- public void clear() {
-
- }
-
- public void setFreeze(boolean value, SetMode command) {
- }
-
- public void resetAssertSelection() {
- }
-
- public IRecordingHelper<?> getHelper() {
- return null;
- }
-}
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/feature.xml b/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/feature.xml
index a816bc5..921419d 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/feature.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/feature.xml
@@ -306,13 +306,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.rcptt.tesla.recording.aspects.ui.ide"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.rcptt.tesla.variables"
download-size="0"
install-size="0"
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/feature.xml b/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/feature.xml
index 52dcf9c..ed5f23c 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/feature.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/feature.xml
@@ -306,13 +306,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.rcptt.tesla.recording.aspects.ui.ide"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.rcptt.tesla.variables"
download-size="0"
install-size="0"
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/src/org/eclipse/rcptt/tesla/swt/events/TeslaEventManager.java b/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/src/org/eclipse/rcptt/tesla/swt/events/TeslaEventManager.java
index 94e3f7e..5eb7834 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/src/org/eclipse/rcptt/tesla/swt/events/TeslaEventManager.java
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/src/org/eclipse/rcptt/tesla/swt/events/TeslaEventManager.java
@@ -245,16 +245,6 @@
}
public static void updateActiveShell() {
- if (Platform.getOS().equals(Platform.OS_LINUX) && activeShell != null
- && !activeShell.isDisposed()) {
- try {
- Field field = Display.class.getDeclaredField("activeShell");
- field.setAccessible(true);
- field.set(activeShell.getDisplay(), activeShell);
- } catch (Throwable e) {
- SWTAspectActivator.log(e);
- }
- }
}
public static Shell getActiveShell() {
diff --git a/runtime/tesla/pom.xml b/runtime/tesla/pom.xml
index 5ab815c..93cdcd2 100644
--- a/runtime/tesla/pom.xml
+++ b/runtime/tesla/pom.xml
@@ -36,7 +36,6 @@
<module>org.eclipse.rcptt.tesla.recording.aspects.jface.text</module>
<module>org.eclipse.rcptt.tesla.recording.aspects.swt</module>
<module>org.eclipse.rcptt.tesla.recording.aspects.workbench</module>
- <module>org.eclipse.rcptt.tesla.recording.aspects.ui.ide</module>
<module>org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor</module>
<module>org.eclipse.rcptt.tesla.recording.draw2d</module>
<module>org.eclipse.rcptt.tesla.recording.gef</module>
