Attachment #89835 for bug #202695

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




 * <ul>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getType <em>Type</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getRole <em>Role</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}</li>
 * </ul>
 * </p>

 * @model
 * @generated
 */
public interface DPLVariable extends CMNNamedElement, IDatapoolVariable {
	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	void setRole(DPLRole value);

	/**
	 * Returns the value of the '<em><b>Encrypted</b></em>' attribute.
	 * The default value is <code>"false"</code>.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Encrypted</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * <!-- end-user-doc -->
	 * <!-- begin-model-doc -->
	 * This boolean specifies whether or not this DPLVariable is encrypted.
	 * <!-- end-model-doc -->
	 * @return the value of the '<em>Encrypted</em>' attribute.
	 * @see #setEncrypted(boolean)
	 * @see org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage#getDPLVariable_Encrypted()
	 * @model default="false"
	 * @generated
	 */
	boolean isEncrypted();

	/**
	 * Sets the value of the '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Encrypted</em>' attribute.
	 * @see #isEncrypted()
	 * @generated
	 */
	void setEncrypted(boolean value);

	/**
	 * Returns the value of the '<em><b>Variables</b></em>' containment reference list.
	 * The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLVariable}.
	 * <!-- begin-user-doc -->

	 */
	EList getVariables();

	
} // DPLVariable




	int DPL_VARIABLE__ROLE = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 1;

	/**
	 * The feature id for the '<em><b>Encrypted</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int DPL_VARIABLE__ENCRYPTED = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 2;

	/**
	 * The feature id for the '<em><b>Variables</b></em>' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int DPL_VARIABLE__VARIABLES = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 3;

	/**
	 * The number of structural features of the '<em>DPL Variable</em>' class.

	 * @generated
	 * @ordered
	 */
	int DPL_VARIABLE_FEATURE_COUNT = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Id</b></em>' attribute.

	int DPL_DATAPOOL__INSTANTIATIONS = Common_ConfigurationPackage.CFG_CLASS__INSTANTIATIONS;

	/**
	 * The feature id for the '<em><b>Challenge</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int DPL_DATAPOOL__CHALLENGE = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 0;

	/**
	 * The feature id for the '<em><b>Equivalence Classes</b></em>' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int DPL_DATAPOOL__EQUIVALENCE_CLASSES = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 1;

	/**
	 * The feature id for the '<em><b>Datapool Spec</b></em>' containment reference.

	 * @generated
	 * @ordered
	 */
	int DPL_DATAPOOL__DATAPOOL_SPEC = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 2;

	/**
	 * The number of structural features of the '<em>DPL Datapool</em>' class.

	 * @generated
	 * @ordered
	 */
	int DPL_DATAPOOL_FEATURE_COUNT = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 3;

	/**
	 * The meta object id for the '{@link org.eclipse.hyades.models.common.datapool.DPLRole <em>DPL Role</em>}' enum.

	EClass getDPLDatapool();

	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Challenge</em>'.
	 * @see org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge()
	 * @see #getDPLDatapool()
	 * @generated
	 */
	EAttribute getDPLDatapool_Challenge();

	/**
	 * Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	EAttribute getDPLVariable_Role();

	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Encrypted</em>'.
	 * @see org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted()
	 * @see #getDPLVariable()
	 * @generated
	 */
	EAttribute getDPLVariable_Encrypted();

	/**
	 * Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

		EAttribute DPL_VARIABLE__ROLE = eINSTANCE.getDPLVariable_Role();

		/**
		 * The meta object literal for the '<em><b>Encrypted</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		EAttribute DPL_VARIABLE__ENCRYPTED = eINSTANCE.getDPLVariable_Encrypted();

		/**
		 * The meta object literal for the '<em><b>Variables</b></em>' containment reference list feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->

		EClass DPL_DATAPOOL = eINSTANCE.getDPLDatapool();

		/**
		 * The meta object literal for the '<em><b>Challenge</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		EAttribute DPL_DATAPOOL__CHALLENGE = eINSTANCE.getDPLDatapool_Challenge();

		/**
		 * The meta object literal for the '<em><b>Equivalence Classes</b></em>' containment reference list feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->




 * <p>
 * The following features are supported:
 * <ul>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getDatapoolSpec <em>Datapool Spec</em>}</li>
 * </ul>

 * @model
 * @generated
 */
public interface DPLDatapool extends CFGClass, CMNNamedElement, IDatapool {
	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	String copyright = "";

	/**
	 * Returns the value of the '<em><b>Challenge</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * <!-- begin-model-doc -->
	 * This string is used to determine whether a user supplied password for an encrypted datapool is correct.
	 * <!-- end-model-doc -->
	 * @return the value of the '<em>Challenge</em>' attribute.
	 * @see #setChallenge(String)
	 * @see org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage#getDPLDatapool_Challenge()
	 * @model
	 * @generated
	 */
	String getChallenge();

	/**
	 * Sets the value of the '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Challenge</em>' attribute.
	 * @see #getChallenge()
	 * @generated
	 */
	void setChallenge(String value);

	/**
	 * Returns the value of the '<em><b>Equivalence Classes</b></em>' containment reference list.
	 * The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLEquivalenceClass}.
	 * <!-- begin-user-doc -->

	 */
	void setDatapoolSpec(DPLDatapoolSpec value);

	
} // DPLDatapool

Lines 227-234 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/impl/Common_DatapoolPackageImpl.java (-3 / +25 lines)
227	* <!-- end-user-doc -->	227	* <!-- end-user-doc -->
228	* @generated	228	* @generated
229	*/	229	*/
		230	public EAttribute getDPLDatapool_Challenge() {
		231	return (EAttribute)dplDatapoolEClass.getEStructuralFeatures().get(0);
		232	}
		233
		234	/**
		235	* <!-- begin-user-doc -->
		236	* <!-- end-user-doc -->
		237	* @generated
		238	*/
230	public EReference getDPLDatapool_EquivalenceClasses() {	239	public EReference getDPLDatapool_EquivalenceClasses() {
231	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(0);	240	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(1);
232	}	241	}
233		242
234	/**	243	/**
Lines 237-243 Link Here
237	* @generated	246	* @generated
238	*/	247	*/
239	public EReference getDPLDatapool_DatapoolSpec() {	248	public EReference getDPLDatapool_DatapoolSpec() {
240	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(1);	249	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(2);
241	}	250	}
242		251
243	/**	252	/**
Lines 344-351 Link Here
344	* <!-- end-user-doc -->	353	* <!-- end-user-doc -->
345	* @generated	354	* @generated
346	*/	355	*/
		356	public EAttribute getDPLVariable_Encrypted() {
		357	return (EAttribute)dplVariableEClass.getEStructuralFeatures().get(2);
		358	}
		359
		360	/**
		361	* <!-- begin-user-doc -->
		362	* <!-- end-user-doc -->
		363	* @generated
		364	*/
347	public EReference getDPLVariable_Variables() {	365	public EReference getDPLVariable_Variables() {
348	return (EReference)dplVariableEClass.getEStructuralFeatures().get(2);	366	return (EReference)dplVariableEClass.getEStructuralFeatures().get(3);
349	}	367	}
350		368
351	/**	369	/**
Lines 402-410 Link Here
402	dplVariableEClass = createEClass(DPL_VARIABLE);	420	dplVariableEClass = createEClass(DPL_VARIABLE);
403	createEAttribute(dplVariableEClass, DPL_VARIABLE__TYPE);	421	createEAttribute(dplVariableEClass, DPL_VARIABLE__TYPE);
404	createEAttribute(dplVariableEClass, DPL_VARIABLE__ROLE);	422	createEAttribute(dplVariableEClass, DPL_VARIABLE__ROLE);
		423	createEAttribute(dplVariableEClass, DPL_VARIABLE__ENCRYPTED);
405	createEReference(dplVariableEClass, DPL_VARIABLE__VARIABLES);	424	createEReference(dplVariableEClass, DPL_VARIABLE__VARIABLES);
406		425
407	dplDatapoolEClass = createEClass(DPL_DATAPOOL);	426	dplDatapoolEClass = createEClass(DPL_DATAPOOL);
		427	createEAttribute(dplDatapoolEClass, DPL_DATAPOOL__CHALLENGE);
408	createEReference(dplDatapoolEClass, DPL_DATAPOOL__EQUIVALENCE_CLASSES);	428	createEReference(dplDatapoolEClass, DPL_DATAPOOL__EQUIVALENCE_CLASSES);
409	createEReference(dplDatapoolEClass, DPL_DATAPOOL__DATAPOOL_SPEC);	429	createEReference(dplDatapoolEClass, DPL_DATAPOOL__DATAPOOL_SPEC);
410		430
Lines 464-472 Link Here
464	initEClass(dplVariableEClass, DPLVariable.class, "DPLVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);	484	initEClass(dplVariableEClass, DPLVariable.class, "DPLVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
465	initEAttribute(getDPLVariable_Type(), ecorePackage.getEString(), "type", null, 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	485	initEAttribute(getDPLVariable_Type(), ecorePackage.getEString(), "type", null, 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
466	initEAttribute(getDPLVariable_Role(), this.getDPLRole(), "role", null, 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	486	initEAttribute(getDPLVariable_Role(), this.getDPLRole(), "role", null, 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
		487	initEAttribute(getDPLVariable_Encrypted(), ecorePackage.getEBoolean(), "encrypted", "false", 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
467	initEReference(getDPLVariable_Variables(), this.getDPLVariable(), null, "variables", null, 0, -1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	488	initEReference(getDPLVariable_Variables(), this.getDPLVariable(), null, "variables", null, 0, -1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
468		489
469	initEClass(dplDatapoolEClass, DPLDatapool.class, "DPLDatapool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);	490	initEClass(dplDatapoolEClass, DPLDatapool.class, "DPLDatapool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
		491	initEAttribute(getDPLDatapool_Challenge(), ecorePackage.getEString(), "challenge", null, 0, 1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
470	initEReference(getDPLDatapool_EquivalenceClasses(), this.getDPLEquivalenceClass(), null, "equivalenceClasses", null, 0, -1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	492	initEReference(getDPLDatapool_EquivalenceClasses(), this.getDPLEquivalenceClass(), null, "equivalenceClasses", null, 0, -1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
471	initEReference(getDPLDatapool_DatapoolSpec(), this.getDPLDatapoolSpec(), null, "datapoolSpec", null, 1, 1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	493	initEReference(getDPLDatapool_DatapoolSpec(), this.getDPLDatapoolSpec(), null, "datapoolSpec", null, 1, 1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
472		494





package org.eclipse.hyades.models.common.datapool.impl;

import java.util.HashMap;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;

import org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage;
import org.eclipse.hyades.models.common.datapool.DPLCell;
import org.eclipse.hyades.models.common.datapool.DPLVariable;
import org.eclipse.hyades.models.common.datapool.util.DPLPasswordCollection;
import org.eclipse.hyades.models.common.util.DatapoolUtil;
import org.eclipse.hyades.models.common.util.EncryptionManager;
import org.eclipse.hyades.models.common.util.XMLParserUtil;
import org.w3c.dom.Document;


	{
		Object cellValue = this.getCellValue();
		if(cellValue != null)
			return decryptValue(cellValue.toString());
		else
			return new String();
	}

	 */
	public long getLongValue()
	{
		return Long.parseLong(decryptValue((String)this.getCellValue()));
	}
	
	/**

	 */
	public int getIntValue()
	{
		return Integer.parseInt(decryptValue((String)this.getCellValue()));
	}
	
	/**

	 */
	public short getShortValue()
	{
		return Short.parseShort(decryptValue((String)this.getCellValue()));
	}
	
	/**

	 */
	public byte getByteValue()
	{
		return Byte.parseByte(decryptValue((String)this.getCellValue()));
	}
	
	/**

	 */
	public double getDoubleValue()
	{
		return Double.parseDouble(decryptValue((String)this.getCellValue()));
	}
	
	/**

	 */
	public float getFloatValue()
	{
		return Float.parseFloat(decryptValue((String)this.getCellValue()));
	}
	
	/**

	 */
	public boolean getBooleanValue()
	{
		return Boolean.getBoolean (decryptValue((String)this.getCellValue()));
	}
	
	/**

	 */
	public char getCharValue()
	{
		return decryptValue(((String)this.getCellValue())).charAt(0);
	}

	/**

		{
	        //get the tag and value from the XML fragment
			try {	
				Document doc = XMLParserUtil.parse(value.toString());					
				tag = doc.getFirstChild().getNodeName();
				val = doc.getFirstChild().getFirstChild().getNodeValue();
		    }

		else
			return START_LITERAL + END_LITERAL;
	}	
	/*
	 * decryptValue the cell value
	 */
	public String decryptValue(String value){
		String result = null;
		if(value == null)
			return result;
		
		result = value;
		HashMap passes = DPLPasswordCollection.getInstance().getDatapoolPassword();		
	    String dpName = this.getCellRecord().getEquivalenceClass().getDatapool().getName();
		if(passes!=null && passes.size()>0 && dpName != null && this.getVariable().isEncrypted()){
	    	String pass = (String)passes.get(dpName);
	    	if(pass != null){
	    		result = EncryptionManager.decrypt(value, pass);
	    	}
	    }
		return result;
	}
} //DPLCellImpl




 * <ul>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#getType <em>Type</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#getRole <em>Role</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#isEncrypted <em>Encrypted</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#getVariables <em>Variables</em>}</li>
 * </ul>
 * </p>

	protected DPLRole role = ROLE_EDEFAULT;

	/**
	 * The default value of the '{@link #isEncrypted() <em>Encrypted</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #isEncrypted()
	 * @generated
	 * @ordered
	 */
	protected static final boolean ENCRYPTED_EDEFAULT = false;

	/**
	 * The cached value of the '{@link #isEncrypted() <em>Encrypted</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #isEncrypted()
	 * @generated
	 * @ordered
	 */
	protected boolean encrypted = ENCRYPTED_EDEFAULT;

	/**
	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public boolean isEncrypted() {
		return encrypted;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setEncrypted(boolean newEncrypted) {
		boolean oldEncrypted = encrypted;
		encrypted = newEncrypted;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED, oldEncrypted, encrypted));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EList getVariables() {
		if (variables == null) {
			variables = new EObjectContainmentEList(DPLVariable.class, this, Common_DatapoolPackage.DPL_VARIABLE__VARIABLES);

				return getType();
			case Common_DatapoolPackage.DPL_VARIABLE__ROLE:
				return getRole();
			case Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED:
				return isEncrypted() ? Boolean.TRUE : Boolean.FALSE;
			case Common_DatapoolPackage.DPL_VARIABLE__VARIABLES:
				return getVariables();
		}

			case Common_DatapoolPackage.DPL_VARIABLE__ROLE:
				setRole((DPLRole)newValue);
				return;
			case Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED:
				setEncrypted(((Boolean)newValue).booleanValue());
				return;
			case Common_DatapoolPackage.DPL_VARIABLE__VARIABLES:
				getVariables().clear();
				getVariables().addAll((Collection)newValue);

			case Common_DatapoolPackage.DPL_VARIABLE__ROLE:
				setRole(ROLE_EDEFAULT);
				return;
			case Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED:
				setEncrypted(ENCRYPTED_EDEFAULT);
				return;
			case Common_DatapoolPackage.DPL_VARIABLE__VARIABLES:
				getVariables().clear();
				return;

			case Common_DatapoolPackage.DPL_VARIABLE__TYPE:
				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
			case Common_DatapoolPackage.DPL_VARIABLE__ROLE:
       		
				return role != ROLE_EDEFAULT;
	        
			case Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED:
       		
				return encrypted != ENCRYPTED_EDEFAULT;
	        
			case Common_DatapoolPackage.DPL_VARIABLE__VARIABLES:
				return variables != null && !variables.isEmpty();
		}

		result.append(type);
		result.append(", role: ");
		result.append(role);
		result.append(", encrypted: ");
		result.append(encrypted);
		result.append(')');
		return result.toString();
	}

	
	//Beginning of non-generated classes
	
	//org.eclipse.hyades.edit.datapool.IDatapoolVariable methods




 * <p>
 * The following features are implemented:
 * <ul>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLDatapoolImpl#getChallenge <em>Challenge</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLDatapoolImpl#getEquivalenceClasses <em>Equivalence Classes</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLDatapoolImpl#getDatapoolSpec <em>Datapool Spec</em>}</li>
 * </ul>

	public static final String copyright = "";

	/**
	 * The default value of the '{@link #getChallenge() <em>Challenge</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getChallenge()
	 * @generated
	 * @ordered
	 */
	protected static final String CHALLENGE_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getChallenge() <em>Challenge</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getChallenge()
	 * @generated
	 * @ordered
	 */
	protected String challenge = CHALLENGE_EDEFAULT;

	/**
	 * The cached value of the '{@link #getEquivalenceClasses() <em>Equivalence Classes</em>}' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getChallenge() {
		return challenge;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setChallenge(String newChallenge) {
		String oldChallenge = challenge;
		challenge = newChallenge;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE, oldChallenge, challenge));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EList getEquivalenceClasses() {
		if (equivalenceClasses == null) {
			equivalenceClasses = new EObjectContainmentEList(DPLEquivalenceClass.class, this, Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES);

	 */
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
		switch (featureID) {
			case Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE:
				return getChallenge();
			case Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES:
				return getEquivalenceClasses();
			case Common_DatapoolPackage.DPL_DATAPOOL__DATAPOOL_SPEC:

	 */
	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE:
				setChallenge((String)newValue);
				return;
			case Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES:
				getEquivalenceClasses().clear();
				getEquivalenceClasses().addAll((Collection)newValue);

	 */
	public void eUnset(int featureID) {
		switch (featureID) {
			case Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE:
				setChallenge(CHALLENGE_EDEFAULT);
				return;
			case Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES:
				getEquivalenceClasses().clear();
				return;

	 */
	public boolean eIsSet(int featureID) {
		switch (featureID) {
			case Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE:
				return CHALLENGE_EDEFAULT == null ? challenge != null : !CHALLENGE_EDEFAULT.equals(challenge);
			case Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES:
				return equivalenceClasses != null && !equivalenceClasses.isEmpty();
			case Common_DatapoolPackage.DPL_DATAPOOL__DATAPOOL_SPEC:

		return super.eIsSet(featureID);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String toString() {
		if (eIsProxy()) return super.toString();

		StringBuffer result = new StringBuffer(super.toString());
		result.append(" (challenge: ");
		result.append(challenge);
		result.append(')');
		return result.toString();
	}

	
	/* (non-Javadoc)
	 * @see org.eclipse.hyades.models.common.configuration.impl.CFGClassImpl#getLocation()
	 */




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolEncryptManager.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.models.common.datapool.util;

import org.eclipse.hyades.edit.datapool.IDatapool;
import org.eclipse.hyades.edit.datapool.IDatapoolCell;
import org.eclipse.hyades.edit.datapool.IDatapoolRecord;
import org.eclipse.hyades.execution.runtime.datapool.IDatapoolEquivalenceClass;
import org.eclipse.hyades.execution.runtime.datapool.IDatapoolVariable;
import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.datapool.DPLVariable;
import org.eclipse.hyades.models.common.util.EncryptionManager;

/**
 * It's used to provide functions of encryption for a datapool .
 * 
 * @author Huang Xin Ying 
 */
public class DatapoolEncryptManager {

	public static void encryptedCellInVarible(IDatapoolVariable varible,
			String key, IDatapool datapool) {

		// String key = DatapoolKeyManager.getKeyInDatapool(datapool);
		// IDatapoolEquivalenceClass equivalenceClass =
		// getDefaultEquivalenceClass(datapool);
		int index = datapool.getDefaultEquivalenceClassIndex();
		if (index == -1) {

			return;
		}
		IDatapoolEquivalenceClass equivalenceClass = datapool
				.getEquivalenceClass(index);
		// datapool.get
		for (int i = 0; i < equivalenceClass.getRecordCount(); i++) {
			IDatapoolRecord record = (IDatapoolRecord) equivalenceClass
					.getRecord(i);
			int cellCount = record.getCellCount();

			int variableCount = datapool.getVariableCount();
			String rowContents[] = new String[variableCount + 1];
			IDatapoolCell[] rowData = new IDatapoolCell[variableCount];
			rowContents[0] = String.valueOf(i);

			for (int k = 0; k < cellCount; k++) {
				IDatapoolCell cell = (IDatapoolCell) record.getCell(k);
				if (cell.getCellVariable().getId().equals(varible.getId())) {
					cell.setCellValue(EncryptionManager.encrypt(cell.getStringValue(),
							key));
				}
			}
		}
	}

	public static void deencryptedCellInVarible(IDatapoolVariable varible,
			String key, IDatapool datapool) {
		int index = datapool.getDefaultEquivalenceClassIndex();
		if (index == -1) {
			return;
		}
		IDatapoolEquivalenceClass equivalenceClass = datapool
				.getEquivalenceClass(index);

		for (int i = 0; i < equivalenceClass.getRecordCount(); i++) {
			IDatapoolRecord record = (IDatapoolRecord) equivalenceClass
					.getRecord(i);
			int cellCount = record.getCellCount();

			int variableCount = datapool.getVariableCount();
			String rowContents[] = new String[variableCount + 1];
			IDatapoolCell[] rowData = new IDatapoolCell[variableCount];
			rowContents[0] = String.valueOf(i);

			for (int k = 0; k < cellCount; k++) {
				IDatapoolCell cell = (IDatapoolCell) record.getCell(k);
				if (cell.getCellVariable().getId().equals(varible.getId())) {
					cell.setCellValue(EncryptionManager.decrypt(cell.getStringValue(),
							key));
				}
			}
		}
	}

	public static void ChangeKey(String newKey, IDatapool datapool) {
		if (!(datapool instanceof DPLDatapool))
			return;
		if (newKey == null || newKey.equals(""))
			((DPLDatapool) datapool).setChallenge(null);
		else
			((DPLDatapool) datapool).setChallenge(newKey);
	}

	public static void changeKeyOfEncryCell(IDatapool datapool, String oldKey,
			String newKey) {
		int variableCount = datapool.getVariableCount();
		IDatapoolVariable variable = null;
		for (int i = 0; i < variableCount; i++) {
			variable = datapool.getVariable(i);
			if (isVaribelEncrypted(variable)) {
				deencryptedCellInVarible(variable, oldKey, datapool);
				encryptedCellInVarible(variable, newKey, datapool);
			}
		}
	}
	
	public static void deencrypDatapool(IDatapool datapool, String key){
		int variableCount = datapool.getVariableCount();
		IDatapoolVariable variable = null;
		for (int i = 0; i < variableCount; i++) {
			variable = datapool.getVariable(i);
			if (isVaribelEncrypted(variable)) {
				deencryptedCellInVarible(variable, key, datapool);				
			}
		}
	}
	
	public static void encrypDatapool(IDatapool datapool, String key){
		int variableCount = datapool.getVariableCount();
		IDatapoolVariable variable = null;
		for (int i = 0; i < variableCount; i++) {
			variable = datapool.getVariable(i);
			if (isVaribelEncrypted(variable)) {
				encryptedCellInVarible(variable, key, datapool);			
			}
		}
	}

	public static boolean isDatapoolEncrypted(IDatapool datapool) {
		if (!(datapool instanceof DPLDatapool))
			return false;

		if (((DPLDatapool) datapool).getChallenge() == null
				|| ((DPLDatapool) datapool).getChallenge().equals(""))
			return false;
		return true;
	}

	public static boolean isKeyCorrect(IDatapool datapool, String key) {
		if (!(datapool instanceof DPLDatapool))
			return false;
		if (key == null)
			return false;
		boolean flag = false;
		try {
			flag = EncryptionManager.EncoderByMd5(key).equals(
					((DPLDatapool) datapool).getChallenge());
		} catch (Exception e) {
			System.out.println("error while keycorrect");
		}
		return flag;

	}

	public static boolean isVaribelEncrypted(IDatapoolVariable varible) {
		return (varible instanceof DPLVariable) ? ((DPLVariable) varible)
				.isEncrypted() : false;
	}

	public static String encrypt(String content, String pass) {
		return EncryptionManager.encrypt(content, pass);
	}

	public static String decrypt(String content, String pass) {
		return EncryptionManager.decrypt(content, pass);
	}

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DPLPasswordCollection.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.models.common.datapool.util;

import java.util.HashMap;

/**
 * It's used to save HashMap of datapools and passwords for the test 
 * during executing a test in agent controller side .
 * 
 * @author Huang Xin Ying 
 */
public class DPLPasswordCollection {
	private static DPLPasswordCollection instance = null;

	private HashMap datapoolPassword = new HashMap();

	private DPLPasswordCollection() {
	}

	public static DPLPasswordCollection getInstance() {
		if (instance == null) {
			instance = new DPLPasswordCollection();
		} 
		return instance;
	}

	public HashMap getDatapoolPassword() {
		return datapoolPassword;
	}

	public void setDatapoolPassword(HashMap datapoolPassword) {
		this.datapoolPassword = datapoolPassword;
	}
	
	public void clear(){
		this.datapoolPassword.clear();
	}	
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: EncryptionManager.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.models.common.util;

import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;

/**
 * It's used to provide encryption and decryption algorithm for a datapool .
 * 
 * @author Huang Xin Ying 
 */
public class EncryptionManager {

	public static String encrypt(String content, String pass) {
		RC4Encrypter encrypter = new RC4Encrypter();
		String encryptedStr = encrypter.cipherMessage(pass, content);
		return encryptedStr;
	}

	public static String decrypt(String content, String pass) {
		RC4Encrypter rc4Encrypted = new RC4Encrypter();

		String deencryptedStr = rc4Encrypted.decipherMessage(pass, content);
		return deencryptedStr;

	}

	public static String EncoderByMd5(String str)
			throws NoSuchAlgorithmException, UnsupportedEncodingException {
		if (str == null)
			return null;
		MessageDigest md5 = MessageDigest.getInstance("MD5");
		RC4Encrypter rc4Encrypted = new RC4Encrypter();
		
		return rc4Encrypted.byteArrayToHexString(md5.digest(str.getBytes()));
	}

	public static class RC4Encrypter {
		
		public static final String[] HEXARRAY = {
	        "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"
	    };

		public String cipherMessage(String pass, String content) {
			if (pass == null || pass.equals("") || content == null
					|| content.equals("")) {
				return content;
			}
			try {
				SecretKeySpec key = this.generateKey(pass);
				Cipher cipher = Cipher.getInstance("RC4");
				cipher.init(Cipher.ENCRYPT_MODE, key);
				byte[] code = cipher.update(content.getBytes());
				return byteArrayToHexString(code);
			} catch (Exception e) {
				e.printStackTrace();
			}
			return null;
		}

		public String decipherMessage(String pass, String encryptStr)

		{
			if (pass == null || pass.equals("") || encryptStr == null
					|| encryptStr.equals("")) {
				return encryptStr;
			}
			try {
				SecretKeySpec key = this.generateKey(pass);
				Cipher cipher = Cipher.getInstance("RC4");
				cipher.init(Cipher.DECRYPT_MODE, key);
				byte[] text = hexStringToByteArray(encryptStr);
				byte[] code = cipher.update(text);
				return new String(code);
			} catch (Exception e) {
				e.printStackTrace();
			}
			return null;
		}

		private SecretKeySpec generateKey(String inpass)

		{
			try {
				byte[] pass = inpass.getBytes();

				MessageDigest md5 = MessageDigest.getInstance("MD5");

				md5.update(pass);
				byte temp[] = md5.digest();

				SecretKeySpec key = new SecretKeySpec(temp, "RC4");
				return key;

			} catch (Exception e) {
				e.printStackTrace();
			}
			return null;
		}
		
		/**
	      * Method converting byte array into String.
	      *
	      * @param The byte array to be converted.
	      * @return A <code>String[]</code> containing String value of byte array.
	      */
	     public  String byteArrayToHexString(byte[] bytes){
	        
	         String result = "";
	          for (int i = 0; i < bytes.length; i++){
	            //the up 4 bits
	            int tmp = bytes[i] >>> 4;
	            result += HEXARRAY[tmp % 16];
	            //the lower 4 bits
	            tmp = bytes[i] & 0x0f;
	              result += HEXARRAY[tmp % 16];
	           }
	         
	           return result;
	     }
	    
	     /**
	      * Method converting String into byte[].
	      *
	      * @param The String to be converted.
	      * @return A <code>byte[]</code> containing byte[] value of string.
	      */ 
	    public  byte[] hexStringToByteArray(String hex){
	        
	         byte[] bytes = new byte[hex.length() / 2];
	         for (int i = 0; i < bytes.length; i++){
	              bytes[i] = (byte) Integer.parseInt(hex.substring(2*i, 2*i+2), 16);
	         }
	           
	       
	        return bytes;
	    }		
	}	
}

Lines 32-37 Link Here

(-)plugin.xml (+19 lines)
32	<extension-point id="RecorderApplication" name="%RecorderApplication" schema="schema/RecorderAppAdapter.exsd"/>	32	<extension-point id="RecorderApplication" name="%RecorderApplication" schema="schema/RecorderAppAdapter.exsd"/>
33	<extension-point id="Recorder" name="%Recorder" schema="schema/Recorder.exsd"/>	33	<extension-point id="Recorder" name="%Recorder" schema="schema/Recorder.exsd"/>
34	<extension-point id="executionHarnessListener" name="%executionHarnessListener" schema="schema/executionHarnessListener.exsd"/>	34	<extension-point id="executionHarnessListener" name="%executionHarnessListener" schema="schema/executionHarnessListener.exsd"/>
		35	<extension-point id="launchconfigDatapoolHandler" name="launchconfigDatapoolHandler" schema="schema/launchconfigDatapoolHandler.exsd"/>
		36	<extension-point id="launchDatapoolCheckPass" name="check passwords while launching" schema="schema/launchDatapoolCheckPass.exsd"/>
35		37
36	<extension	38	<extension
37	id="org.eclipse.hyades.execution.harness.RegisteredExecutionComponentImpl.JAVA"	39	id="org.eclipse.hyades.execution.harness.RegisteredExecutionComponentImpl.JAVA"
Lines 216-220 Link Here
216	point="org.eclipse.hyades.execution.testService">	218	point="org.eclipse.hyades.execution.testService">
217	<testService class="org.eclipse.hyades.test.core.testservices.resources.FilesystemResourceProviderService"/>	219	<testService class="org.eclipse.hyades.test.core.testservices.resources.FilesystemResourceProviderService"/>
218	</extension>	220	</extension>
		221	<extension
		222	point="org.eclipse.hyades.test.core.launchconfigDatapoolHandler">
		223	<launchconfigDatapoolHandler
		224	class="org.eclipse.hyades.test.core.internal.launch.datapool.extensions.JUnitLaunchconfigDatapoolHandler">
		225	<supportedTestType
		226	name="org.eclipse.hyades.test.java.junit.testSuite">
		227	</supportedTestType>
		228	</launchconfigDatapoolHandler>
		229	</extension>
		230	<extension
		231	id="DatapoolPasswordProvider"
		232	name="DatapoolPasswordProvider"
		233	point="org.eclipse.hyades.execution.testService">
		234	<testService
		235	class="org.eclipse.hyades.test.core.testservices.resources.DatapoolPasswordsService">
		236	</testService>
		237	</extension>
219		238
220	</plugin>	239	</plugin>




package org.eclipse.hyades.test.core.launch.delegates;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;


import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.hyades.execution.core.IExecutor;
import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.test.core.TestCorePlugin;
import org.eclipse.hyades.test.core.internal.launch.datapool.extensions.LaunchDatapoolExtensionManager;
import org.eclipse.hyades.test.core.internal.launch.extensions.LaunchConfigurationExtensionsManager;
import org.eclipse.hyades.test.core.internal.launch.processes.TestExecutionProcess;
import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;
import org.eclipse.hyades.test.core.launch.configurations.DeploymentLaunchConfigurationFacade;
import org.eclipse.hyades.test.core.launch.configurations.TestLaunchConfigurationFacade;
import org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler;
import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;
import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;
import org.eclipse.hyades.test.core.launch.extensions.IRunHandler2;
import org.eclipse.hyades.test.core.launch.extensions.ITestLaunchConfigurationValidator;
import org.eclipse.hyades.test.core.testservices.resources.PasswordCollection;
import org.eclipse.osgi.util.NLS;

/**

	    		}
	    	}
			
	    	// find the datapools which is encrypted   	
	    	ILaunchconfigDatapoolHandler datapoolHandler = LaunchDatapoolExtensionManager.getInstance().getRunHandler(getLaunchedElement(configuration));
			DPLDatapool[] dp = null;
			if(datapoolHandler != null){
				dp = datapoolHandler.getAllDatapools(TestLaunchConfigurationFacade.getTest(configuration, getResourceSet()), 
						DeploymentLaunchConfigurationFacade.getDeployment(configuration, getResourceSet()));				
			}
			HashMap pass = PasswordCollection.getInstance().getDatapoolPassword();
			
			// show a dialog to collect the passwords
			if(dp!=null && dp.length > 0){
				IPassInfoCollector collector = LaunchDatapoolExtensionManager.getInstance().getCollector(getLaunchedElement(configuration));
				List isContinue = new ArrayList();
				isContinue.add(TestLaunchConfigurationFacade.getTest(configuration, getResourceSet()).getImplementor().getId());
				collector.execute(dp, pass, isContinue);
				if(isContinue.size()==0)				
					return;
			}				
			// Invoke the Test Execution Harness
			StringBuffer errorMessages = new StringBuffer();
			IExecutor executor = null;
			try {				
				executor = invokeTestExecutionHarness(configuration, mode, errorMessages, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
				if (errorMessages.length() > 0) {
					IStatus status = new Status(IStatus.ERROR, TestCorePlugin.getPluginId(), 0, TestCorePluginResourceBundle._EXC_AbstractLaunchConfigurationDelegate_testHarnessProblems + errorMessages, null); 

Lines 44-49 Link Here

(-)src/org/eclipse/hyades/test/core/internal/launch/processes/TestExecutionProcess.java (+3 lines)
44	import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;	44	import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;
45	import org.eclipse.hyades.test.core.launch.configurations.TestLaunchConfigurationFacade;	45	import org.eclipse.hyades.test.core.launch.configurations.TestLaunchConfigurationFacade;
46	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;	46	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;
		47	import org.eclipse.hyades.test.core.testservices.resources.PasswordCollection;
47		48
48	/**	49	/**
49	* Fake process that represents a Hyades Execution Session. The lifecycle of	50	* Fake process that represents a Hyades Execution Session. The lifecycle of
Lines 146-151 Link Here
146		147
147	protected synchronized void onTerminate() {	148	protected synchronized void onTerminate() {
148	if (!terminated) {	149	if (!terminated) {
		150	//remove the dps and passwords from passwordCollection
		151	PasswordCollection.getInstance().clear(test.getImplementor().getId());
149	// Notify the run handler (if any)	152	// Notify the run handler (if any)
150	IRunHandler runHandler = LaunchConfigurationExtensionsManager.getInstance().getRunHandler(test);	153	IRunHandler runHandler = LaunchConfigurationExtensionsManager.getInstance().getRunHandler(test);
151	if (runHandler != null) {	154	if (runHandler != null) {




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: LaunchDatapoolExtensionManager.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.core.internal.launch.datapool.extensions;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
import org.eclipse.hyades.models.common.testprofile.TPFTest;
import org.eclipse.hyades.test.core.TestCorePlugin;
import org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler;
import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;

/**
 * It's used to manage extensions for launchconfigDatapoolHandler and 
 * launchDatapoolCheckPass extension points ,based on the type of each test .
 * 
 * @author Huang Xin Ying 
 *
 */
public class LaunchDatapoolExtensionManager {

	private static LaunchDatapoolExtensionManager instance;

	public static LaunchDatapoolExtensionManager getInstance() {
		if (instance == null) {
			instance = new LaunchDatapoolExtensionManager();
		}
		return instance;
	}

	private LaunchDatapoolExtensionManager() {
		registerDatapoolHandlers();
		registerCheckPass();
	}

	private Map datapoolHandlerExtensionMap = new HashMap();

	public ILaunchconfigDatapoolHandler getRunHandler(Object testElement) {
		LaunchDatapoolExtensionDescriper ed = getLaunchDatapoolDescriptor(testElement);
		if (ed != null) {
			return ed.getRunHandler();
		}
		return null;
	}
	
	public IPassInfoCollector getCollector(Object testElement) {
		LaunchDatapoolExtensionDescriper ed = getLaunchDatapoolDescriptor(testElement);
		if (ed != null && ed.getCollector()!= null) 
			return ed.getCollector();

		return getExtensionDescriptor("default").getCollector();
	}

	private void registerDatapoolHandlers() {
		IExtensionPoint extPoint = Platform.getExtensionRegistry()
				.getExtensionPoint(
						TestCorePlugin.getPluginId()
								+ ".launchconfigDatapoolHandler");
		if (extPoint != null) {
			IConfigurationElement[] datapoolHandlers = extPoint
					.getConfigurationElements();
			for (int i = 0; i < datapoolHandlers.length; i++) {
				IConfigurationElement[] supportedTypes = datapoolHandlers[i]
						.getChildren();
				for (int j = 0; j < supportedTypes.length; j++) {
					String type = supportedTypes[j].getAttribute("name"); //$NON-NLS-1$					
					try {
						LaunchDatapoolExtensionDescriper ed = getExtensionDescriptor(type);
						ed.launchDatapoolConfigElem = datapoolHandlers[i];
					} catch (Exception e) {
						TestCorePlugin
								.getDefault()
								.logError(
										"Extension "
												+ datapoolHandlers[i].getName()
												+ " was ignored. See next messages for details.");
						TestCorePlugin.getDefault().logError(e);
					}
				}
			}
		}
	}
	
	private void registerCheckPass() {
		IExtensionPoint extPoint = Platform.getExtensionRegistry()
				.getExtensionPoint(
						TestCorePlugin.getPluginId()
								+ ".launchDatapoolCheckPass");
		if (extPoint != null) {
			IConfigurationElement[] datapoolHandlers = extPoint
					.getConfigurationElements();
			for (int i = 0; i < datapoolHandlers.length; i++) {
				IConfigurationElement[] supportedTypes = datapoolHandlers[i]
						.getChildren();
				for (int j = 0; j < supportedTypes.length; j++) {
					String type = supportedTypes[j].getAttribute("name"); //$NON-NLS-1$	
					if(type == null || type.equals(""))
						type = "default";
					try {
						LaunchDatapoolExtensionDescriper ed = getExtensionDescriptor(type);
						ed.CheckPassConfigElem = datapoolHandlers[i];
					} catch (Exception e) {
						TestCorePlugin
								.getDefault()
								.logError(
										"Extension "
												+ datapoolHandlers[i].getName()
												+ " was ignored. See next messages for details.");
						TestCorePlugin.getDefault().logError(e);
					}
				}
			}
		}
	}

	private LaunchDatapoolExtensionDescriper getExtensionDescriptor(String type) {

		if (type == null) {
			throw new NullPointerException("Type must be non-null"); //$NON-NLS-1$
		}

		Object o = datapoolHandlerExtensionMap.get(type);
		if (o == null) {
			o = new LaunchDatapoolExtensionDescriper();
			datapoolHandlerExtensionMap.put(type, o);
		}
		return (LaunchDatapoolExtensionDescriper) o;
	}

	private LaunchDatapoolExtensionDescriper getLaunchDatapoolDescriptor(
			Object testElement) {
		if (testElement != null) {
			if (testElement instanceof TPFTest) {
				TPFTest test = (TPFTest) testElement;
				if (test.getType() != null) {
					return getExtensionDescriptor(test.getType());
				}
			}
		}
		return null;
	}

	private class LaunchDatapoolExtensionDescriper {
		public IConfigurationElement launchDatapoolConfigElem = null;
		public IConfigurationElement CheckPassConfigElem = null;
		private ILaunchconfigDatapoolHandler hanler = null;
		private IPassInfoCollector collector = null;
		public String launchConfigurationType = null;

		public ILaunchconfigDatapoolHandler getRunHandler() {
			if (this.hanler == null) {
				if (this.launchDatapoolConfigElem != null) {
					try {
						this.hanler = (ILaunchconfigDatapoolHandler) this.launchDatapoolConfigElem
								.createExecutableExtension("class"); //$NON-NLS-1$
					} catch (CoreException e) {
						TestCorePlugin.getDefault().logError(e);
						this.launchDatapoolConfigElem = null;
					}
				}
			}
			return this.hanler;
		}
		
		public IPassInfoCollector getCollector() {
			if (this.collector == null) {
				if (this.CheckPassConfigElem != null) {
					try {
						this.collector = (IPassInfoCollector) this.CheckPassConfigElem
								.createExecutableExtension("UIClass"); //$NON-NLS-1$
					} catch (CoreException e) {
						TestCorePlugin.getDefault().logError(e);
						this.CheckPassConfigElem = null;
					}
				}
			}
			return this.collector;
		}

		public boolean isLaunchConfigurationTypeSupported(String lcType) {
			return (this.launchConfigurationType == lcType)
					|| (lcType != null && lcType
							.equals(this.launchConfigurationType));
		}
	}
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: ILaunchconfigDatapoolHandler.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.test.core.launch.extensions;

import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.testprofile.TPFDeployment;
import org.eclipse.hyades.models.common.testprofile.TPFTest;

/**
*  
* It's the interface for the  launchconfigDatapoolHandler extension point.
* 
* @author Huang Xin Ying 
*
*/
public interface ILaunchconfigDatapoolHandler {
	
	public	DPLDatapool[] getAllDatapools(TPFTest test, TPFDeployment deploy);

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: IPassInfoCollector.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.core.launch.extensions;

import java.util.List;
import java.util.Map;

import org.eclipse.hyades.models.common.datapool.DPLDatapool;

/**
*  
* It's the interface for the launchDatapoolCheckPass extension point.
* @author Huang Xin Ying 
*
*/
public interface IPassInfoCollector {
	
	void execute(DPLDatapool[] dp, Map pass, List isContinue);
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: PasswordCollection.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.test.core.testservices.resources;



import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

/**
 * This class runs on the workbench, and used to save HashMap of
 *  datapool & password for this datapool during luaching  tests .
 *  
 * It's supposed to support mult-lauch on the workbench side . 
 *  
 * @author Xin Ying Huang
 *
 */
public class PasswordCollection {
	
	private static PasswordCollection instance = null;
	private HashMap datapoolPassword = new HashMap();
	
	
	private PasswordCollection(){}
	
	/**
	 * @param 
	 * @return PasswordCollection
	 */
	public static PasswordCollection getInstance(){
		if(instance == null){
			instance = new PasswordCollection();
		}
		return instance;
	}	
   
	/**
	 * @param 
	 * @return HashMap
	 */
	public HashMap getDatapoolPassword() {
		return datapoolPassword;
	}
	
	/**
	 * @param  testId
	 * @return HashMap
	 */
	public HashMap getDatapoolPassword(String testId){
		if(testId == null)
			return null;
		return (HashMap)datapoolPassword.get(testId);
	}
	
	/**
	 * @param  testId
	 * @return HashMap
	 */
	public void clear(String testId){
		if(testId == null)
			return;
		datapoolPassword.remove(testId);
		return;
	}
}




<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.hyades.test.core">
<annotation>
      <appInfo>
         <meta.schema plugin="org.eclipse.hyades.test.core" id="launchconfigDatapoolHandler" name="launchconfigDatapoolHandler"/>
      </appInfo>
      <documentation>
         This extension point provides a mechanism to get datapool model for each test type when launching a test case .
      </documentation>
   </annotation>

   <element name="extension">
      <complexType>
         <sequence>
            <element ref="launchconfigDatapoolHandler"/>
         </sequence>
         <attribute name="point" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="id" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="name" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
               <appInfo>
                  <meta.attribute translatable="true"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="launchconfigDatapoolHandler">
      <complexType>
         <sequence>
            <element ref="supportedTestType"/>
         </sequence>
         <attribute name="class" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="supportedTestType">
      <complexType>
         <attribute name="name" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <annotation>
      <appInfo>
         <meta.section type="since"/>
      </appInfo>
      <documentation>
         [4.5 ]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="examples"/>
      </appInfo>
      <documentation>
         The following example associates a DatapoolHandler class with tests of type org.eclipse.hyades.test.:

&lt;pre&gt;

 &lt;extension

       point=&quot;org.eclipse.hyades.test.core.launchconfigDatapoolHandler&quot;&gt;

    &lt;launchconfigDatapoolHandler class=&quot; &quot;&gt;

       &lt;supportedType

             name =&quot;  &quot;/&gt;

    &lt;/runHandler&gt;

 &lt;/extension&gt;

&lt;/pre&gt;
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="apiInfo"/>
      </appInfo>
      <documentation>
         [org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="implementation"/>
      </appInfo>
      <documentation>
         [Enter information about supplied implementation of this extension point.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="copyright"/>
      </appInfo>
      <documentation>
         
      </documentation>
   </annotation>

</schema>




<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.hyades.test.core">
<annotation>
      <appInfo>
         <meta.schema plugin="org.eclipse.hyades.test.core" id="launchDatapoolCheckPass" name="check passwords while launching"/>
      </appInfo>
      <documentation>
         [Used to collect password for each enctypted datapool which used in current test on workbench side .]
      </documentation>
   </annotation>

   <element name="extension">
      <complexType>
         <sequence>
            <element ref="launchDatapoolCheckPass"/>
         </sequence>
         <attribute name="point" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="id" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="name" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
               <appInfo>
                  <meta.attribute translatable="true"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="launchDatapoolCheckPass">
      <complexType>
         <sequence>
            <element ref="supportedTestType"/>
         </sequence>
         <attribute name="UIClass" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="supportedTestType">
      <complexType>
         <attribute name="name" type="string" use="default" value="">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <annotation>
      <appInfo>
         <meta.section type="since"/>
      </appInfo>
      <documentation>
         [4.5.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="examples"/>
      </appInfo>
      <documentation>
         [  &lt;element name=&quot;extension&quot;&gt;
      &lt;complexType&gt;
         &lt;sequence&gt;
            &lt;element ref=&quot;launchDatapoolCheckPass&quot;/&gt;
         &lt;/sequence&gt;
         &lt;attribute name=&quot;point&quot; type=&quot;string&quot; use=&quot;required&quot;&gt;
            &lt;annotation&gt;
               &lt;documentation&gt;
                  
               &lt;/documentation&gt;
            &lt;/annotation&gt;
         &lt;/attribute&gt;
         &lt;attribute name=&quot;id&quot; type=&quot;string&quot;&gt;
            &lt;annotation&gt;
               &lt;documentation&gt;
                  
               &lt;/documentation&gt;
            &lt;/annotation&gt;
         &lt;/attribute&gt;
         &lt;attribute name=&quot;name&quot; type=&quot;string&quot;&gt;
            &lt;annotation&gt;
               &lt;documentation&gt;
                  
               &lt;/documentation&gt;
               &lt;appInfo&gt;
                  &lt;meta.attribute translatable=&quot;true&quot;/&gt;
               &lt;/appInfo&gt;
            &lt;/annotation&gt;
         &lt;/attribute&gt;
      &lt;/complexType&gt;
   &lt;/element&gt;
.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="apiInfo"/>
      </appInfo>
      <documentation>
         [org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector .]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="implementation"/>
      </appInfo>
      <documentation>
         [Enter information about supplied implementation of this extension point.]
      </documentation>
   </annotation>


</schema>




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: JUnitLaunchconfigDatapoolHandler.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.test.core.internal.launch.datapool.extensions;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.eclipse.hyades.models.common.configuration.CFGArtifactLocationPair;
import org.eclipse.hyades.models.common.configuration.CFGClass;
import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.testprofile.TPFDeployment;
import org.eclipse.hyades.models.common.testprofile.TPFTest;
import org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler;


/**
 * This class runs on the workbench, and provides the workbench side 
 * implementation of the launchconfigDatapoolHandler extension point.
 * 
 * It's used to get datapool[] from test or delpoy for Junit test type .
 * 
 * @author Huang Xin Ying 
 *
 */
public class JUnitLaunchconfigDatapoolHandler implements
		ILaunchconfigDatapoolHandler {
	
	/**
	 * @param test,deploy
	 * @return DPLDatapool[]
	 */
	public DPLDatapool[] getAllDatapools(TPFTest test, TPFDeployment deploy) {
		if(deploy == null)
			return null;
		
		List keyList = new ArrayList();
		List pairs = deploy.getArtifactLocations();
		
		if(pairs == null)
			return null;
		for(Iterator iti = pairs.iterator();iti.hasNext();){
			CFGArtifactLocationPair aflp = (CFGArtifactLocationPair)iti.next();
			if(aflp == null)
				continue;
			if(aflp.getArtifact() == null)
				continue;
			List deploys = aflp.getArtifact().getDeployableInstances();
			if(deploys == null)
				continue;
			for(Iterator it=deploys.iterator();it.hasNext();){
				CFGClass cfg = (CFGClass)it.next();
				if(cfg instanceof DPLDatapool && ((DPLDatapool)cfg).getChallenge()!= null){					
					keyList.add(cfg);
				}
			}			
		}
		
		if(keyList.size() == 0)			
			return null;		
	
		return (DPLDatapool[])(keyList.toArray(new DPLDatapool[]{}));
	}
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolPasswordsService.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.core.testservices.resources;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.eclipse.hyades.execution.local.testservices.AbstractTestService;
import org.eclipse.hyades.execution.local.testservices.ITestService;
import org.eclipse.hyades.internal.execution.local.control.Agent;

/**
*  
* It's the class of DatapoolPasswordsService ,used to provide list of datapool and it's encryption 
* password to the agent controller side .
* @author Huang Xin Ying 
*
*/
public class DatapoolPasswordsService extends AbstractTestService implements ITestService{
	
	/**
	 * @param agent
	 * @param methodArgs
	 * @param errBuf
	 * @return
	 */
	public String getDatapoolList(Agent agent, String methodArgs, StringBuffer errBuf){
		Pattern pattern = Pattern.compile("testId=(.*)"); //$NON-NLS-1$
		Matcher matcher = pattern.matcher(methodArgs);
		String testId = null;
		if (matcher.find()) {
			testId = matcher.group(1);
		}
		HashMap data = PasswordCollection.getInstance().getDatapoolPassword(testId);
		
		if(data == null || data.size() == 0)
			return null;
		
		StringBuffer result = new StringBuffer();
		
		for( Iterator it = data.entrySet().iterator();it.hasNext();){
			Map.Entry entry = (Map.Entry)it.next();
			result.append(entry.getKey() + "=" + entry.getValue() + ";");
		}
		
		return result.toString();
	}	
}

Lines 32-37 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/editor/extension/DatapoolEditorExtension.java (-3 / +20 lines)
32	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;	32	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
33	import org.eclipse.hyades.ui.editor.IEditActionsExtension;	33	import org.eclipse.hyades.ui.editor.IEditActionsExtension;
34	import org.eclipse.hyades.ui.editor.IHyadesEditorPart;	34	import org.eclipse.hyades.ui.editor.IHyadesEditorPart;
		35	import org.eclipse.jface.dialogs.MessageDialog;
35	import org.eclipse.jface.text.IFindReplaceTarget;	36	import org.eclipse.jface.text.IFindReplaceTarget;
36	import org.eclipse.jface.text.IFindReplaceTargetExtension3;	37	import org.eclipse.jface.text.IFindReplaceTargetExtension3;
37	import org.eclipse.jface.viewers.ISelection;	38	import org.eclipse.jface.viewers.ISelection;
Lines 39-44 Link Here
39	import org.eclipse.jface.viewers.StructuredSelection;	40	import org.eclipse.jface.viewers.StructuredSelection;
40	import org.eclipse.swt.custom.TableCursor;	41	import org.eclipse.swt.custom.TableCursor;
41	import org.eclipse.swt.graphics.Point;	42	import org.eclipse.swt.graphics.Point;
		43	import org.eclipse.swt.widgets.Shell;
42	import org.eclipse.swt.widgets.Table;	44	import org.eclipse.swt.widgets.Table;
43	import org.eclipse.swt.widgets.TableItem;	45	import org.eclipse.swt.widgets.TableItem;
44	import org.eclipse.tptp.platform.common.ui.internal.util.UIUtil;	46	import org.eclipse.tptp.platform.common.ui.internal.util.UIUtil;
Lines 397-404 Link Here
397	/* (non-Javadoc)	399	/* (non-Javadoc)
398	* @see org.eclipse.hyades.ui.editor.IEditorExtension#createPages()	400	* @see org.eclipse.hyades.ui.editor.IEditorExtension#createPages()
399	*/	401	*/
		402	private void showErrMes(Shell shell, String mes) {
		403	MessageDialog.openError(shell, UiPluginResourceBundle.DatapoolDialog_ERRORDIALOGTITLE, mes);
		404	}
400	public void createPages() {	405	public void createPages() {
401	IHyadesEditorPart hyadesEditorPart = getHyadesEditorPart();	406	IHyadesEditorPart hyadesEditorPart = getHyadesEditorPart();
402	WidgetFactory widgetFactory = new WidgetFactory();	407	WidgetFactory widgetFactory = new WidgetFactory();
403		408
404	datapoolForm = new DatapoolForm(this, widgetFactory);	409	datapoolForm = new DatapoolForm(this, widgetFactory);
Lines 406-412 Link Here
406	hyadesEditorPart.setPageText(PAGE_OVERVIEW, UiPluginResourceBundle.W_OVERVIEW);	411	hyadesEditorPart.setPageText(PAGE_OVERVIEW, UiPluginResourceBundle.W_OVERVIEW);
407	datapoolForm.updateTitle();	412	datapoolForm.updateTitle();
408		413
409	IDatapool dp = getDatapool();	414	IDatapool dp = getDatapool();
410	for (int i = 0; i < dp.getEquivalenceClassCount(); i++) {	415	for (int i = 0; i < dp.getEquivalenceClassCount(); i++) {
411	addEquivalenceClassPage(i);	416	addEquivalenceClassPage(i);
412	}	417	}
Lines 631-635 Link Here
631	public void connectPart(IWorkbenchPart part) {	636	public void connectPart(IWorkbenchPart part) {
632	DatapoolActionHandlerListener.INSTANCE.connectPart(part);	637	DatapoolActionHandlerListener.INSTANCE.connectPart(part);
633	}	638	}
634		639	/**
		640	* used for DatapoolEditorPart to save
		641	* deal with the encrypted datapool
		642	* */
		643	public void save(){
		644	if(super.getProgressMonitor() != null){
		645	try{
		646	super.save(super.getProgressMonitor());
		647	}catch(Exception e){
		648	e.printStackTrace();
		649	}
		650	}
		651	}
635	}	652	}

Lines 14-31 Link Here

(-)src/org/eclipse/hyades/test/ui/datapool/internal/dialog/DatapoolColumnDialog.java (-4 / +176 lines)
14		14
15	import org.eclipse.hyades.edit.datapool.IDatapool;	15	import org.eclipse.hyades.edit.datapool.IDatapool;
16	import org.eclipse.hyades.edit.datapool.IDatapoolVariable;	16	import org.eclipse.hyades.edit.datapool.IDatapoolVariable;
		17	import org.eclipse.hyades.models.common.datapool.DPLVariable;
		18	import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
		19	import org.eclipse.hyades.models.common.util.EncryptionManager;
17	import org.eclipse.hyades.test.ui.datapool.internal.util.DatapoolUtil;	20	import org.eclipse.hyades.test.ui.datapool.internal.util.DatapoolUtil;
18	import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;	21	import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;
19	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;	22	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
		23	import org.eclipse.jface.dialogs.IDialogConstants;
		24	import org.eclipse.jface.dialogs.MessageDialog;
20	import org.eclipse.osgi.util.NLS;	25	import org.eclipse.osgi.util.NLS;
21	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
22	import org.eclipse.swt.events.KeyEvent;	27	import org.eclipse.swt.events.KeyEvent;
23	import org.eclipse.swt.events.KeyListener;	28	import org.eclipse.swt.events.KeyListener;
		29	import org.eclipse.swt.events.MouseEvent;
		30	import org.eclipse.swt.events.MouseListener;
24	import org.eclipse.swt.events.SelectionEvent;	31	import org.eclipse.swt.events.SelectionEvent;
25	import org.eclipse.swt.events.SelectionListener;	32	import org.eclipse.swt.events.SelectionListener;
26	import org.eclipse.swt.graphics.Color;	33	import org.eclipse.swt.graphics.Color;
27	import org.eclipse.swt.layout.GridData;	34	import org.eclipse.swt.layout.GridData;
28	import org.eclipse.swt.layout.GridLayout;	35	import org.eclipse.swt.layout.GridLayout;
		36	import org.eclipse.swt.widgets.Button;
29	import org.eclipse.swt.widgets.Combo;	37	import org.eclipse.swt.widgets.Combo;
30	import org.eclipse.swt.widgets.Composite;	38	import org.eclipse.swt.widgets.Composite;
31	import org.eclipse.swt.widgets.Control;	39	import org.eclipse.swt.widgets.Control;
Lines 43-49 Link Here
43	* @author psun	51	* @author psun
44	*	52	*
45	*/	53	*/
46	public class DatapoolColumnDialog extends DatapoolBaseDialog implements KeyListener, SelectionListener{	54	public class DatapoolColumnDialog extends DatapoolBaseDialog implements KeyListener, SelectionListener,MouseListener{
47		55
48	private static final String TAG_VARIABLES = "variables"; //$NON-NLS-1$	56	private static final String TAG_VARIABLES = "variables"; //$NON-NLS-1$
49		57
Lines 66-71 Link Here
66	private String insertionVariableName = null;	74	private String insertionVariableName = null;
67	private int defaultNameCounter = 1;	75	private int defaultNameCounter = 1;
68		76
		77	private Button okButton;
		78	private Button checkBox;
		79	private Button changeKeyButton;
		80	private boolean isEncrypted;
		81	private boolean isKeyChanged;
		82	private String newKey;
		83	//private String key;
		84
		85	public boolean isKeyChanged() {
		86	return isKeyChanged;
		87	}
69	public DatapoolColumnDialog(Shell parentShell,	88	public DatapoolColumnDialog(Shell parentShell,
70	IDatapool datapool,	89	IDatapool datapool,
71	IDatapoolVariable selectedVariable,	90	IDatapoolVariable selectedVariable,
Lines 78-83 Link Here
78	this.title = title;	97	this.title = title;
79	this.selectedVariable = selectedVariable;	98	this.selectedVariable = selectedVariable;
80	this.previousVariable = previousVariable;	99	this.previousVariable = previousVariable;
		100	boolean isKeyChanged = false;
81	}	101	}
82		102
83	/**	103	/**
Lines 122-127 Link Here
122	typeField.setLayoutData(gridData);	142	typeField.setLayoutData(gridData);
123	typeField.addKeyListener(this);	143	typeField.addKeyListener(this);
124	typeFieldForeground = typeField.getForeground();	144	typeFieldForeground = typeField.getForeground();
		145	checkBox = new Button(superComposite,SWT.CHECK);
		146	checkBox.setText(UiPluginResourceBundle.DatapoolDialog_ENCRYPTED);
		147	checkBox.addMouseListener(this);
		148	changeKeyButton = new Button(superComposite,SWT.NONE);
		149	changeKeyButton.setText(UiPluginResourceBundle.DatapoolDialog_CHANGEKEY);
		150	changeKeyButton.addMouseListener(this);
125		151
126	IDatapoolVariable[] variables = DatapoolUtil.getInstance().getVariables(datapool, null);	152	IDatapoolVariable[] variables = DatapoolUtil.getInstance().getVariables(datapool, null);
127	if(selectedVariable != null)	153	if(selectedVariable != null)
Lines 156-162 Link Here
156	else {	182	else {
157	insertionLabel.setText(UiPluginResourceBundle.DATA_DLG_MOVE);	183	insertionLabel.setText(UiPluginResourceBundle.DATA_DLG_MOVE);
158	}	184	}
159		185	if(isVaribelEncrypted(selectedVariable))
		186	{
		187	if(DatapoolEncryptManager.isDatapoolEncrypted(datapool))
		188	changeKeyButton.setEnabled(true);
		189	checkBox.setSelection(true);
		190	isEncrypted =true;
		191	}
		192	else
		193	{
		194	changeKeyButton.setEnabled(false);
		195	checkBox.setSelection(false);
		196	isEncrypted = false;
		197	}
160	insertionVariables = new Combo(superComposite, SWT.DROP_DOWN \| SWT.READ_ONLY);	198	insertionVariables = new Combo(superComposite, SWT.DROP_DOWN \| SWT.READ_ONLY);
161	insertionVariables.setItems(variableLabels);	199	insertionVariables.setItems(variableLabels);
162	insertionVariables.setData(TAG_VARIABLES, variables);	200	insertionVariables.setData(TAG_VARIABLES, variables);
Lines 165-171 Link Here
165		203
166	if(variables.length > 0 && previousVariable != null)	204	if(variables.length > 0 && previousVariable != null)
167	{	205	{
168	int selectIndex = findVariableIndexInCombo(variables, previousVariable) - 1;	206	int selectIndex = findVariableIndexInCombo(variables, previousVariable);
169	if (selectIndex < 0) {	207	if (selectIndex < 0) {
170	insertionVariables.select(0);	208	insertionVariables.select(0);
171	insertionVariableName = new String();	209	insertionVariableName = new String();
Lines 184-190 Link Here
184	}	222	}
185	if (title.equals(UiPluginResourceBundle.DATA_COL_DLG_TITLE_EDIT) && variables.length == 1) {	223	if (title.equals(UiPluginResourceBundle.DATA_COL_DLG_TITLE_EDIT) && variables.length == 1) {
186	//- Move field hidden	224	//- Move field hidden
187	insertionVariables.setVisible(false);	225	insertionVariables.setVisible(false);
188	insertionLabel.setVisible(false);	226	insertionLabel.setVisible(false);
189	}	227	}
190	nameErrorLabel = new Label(superComposite, SWT.NONE);	228	nameErrorLabel = new Label(superComposite, SWT.NONE);
Lines 384-387 Link Here
384	defaultNameCounter++;	422	defaultNameCounter++;
385	return NLS.bind(UiPluginResourceBundle.DATA_VARIABLE_NAME, NumberFormat.getInstance().format(defaultNameCounter));	423	return NLS.bind(UiPluginResourceBundle.DATA_VARIABLE_NAME, NumberFormat.getInstance().format(defaultNameCounter));
386	}	424	}
		425	public void mouseDoubleClick(MouseEvent e) {
		426	// TODO Auto-generated method stub
		427
		428	}
		429
		430	public void mouseDown(MouseEvent e) {
		431	// TODO Auto-generated method stub
		432
		433	}
		434
		435	public void mouseUp(MouseEvent e) {
		436	// TODO Auto-generated method stub
		437	Button clickButton = (Button)e.getSource();
		438	if(clickButton == null)
		439	{
		440	return;
		441	}
		442	String title = clickButton.getText();
		443	if(title != null)
		444	{
		445	if(title.equals(UiPluginResourceBundle.DatapoolDialog_ENCRYPTED))
		446	{
		447	dealClickCheckBox(clickButton);
		448	}
		449	else if(title.equals(UiPluginResourceBundle.DatapoolDialog_CHANGEKEY))
		450	{
		451	dealClickChangeKey(clickButton);
		452	}
		453	}
		454
		455
		456
		457	}
		458	private void dealClickCheckBox(Button checkBoxButton)
		459	{
		460	//if(key == null \|\| key.equals(""))
		461	//{
		462	// isEncrypted = checkBox.getSelection();
		463	// changeKeyButton.setEnabled(false);
		464	// return ;
		465	//}
		466	checkBox = checkBoxButton;
		467	isEncrypted = checkBox.getSelection();
		468	if(changeKeyButton != null)
		469	{
		470	if(DatapoolEncryptManager.isDatapoolEncrypted(datapool))
		471	changeKeyButton.setEnabled(isChangeKeyButtonEnable());
		472	}
		473	}
		474	public boolean isEncrypted()
		475	{
		476	return isEncrypted;
		477	}
		478	private void dealClickChangeKey(Button changeKeyButton)
		479	{
		480
		481	boolean errorKey = true;
		482	Shell shell = Display.getCurrent().getActiveShell();
		483	DatapoolChangeKeyDialog changeKeyDialog = new DatapoolChangeKeyDialog(shell, datapool, UiPluginResourceBundle.DatapoolDialog_CHANGEKEYDIALOGTITLE);
		484	String key = null;
		485	int retVal = 0;
		486	while(errorKey)
		487	{
		488	if (changeKeyDialog.open() == IDialogConstants.OK_ID) {
489
490	key = changeKeyDialog.getOldKey();
491	retVal = changeKeyDialog.isKeyChangeSuccess(datapool);
492	switch(retVal)
493	{
494	case DatapoolConstant.ORIGINTKEYERROR:
495	showErrMes(shell,UiPluginResourceBundle.DatapoolDialog_ORIGINKEYERRORMES);
496	break;
497	case DatapoolConstant.NEWKEYNULL:
498	showErrMes(shell,UiPluginResourceBundle.DatapoolDialog_NEWKEYNULLMES);
499	break;
500	case DatapoolConstant.NEWKEYNOTCONFIRM:
501	showErrMes(shell,UiPluginResourceBundle.DatapoolDialog_NEWKEYNOTCONFIRMMES);
502	break;
503	case DatapoolConstant.CHANGEKEYSUCCESS:
504	newKey = changeKeyDialog.getNewKey();
505	DatapoolEncryptManager.changeKeyOfEncryCell(datapool, key, newKey);
506	key = newKey;
507	try{
508	DatapoolEncryptManager.ChangeKey(EncryptionManager.EncoderByMd5(key),
509	datapool);
510	}catch(Exception e){
511	}
512	errorKey = false;
513	isKeyChanged = true;
514	break;
515	default://error
516	errorKey = false;
517	isKeyChanged = false;
518	}
519	}
520	else
521	{
522	errorKey = false;
523	isKeyChanged = false;
524	}
525
526	}
527
528	}
529	private void showErrMes(Shell shell,String mes)
530	{
531	MessageDialog.openError(shell,UiPluginResourceBundle.DatapoolDialog_ERRORDIALOGTITLE ,mes);
532	}
533	private boolean isChangeKeyButtonEnable()
534	{
535	boolean retValue = true;
536	if(checkBox != null)
537	{
538	if(!checkBox.getSelection())
539	{
540	retValue = false;
541	}
542
543	}
544
545	return retValue;
546
547	}
548
549	private boolean isVaribelEncrypted(IDatapoolVariable varible)
550	{
551	return (varible instanceof DPLVariable)?((DPLVariable)varible).isEncrypted():false;
552	}
553
554	public String getNewKey() {
555	return newKey;
556	}
557
558
387	}	559	}




import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.edit.datapool.IDatapool;
import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
import org.eclipse.hyades.test.core.util.EMFUtil;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil;

				datapool.removeEquivalenceClass(0);
			}
			
			//TODO:first deencrpted all
			String key = datapoolImportPageSelection.getTextArea().getText();
			
			if(datapoolImportPageSelection.isEncrypted()){
				if(!DatapoolEncryptManager.isKeyCorrect(datapool, key)){
					datapoolImportPageSelection.setMessage(UiPluginResourceBundle.DatapoolExportWizard_wrongpass,3);
					datapoolImportPageSelection.getTextArea().setText("");
					datapoolImportPageSelection.getTextArea().setFocus();
					return false;
				}
			}
			
			if( DatapoolEncryptManager.isDatapoolEncrypted(datapool))
			{
				DatapoolEncryptManager.deencrypDatapool(datapool, key);
			}
			if(datapool.getVariableCount() == 0)
			{
				CSVImportExportUtil.getInstance().importCSV(datapool, 

																datapoolImportPage.firstColumnContainsEquivalenceClassName(),
																datapoolImportPage.getImportEncoding());
			}
			//TODO:deal with the encrypted datapool			
						
			if( DatapoolEncryptManager.isDatapoolEncrypted(datapool))
			{
				DatapoolEncryptManager.encrypDatapool(datapool, key);
			}
			Resource dp = ((EObject)datapool).eResource();
			EMFUtil.save(dp);
			dp.unload();

Lines 18-23 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportWizard.java (+26 lines)
18	import org.eclipse.core.runtime.CoreException;	18	import org.eclipse.core.runtime.CoreException;
19	import org.eclipse.core.runtime.Path;	19	import org.eclipse.core.runtime.Path;
20	import org.eclipse.hyades.edit.datapool.IDatapool;	20	import org.eclipse.hyades.edit.datapool.IDatapool;
		21	import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
21	import org.eclipse.hyades.test.ui.TestUIImages;	22	import org.eclipse.hyades.test.ui.TestUIImages;
22	import org.eclipse.hyades.test.ui.UiPlugin;	23	import org.eclipse.hyades.test.ui.UiPlugin;
23	import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil;	24	import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil;
Lines 28-33 Link Here
28	import org.eclipse.jface.wizard.Wizard;	29	import org.eclipse.jface.wizard.Wizard;
29	import org.eclipse.osgi.util.NLS;	30	import org.eclipse.osgi.util.NLS;
30	import org.eclipse.swt.widgets.Composite;	31	import org.eclipse.swt.widgets.Composite;
		32	import org.eclipse.swt.widgets.Shell;
31	import org.eclipse.ui.IExportWizard;	33	import org.eclipse.ui.IExportWizard;
32	import org.eclipse.ui.IWorkbench;	34	import org.eclipse.ui.IWorkbench;
33		35
Lines 86-94 Link Here
86	/* (non-Javadoc)	88	/* (non-Javadoc)
87	* @see org.eclipse.jface.wizard.IWizard#performFinish()	89	* @see org.eclipse.jface.wizard.IWizard#performFinish()
88	*/	90	*/
		91	private void showErrMes(Shell shell, String mes) {
		92	MessageDialog.openError(shell, UiPluginResourceBundle.DatapoolDialog_ERRORDIALOGTITLE, mes);
		93	}
89	public boolean performFinish()	94	public boolean performFinish()
90	{	95	{
91	IDatapool datapool = datapoolSelectionPage.getDatapool();	96	IDatapool datapool = datapoolSelectionPage.getDatapool();
		97	String key = datapoolSelectionPage.getTextArea().getText();
		98
		99	if(datapoolSelectionPage.isEncrypted()){
		100	if(!DatapoolEncryptManager.isKeyCorrect(datapool, key)){
		101	datapoolSelectionPage.setMessage(UiPluginResourceBundle.DatapoolExportWizard_wrongpass,3);
		102	datapoolSelectionPage.getTextArea().setText("");
		103	datapoolSelectionPage.getTextArea().setFocus();
		104	return false;
		105	}
		106	}
		107	//TODO:deal with the encrypted datapool
		108	if( DatapoolEncryptManager.isDatapoolEncrypted(datapool))
		109	{
		110	DatapoolEncryptManager.deencrypDatapool(datapool, key);
		111	}
92	String csvFileName = csvFileLocationPage.getCSVFileName();	112	String csvFileName = csvFileLocationPage.getCSVFileName();
93	if(!csvFileName.endsWith(".csv") && !csvFileName.endsWith(".CSV"))	113	if(!csvFileName.endsWith(".csv") && !csvFileName.endsWith(".CSV"))
94	csvFileName = csvFileName + ".csv";	114	csvFileName = csvFileName + ".csv";
Lines 125-130 Link Here
125	UiPlugin.logError(e);	145	UiPlugin.logError(e);
126	}	146	}
127	}	147	}
		148
		149	//Encrypted back
		150	if( DatapoolEncryptManager.isDatapoolEncrypted(datapool))
		151	{
		152	DatapoolEncryptManager.encrypDatapool(datapool, key);
		153	}
128	return close;	154	return close;
129	}	155	}
130	}	156	}

Lines 14-19 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportSelectionPage.java (-2 / +57 lines)
14	import org.eclipse.core.resources.IResource;	14	import org.eclipse.core.resources.IResource;
15	import org.eclipse.core.resources.ResourcesPlugin;	15	import org.eclipse.core.resources.ResourcesPlugin;
16	import org.eclipse.hyades.edit.datapool.IDatapool;	16	import org.eclipse.hyades.edit.datapool.IDatapool;
		17	import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
17	import org.eclipse.hyades.models.common.util.ICommonConstants;	18	import org.eclipse.hyades.models.common.util.ICommonConstants;
18	import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;	19	import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;
19	import org.eclipse.hyades.test.ui.dialog.EObjectResourceContentProvider;	20	import org.eclipse.hyades.test.ui.dialog.EObjectResourceContentProvider;
Lines 27-39 Link Here
27	import org.eclipse.jface.viewers.ViewerSorter;	28	import org.eclipse.jface.viewers.ViewerSorter;
28	import org.eclipse.jface.wizard.WizardPage;	29	import org.eclipse.jface.wizard.WizardPage;
29	import org.eclipse.swt.SWT;	30	import org.eclipse.swt.SWT;
		31	import org.eclipse.swt.events.ModifyEvent;
		32	import org.eclipse.swt.events.ModifyListener;
30	import org.eclipse.swt.events.SelectionEvent;	33	import org.eclipse.swt.events.SelectionEvent;
31	import org.eclipse.swt.events.SelectionListener;	34	import org.eclipse.swt.events.SelectionListener;
32	import org.eclipse.swt.graphics.Image;	35	import org.eclipse.swt.graphics.Image;
		36	import org.eclipse.swt.layout.FormAttachment;
		37	import org.eclipse.swt.layout.FormData;
		38	import org.eclipse.swt.layout.FormLayout;
33	import org.eclipse.swt.layout.GridData;	39	import org.eclipse.swt.layout.GridData;
34	import org.eclipse.swt.layout.GridLayout;	40	import org.eclipse.swt.layout.GridLayout;
35	import org.eclipse.swt.widgets.Button;	41	import org.eclipse.swt.widgets.Button;
36	import org.eclipse.swt.widgets.Composite;	42	import org.eclipse.swt.widgets.Composite;
		43	import org.eclipse.swt.widgets.Group;
		44	import org.eclipse.swt.widgets.Text;
37	import org.eclipse.swt.widgets.Tree;	45	import org.eclipse.swt.widgets.Tree;
38		46
39	/**	47	/**
Lines 50-55 Link Here
50	private EObjectResourceContentProvider contentProvider;	58	private EObjectResourceContentProvider contentProvider;
51	private String[] fileExtensions;	59	private String[] fileExtensions;
52	private Image fileImage;	60	private Image fileImage;
		61	private Group group;
		62	private Text textArea;
		63	private FormData formData;
		64	private boolean isEncrypted = false;
53		65
54	/**	66	/**
55	* @param pageName	67	* @param pageName
Lines 148-155 Link Here
148	};	160	};
149	assetViewer.setSorter(sorter);	161	assetViewer.setSorter(sorter);
150		162
		163	group = new Group(parent,SWT.NULL);
		164	group.setText(UiPluginResourceBundle.DatapoolExportWizard_password);
		165	group.setLayoutData(GridDataUtil.createHorizontalFill());
		166	group.setLayout(new FormLayout());
		167	group.setVisible(false);
		168	textArea = new Text(group, SWT.SINGLE \| SWT.FULL_SELECTION \| SWT.BORDER \| SWT.PASSWORD);
		169	formData = new FormData();
		170	formData.left = new FormAttachment(0,5);
		171	formData.top = new FormAttachment(0,5);
		172	formData.bottom = new FormAttachment(80,-5);
		173	formData.width = 200;
		174	textArea.setLayoutData(formData);
		175	textArea.addModifyListener(new ModifyListener(){
		176	public void modifyText(ModifyEvent e){
		177	if(textArea.getText().length()>0){
		178	setPageComplete(true);
		179	}
		180	}
		181	});
151	return assetViewer;	182	return assetViewer;
152	}	183	}
		184
		185	public Text getTextArea(){
		186	return textArea;
		187	}
		188
		189	public boolean isEncrypted(){
		190	return isEncrypted;
		191	}
153		192
154	private void setSelection()	193	private void setSelection()
155	{	194	{
Lines 162-169 Link Here
162	datapool = (IDatapool)selectedObject;	201	datapool = (IDatapool)selectedObject;
163	if(datapool != null)	202	if(datapool != null)
164	{	203	{
165	setPageComplete(true);	204	if(DatapoolEncryptManager.isDatapoolEncrypted(datapool)){
166	getContainer().updateButtons();	205	isEncrypted = true;
		206	setMessage(datapool.getName() + " " + UiPluginResourceBundle.DatapoolExportWizard_encrypted,WARNING);
		207	group.setVisible(true);
		208	group.setText(UiPluginResourceBundle.DatapoolExportWizard_password + " " + datapool.getName() + ".datapool");
		209	textArea.setFocus();
		210
		211	setPageComplete(false);
		212	//getContainer().updateButtons();
		213	}else{
		214	isEncrypted = false;
		215	setMessage(datapool.getName() + " " + UiPluginResourceBundle.DatapoolExportWizard_unencrypted);
		216	group.setVisible(false);
		217	textArea.setText("");
		218
		219	setPageComplete(true);
		220	getContainer().updateButtons();
		221	}
167	}	222	}
168	}	223	}
169	}	224	}

Lines 25-30 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageSelection.java (-1 / +65 lines)
25	import org.eclipse.emf.ecore.resource.Resource;	25	import org.eclipse.emf.ecore.resource.Resource;
26	import org.eclipse.hyades.edit.datapool.IDatapool;	26	import org.eclipse.hyades.edit.datapool.IDatapool;
27	import org.eclipse.hyades.models.common.datapool.DPLDatapool;	27	import org.eclipse.hyades.models.common.datapool.DPLDatapool;
		28	import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
28	import org.eclipse.hyades.models.common.util.DatapoolUtil;	29	import org.eclipse.hyades.models.common.util.DatapoolUtil;
29	import org.eclipse.hyades.models.common.util.ICommonConstants;	30	import org.eclipse.hyades.models.common.util.ICommonConstants;
30	import org.eclipse.hyades.test.ui.UiPlugin;	31	import org.eclipse.hyades.test.ui.UiPlugin;
Lines 39-52 Link Here
39	import org.eclipse.osgi.util.NLS;	40	import org.eclipse.osgi.util.NLS;
40	import org.eclipse.swt.SWT;	41	import org.eclipse.swt.SWT;
41	import org.eclipse.swt.custom.StackLayout;	42	import org.eclipse.swt.custom.StackLayout;
		43	import org.eclipse.swt.events.ModifyEvent;
		44	import org.eclipse.swt.events.ModifyListener;
42	import org.eclipse.swt.events.SelectionEvent;	45	import org.eclipse.swt.events.SelectionEvent;
43	import org.eclipse.swt.events.SelectionListener;	46	import org.eclipse.swt.events.SelectionListener;
		47	import org.eclipse.swt.layout.FormAttachment;
		48	import org.eclipse.swt.layout.FormData;
		49	import org.eclipse.swt.layout.FormLayout;
44	import org.eclipse.swt.layout.GridData;	50	import org.eclipse.swt.layout.GridData;
45	import org.eclipse.swt.layout.GridLayout;	51	import org.eclipse.swt.layout.GridLayout;
46	import org.eclipse.swt.widgets.Button;	52	import org.eclipse.swt.widgets.Button;
47	import org.eclipse.swt.widgets.Composite;	53	import org.eclipse.swt.widgets.Composite;
48	import org.eclipse.swt.widgets.Event;	54	import org.eclipse.swt.widgets.Event;
		55	import org.eclipse.swt.widgets.Group;
49	import org.eclipse.swt.widgets.Listener;	56	import org.eclipse.swt.widgets.Listener;
		57	import org.eclipse.swt.widgets.Text;
50	import org.eclipse.tptp.platform.common.internal.util.EMFUtil;	58	import org.eclipse.tptp.platform.common.internal.util.EMFUtil;
51	import org.eclipse.tptp.platform.common.ui.internal.CommonUIMessages;	59	import org.eclipse.tptp.platform.common.ui.internal.CommonUIMessages;
52	import org.eclipse.tptp.platform.common.ui.internal.CommonUIPlugin;	60	import org.eclipse.tptp.platform.common.ui.internal.CommonUIPlugin;
Lines 68-73 Link Here
68	private final static String nameExistingDatapool = "Select Existing Datapool";	76	private final static String nameExistingDatapool = "Select Existing Datapool";
69		77
70	private static final int SIZING_CONTAINER_GROUP_HEIGHT = 250;	78	private static final int SIZING_CONTAINER_GROUP_HEIGHT = 250;
		79	private Group group;
		80	private Text textArea;
		81	private boolean valid = false;
		82	private FormData formData;
		83	private boolean isEncrypted = false;
71		84
72	/**	85	/**
73	* Constructor.	86	* Constructor.
Lines 145-152 Link Here
145	{	158	{
146	super.setSelection();	159	super.setSelection();
147	validateSelection();	160	validateSelection();
		161	IDatapool datapool = getSelectedDatapool()[0];
		162	if(datapool != null)
		163	{
		164	if(DatapoolEncryptManager.isDatapoolEncrypted(datapool)){
		165	isEncrypted = true;
		166	setMessage(datapool.getName() + " " + UiPluginResourceBundle.DatapoolExportWizard_encrypted,WARNING);
		167	group.setVisible(true);
		168	group.setText(UiPluginResourceBundle.DatapoolExportWizard_password + " " + datapool.getName() + ".datapool");
		169	textArea.setFocus();
		170
		171	setPageComplete(false);
		172	//getContainer().updateButtons();
		173	}else{
		174	isEncrypted = false;
		175	setMessage(datapool.getName() + " " + UiPluginResourceBundle.DatapoolExportWizard_unencrypted);
		176	group.setVisible(false);
		177	textArea.setText("");
		178
		179	//setPageComplete(true);
		180	getContainer().updateButtons();
		181	}
		182	}
		183
148	}	184	}
149	};	185	};
		186	group = new Group(topLevel,SWT.NULL);
		187	group.setText(UiPluginResourceBundle.DatapoolExportWizard_password);
		188	group.setLayoutData(GridDataUtil.createHorizontalFill());
		189	group.setLayout(new FormLayout());
		190	group.setVisible(false);
		191	textArea = new Text(group, SWT.SINGLE \| SWT.FULL_SELECTION \| SWT.BORDER \| SWT.PASSWORD);
		192	formData = new FormData();
		193	formData.left = new FormAttachment(0,5);
		194	formData.top = new FormAttachment(0,5);
		195	formData.bottom = new FormAttachment(80,-5);
		196	formData.width = 200;
		197	textArea.setLayoutData(formData);
		198
		199
		200	textArea.addModifyListener(new ModifyListener(){
		201	public void modifyText(ModifyEvent e){
		202	if(textArea.getText().length()>0){
		203	setPageComplete(valid);
		204	}
		205	}
		206	});
150	setControl(topLevel);	207	setControl(topLevel);
151	validateSelection();	208	validateSelection();
152	}	209	}
Lines 319-325 Link Here
319	}	376	}
320		377
321	protected boolean validateSelection() {	378	protected boolean validateSelection() {
322	boolean valid = true;	379	valid = true;
323	setMessage(null);	380	setMessage(null);
324	setErrorMessage(null);	381	setErrorMessage(null);
325	if (existingDatapoolButtonStatus) {	382	if (existingDatapoolButtonStatus) {
Lines 403-406 Link Here
403	{	460	{
404	return datapoolSelectionViewer.getSelectedFiles();	461	return datapoolSelectionViewer.getSelectedFiles();
405	}	462	}
		463	public Text getTextArea(){
		464	return textArea;
		465	}
		466
		467	public boolean isEncrypted(){
		468	return isEncrypted;
		469	}
406	}	470	}




public class ValueObject {

	private Object theObject;
	protected IDisplayValueClass valueClass;
	private String description;
	private Object display;
	

		return null;
	}
	
	public Object getEncryptedDisplay(Composite parent)
	{
		if ( display != null && display instanceof CellEditor )
		{
			Control control = ((CellEditor)display).getControl();
			if ( control != null && !control.isDisposed() )
				return display;
		}
		if ( valueClass != null )
		{
			display = ((EncryptedStringValueClass)valueClass).getPropertyDisplay(theObject, parent, true);
			return display;
		}
		return null;
	}
	public Object getDialogDisplay(Composite parent, boolean isEditable)
	{
		return null;




	public static String DatapoolImportWizard_editOrSelectDatapool;
	public static String DatapoolImportWizard_selectCSV;
	public static String DatapoolImportWizard_selectDatapool;
	public static String DatapoolExportWizard_encrypted;
	public static String DatapoolExportWizard_unencrypted;
	public static String DatapoolExportWizard_wrongpass;
	public static String DatapoolExportWizard_rightpass;
	public static String DatapoolExportWizard_password;
	public static String DatapoolDialog_CHANGEKEY;
	public static String DatapoolDialog_ENCRYPTED;
	public static String DatapoolDialog_ASSIGNKEYDIALOGTITLE;
	public static String DatapoolDialog_CHANGEKEYDIALOGTITLE;
	public static String DatapoolDialog_OLDKEY;
	public static String DatapoolDialog_NEWKEY;
	public static String DatapoolDialog_CONFIRMNEWKEY;
	public static String DatapoolDialog_ORIGINKEYERRORMES;
	public static String DatapoolDialog_NEWKEYNULLMES;
	public static String DatapoolDialog_NEWKEYNOTCONFIRMMES;
	public static String DatapoolDialog_WRONGLOGONKEYMES;
	public static String DatapoolDialog_ERRORDIALOGTITLE;
	public static String DatapoolDialog_KEY;
	public static String DatapoolDialog_LOGONDIALOGTITLE;
	public static String DatapoolDialog_ENCRYPTEDID;
	public static String DatapoolDialog_ENCRYPTEDDISPLAYVALUE;
	public static String DatapoolDialog_ERRORFOREDITENCRYPTEDVALUE;
	public static String DatapoolDialog_INPUTKEYDIALGOTITLE;
	public static String DatapoolDialog_TRUE;
	public static String DatapoolDialog_OK;
	public static String DatapoolDialog_PASSWORDSHINT;
	public static String DatapoolDialog_SPLITMARK;
	public static String DatapoolDialog_TRYAGAIN;
	public static String DatapoolDialog_NOTALLMATCH;
	public static String DatapoolDialog_INPUTPASSHINT;
	public static String ToggleViewAction_resource_label;
	public static String ToggleViewAction_resource_description;
	public static String ToggleViewAction_resource_tooltip;




DatapoolImportWizard_editOrSelectDatapool=Please edit the datapool or select a different one and import again.
DatapoolImportWizard_selectCSV=&Select the CSV file to import data from:
DatapoolImportWizard_selectDatapool= Select a datapool to import data into:
DatapoolExportWizard_encrypted=  is encrypted. Please supply the password.
DatapoolExportWizard_unencrypted=  is not encrypted. Press Finish to complete.
DatapoolExportWizard_wrongpass=Wrong password. Try again or cancel.
DatapoolExportWizard_rightpass=You passed. Check Finish to complete.
DatapoolExportWizard_password=Password for

DatapoolDialog_CHANGEKEY=Change Password
DatapoolDialog_ENCRYPTED=Encrypted
DatapoolDialog_ASSIGNKEYDIALOGTITLE=Assign  Password
DatapoolDialog_CHANGEKEYDIALOGTITLE=Change Password
DatapoolDialog_OLDKEY=Origin Password
DatapoolDialog_NEWKEY=New Password
DatapoolDialog_CONFIRMNEWKEY=Confirm New Password
DatapoolDialog_ORIGINKEYERRORMES=The origin Password is wrong
DatapoolDialog_NEWKEYNULLMES=The new Password should not be null
DatapoolDialog_NEWKEYNOTCONFIRMMES=The confirm Password is not the same as the new Password
DatapoolDialog_WRONGLOGONKEYMES=The Password input is incorrect
DatapoolDialog_ERRORDIALOGTITLE=Error
DatapoolDialog_KEY=Key
DatapoolDialog_LOGONDIALOGTITLE=Log on
DatapoolDialog_ENCRYPTEDID=isencrypted
DatapoolDialog_ENCRYPTEDDISPLAYVALUE=******
DatapoolDialog_ERRORFOREDITENCRYPTEDVALUE=The cell has been encrypted , please decrypted it before editing
DatapoolDialog_INPUTKEYDIALGOTITLE=Input Password
DatapoolDialog_TRUE=true
DatapoolDialog_OK=OK
DatapoolDialog_PASSWORDSHINT=password for the following are not correct!:\n\n
DatapoolDialog_SPLITMARK=::
DatapoolDialog_TRYAGAIN=\n\nPlease try again or Cancel
DatapoolDialog_NOTALLMATCH=Passwords not all matched!
DatapoolDialog_INPUTPASSHINT=Please enter the passwords for each encrypted datapool:
ToggleViewAction_resource_label=Resource test navigator
ToggleViewAction_resource_description=Show the resource test navigator
ToggleViewAction_resource_tooltip=Show the resource test navigator




import org.eclipse.hyades.edit.datapool.IDatapoolRecord;
import org.eclipse.hyades.edit.datapool.IDatapoolSuggestedType;
import org.eclipse.hyades.edit.datapool.IDatapoolVariable;
import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.datapool.DPLVariable;
import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
import org.eclipse.hyades.models.common.util.EncryptionManager;
import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolChangeKeyDialog;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolColumnDialog;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolConstant;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolDeleteColumnDialog;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolInputKeyDialog;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolRowDialog;
import org.eclipse.hyades.test.ui.datapool.internal.interfaces.IDatapoolPart;
import org.eclipse.hyades.test.ui.datapool.internal.interfaces.IValidateValueClass;
import org.eclipse.hyades.test.ui.datapool.internal.interfaces.IValueClassFactory;
import org.eclipse.hyades.test.ui.datapool.internal.util.DatapoolUtil;
import org.eclipse.hyades.test.ui.datapool.internal.util.EncryptedValueObject;
import org.eclipse.hyades.test.ui.datapool.internal.util.TypeChecker;
import org.eclipse.hyades.test.ui.datapool.internal.util.ValueClassMap;
import org.eclipse.hyades.test.ui.datapool.internal.util.ValueObject;

	private boolean showRecords = true;
	private boolean isF2Mode = false;
	private int previousMultiRowSelectionIndex = -1;  // only used for deselecting when multi-selection in place.
	private String cellkey;
	private boolean passwordExist = false;
	private String password = null;
	
	private String vendorID = null;
	

			if(rawValue == null)
			{	
				String typeName = suggestedType.getSuggestedClassName();					
				if (typeName == null || typeName.length() == 0) {
				{
					rawValue = new String();
				} else {
				else
				{
					rawValue = createEmptyCellObject(typeName);
				}
			}
			if(DatapoolEncryptManager.isVaribelEncrypted(variable))
			{
				boolean errorKey = true;
				boolean isCancelChange = false;
				String key = null;
				if(passwordExist){
					key = password;
				}else{
					DatapoolInputKeyDialog logOnDialog = new DatapoolInputKeyDialog(
							Display.getCurrent().getActiveShell(),
							UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE);
	//				String key = getKeyInDatapool(datapool);
					
					while (errorKey) {
						int openValue = logOnDialog.open();
						if (openValue == IDialogConstants.OK_ID) {
							key = logOnDialog.getKey();
							cellkey = key;
							if (DatapoolEncryptManager.isKeyCorrect(datapool, key)) {
								errorKey = false;
								password = key;
								passwordExist = true;
							} else {//the input key is incorrect
								showErrMes(Display.getCurrent()
										.getActiveShell(),
										UiPluginResourceBundle.DatapoolDialog_WRONGLOGONKEYMES);
							}
						} else if (openValue == IDialogConstants.CANCEL_ID) {// click cancel button
							isCancelChange = true;
							errorKey = false;
	
						}
					}
					
					if(isCancelChange)
					{
						return;
					}
				}
				rawValue = EncryptionManager.decrypt(rawValue.toString(), key);
				theValueObject = new EncryptedValueObject(rawValue);
				cellEditor = (CellEditor) theValueObject
				.getEncryptedDisplay(tableCursor);
			}else{
				theValueObject = new ValueObject(rawValue);
			cellEditor = (CellEditor) theValueObject
					.getPropertyDisplay(tableCursor);
			}
//			cellEditor = new TextCellEditor(tableCursor,SWT.PASSWORD);
//			cellEditor.setValue(rawValue.toString());
//			int oldStyle = cellEditor.getStyle();
//			cellEditor.setStyle(SWT.PASSWORD|oldStyle);
//			oldStyle = cellEditor.getStyle();
		}
		
		if(cellEditor != null && cellEditor.getControl() != null)
		{

					}
				}
				
				if (update) {
					if(DatapoolEncryptManager.isVaribelEncrypted(cell.getCellVariable()))
					{
						String value = String.valueOf(updatedValue);
						String encryptValue = DatapoolEncryptManager.encrypt(value, cellkey);
						updatedValue = (Object)encryptValue;
						
					}
					cell.setCellValue(updatedValue);
					selectedTableItem.setText(selectedColumnIndex, newDescription);
					tableCursor.setSelection(table.getSelectionIndex(), selectedColumnIndex);

			}
			
			if(dispose)
				refreshRows();
				clearCellEditor();
		}						
	}


		IDatapool datapool = getDatapool();
		DatapoolColumnDialog dialog = new DatapoolColumnDialog(Display.getCurrent().getActiveShell(), datapool, null, previousVariable, UiPluginResourceBundle.DATA_COL_DLG_TITLE_INS);  
		if (dialog.open() == IDialogConstants.OK_ID) {
			if(dialog.isEncrypted()){
			String key = null;			
			if(isKeyExist())
			{
				boolean errorKey = true;
				if(passwordExist && !dialog.isKeyChanged()){
					key = password;
				}else{
					DatapoolInputKeyDialog logOnDialog = new DatapoolInputKeyDialog(
							Display.getCurrent().getActiveShell(),
							UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE);
					while (errorKey) {
						int openValue = logOnDialog.open();
						if (openValue == IDialogConstants.OK_ID) {
							key = logOnDialog.getKey();
							if (DatapoolEncryptManager.isKeyCorrect(datapool,key)) {
								errorKey = false;
								password = key;
								passwordExist = true;
							} else {
								showErrMes(Display.getCurrent()
										.getActiveShell(),
										UiPluginResourceBundle.DatapoolDialog_WRONGLOGONKEYMES);
							}
						} else if (openValue == IDialogConstants.CANCEL_ID) {
							errorKey = false;
						}
					}
				}
			}
			else
			{
				Shell shell = Display.getCurrent().getActiveShell();
				DatapoolChangeKeyDialog assignKeyDialog = new DatapoolChangeKeyDialog(
						shell, datapool,
						UiPluginResourceBundle.DatapoolDialog_ASSIGNKEYDIALOGTITLE);
				boolean errorKey = true;				
				while (errorKey) {
					if (assignKeyDialog.open() == IDialogConstants.OK_ID) {
						key = assignKeyDialog.getNewKey();
						int ret = assignKeyDialog.isKeyAssignSuccess();
						switch (ret) {
						case DatapoolConstant.NEWKEYNULL:
							showErrMes(shell,
									UiPluginResourceBundle.DatapoolDialog_NEWKEYNULLMES);
							break;
						case DatapoolConstant.NEWKEYNOTCONFIRM:
							showErrMes(
									shell,
									UiPluginResourceBundle.DatapoolDialog_NEWKEYNOTCONFIRMMES);
							break;
						case DatapoolConstant.CHANGEKEYSUCCESS:									
							try{
							DatapoolEncryptManager.ChangeKey(EncryptionManager.EncoderByMd5(key),
									datapool);
//							
							errorKey = false;
							password = key;
							passwordExist = true;
							}catch(Exception e){}
							break;
						default:// error
						}
					} else {						
						errorKey = false;
					}
				}
			}
			}
			
			setWaitCursor();
			IDatapoolVariable variable = datapool.constructVariable();
			variable.setName(dialog.getName());
			IDatapoolSuggestedType suggestedType = (IDatapoolSuggestedType)variable.getSuggestedType();
			setVariableType(suggestedType, dialog.getType());
			variable.setSuggestedType(suggestedType);
			
			((DPLVariable)variable).setEncrypted(dialog.isEncrypted());
			
			int insertionIndex = findColumnIndex(dialog
					.getInsertionVariableName());
			if(insertionIndex == -1)
				insertionIndex = 0;


			if (tableCursor != null && !tableCursor.isDisposed() && !(row < 0 || row >= table.getItemCount() || insertionIndex < 0 || insertionIndex > maxColumnIndex)) {
                tableCursor.setSelection(row, insertionIndex + 1);			
            }
			refreshRows();
		}
	}


	 * Function that actually does the editing of the variable/column.
	 */	
	private void editColumnAux(TableColumn tableColumn) {
		boolean isVariableEncrypted = false;
        try {
            if (showVariables == false) return;


            IDatapoolVariable previousVariable = null;
            if (previousTableColumn != null) previousVariable = (IDatapoolVariable) previousTableColumn.getData(TAG_VARIABLE);
            IDatapoolVariable variable = (IDatapoolVariable) tableColumn.getData(TAG_VARIABLE);
            DatapoolColumnDialog dialog = new DatapoolColumnDialog(Display
					.getCurrent().getActiveShell(), datapool, variable,
					previousVariable,
					UiPluginResourceBundle.DATA_COL_DLG_TITLE_EDIT); //$NON-NLS-1$
			isVariableEncrypted = DatapoolEncryptManager.isVaribelEncrypted(variable);
			String key = null;
			if (dialog.open() == IDialogConstants.OK_ID) {
				if (isNeedKeyVerify(dialog,isVariableEncrypted)) {//need to confrim key or assign a new key
					boolean isCancelChange = false;
					if(isKeyExist())//key exists means it needs to confirm key
					{
						//if(dialog.isKeyChanged())
						//{
							//key = dialog.getKey();							
						//}
						boolean errorKey = true;
						
						if(passwordExist && !dialog.isKeyChanged()){
							key = password;
						}else{
						
							DatapoolInputKeyDialog logOnDialog = new DatapoolInputKeyDialog(
									Display.getCurrent().getActiveShell(),
									UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE);
							while (errorKey) {
								int openValue = logOnDialog.open();
								if (openValue == IDialogConstants.OK_ID) {
									key = logOnDialog.getKey();									
									if (DatapoolEncryptManager.isKeyCorrect(datapool,key)) {
										errorKey = false;
										password = key;
										passwordExist = true;
									} else {//the input key is incorrect
										showErrMes(Display.getCurrent()
												.getActiveShell(),
												UiPluginResourceBundle.DatapoolDialog_WRONGLOGONKEYMES);
									}
								} else if (openValue == IDialogConstants.CANCEL_ID) {// click cancel button
									isCancelChange = true;
									errorKey = false;
								}
							}
						}
					}
					else//it should assing a new key
					{
						Shell shell = Display.getCurrent().getActiveShell();
						DatapoolChangeKeyDialog assignKeyDialog = new DatapoolChangeKeyDialog(
								shell, datapool,
								UiPluginResourceBundle.DatapoolDialog_ASSIGNKEYDIALOGTITLE);
						boolean errorKey = true;
						
						while (errorKey) {

							if (assignKeyDialog.open() == IDialogConstants.OK_ID) {
								key = assignKeyDialog.getNewKey();
								int ret = assignKeyDialog.isKeyAssignSuccess();
								switch (ret) {
								case DatapoolConstant.NEWKEYNULL:
									showErrMes(shell,
											UiPluginResourceBundle.DatapoolDialog_NEWKEYNULLMES);
									break;
								case DatapoolConstant.NEWKEYNOTCONFIRM:
									showErrMes(
											shell,
											UiPluginResourceBundle.DatapoolDialog_NEWKEYNOTCONFIRMMES);
									break;
								case DatapoolConstant.CHANGEKEYSUCCESS:									
									try{
									DatapoolEncryptManager.ChangeKey(EncryptionManager.EncoderByMd5(key),
											datapool);
//									encryptedCellInVarible(variable,newKey);
									errorKey = false;
									
									//TODO: added 
									password = key;
									passwordExist = true;
									}catch(Exception e){}
									break;
								default:// error
								}

							} else {
								isCancelChange = true;
								errorKey = false;
							}
						}
					}
					if(!isCancelChange)//input the correct key
					{					
						if (dialog.isEncrypted()) {
							if (!isVariableEncrypted) {//encrypted a varible which didn't encrypted
								DatapoolEncryptManager.encryptedCellInVarible(variable,key,datapool);
								if(variable instanceof DPLVariable)
									((DPLVariable)variable).setEncrypted(true);
							}

						} else {
							if (isVariableEncrypted) {//deencrypted a encrypted variable
								DatapoolEncryptManager.deencryptedCellInVarible(variable,key,datapool);
								if(variable instanceof DPLVariable)
									((DPLVariable)variable).setEncrypted(false);
							}
						}
                setWaitCursor();
                String name = dialog.getName();
                String insertionVariableID = dialog.getInsertionVariableID();

                variable.setName(dialog.getName());
                setVariableType(suggestedType, dialog.getType());
                variable.setSuggestedType(suggestedType);
						int insertionIndex = findColumnIndex(dialog
								.getInsertionVariableName());
						if (insertionIndex == columnIndex - 1) {
							refresh();
							return;
						}
						if (insertionIndex == -1)
							datapool.moveVariable(columnIndex - 1, 0);
						else if (insertionIndex > columnIndex)
							datapool.moveVariable(columnIndex - 1,
									insertionIndex - 1);
						else
							datapool.moveVariable(columnIndex - 1, insertionIndex);

						refreshRows();//needs to refresh row
						tableCursor.setSelection(0, 0);
					}
				
				} else {
					setWaitCursor();

					String name = dialog.getName();
					String insertionVariableID = dialog
							.getInsertionVariableID();

					IDatapoolSuggestedType suggestedType = (IDatapoolSuggestedType) variable
							.getSuggestedType();
					if (name.equals(variable.getName())
							&& insertionVariableID.equals(variable.getId())) {
						return;
					}
					variable.setName(dialog.getName());
					setVariableType(suggestedType, dialog.getType());
					variable.setSuggestedType(suggestedType);
					
					int insertionIndex = findColumnIndex(dialog
							.getInsertionVariableName());
                if (insertionIndex == columnIndex - 1) {
                    return;
                }

                    datapool.moveVariable(columnIndex - 1, insertionIndex - 1);
                else
                    datapool.moveVariable(columnIndex - 1, insertionIndex);
					tableCursor.setSelection(0, 0);
            }
        }} finally {
            unsetWaitCursor();
        }
    }

				IDatapoolVariable cellVariable = (IDatapoolVariable)cell.getCellVariable();
				int index = findColumnIndex(cellVariable.getName());
				String cellValue = cell.getStringValue();
				if(DatapoolEncryptManager.isVaribelEncrypted(cell.getCellVariable()))
				{
					cellValue = UiPluginResourceBundle.DatapoolDialog_ENCRYPTEDDISPLAYVALUE;
				}
//				ValueObject valueObject = new ValueObject(cell.getCellValue());
				ValueObject valueObject = new ValueObject(cellValue);
				if(valueObject != null)
					cellValue = valueObject.getDescription();
				rowContents[index] = cellValue;

		setMenuMode(datapoolMenuManager);
	}
	
	public void setPassword(String password){
		this.password = password;
	}
	private void showErrMes(Shell shell, String mes) {
		MessageDialog.openError(shell, UiPluginResourceBundle.DatapoolDialog_ERRORDIALOGTITLE, mes);
	}
	
		private boolean isNeedKeyVerify(DatapoolColumnDialog dialog,boolean isVariableEncrypted)
		{
			return dialog.isEncrypted() || isVariableEncrypted;
		}
		private boolean isKeyExist()
		{
			return (datapool instanceof DPLDatapool)?(((DPLDatapool)datapool).getChallenge()!=null):false;	
		}	
}

Lines 12-18 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/editor/DatapoolEditorPart.java (-1 / +22 lines)
12	package org.eclipse.hyades.test.ui.internal.editor;	12	package org.eclipse.hyades.test.ui.internal.editor;
13		13
14	import org.eclipse.emf.ecore.EObject;	14	import org.eclipse.emf.ecore.EObject;
		15	import org.eclipse.hyades.edit.datapool.IDatapool;
15	import org.eclipse.hyades.models.common.datapool.DPLDatapool;	16	import org.eclipse.hyades.models.common.datapool.DPLDatapool;
		17	import org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl;
		18	import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
16	import org.eclipse.hyades.models.common.util.ICommonConstants;	19	import org.eclipse.hyades.models.common.util.ICommonConstants;
17	import org.eclipse.hyades.test.ui.TestUIExtension;	20	import org.eclipse.hyades.test.ui.TestUIExtension;
18	import org.eclipse.hyades.test.ui.internal.editor.extension.DatapoolEditorExtension;	21	import org.eclipse.hyades.test.ui.internal.editor.extension.DatapoolEditorExtension;
Lines 86-90 Link Here
86	return true;	89	return true;
87	}	90	}
88		91
89		92	public void dispose(){
		93	if(this.getEditorExtension() instanceof DatapoolEditorExtension){
		94	IDatapool dp = ((DatapoolEditorExtension)this.getEditorExtension()).getDatapool();
		95	boolean isAnyColumnEncrypted = false;
		96	int variableCount = dp.getVariableCount();
		97	for(int i=0;i<variableCount;i++){
		98	if(DatapoolEncryptManager.isVaribelEncrypted(((DPLVariableImpl)dp.getVariable(i)))){
		99	isAnyColumnEncrypted = true;
		100	break;
		101	}
		102	}
		103	if(!isAnyColumnEncrypted && (dp instanceof DPLDatapool)){
		104	((DPLDatapool)dp).setChallenge(null);
		105	((DatapoolEditorExtension)this.getEditorExtension()).save();
		106	}
		107	}
		108	super.dispose();
		109
		110	}
90	}	111	}

Lines 900-905 Link Here

(-)plugin.xml (+8 lines)
900	testType="org.eclipse.hyades.test.http.junit.testSuite">	900	testType="org.eclipse.hyades.test.http.junit.testSuite">
901	</verdictProvider>	901	</verdictProvider>
902	</extension>	902	</extension>
		903	<extension
		904	point="org.eclipse.hyades.test.core.launchDatapoolCheckPass">
		905	<launchDatapoolCheckPass
		906	UIClass="org.eclipse.hyades.test.ui.dialog.DatapoolCheck">
		907	<supportedTestType>
		908	</supportedTestType>
		909	</launchDatapoolCheckPass>
		910	</extension>
903		911
904		912
905	</plugin>	913	</plugin>




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolConstant.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.ui.datapool.internal.dialog;

/**
* It's used to provide constant message for datapool related dialog .
* 
* @author Huang Xin Ying 
*/
public class DatapoolConstant {
	public static final int CHANGEKEYSUCCESS = 0;
	public static final int ORIGINTKEYERROR = 1;
	public static final int NEWKEYNULL = 2;
	public static final int NEWKEYNOTCONFIRM = 3;	
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: EncryptedStringValueClass.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.ui.datapool.internal.util;

import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;

/**
* @author Huang Xin Ying 
*/
public class EncryptedStringValueClass extends StringValueClass{
	public Object getPropertyDisplay(Object theObject, Composite parent, boolean editable)
	{
		if(editable && theObject != null)
		{
			TextCellEditor cellEditor = new TextCellEditor(parent,SWT.PASSWORD);

			cellEditor.setValue(theObject.toString());
			return cellEditor;
		}
		else
		{
			Label label = new Label(parent, SWT.NONE);
			label.setText(getPropertyDescription(theObject));
			return label;
		}
	}

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: EncryptedValueObject.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.test.ui.datapool.internal.util;

/**
* @author Huang Xin Ying 
*/
public class EncryptedValueObject extends ValueObject{

	public EncryptedValueObject(Object theObject) {
		super(theObject);
		valueClass = new EncryptedStringValueClass();
		
		// TODO Auto-generated constructor stub
	}
	

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolCheck.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.ui.dialog;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.util.EncryptionManager;
import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;
import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

/**
 * 
 * It's the implementation of launchDatapoolCheckPass extension point , provide
 * dialog to prompt user input password for encrypted datapool during launching a test 
 * on workbench side .
 * 
 * @author Huang Xin Ying 
 */
public class DatapoolCheck implements IPassInfoCollector {

	public DatapoolCheck() {
	}

	public void execute(DPLDatapool[] dp, Map pass, List isContinue) {
		DialogRun dr = new DialogRun();
		dr.setDp(dp);
		dr.setContinue(isContinue);
		dr.setPass(pass);
		Display.getDefault().syncExec(dr);
	}

	private class DialogRun implements Runnable {
		private DPLDatapool[] dp;
		private Map pass;
		private List isContinue;

		public void setDp(DPLDatapool[] dp) {
			this.dp = dp;
		}

		public void setPass(Map pass) {
			this.pass = pass;
		}

		public void setContinue(List isContinue) {
			this.isContinue = isContinue;
		}

		public void run() {
			String testId = null;
			if(isContinue != null && isContinue.size() == 1){
				testId = (String)isContinue.get(0);
				isContinue.clear();
			}
			DatapoolCheckDialog db = new DatapoolCheckDialog(null, 
					dp, 
					UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE,
					pass,
					testId);
			db.setBlockOnOpen(true);
			if (db.open() == IDialogConstants.OK_ID) {
				isContinue.add(UiPluginResourceBundle.DatapoolDialog_TRUE);
			}
		}
	}
    
	
	private class DatapoolCheckDialog extends Dialog {
		private Button okButton;

		private Button checkButton;

		private DPLDatapool[] dp;
		private String title;
		private int dpNameLength = 0;
		private int oriHeight = 0;
		private Label[] name;
		private Text[] pass;
		private Button[] status;
		private List unCorrectList = new ArrayList();
		private Map passed;
		private String testId;

		/**
		 * @param parentShell
		 */
		public DatapoolCheckDialog(Shell parentShell) {
			super(parentShell);
		}

		public DatapoolCheckDialog(Shell parentShell, DPLDatapool[] dp,
				String title, Map passed,String testId) {
			super(parentShell);
			this.dp = dp;
			this.title = title;
			this.passed = passed;
			this.testId = testId;
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
		 */
		protected void createButtonsForButtonBar(Composite parent) {
			// create OK and Cancel buttons by default
			okButton = createButton(parent, IDialogConstants.OK_ID,
					IDialogConstants.OK_LABEL, true);
			checkButton = createButton(parent, IDialogConstants.YES_ID,
					IDialogConstants.YES_LABEL, false);
			checkButton.setText(UiPluginResourceBundle.DatapoolDialog_OK);
			checkButton.addMouseListener(new MouseAdapter() {
				public void mouseDown(MouseEvent e) {
					// check all the passwords
					for (int i = 0; i < dp.length; i++) {
						try {
							if (status[i].getSelection()) {
								continue;
							} else if (dp[i].getChallenge().equals(
									EncryptionManager.EncoderByMd5(pass[i].getText()))) {
								
								if(passed.get(testId) == null){
									passed.put(testId, new HashMap());
								}
								HashMap thm = (HashMap)passed.get(testId);
								thm.put(dp[i].getName(), pass[i].getText());
								
								pass[i].setEnabled(false);
								status[i].setSelection(true);
								if (unCorrectList != null
										&& unCorrectList.contains(dp[i])) {
									unCorrectList.remove(dp[i]);
								}
							} else {
								pass[i].setText("");
								if (!unCorrectList.contains(dp[i]))
									unCorrectList.add(dp[i]);
							}
						} catch (Exception er) {
							er.printStackTrace();
						}
					}
					// if all status is true, then set ok button can be pressed
					if (unCorrectList.size() == 0) {
						okPressed();
						return;
					}

					StringBuffer toShow = new StringBuffer();
					toShow
							.append(UiPluginResourceBundle.DatapoolDialog_PASSWORDSHINT);
					for (int i = 0; i < unCorrectList.size(); i++) {
						toShow.append(((DPLDatapool) unCorrectList.get(i))
								.getName().split(UiPluginResourceBundle.DatapoolDialog_SPLITMARK)[0]);
						if (i < unCorrectList.size() - 1) {
							toShow.append(",\n");
						}
					}
					toShow.append(UiPluginResourceBundle.DatapoolDialog_TRYAGAIN);

					MessageDialog dialog = new MessageDialog(null,
							UiPluginResourceBundle.DatapoolDialog_NOTALLMATCH, // the dialog title
							null, toShow.toString(), // text to be displayed
							MessageDialog.WARNING, // dialog type
							new String[] { UiPluginResourceBundle.DatapoolDialog_OK }, // button labels
							0);
					dialog.open();
				}
			});

			createButton(parent, IDialogConstants.CANCEL_ID,
					IDialogConstants.CANCEL_LABEL, false);
			okButton.setVisible(false);
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.dialogs.Dialog#getButton(int)
		 */
		protected Button getButton(int id) {
			if (id == IDialogConstants.OK_ID)
				return okButton;
			return super.getButton(id);
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.dialogs.Dialog#getOKButton()
		 */
		protected Button getOKButton() {
			return okButton;
		}

		/* modified the content */
		protected Control createDialogArea(Composite parent) {
			getShell().setText(title);
			Composite superComposite = (Composite) super
					.createDialogArea(parent);

			superComposite.setLayout(new FormLayout());

			FormData formData;

			Label hint = new Label(superComposite, SWT.NULL);
			hint.setText(UiPluginResourceBundle.DatapoolDialog_INPUTPASSHINT);
			formData = new FormData();
			formData.left = new FormAttachment(superComposite, 5);
			formData.top = new FormAttachment(superComposite, 5);
			hint.setLayoutData(formData);

			if (dp != null && dp.length > 0) {

				name = new Label[dp.length];
				pass = new Text[dp.length];
				status = new Button[dp.length];

				name[0] = new Label(superComposite, SWT.BORDER);
				formData = new FormData();
				formData.left = new FormAttachment(superComposite, 5);
				formData.top = new FormAttachment(hint, 10);
				name[0].setLayoutData(formData);
				name[0].setText(getdpNameLength());
				name[0].pack();
				dpNameLength = name[0].getSize().x;
				oriHeight = name[0].getSize().y;
				formData.width = dpNameLength;
				formData.height = oriHeight;
				name[0].setLayoutData(formData);
				name[0].setText(dp[0].getName().split(UiPluginResourceBundle.DatapoolDialog_SPLITMARK)[0] + ":");

				pass[0] = new Text(superComposite, SWT.PASSWORD | SWT.BORDER);
				formData = new FormData();
				formData.left = new FormAttachment(name[0], 5);
				formData.top = new FormAttachment(hint, 10);
				formData.width = 50;
				formData.height = oriHeight;
				pass[0].setLayoutData(formData);

				status[0] = new Button(superComposite, SWT.CHECK);
				formData = new FormData();
				formData.left = new FormAttachment(pass[0], 10);
				formData.top = new FormAttachment(hint, 10);
				formData.height = oriHeight;
				status[0].setLayoutData(formData);
				status[0].setSelection(false);
				status[0].setEnabled(false);
				status[0].setVisible(false);

				for (int i = 1; i < dp.length; i++) {
					name[i] = new Label(superComposite, SWT.BORDER);
					formData = new FormData();
					formData.left = new FormAttachment(superComposite, 5);
					formData.top = new FormAttachment(name[i - 1], 10);
					formData.width = dpNameLength;
					formData.height = oriHeight;
					name[i].setLayoutData(formData);
					name[i].setText(dp[i].getName().split(UiPluginResourceBundle.DatapoolDialog_SPLITMARK)[0] + ":");

					pass[i] = new Text(superComposite, SWT.PASSWORD
							| SWT.BORDER);
					formData = new FormData();
					formData.left = new FormAttachment(name[i], 5);
					formData.top = new FormAttachment(name[i - 1], 5);
					formData.width = 50;
					formData.height = oriHeight;
					pass[i].setLayoutData(formData);

					status[i] = new Button(superComposite, SWT.CHECK);
					formData = new FormData();
					formData.left = new FormAttachment(pass[i], 10);
					formData.top = new FormAttachment(name[i - 1], 5);
					formData.height = oriHeight;
					status[i].setLayoutData(formData);
					status[i].setSelection(false);
					status[i].setEnabled(false);
					status[i].setVisible(false);
				}
			}

			superComposite.pack();
			return superComposite;
		}

		private String getdpNameLength() {
			
			String datapoolName = "";
			
			for (int counter = 0; counter < dp.length; counter++) {

				if(dp[counter].getName().length() > datapoolName.length()){
					datapoolName = dp[counter].getName();
				}
			}
			
			return datapoolName;
		}
	}

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolInputKeyDialog.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.ui.datapool.internal.dialog;

import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;
import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

/**
* It's used to provide dialog for key input function .
* 
* @author Huang Xin Ying 
*/
public class DatapoolInputKeyDialog extends DatapoolBaseDialog implements
		KeyListener {

	private String title;

	private Text logOnField = null;
	private Color logOnFieldForeground = null;

	private String key = "";

	public DatapoolInputKeyDialog(Shell parentShell, String title) {
		super(parentShell);
		this.title = title;
		// TODO Auto-generated constructor stub
	}

	public void keyPressed(KeyEvent e) {
		// TODO Auto-generated method stub

	}

	public void keyReleased(KeyEvent e) {
		// TODO Auto-generated method stub
		if (logOnField != null) {
			key = logOnField.getText();
		}

	}

	protected Control createDialogArea(Composite parent) {
		getShell().setText(title);
		Composite superComposite = (Composite) super.createDialogArea(parent);
		GridData gridData = GridDataUtil.createFill();
		gridData.minimumWidth = 250;
		superComposite.setLayoutData(gridData);

		GridLayout gridLayout = new GridLayout();
		gridLayout.numColumns = 2;
		superComposite.setLayout(gridLayout);

		Label logOnLabe = new Label(superComposite, SWT.NONE);
		logOnLabe.setText(UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE);
		logOnField = new Text(superComposite, SWT.SINGLE | SWT.BORDER
				| SWT.PASSWORD);
		gridData = new GridData(GridData.FILL_HORIZONTAL);
		logOnField.setLayoutData(gridData);
		logOnField.addKeyListener(this);
		logOnFieldForeground = logOnField.getForeground();
		if (key != null) {
			logOnField.setText(key);
		}
		superComposite.pack();
		return superComposite;
	}

	public String getKey() {
		return key;
	}

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolChangeKeyDialog.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.ui.datapool.internal.dialog;

import org.eclipse.hyades.edit.datapool.IDatapool;
import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;
import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

/**
* It's used to provide dialog for key change function .
* 
* @author Huang Xin Ying 
*/
public class DatapoolChangeKeyDialog extends DatapoolBaseDialog implements
		KeyListener {

	private IDatapool datapool = null;
	private String title = null;
	private Text oldKeyField = null;
	private Text newKeyField = null;
	private Text confirmKeyField = null;
	private Color oldKeyFieldForeground = null;
	private Color newKeyFieldForeground = null;
	private Color confirmKeyFieldForeground = null;
	private Combo insertionVariables = null;
	private Label nameErrorLabel;
	private Label typeErrorLabel;

	private String oldKey = null;
	private String newKey = null;
	private String confirmKey = null;
	private String insertionVariableID = null;
	private String insertionVariableName = null;
	private int defaultNameCounter = 1;

	public DatapoolChangeKeyDialog(Shell parentShell, IDatapool datapool,
			String title) {
		super(parentShell);
		this.title = title;
		this.datapool = datapool;
		// TODO Auto-generated constructor stub
	}

	public void keyPressed(KeyEvent e) {
		// TODO Auto-generated method stub

	}

	public void keyReleased(KeyEvent e) {
		// TODO Auto-generated method stub
		if (oldKeyField != null) {
			oldKey = oldKeyField.getText();
		}
		if (newKeyField != null) {
			newKey = newKeyField.getText();
		}
		if (confirmKeyField != null) {
			confirmKey = confirmKeyField.getText();
		}

	}

	protected Control createDialogArea(Composite parent) {
		getShell().setText(title);
		Composite superComposite = (Composite) super.createDialogArea(parent);
		GridData gridData = GridDataUtil.createFill();
		gridData.minimumWidth = 250;
		superComposite.setLayoutData(gridData);

		GridLayout gridLayout = new GridLayout();
		gridLayout.numColumns = 2;
		superComposite.setLayout(gridLayout);
		if (title.equals(UiPluginResourceBundle.DatapoolDialog_CHANGEKEYDIALOGTITLE)) {
			Label oldKeyLabel = new Label(superComposite, SWT.NONE);
			oldKeyLabel.setText(UiPluginResourceBundle.DatapoolDialog_OLDKEY);
			oldKeyField = new Text(superComposite, SWT.SINGLE | SWT.BORDER
					| SWT.PASSWORD);
			gridData = new GridData(GridData.FILL_HORIZONTAL);
			oldKeyField.setLayoutData(gridData);
			oldKeyField.addKeyListener(this);
			oldKeyFieldForeground = oldKeyField.getForeground();
		}
		Label newKeyLabel = new Label(superComposite, SWT.NONE);
		newKeyLabel.setText(UiPluginResourceBundle.DatapoolDialog_NEWKEY);
		newKeyField = new Text(superComposite, SWT.SINGLE | SWT.BORDER
				| SWT.PASSWORD);
		gridData = new GridData(GridData.FILL_HORIZONTAL);
		newKeyField.setLayoutData(gridData);
		newKeyField.addKeyListener(this);
		newKeyFieldForeground = newKeyField.getForeground();

		Label confirmKeyLabel = new Label(superComposite, SWT.NONE);
		confirmKeyLabel.setText(UiPluginResourceBundle.DatapoolDialog_CONFIRMNEWKEY);
		confirmKeyField = new Text(superComposite, SWT.SINGLE | SWT.BORDER
				| SWT.PASSWORD);
		gridData = new GridData(GridData.FILL_HORIZONTAL);
		confirmKeyField.setLayoutData(gridData);
		confirmKeyField.addKeyListener(this);
		confirmKeyFieldForeground = confirmKeyField.getForeground();
		
		superComposite.pack();
		return superComposite;
	}

	public String getOldKey() {
		return oldKey;
	}

	public String getNewKey() {
		return newKey;
	}

	public String getConfirmKey() {
		return confirmKey;
	}

	public int isKeyChangeSuccess(IDatapool datapool) {
		int retValue = DatapoolConstant.CHANGEKEYSUCCESS;
		if (!DatapoolEncryptManager.isKeyCorrect(datapool, oldKey)) {
			retValue = DatapoolConstant.ORIGINTKEYERROR;
		} else if (newKey == null || newKey.equals("")) {
			retValue = DatapoolConstant.NEWKEYNULL;
		} else if (!newKey.equals(confirmKey)) {
			retValue = DatapoolConstant.NEWKEYNOTCONFIRM;
		}
		return retValue;

	}

	public int isKeyAssignSuccess() {
		int retValue = DatapoolConstant.CHANGEKEYSUCCESS;
		if (newKey == null || newKey.equals("")) {
			retValue = DatapoolConstant.NEWKEYNULL;
		} else if (!newKey.equals(confirmKey)) {
			retValue = DatapoolConstant.NEWKEYNOTCONFIRM;
		}
		return retValue;

	}

}




import org.eclipse.hyades.internal.execution.remote.AgentControllerUnavailableException;
import org.eclipse.hyades.internal.execution.remote.CustomCommandHandler;
import org.eclipse.hyades.internal.execution.remote.RemoteComponentSkeleton;
import org.eclipse.hyades.models.common.datapool.util.DPLPasswordCollection;
import org.eclipse.hyades.models.common.facades.behavioral.impl.FacadeResourceFactoryImpl;
import org.eclipse.hyades.models.common.testprofile.impl.Common_TestprofilePackageImpl;
import org.eclipse.hyades.test.common.agent.ComptestAgent;
import org.eclipse.hyades.test.common.agent.PrimaryTestAgent;
import org.eclipse.hyades.test.common.agent.ServiceCommandHandler;
import org.eclipse.hyades.test.common.agent.UnknownTestServiceException;
import org.eclipse.hyades.test.common.event.ExecutionEvent;
import org.eclipse.hyades.test.common.testservices.resources.DatapoolPasswordProvider;

/**
 * @author jsutton

				}
			}
		}
		//set password to Models
		try {
			DPLPasswordCollection.getInstance().
			setDatapoolPassword(DatapoolPasswordProvider.getDatapoolPassword(testID));
		} catch (UnknownTestServiceException e) {			
		}

	}
	

	};
	
	public void dispose() {
		//clear the passwords in Models
		DPLPasswordCollection.getInstance().clear();
		if (agent != null && agent.isRegistered()) {
			Runtime.getRuntime().removeShutdownHook(disposeOnExitHook);
			agent.deregister();




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolPasswordProvider.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.common.testservices.resources;

import java.util.HashMap;

import org.eclipse.hyades.test.common.agent.ServiceInvoker;
import org.eclipse.hyades.test.common.agent.UnconfiguredComptestAgentException;
import org.eclipse.hyades.test.common.agent.UnknownTestServiceException;
import org.eclipse.osgi.util.NLS;

/**
*  
* It's the client of DatapoolPasswordsService ,used to get list of datapool and it's encryption 
* password from workbench side.
* 
* @author Huang Xin Ying 
*
*/
public class DatapoolPasswordProvider{
	
  protected static final String DATAPOOL_PASSWORD_PROVIDER = "org.eclipse.hyades.test.core.DatapoolPasswordProvider";
  
  /**
   * @param testId
   * @return 
   */
  public static HashMap getDatapoolPassword(String testId) throws UnknownTestServiceException{
		String result = null;
		Object[] args = {testId};
		String buffer = NLS.bind("method=getDatapoolList,args:testId={0}", args);
		try{
			
			result = ServiceInvoker.invokeService(getProviderName(), buffer);
			
		}catch(UnconfiguredComptestAgentException e) {
			throw new UnknownTestServiceException(e);
		}
		
		return parseResult(result);
	}	
	
  /**
   * @param result
   * @return 
   */
	private static HashMap parseResult(String result){
		if(result == null)
			return null;
		
		HashMap pr = new HashMap();
		if(result.contains(";")){
			String[] pairs = result.split(";");
			for(int i=0;i<pairs.length;i++){
				if(pairs[i].contains("=")){
					pr.put(pairs[i].split("=")[0], pairs[i].split("=")[1]);
				}
			}
		}
		
		return pr;
	}
	
	public static String getProviderName(){
		return DATAPOOL_PASSWORD_PROVIDER;
	}
}

Return to bug 202695

Lines 32-37 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/DPLVariable.java (-1 / +33 lines)
32	* <ul>	32	* <ul>
33	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getType <em>Type</em>}</li>	33	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getType <em>Type</em>}</li>
34	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getRole <em>Role</em>}</li>	34	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getRole <em>Role</em>}</li>
		35	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}</li>
35	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}</li>	36	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}</li>
36	* </ul>	37	* </ul>
37	* </p>	38	* </p>
Lines 40-46 Link Here
40	* @model	41	* @model
41	* @generated	42	* @generated
42	*/	43	*/
43	public interface DPLVariable extends CMNNamedElement, IDatapoolVariable{	44	public interface DPLVariable extends CMNNamedElement, IDatapoolVariable {
44	/**	45	/**
45	* <!-- begin-user-doc -->	46	* <!-- begin-user-doc -->
46	* <!-- end-user-doc -->	47	* <!-- end-user-doc -->
Lines 104-109 Link Here
104	void setRole(DPLRole value);	105	void setRole(DPLRole value);
105		106
106	/**	107	/**
		108	* Returns the value of the '<em><b>Encrypted</b></em>' attribute.
		109	* The default value is <code>"false"</code>.
		110	* <!-- begin-user-doc -->
		111	* <p>
		112	* If the meaning of the '<em>Encrypted</em>' attribute isn't clear,
		113	* there really should be more of a description here...
		114	* </p>
		115	* <!-- end-user-doc -->
		116	* <!-- begin-model-doc -->
		117	* This boolean specifies whether or not this DPLVariable is encrypted.
		118	* <!-- end-model-doc -->
		119	* @return the value of the '<em>Encrypted</em>' attribute.
		120	* @see #setEncrypted(boolean)
		121	* @see org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage#getDPLVariable_Encrypted()
		122	* @model default="false"
		123	* @generated
		124	*/
		125	boolean isEncrypted();
		126
		127	/**
		128	* Sets the value of the '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}' attribute.
		129	* <!-- begin-user-doc -->
		130	* <!-- end-user-doc -->
		131	* @param value the new value of the '<em>Encrypted</em>' attribute.
		132	* @see #isEncrypted()
		133	* @generated
		134	*/
		135	void setEncrypted(boolean value);
		136
		137	/**
107	* Returns the value of the '<em><b>Variables</b></em>' containment reference list.	138	* Returns the value of the '<em><b>Variables</b></em>' containment reference list.
108	* The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLVariable}.	139	* The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLVariable}.
109	* <!-- begin-user-doc -->	140	* <!-- begin-user-doc -->
Lines 119-122 Link Here
119	*/	150	*/
120	EList getVariables();	151	EList getVariables();
121		152
		153
122	} // DPLVariable	154	} // DPLVariable

Lines 330-342 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/Common_DatapoolPackage.java (-5 / +61 lines)
330	int DPL_VARIABLE__ROLE = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 1;	330	int DPL_VARIABLE__ROLE = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 1;
331		331
332	/**	332	/**
		333	* The feature id for the '<em><b>Encrypted</b></em>' attribute.
		334	* <!-- begin-user-doc -->
		335	* <!-- end-user-doc -->
		336	* @generated
		337	* @ordered
		338	*/
		339	int DPL_VARIABLE__ENCRYPTED = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 2;
		340
		341	/**
333	* The feature id for the '<em><b>Variables</b></em>' containment reference list.	342	* The feature id for the '<em><b>Variables</b></em>' containment reference list.
334	* <!-- begin-user-doc -->	343	* <!-- begin-user-doc -->
335	* <!-- end-user-doc -->	344	* <!-- end-user-doc -->
336	* @generated	345	* @generated
337	* @ordered	346	* @ordered
338	*/	347	*/
339	int DPL_VARIABLE__VARIABLES = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 2;	348	int DPL_VARIABLE__VARIABLES = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 3;
340		349
341	/**	350	/**
342	* The number of structural features of the '<em>DPL Variable</em>' class.	351	* The number of structural features of the '<em>DPL Variable</em>' class.
Lines 345-351 Link Here
345	* @generated	354	* @generated
346	* @ordered	355	* @ordered
347	*/	356	*/
348	int DPL_VARIABLE_FEATURE_COUNT = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 3;	357	int DPL_VARIABLE_FEATURE_COUNT = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 4;
349		358
350	/**	359	/**
351	* The feature id for the '<em><b>Id</b></em>' attribute.	360	* The feature id for the '<em><b>Id</b></em>' attribute.
Lines 402-414 Link Here
402	int DPL_DATAPOOL__INSTANTIATIONS = Common_ConfigurationPackage.CFG_CLASS__INSTANTIATIONS;	411	int DPL_DATAPOOL__INSTANTIATIONS = Common_ConfigurationPackage.CFG_CLASS__INSTANTIATIONS;
403		412
404	/**	413	/**
		414	* The feature id for the '<em><b>Challenge</b></em>' attribute.
		415	* <!-- begin-user-doc -->
		416	* <!-- end-user-doc -->
		417	* @generated
		418	* @ordered
		419	*/
		420	int DPL_DATAPOOL__CHALLENGE = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 0;
		421
		422	/**
405	* The feature id for the '<em><b>Equivalence Classes</b></em>' containment reference list.	423	* The feature id for the '<em><b>Equivalence Classes</b></em>' containment reference list.
406	* <!-- begin-user-doc -->	424	* <!-- begin-user-doc -->
407	* <!-- end-user-doc -->	425	* <!-- end-user-doc -->
408	* @generated	426	* @generated
409	* @ordered	427	* @ordered
410	*/	428	*/
411	int DPL_DATAPOOL__EQUIVALENCE_CLASSES = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 0;	429	int DPL_DATAPOOL__EQUIVALENCE_CLASSES = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 1;
412		430
413	/**	431	/**
414	* The feature id for the '<em><b>Datapool Spec</b></em>' containment reference.	432	* The feature id for the '<em><b>Datapool Spec</b></em>' containment reference.
Lines 417-423 Link Here
417	* @generated	435	* @generated
418	* @ordered	436	* @ordered
419	*/	437	*/
420	int DPL_DATAPOOL__DATAPOOL_SPEC = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 1;	438	int DPL_DATAPOOL__DATAPOOL_SPEC = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 2;
421		439
422	/**	440	/**
423	* The number of structural features of the '<em>DPL Datapool</em>' class.	441	* The number of structural features of the '<em>DPL Datapool</em>' class.
Lines 426-432 Link Here
426	* @generated	444	* @generated
427	* @ordered	445	* @ordered
428	*/	446	*/
429	int DPL_DATAPOOL_FEATURE_COUNT = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 2;	447	int DPL_DATAPOOL_FEATURE_COUNT = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 3;
430		448
431	/**	449	/**
432	* The meta object id for the '{@link org.eclipse.hyades.models.common.datapool.DPLRole <em>DPL Role</em>}' enum.	450	* The meta object id for the '{@link org.eclipse.hyades.models.common.datapool.DPLRole <em>DPL Role</em>}' enum.
Lines 471-476 Link Here
471	EClass getDPLDatapool();	489	EClass getDPLDatapool();
472		490
473	/**	491	/**
		492	* Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}'.
		493	* <!-- begin-user-doc -->
		494	* <!-- end-user-doc -->
		495	* @return the meta object for the attribute '<em>Challenge</em>'.
		496	* @see org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge()
		497	* @see #getDPLDatapool()
		498	* @generated
		499	*/
		500	EAttribute getDPLDatapool_Challenge();
		501
		502	/**
474	* Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}'.	503	* Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}'.
475	* <!-- begin-user-doc -->	504	* <!-- begin-user-doc -->
476	* <!-- end-user-doc -->	505	* <!-- end-user-doc -->
Lines 610-615 Link Here
610	EAttribute getDPLVariable_Role();	639	EAttribute getDPLVariable_Role();
611		640
612	/**	641	/**
		642	* Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}'.
		643	* <!-- begin-user-doc -->
		644	* <!-- end-user-doc -->
		645	* @return the meta object for the attribute '<em>Encrypted</em>'.
		646	* @see org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted()
		647	* @see #getDPLVariable()
		648	* @generated
		649	*/
		650	EAttribute getDPLVariable_Encrypted();
		651
		652	/**
613	* Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}'.	653	* Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}'.
614	* <!-- begin-user-doc -->	654	* <!-- begin-user-doc -->
615	* <!-- end-user-doc -->	655	* <!-- end-user-doc -->
Lines 767-772 Link Here
767	EAttribute DPL_VARIABLE__ROLE = eINSTANCE.getDPLVariable_Role();	807	EAttribute DPL_VARIABLE__ROLE = eINSTANCE.getDPLVariable_Role();
768		808
769	/**	809	/**
		810	* The meta object literal for the '<em><b>Encrypted</b></em>' attribute feature.
		811	* <!-- begin-user-doc -->
		812	* <!-- end-user-doc -->
		813	* @generated
		814	*/
		815	EAttribute DPL_VARIABLE__ENCRYPTED = eINSTANCE.getDPLVariable_Encrypted();
		816
		817	/**
770	* The meta object literal for the '<em><b>Variables</b></em>' containment reference list feature.	818	* The meta object literal for the '<em><b>Variables</b></em>' containment reference list feature.
771	* <!-- begin-user-doc -->	819	* <!-- begin-user-doc -->
772	* <!-- end-user-doc -->	820	* <!-- end-user-doc -->
Lines 785-790 Link Here
785	EClass DPL_DATAPOOL = eINSTANCE.getDPLDatapool();	833	EClass DPL_DATAPOOL = eINSTANCE.getDPLDatapool();
786		834
787	/**	835	/**
		836	* The meta object literal for the '<em><b>Challenge</b></em>' attribute feature.
		837	* <!-- begin-user-doc -->
		838	* <!-- end-user-doc -->
		839	* @generated
		840	*/
		841	EAttribute DPL_DATAPOOL__CHALLENGE = eINSTANCE.getDPLDatapool_Challenge();
		842
		843	/**
788	* The meta object literal for the '<em><b>Equivalence Classes</b></em>' containment reference list feature.	844	* The meta object literal for the '<em><b>Equivalence Classes</b></em>' containment reference list feature.
789	* <!-- begin-user-doc -->	845	* <!-- begin-user-doc -->
790	* <!-- end-user-doc -->	846	* <!-- end-user-doc -->

Lines 16-23 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/impl/DPLCellImpl.java (-10 / +33 lines)
16		16
17	package org.eclipse.hyades.models.common.datapool.impl;	17	package org.eclipse.hyades.models.common.datapool.impl;
18		18
		19	import java.util.HashMap;
19	import org.eclipse.emf.common.notify.Notification;	20	import org.eclipse.emf.common.notify.Notification;
20	import org.eclipse.emf.ecore.EClass;	21	import org.eclipse.emf.ecore.EClass;
		22	import org.eclipse.emf.ecore.EStructuralFeature;
21	import org.eclipse.emf.ecore.InternalEObject;	23	import org.eclipse.emf.ecore.InternalEObject;
22	import org.eclipse.emf.ecore.impl.ENotificationImpl;	24	import org.eclipse.emf.ecore.impl.ENotificationImpl;
23	import org.eclipse.emf.ecore.impl.EObjectImpl;	25	import org.eclipse.emf.ecore.impl.EObjectImpl;
Lines 28-34 Link Here
28	import org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage;	30	import org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage;
29	import org.eclipse.hyades.models.common.datapool.DPLCell;	31	import org.eclipse.hyades.models.common.datapool.DPLCell;
30	import org.eclipse.hyades.models.common.datapool.DPLVariable;	32	import org.eclipse.hyades.models.common.datapool.DPLVariable;
		33	import org.eclipse.hyades.models.common.datapool.util.DPLPasswordCollection;
31	import org.eclipse.hyades.models.common.util.DatapoolUtil;	34	import org.eclipse.hyades.models.common.util.DatapoolUtil;
		35	import org.eclipse.hyades.models.common.util.EncryptionManager;
32	import org.eclipse.hyades.models.common.util.XMLParserUtil;	36	import org.eclipse.hyades.models.common.util.XMLParserUtil;
33	import org.w3c.dom.Document;	37	import org.w3c.dom.Document;
34		38
Lines 361-367 Link Here
361	{	365	{
362	Object cellValue = this.getCellValue();	366	Object cellValue = this.getCellValue();
363	if(cellValue != null)	367	if(cellValue != null)
364	return cellValue.toString();	368	return decryptValue(cellValue.toString());
365	else	369	else
366	return new String();	370	return new String();
367	}	371	}
Lines 376-382 Link Here
376	*/	380	*/
377	public long getLongValue()	381	public long getLongValue()
378	{	382	{
379	return Long.parseLong((String)this.getCellValue());	383	return Long.parseLong(decryptValue((String)this.getCellValue()));
380	}	384	}
381		385
382	/**	386	/**
Lines 389-395 Link Here
389	*/	393	*/
390	public int getIntValue()	394	public int getIntValue()
391	{	395	{
392	return Integer.parseInt((String)this.getCellValue());	396	return Integer.parseInt(decryptValue((String)this.getCellValue()));
393	}	397	}
394		398
395	/**	399	/**
Lines 402-408 Link Here
402	*/	406	*/
403	public short getShortValue()	407	public short getShortValue()
404	{	408	{
405	return Short.parseShort((String)this.getCellValue());	409	return Short.parseShort(decryptValue((String)this.getCellValue()));
406	}	410	}
407		411
408	/**	412	/**
Lines 415-421 Link Here
415	*/	419	*/
416	public byte getByteValue()	420	public byte getByteValue()
417	{	421	{
418	return Byte.parseByte((String)this.getCellValue());	422	return Byte.parseByte(decryptValue((String)this.getCellValue()));
419	}	423	}
420		424
421	/**	425	/**
Lines 428-434 Link Here
428	*/	432	*/
429	public double getDoubleValue()	433	public double getDoubleValue()
430	{	434	{
431	return Double.parseDouble((String)this.getCellValue());	435	return Double.parseDouble(decryptValue((String)this.getCellValue()));
432	}	436	}
433		437
434	/**	438	/**
Lines 441-447 Link Here
441	*/	445	*/
442	public float getFloatValue()	446	public float getFloatValue()
443	{	447	{
444	return Float.parseFloat((String)this.getCellValue());	448	return Float.parseFloat(decryptValue((String)this.getCellValue()));
445	}	449	}
446		450
447	/**	451	/**
Lines 454-460 Link Here
454	*/	458	*/
455	public boolean getBooleanValue()	459	public boolean getBooleanValue()
456	{	460	{
457	return Boolean.getBoolean ((String)this.getCellValue());	461	return Boolean.getBoolean (decryptValue((String)this.getCellValue()));
458	}	462	}
459		463
460	/**	464	/**
Lines 468-474 Link Here
468	*/	472	*/
469	public char getCharValue()	473	public char getCharValue()
470	{	474	{
471	return ((String)this.getCellValue()).charAt(0);	475	return decryptValue(((String)this.getCellValue())).charAt(0);
472	}	476	}
473		477
474	/**	478	/**
Lines 504-510 Link Here
504	{	508	{
505	//get the tag and value from the XML fragment	509	//get the tag and value from the XML fragment
506	try {	510	try {
507	Document doc = XMLParserUtil.parse(value.toString());	511	Document doc = XMLParserUtil.parse(value.toString());
508	tag = doc.getFirstChild().getNodeName();	512	tag = doc.getFirstChild().getNodeName();
509	val = doc.getFirstChild().getFirstChild().getNodeValue();	513	val = doc.getFirstChild().getFirstChild().getNodeValue();
510	}	514	}
Lines 569-572 Link Here
569	else	573	else
570	return START_LITERAL + END_LITERAL;	574	return START_LITERAL + END_LITERAL;
571	}	575	}
		576	/*
		577	* decryptValue the cell value
		578	*/
		579	public String decryptValue(String value){
		580	String result = null;
		581	if(value == null)
		582	return result;
		583
		584	result = value;
		585	HashMap passes = DPLPasswordCollection.getInstance().getDatapoolPassword();
		586	String dpName = this.getCellRecord().getEquivalenceClass().getDatapool().getName();
		587	if(passes!=null && passes.size()>0 && dpName != null && this.getVariable().isEncrypted()){
		588	String pass = (String)passes.get(dpName);
		589	if(pass != null){
		590	result = EncryptionManager.decrypt(value, pass);
		591	}
		592	}
		593	return result;
		594	}
572	} //DPLCellImpl	595	} //DPLCellImpl

Added Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/util/DatapoolEncryptManager.java (+177 lines)
1	/**********************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: DatapoolEncryptManager.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12
13	package org.eclipse.hyades.models.common.datapool.util;
14
15	import org.eclipse.hyades.edit.datapool.IDatapool;
16	import org.eclipse.hyades.edit.datapool.IDatapoolCell;
17	import org.eclipse.hyades.edit.datapool.IDatapoolRecord;
18	import org.eclipse.hyades.execution.runtime.datapool.IDatapoolEquivalenceClass;
19	import org.eclipse.hyades.execution.runtime.datapool.IDatapoolVariable;
20	import org.eclipse.hyades.models.common.datapool.DPLDatapool;
21	import org.eclipse.hyades.models.common.datapool.DPLVariable;
22	import org.eclipse.hyades.models.common.util.EncryptionManager;
23
24	/**
25	* It's used to provide functions of encryption for a datapool .
26	*
27	* @author Huang Xin Ying
28	*/
29	public class DatapoolEncryptManager {
30
31	public static void encryptedCellInVarible(IDatapoolVariable varible,
32	String key, IDatapool datapool) {
33
34	// String key = DatapoolKeyManager.getKeyInDatapool(datapool);
35	// IDatapoolEquivalenceClass equivalenceClass =
36	// getDefaultEquivalenceClass(datapool);
37	int index = datapool.getDefaultEquivalenceClassIndex();
38	if (index == -1) {
39
40	return;
41	}
42	IDatapoolEquivalenceClass equivalenceClass = datapool
43	.getEquivalenceClass(index);
44	// datapool.get
45	for (int i = 0; i < equivalenceClass.getRecordCount(); i++) {
46	IDatapoolRecord record = (IDatapoolRecord) equivalenceClass
47	.getRecord(i);
48	int cellCount = record.getCellCount();
49
50	int variableCount = datapool.getVariableCount();
51	String rowContents[] = new String[variableCount + 1];
52	IDatapoolCell[] rowData = new IDatapoolCell[variableCount];
53	rowContents[0] = String.valueOf(i);
54
55	for (int k = 0; k < cellCount; k++) {
56	IDatapoolCell cell = (IDatapoolCell) record.getCell(k);
57	if (cell.getCellVariable().getId().equals(varible.getId())) {
58	cell.setCellValue(EncryptionManager.encrypt(cell.getStringValue(),
59	key));
60	}
61	}
62	}
63	}
64
65	public static void deencryptedCellInVarible(IDatapoolVariable varible,
66	String key, IDatapool datapool) {
67	int index = datapool.getDefaultEquivalenceClassIndex();
68	if (index == -1) {
69	return;
70	}
71	IDatapoolEquivalenceClass equivalenceClass = datapool
72	.getEquivalenceClass(index);
73
74	for (int i = 0; i < equivalenceClass.getRecordCount(); i++) {
75	IDatapoolRecord record = (IDatapoolRecord) equivalenceClass
76	.getRecord(i);
77	int cellCount = record.getCellCount();
78
79	int variableCount = datapool.getVariableCount();
80	String rowContents[] = new String[variableCount + 1];
81	IDatapoolCell[] rowData = new IDatapoolCell[variableCount];
82	rowContents[0] = String.valueOf(i);
83
84	for (int k = 0; k < cellCount; k++) {
85	IDatapoolCell cell = (IDatapoolCell) record.getCell(k);
86	if (cell.getCellVariable().getId().equals(varible.getId())) {
87	cell.setCellValue(EncryptionManager.decrypt(cell.getStringValue(),
88	key));
89	}
90	}
91	}
92	}
93
94	public static void ChangeKey(String newKey, IDatapool datapool) {
95	if (!(datapool instanceof DPLDatapool))
96	return;
97	if (newKey == null \|\| newKey.equals(""))
98	((DPLDatapool) datapool).setChallenge(null);
99	else
100	((DPLDatapool) datapool).setChallenge(newKey);
101	}
102
103	public static void changeKeyOfEncryCell(IDatapool datapool, String oldKey,
104	String newKey) {
105	int variableCount = datapool.getVariableCount();
106	IDatapoolVariable variable = null;
107	for (int i = 0; i < variableCount; i++) {
108	variable = datapool.getVariable(i);
109	if (isVaribelEncrypted(variable)) {
110	deencryptedCellInVarible(variable, oldKey, datapool);
111	encryptedCellInVarible(variable, newKey, datapool);
112	}
113	}
114	}
115
116	public static void deencrypDatapool(IDatapool datapool, String key){
117	int variableCount = datapool.getVariableCount();
118	IDatapoolVariable variable = null;
119	for (int i = 0; i < variableCount; i++) {
120	variable = datapool.getVariable(i);
121	if (isVaribelEncrypted(variable)) {
122	deencryptedCellInVarible(variable, key, datapool);
123	}
124	}
125	}
126
127	public static void encrypDatapool(IDatapool datapool, String key){
128	int variableCount = datapool.getVariableCount();
129	IDatapoolVariable variable = null;
130	for (int i = 0; i < variableCount; i++) {
131	variable = datapool.getVariable(i);
132	if (isVaribelEncrypted(variable)) {
133	encryptedCellInVarible(variable, key, datapool);
134	}
135	}
136	}
137
138	public static boolean isDatapoolEncrypted(IDatapool datapool) {
139	if (!(datapool instanceof DPLDatapool))
140	return false;
141
142	if (((DPLDatapool) datapool).getChallenge() == null
143	\|\| ((DPLDatapool) datapool).getChallenge().equals(""))
144	return false;
145	return true;
146	}
147
148	public static boolean isKeyCorrect(IDatapool datapool, String key) {
149	if (!(datapool instanceof DPLDatapool))
150	return false;
151	if (key == null)
152	return false;
153	boolean flag = false;
154	try {
155	flag = EncryptionManager.EncoderByMd5(key).equals(
156	((DPLDatapool) datapool).getChallenge());
157	} catch (Exception e) {
158	System.out.println("error while keycorrect");
159	}
160	return flag;
161
162	}
163
164	public static boolean isVaribelEncrypted(IDatapoolVariable varible) {
165	return (varible instanceof DPLVariable) ? ((DPLVariable) varible)
166	.isEncrypted() : false;
167	}
168
169	public static String encrypt(String content, String pass) {
170	return EncryptionManager.encrypt(content, pass);
171	}
172
173	public static String decrypt(String content, String pass) {
174	return EncryptionManager.decrypt(content, pass);
175	}
176
177	}

Lines 12-17 Link Here

(-)src/org/eclipse/hyades/test/core/launch/delegates/AbstractLaunchConfigurationDelegate2.java (-1 / +27 lines)
12	package org.eclipse.hyades.test.core.launch.delegates;	12	package org.eclipse.hyades.test.core.launch.delegates;
13		13
14	import java.util.ArrayList;	14	import java.util.ArrayList;
		15	import java.util.HashMap;
15	import java.util.Iterator;	16	import java.util.Iterator;
16	import java.util.List;	17	import java.util.List;
17		18
Lines 27-39 Link Here
27	import org.eclipse.emf.ecore.resource.ResourceSet;	28	import org.eclipse.emf.ecore.resource.ResourceSet;
28	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;	29	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
29	import org.eclipse.hyades.execution.core.IExecutor;	30	import org.eclipse.hyades.execution.core.IExecutor;
		31	import org.eclipse.hyades.models.common.datapool.DPLDatapool;
30	import org.eclipse.hyades.test.core.TestCorePlugin;	32	import org.eclipse.hyades.test.core.TestCorePlugin;
		33	import org.eclipse.hyades.test.core.internal.launch.datapool.extensions.LaunchDatapoolExtensionManager;
31	import org.eclipse.hyades.test.core.internal.launch.extensions.LaunchConfigurationExtensionsManager;	34	import org.eclipse.hyades.test.core.internal.launch.extensions.LaunchConfigurationExtensionsManager;
32	import org.eclipse.hyades.test.core.internal.launch.processes.TestExecutionProcess;	35	import org.eclipse.hyades.test.core.internal.launch.processes.TestExecutionProcess;
33	import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;	36	import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;
		37	import org.eclipse.hyades.test.core.launch.configurations.DeploymentLaunchConfigurationFacade;
		38	import org.eclipse.hyades.test.core.launch.configurations.TestLaunchConfigurationFacade;
		39	import org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler;
		40	import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;
34	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;	41	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;
35	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler2;	42	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler2;
36	import org.eclipse.hyades.test.core.launch.extensions.ITestLaunchConfigurationValidator;	43	import org.eclipse.hyades.test.core.launch.extensions.ITestLaunchConfigurationValidator;
		44	import org.eclipse.hyades.test.core.testservices.resources.PasswordCollection;
37	import org.eclipse.osgi.util.NLS;	45	import org.eclipse.osgi.util.NLS;
38		46
39	/**	47	/**
Lines 185-194 Link Here
185	}	193	}
186	}	194	}
187		195
		196	// find the datapools which is encrypted
		197	ILaunchconfigDatapoolHandler datapoolHandler = LaunchDatapoolExtensionManager.getInstance().getRunHandler(getLaunchedElement(configuration));
		198	DPLDatapool[] dp = null;
		199	if(datapoolHandler != null){
		200	dp = datapoolHandler.getAllDatapools(TestLaunchConfigurationFacade.getTest(configuration, getResourceSet()),
		201	DeploymentLaunchConfigurationFacade.getDeployment(configuration, getResourceSet()));
		202	}
		203	HashMap pass = PasswordCollection.getInstance().getDatapoolPassword();
		204
		205	// show a dialog to collect the passwords
		206	if(dp!=null && dp.length > 0){
		207	IPassInfoCollector collector = LaunchDatapoolExtensionManager.getInstance().getCollector(getLaunchedElement(configuration));
		208	List isContinue = new ArrayList();
		209	isContinue.add(TestLaunchConfigurationFacade.getTest(configuration, getResourceSet()).getImplementor().getId());
		210	collector.execute(dp, pass, isContinue);
		211	if(isContinue.size()==0)
		212	return;
		213	}
188	// Invoke the Test Execution Harness	214	// Invoke the Test Execution Harness
189	StringBuffer errorMessages = new StringBuffer();	215	StringBuffer errorMessages = new StringBuffer();
190	IExecutor executor = null;	216	IExecutor executor = null;
191	try {	217	try {
192	executor = invokeTestExecutionHarness(configuration, mode, errorMessages, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));	218	executor = invokeTestExecutionHarness(configuration, mode, errorMessages, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
193	if (errorMessages.length() > 0) {	219	if (errorMessages.length() > 0) {
194	IStatus status = new Status(IStatus.ERROR, TestCorePlugin.getPluginId(), 0, TestCorePluginResourceBundle._EXC_AbstractLaunchConfigurationDelegate_testHarnessProblems + errorMessages, null);	220	IStatus status = new Status(IStatus.ERROR, TestCorePlugin.getPluginId(), 0, TestCorePluginResourceBundle._EXC_AbstractLaunchConfigurationDelegate_testHarnessProblems + errorMessages, null);

Added Link Here

(-)src/org/eclipse/hyades/test/core/testservices/resources/PasswordCollection.java (+77 lines)
1	/**********************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: PasswordCollection.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12
13	package org.eclipse.hyades.test.core.testservices.resources;
14
15
16
17	import java.util.HashMap;
18	import java.util.Iterator;
19	import java.util.Map;
20
21	/**
22	* This class runs on the workbench, and used to save HashMap of
23	* datapool & password for this datapool during luaching tests .
24	*
25	* It's supposed to support mult-lauch on the workbench side .
26	*
27	* @author Xin Ying Huang
28	*
29	*/
30	public class PasswordCollection {
31
32	private static PasswordCollection instance = null;
33	private HashMap datapoolPassword = new HashMap();
34
35
36	private PasswordCollection(){}
37
38	/**
39	* @param
40	* @return PasswordCollection
41	*/
42	public static PasswordCollection getInstance(){
43	if(instance == null){
44	instance = new PasswordCollection();
45	}
46	return instance;
47	}
48
49	/**
50	* @param
51	* @return HashMap
52	*/
53	public HashMap getDatapoolPassword() {
54	return datapoolPassword;
55	}
56
57	/**
58	* @param testId
59	* @return HashMap
60	*/
61	public HashMap getDatapoolPassword(String testId){
62	if(testId == null)
63	return null;
64	return (HashMap)datapoolPassword.get(testId);
65	}
66
67	/**
68	* @param testId
69	* @return HashMap
70	*/
71	public void clear(String testId){
72	if(testId == null)
73	return;
74	datapoolPassword.remove(testId);
75	return;
76	}
77	}

Added Link Here

(-)schema/launchconfigDatapoolHandler.exsd (+135 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2	<!-- Schema file written by PDE -->
3	<schema targetNamespace="org.eclipse.hyades.test.core">
4	<annotation>
5	<appInfo>
6	<meta.schema plugin="org.eclipse.hyades.test.core" id="launchconfigDatapoolHandler" name="launchconfigDatapoolHandler"/>
7	</appInfo>
8	<documentation>
9	This extension point provides a mechanism to get datapool model for each test type when launching a test case .
10	</documentation>
11	</annotation>
12
13	<element name="extension">
14	<complexType>
15	<sequence>
16	<element ref="launchconfigDatapoolHandler"/>
17	</sequence>
18	<attribute name="point" type="string" use="required">
19	<annotation>
20	<documentation>
21
22	</documentation>
23	</annotation>
24	</attribute>
25	<attribute name="id" type="string">
26	<annotation>
27	<documentation>
28
29	</documentation>
30	</annotation>
31	</attribute>
32	<attribute name="name" type="string">
33	<annotation>
34	<documentation>
35
36	</documentation>
37	<appInfo>
38	<meta.attribute translatable="true"/>
39	</appInfo>
40	</annotation>
41	</attribute>
42	</complexType>
43	</element>
44
45	<element name="launchconfigDatapoolHandler">
46	<complexType>
47	<sequence>
48	<element ref="supportedTestType"/>
49	</sequence>
50	<attribute name="class" type="string" use="required">
51	<annotation>
52	<documentation>
53
54	</documentation>
55	</annotation>
56	</attribute>
57	</complexType>
58	</element>
59
60	<element name="supportedTestType">
61	<complexType>
62	<attribute name="name" type="string" use="required">
63	<annotation>
64	<documentation>
65
66	</documentation>
67	</annotation>
68	</attribute>
69	</complexType>
70	</element>
71
72	<annotation>
73	<appInfo>
74	<meta.section type="since"/>
75	</appInfo>
76	<documentation>
77	[4.5 ]
78	</documentation>
79	</annotation>
80
81	<annotation>
82	<appInfo>
83	<meta.section type="examples"/>
84	</appInfo>
85	<documentation>
86	The following example associates a DatapoolHandler class with tests of type org.eclipse.hyades.test.:
87
88	<pre>
89
90	<extension
91
92	point="org.eclipse.hyades.test.core.launchconfigDatapoolHandler">
93
94	<launchconfigDatapoolHandler class=" ">
95
96	<supportedType
97
98	name =" "/>
99
100	</runHandler>
101
102	</extension>
103
104	</pre>
105	</documentation>
106	</annotation>
107
108	<annotation>
109	<appInfo>
110	<meta.section type="apiInfo"/>
111	</appInfo>
112	<documentation>
113	[org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler]
114	</documentation>
115	</annotation>
116
117	<annotation>
118	<appInfo>
119	<meta.section type="implementation"/>
120	</appInfo>
121	<documentation>
122	[Enter information about supplied implementation of this extension point.]
123	</documentation>
124	</annotation>
125
126	<annotation>
127	<appInfo>
128	<meta.section type="copyright"/>
129	</appInfo>
130	<documentation>
131
132	</documentation>
133	</annotation>
134
135	</schema>

Added Link Here

(-)schema/launchDatapoolCheckPass.exsd (+140 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2	<!-- Schema file written by PDE -->
3	<schema targetNamespace="org.eclipse.hyades.test.core">
4	<annotation>
5	<appInfo>
6	<meta.schema plugin="org.eclipse.hyades.test.core" id="launchDatapoolCheckPass" name="check passwords while launching"/>
7	</appInfo>
8	<documentation>
9	[Used to collect password for each enctypted datapool which used in current test on workbench side .]
10	</documentation>
11	</annotation>
12
13	<element name="extension">
14	<complexType>
15	<sequence>
16	<element ref="launchDatapoolCheckPass"/>
17	</sequence>
18	<attribute name="point" type="string" use="required">
19	<annotation>
20	<documentation>
21
22	</documentation>
23	</annotation>
24	</attribute>
25	<attribute name="id" type="string">
26	<annotation>
27	<documentation>
28
29	</documentation>
30	</annotation>
31	</attribute>
32	<attribute name="name" type="string">
33	<annotation>
34	<documentation>
35
36	</documentation>
37	<appInfo>
38	<meta.attribute translatable="true"/>
39	</appInfo>
40	</annotation>
41	</attribute>
42	</complexType>
43	</element>
44
45	<element name="launchDatapoolCheckPass">
46	<complexType>
47	<sequence>
48	<element ref="supportedTestType"/>
49	</sequence>
50	<attribute name="UIClass" type="string" use="required">
51	<annotation>
52	<documentation>
53
54	</documentation>
55	</annotation>
56	</attribute>
57	</complexType>
58	</element>
59
60	<element name="supportedTestType">
61	<complexType>
62	<attribute name="name" type="string" use="default" value="">
63	<annotation>
64	<documentation>
65
66	</documentation>
67	</annotation>
68	</attribute>
69	</complexType>
70	</element>
71
72	<annotation>
73	<appInfo>
74	<meta.section type="since"/>
75	</appInfo>
76	<documentation>
77	[4.5.]
78	</documentation>
79	</annotation>
80
81	<annotation>
82	<appInfo>
83	<meta.section type="examples"/>
84	</appInfo>
85	<documentation>
86	[ <element name="extension">
87	<complexType>
88	<sequence>
89	<element ref="launchDatapoolCheckPass"/>
90	</sequence>
91	<attribute name="point" type="string" use="required">
92	<annotation>
93	<documentation>
94
95	</documentation>
96	</annotation>
97	</attribute>
98	<attribute name="id" type="string">
99	<annotation>
100	<documentation>
101
102	</documentation>
103	</annotation>
104	</attribute>
105	<attribute name="name" type="string">
106	<annotation>
107	<documentation>
108
109	</documentation>
110	<appInfo>
111	<meta.attribute translatable="true"/>
112	</appInfo>
113	</annotation>
114	</attribute>
115	</complexType>
116	</element>
117	.]
118	</documentation>
119	</annotation>
120
121	<annotation>
122	<appInfo>
123	<meta.section type="apiInfo"/>
124	</appInfo>
125	<documentation>
126	[org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector .]
127	</documentation>
128	</annotation>
129
130	<annotation>
131	<appInfo>
132	<meta.section type="implementation"/>
133	</appInfo>
134	<documentation>
135	[Enter information about supplied implementation of this extension point.]
136	</documentation>
137	</annotation>
138
139
140	</schema>

Lines 23-29 Link Here

(-)src/org/eclipse/hyades/test/ui/datapool/internal/util/ValueObject.java (-1 / +16 lines)
23	public class ValueObject {	23	public class ValueObject {
24		24
25	private Object theObject;	25	private Object theObject;
26	private IDisplayValueClass valueClass;	26	protected IDisplayValueClass valueClass;
27	private String description;	27	private String description;
28	private Object display;	28	private Object display;
29		29
Lines 65-70 Link Here
65	return null;	65	return null;
66	}	66	}
67		67
		68	public Object getEncryptedDisplay(Composite parent)
		69	{
		70	if ( display != null && display instanceof CellEditor )
		71	{
		72	Control control = ((CellEditor)display).getControl();
		73	if ( control != null && !control.isDisposed() )
		74	return display;
		75	}
		76	if ( valueClass != null )
		77	{
		78	display = ((EncryptedStringValueClass)valueClass).getPropertyDisplay(theObject, parent, true);
		79	return display;
		80	}
		81	return null;
		82	}
68	public Object getDialogDisplay(Composite parent, boolean isEditable)	83	public Object getDialogDisplay(Composite parent, boolean isEditable)
69	{	84	{
70	return null;	85	return null;

Lines 69-74 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/resources/UiPluginResourceBundle.java (+30 lines)
69	public static String DatapoolImportWizard_editOrSelectDatapool;	69	public static String DatapoolImportWizard_editOrSelectDatapool;
70	public static String DatapoolImportWizard_selectCSV;	70	public static String DatapoolImportWizard_selectCSV;
71	public static String DatapoolImportWizard_selectDatapool;	71	public static String DatapoolImportWizard_selectDatapool;
		72	public static String DatapoolExportWizard_encrypted;
		73	public static String DatapoolExportWizard_unencrypted;
		74	public static String DatapoolExportWizard_wrongpass;
		75	public static String DatapoolExportWizard_rightpass;
		76	public static String DatapoolExportWizard_password;
		77	public static String DatapoolDialog_CHANGEKEY;
		78	public static String DatapoolDialog_ENCRYPTED;
		79	public static String DatapoolDialog_ASSIGNKEYDIALOGTITLE;
		80	public static String DatapoolDialog_CHANGEKEYDIALOGTITLE;
		81	public static String DatapoolDialog_OLDKEY;
		82	public static String DatapoolDialog_NEWKEY;
		83	public static String DatapoolDialog_CONFIRMNEWKEY;
		84	public static String DatapoolDialog_ORIGINKEYERRORMES;
		85	public static String DatapoolDialog_NEWKEYNULLMES;
		86	public static String DatapoolDialog_NEWKEYNOTCONFIRMMES;
		87	public static String DatapoolDialog_WRONGLOGONKEYMES;
		88	public static String DatapoolDialog_ERRORDIALOGTITLE;
		89	public static String DatapoolDialog_KEY;
		90	public static String DatapoolDialog_LOGONDIALOGTITLE;
		91	public static String DatapoolDialog_ENCRYPTEDID;
		92	public static String DatapoolDialog_ENCRYPTEDDISPLAYVALUE;
		93	public static String DatapoolDialog_ERRORFOREDITENCRYPTEDVALUE;
		94	public static String DatapoolDialog_INPUTKEYDIALGOTITLE;
		95	public static String DatapoolDialog_TRUE;
		96	public static String DatapoolDialog_OK;
		97	public static String DatapoolDialog_PASSWORDSHINT;
		98	public static String DatapoolDialog_SPLITMARK;
		99	public static String DatapoolDialog_TRYAGAIN;
		100	public static String DatapoolDialog_NOTALLMATCH;
		101	public static String DatapoolDialog_INPUTPASSHINT;
72	public static String ToggleViewAction_resource_label;	102	public static String ToggleViewAction_resource_label;
73	public static String ToggleViewAction_resource_description;	103	public static String ToggleViewAction_resource_description;
74	public static String ToggleViewAction_resource_tooltip;	104	public static String ToggleViewAction_resource_tooltip;

Lines 64-70 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/resources/messages.properties (-1 / +31 lines)
64	DatapoolImportWizard_editOrSelectDatapool=Please edit the datapool or select a different one and import again.	64	DatapoolImportWizard_editOrSelectDatapool=Please edit the datapool or select a different one and import again.
65	DatapoolImportWizard_selectCSV=&Select the CSV file to import data from:	65	DatapoolImportWizard_selectCSV=&Select the CSV file to import data from:
66	DatapoolImportWizard_selectDatapool= Select a datapool to import data into:	66	DatapoolImportWizard_selectDatapool= Select a datapool to import data into:
67		67	DatapoolExportWizard_encrypted= is encrypted. Please supply the password.
		68	DatapoolExportWizard_unencrypted= is not encrypted. Press Finish to complete.
		69	DatapoolExportWizard_wrongpass=Wrong password. Try again or cancel.
		70	DatapoolExportWizard_rightpass=You passed. Check Finish to complete.
		71	DatapoolExportWizard_password=Password for
		72
		73	DatapoolDialog_CHANGEKEY=Change Password
		74	DatapoolDialog_ENCRYPTED=Encrypted
		75	DatapoolDialog_ASSIGNKEYDIALOGTITLE=Assign Password
		76	DatapoolDialog_CHANGEKEYDIALOGTITLE=Change Password
		77	DatapoolDialog_OLDKEY=Origin Password
		78	DatapoolDialog_NEWKEY=New Password
		79	DatapoolDialog_CONFIRMNEWKEY=Confirm New Password
		80	DatapoolDialog_ORIGINKEYERRORMES=The origin Password is wrong
		81	DatapoolDialog_NEWKEYNULLMES=The new Password should not be null
		82	DatapoolDialog_NEWKEYNOTCONFIRMMES=The confirm Password is not the same as the new Password
		83	DatapoolDialog_WRONGLOGONKEYMES=The Password input is incorrect
		84	DatapoolDialog_ERRORDIALOGTITLE=Error
		85	DatapoolDialog_KEY=Key
		86	DatapoolDialog_LOGONDIALOGTITLE=Log on
		87	DatapoolDialog_ENCRYPTEDID=isencrypted
		88	DatapoolDialog_ENCRYPTEDDISPLAYVALUE=******
		89	DatapoolDialog_ERRORFOREDITENCRYPTEDVALUE=The cell has been encrypted , please decrypted it before editing
		90	DatapoolDialog_INPUTKEYDIALGOTITLE=Input Password
		91	DatapoolDialog_TRUE=true
		92	DatapoolDialog_OK=OK
		93	DatapoolDialog_PASSWORDSHINT=password for the following are not correct!:\n\n
		94	DatapoolDialog_SPLITMARK=::
		95	DatapoolDialog_TRYAGAIN=\n\nPlease try again or Cancel
		96	DatapoolDialog_NOTALLMATCH=Passwords not all matched!
		97	DatapoolDialog_INPUTPASSHINT=Please enter the passwords for each encrypted datapool:
68	ToggleViewAction_resource_label=Resource test navigator	98	ToggleViewAction_resource_label=Resource test navigator
69	ToggleViewAction_resource_description=Show the resource test navigator	99	ToggleViewAction_resource_description=Show the resource test navigator
70	ToggleViewAction_resource_tooltip=Show the resource test navigator	100	ToggleViewAction_resource_tooltip=Show the resource test navigator

Added Link Here

(-)src/org/eclipse/hyades/test/ui/dialog/DatapoolCheck.java (+330 lines)
1	/**********************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: DatapoolCheck.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12	package org.eclipse.hyades.test.ui.dialog;
13
14	import java.util.ArrayList;
15	import java.util.HashMap;
16	import java.util.List;
17	import java.util.Map;
18
19	import org.eclipse.hyades.models.common.datapool.DPLDatapool;
20	import org.eclipse.hyades.models.common.util.EncryptionManager;
21	import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;
22	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
23	import org.eclipse.jface.dialogs.Dialog;
24	import org.eclipse.jface.dialogs.IDialogConstants;
25	import org.eclipse.jface.dialogs.MessageDialog;
26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.events.MouseAdapter;
28	import org.eclipse.swt.events.MouseEvent;
29	import org.eclipse.swt.layout.FormAttachment;
30	import org.eclipse.swt.layout.FormData;
31	import org.eclipse.swt.layout.FormLayout;
32	import org.eclipse.swt.widgets.Button;
33	import org.eclipse.swt.widgets.Composite;
34	import org.eclipse.swt.widgets.Control;
35	import org.eclipse.swt.widgets.Display;
36	import org.eclipse.swt.widgets.Label;
37	import org.eclipse.swt.widgets.Shell;
38	import org.eclipse.swt.widgets.Text;
39
40	/**
41	*
42	* It's the implementation of launchDatapoolCheckPass extension point , provide
43	* dialog to prompt user input password for encrypted datapool during launching a test
44	* on workbench side .
45	*
46	* @author Huang Xin Ying
47	*/
48	public class DatapoolCheck implements IPassInfoCollector {
49
50	public DatapoolCheck() {
51	}
52
53	public void execute(DPLDatapool[] dp, Map pass, List isContinue) {
54	DialogRun dr = new DialogRun();
55	dr.setDp(dp);
56	dr.setContinue(isContinue);
57	dr.setPass(pass);
58	Display.getDefault().syncExec(dr);
59	}
60
61	private class DialogRun implements Runnable {
62	private DPLDatapool[] dp;
63	private Map pass;
64	private List isContinue;
65
66	public void setDp(DPLDatapool[] dp) {
67	this.dp = dp;
68	}
69
70	public void setPass(Map pass) {
71	this.pass = pass;
72	}
73
74	public void setContinue(List isContinue) {
75	this.isContinue = isContinue;
76	}
77
78	public void run() {
79	String testId = null;
80	if(isContinue != null && isContinue.size() == 1){
81	testId = (String)isContinue.get(0);
82	isContinue.clear();
83	}
84	DatapoolCheckDialog db = new DatapoolCheckDialog(null,
85	dp,
86	UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE,
87	pass,
88	testId);
89	db.setBlockOnOpen(true);
90	if (db.open() == IDialogConstants.OK_ID) {
91	isContinue.add(UiPluginResourceBundle.DatapoolDialog_TRUE);
92	}
93	}
94	}
95
96
97	private class DatapoolCheckDialog extends Dialog {
98	private Button okButton;
99
100	private Button checkButton;
101
102	private DPLDatapool[] dp;
103	private String title;
104	private int dpNameLength = 0;
105	private int oriHeight = 0;
106	private Label[] name;
107	private Text[] pass;
108	private Button[] status;
109	private List unCorrectList = new ArrayList();
110	private Map passed;
111	private String testId;
112
113	/**
114	* @param parentShell
115	*/
116	public DatapoolCheckDialog(Shell parentShell) {
117	super(parentShell);
118	}
119
120	public DatapoolCheckDialog(Shell parentShell, DPLDatapool[] dp,
121	String title, Map passed,String testId) {
122	super(parentShell);
123	this.dp = dp;
124	this.title = title;
125	this.passed = passed;
126	this.testId = testId;
127	}
128
129	/*
130	* (non-Javadoc)
131	*
132	* @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
133	*/
134	protected void createButtonsForButtonBar(Composite parent) {
135	// create OK and Cancel buttons by default
136	okButton = createButton(parent, IDialogConstants.OK_ID,
137	IDialogConstants.OK_LABEL, true);
138	checkButton = createButton(parent, IDialogConstants.YES_ID,
139	IDialogConstants.YES_LABEL, false);
140	checkButton.setText(UiPluginResourceBundle.DatapoolDialog_OK);
141	checkButton.addMouseListener(new MouseAdapter() {
142	public void mouseDown(MouseEvent e) {
143	// check all the passwords
144	for (int i = 0; i < dp.length; i++) {
145	try {
146	if (status[i].getSelection()) {
147	continue;
148	} else if (dp[i].getChallenge().equals(
149	EncryptionManager.EncoderByMd5(pass[i].getText()))) {
150
151	if(passed.get(testId) == null){
152	passed.put(testId, new HashMap());
153	}
154	HashMap thm = (HashMap)passed.get(testId);
155	thm.put(dp[i].getName(), pass[i].getText());
156
157	pass[i].setEnabled(false);
158	status[i].setSelection(true);
159	if (unCorrectList != null
160	&& unCorrectList.contains(dp[i])) {
161	unCorrectList.remove(dp[i]);
162	}
163	} else {
164	pass[i].setText("");
165	if (!unCorrectList.contains(dp[i]))
166	unCorrectList.add(dp[i]);
167	}
168	} catch (Exception er) {
169	er.printStackTrace();
170	}
171	}
172	// if all status is true, then set ok button can be pressed
173	if (unCorrectList.size() == 0) {
174	okPressed();
175	return;
176	}
177
178	StringBuffer toShow = new StringBuffer();
179	toShow
180	.append(UiPluginResourceBundle.DatapoolDialog_PASSWORDSHINT);
181	for (int i = 0; i < unCorrectList.size(); i++) {
182	toShow.append(((DPLDatapool) unCorrectList.get(i))
183	.getName().split(UiPluginResourceBundle.DatapoolDialog_SPLITMARK)[0]);
184	if (i < unCorrectList.size() - 1) {
185	toShow.append(",\n");
186	}
187	}
188	toShow.append(UiPluginResourceBundle.DatapoolDialog_TRYAGAIN);
189
190	MessageDialog dialog = new MessageDialog(null,
191	UiPluginResourceBundle.DatapoolDialog_NOTALLMATCH, // the dialog title
192	null, toShow.toString(), // text to be displayed
193	MessageDialog.WARNING, // dialog type
194	new String[] { UiPluginResourceBundle.DatapoolDialog_OK }, // button labels
195	0);
196	dialog.open();
197	}
198	});
199
200	createButton(parent, IDialogConstants.CANCEL_ID,
201	IDialogConstants.CANCEL_LABEL, false);
202	okButton.setVisible(false);
203	}
204
205	/*
206	* (non-Javadoc)
207	*
208	* @see org.eclipse.jface.dialogs.Dialog#getButton(int)
209	*/
210	protected Button getButton(int id) {
211	if (id == IDialogConstants.OK_ID)
212	return okButton;
213	return super.getButton(id);
214	}
215
216	/*
217	* (non-Javadoc)
218	*
219	* @see org.eclipse.jface.dialogs.Dialog#getOKButton()
220	*/
221	protected Button getOKButton() {
222	return okButton;
223	}
224
225	/* modified the content */
226	protected Control createDialogArea(Composite parent) {
227	getShell().setText(title);
228	Composite superComposite = (Composite) super
229	.createDialogArea(parent);
230
231	superComposite.setLayout(new FormLayout());
232
233	FormData formData;
234
235	Label hint = new Label(superComposite, SWT.NULL);
236	hint.setText(UiPluginResourceBundle.DatapoolDialog_INPUTPASSHINT);
237	formData = new FormData();
238	formData.left = new FormAttachment(superComposite, 5);
239	formData.top = new FormAttachment(superComposite, 5);
240	hint.setLayoutData(formData);
241
242	if (dp != null && dp.length > 0) {
243
244	name = new Label[dp.length];
245	pass = new Text[dp.length];
246	status = new Button[dp.length];
247
248	name[0] = new Label(superComposite, SWT.BORDER);
249	formData = new FormData();
250	formData.left = new FormAttachment(superComposite, 5);
251	formData.top = new FormAttachment(hint, 10);
252	name[0].setLayoutData(formData);
253	name[0].setText(getdpNameLength());
254	name[0].pack();
255	dpNameLength = name[0].getSize().x;
256	oriHeight = name[0].getSize().y;
257	formData.width = dpNameLength;
258	formData.height = oriHeight;
259	name[0].setLayoutData(formData);
260	name[0].setText(dp[0].getName().split(UiPluginResourceBundle.DatapoolDialog_SPLITMARK)[0] + ":");
261
262	pass[0] = new Text(superComposite, SWT.PASSWORD \| SWT.BORDER);
263	formData = new FormData();
264	formData.left = new FormAttachment(name[0], 5);
265	formData.top = new FormAttachment(hint, 10);
266	formData.width = 50;
267	formData.height = oriHeight;
268	pass[0].setLayoutData(formData);
269
270	status[0] = new Button(superComposite, SWT.CHECK);
271	formData = new FormData();
272	formData.left = new FormAttachment(pass[0], 10);
273	formData.top = new FormAttachment(hint, 10);
274	formData.height = oriHeight;
275	status[0].setLayoutData(formData);
276	status[0].setSelection(false);
277	status[0].setEnabled(false);
278	status[0].setVisible(false);
279
280	for (int i = 1; i < dp.length; i++) {
281	name[i] = new Label(superComposite, SWT.BORDER);
282	formData = new FormData();
283	formData.left = new FormAttachment(superComposite, 5);
284	formData.top = new FormAttachment(name[i - 1], 10);
285	formData.width = dpNameLength;
286	formData.height = oriHeight;
287	name[i].setLayoutData(formData);
288	name[i].setText(dp[i].getName().split(UiPluginResourceBundle.DatapoolDialog_SPLITMARK)[0] + ":");
289
290	pass[i] = new Text(superComposite, SWT.PASSWORD
291	\| SWT.BORDER);
292	formData = new FormData();
293	formData.left = new FormAttachment(name[i], 5);
294	formData.top = new FormAttachment(name[i - 1], 5);
295	formData.width = 50;
296	formData.height = oriHeight;
297	pass[i].setLayoutData(formData);
298
299	status[i] = new Button(superComposite, SWT.CHECK);
300	formData = new FormData();
301	formData.left = new FormAttachment(pass[i], 10);
302	formData.top = new FormAttachment(name[i - 1], 5);
303	formData.height = oriHeight;
304	status[i].setLayoutData(formData);
305	status[i].setSelection(false);
306	status[i].setEnabled(false);
307	status[i].setVisible(false);
308	}
309	}
310
311	superComposite.pack();
312	return superComposite;
313	}
314
315	private String getdpNameLength() {
316
317	String datapoolName = "";
318
319	for (int counter = 0; counter < dp.length; counter++) {
320
321	if(dp[counter].getName().length() > datapoolName.length()){
322	datapoolName = dp[counter].getName();
323	}
324	}
325
326	return datapoolName;
327	}
328	}
329
330	}

Lines 22-33 Link Here

(-)src-common-runner/org/eclipse/hyades/test/common/runner/HyadesRunner.java (+11 lines)
22	import org.eclipse.hyades.internal.execution.remote.AgentControllerUnavailableException;	22	import org.eclipse.hyades.internal.execution.remote.AgentControllerUnavailableException;
23	import org.eclipse.hyades.internal.execution.remote.CustomCommandHandler;	23	import org.eclipse.hyades.internal.execution.remote.CustomCommandHandler;
24	import org.eclipse.hyades.internal.execution.remote.RemoteComponentSkeleton;	24	import org.eclipse.hyades.internal.execution.remote.RemoteComponentSkeleton;
		25	import org.eclipse.hyades.models.common.datapool.util.DPLPasswordCollection;
25	import org.eclipse.hyades.models.common.facades.behavioral.impl.FacadeResourceFactoryImpl;	26	import org.eclipse.hyades.models.common.facades.behavioral.impl.FacadeResourceFactoryImpl;
26	import org.eclipse.hyades.models.common.testprofile.impl.Common_TestprofilePackageImpl;	27	import org.eclipse.hyades.models.common.testprofile.impl.Common_TestprofilePackageImpl;
27	import org.eclipse.hyades.test.common.agent.ComptestAgent;	28	import org.eclipse.hyades.test.common.agent.ComptestAgent;
28	import org.eclipse.hyades.test.common.agent.PrimaryTestAgent;	29	import org.eclipse.hyades.test.common.agent.PrimaryTestAgent;
29	import org.eclipse.hyades.test.common.agent.ServiceCommandHandler;	30	import org.eclipse.hyades.test.common.agent.ServiceCommandHandler;
		31	import org.eclipse.hyades.test.common.agent.UnknownTestServiceException;
30	import org.eclipse.hyades.test.common.event.ExecutionEvent;	32	import org.eclipse.hyades.test.common.event.ExecutionEvent;
		33	import org.eclipse.hyades.test.common.testservices.resources.DatapoolPasswordProvider;
31		34
32	/**	35	/**
33	* @author jsutton	36	* @author jsutton
Lines 234-239 Link Here
234	}	237	}
235	}	238	}
236	}	239	}
		240	//set password to Models
		241	try {
		242	DPLPasswordCollection.getInstance().
		243	setDatapoolPassword(DatapoolPasswordProvider.getDatapoolPassword(testID));
		244	} catch (UnknownTestServiceException e) {
		245	}
237		246
238	}	247	}
239		248
Lines 246-251 Link Here
246	};	255	};
247		256
248	public void dispose() {	257	public void dispose() {
		258	//clear the passwords in Models
		259	DPLPasswordCollection.getInstance().clear();
249	if (agent != null && agent.isRegistered()) {	260	if (agent != null && agent.isRegistered()) {
250	Runtime.getRuntime().removeShutdownHook(disposeOnExitHook);	261	Runtime.getRuntime().removeShutdownHook(disposeOnExitHook);
251	agent.deregister();	262	agent.deregister();