Attachment #81975 for bug #202695

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

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.tptp.platform.models; singleton:=true	4	Bundle-SymbolicName: org.eclipse.tptp.platform.models; singleton:=true
5	Bundle-Version: 4.3.100.qualifier	5	Bundle-Version: 4.4.0.qualifier
6	Bundle-ClassPath: tptp-models.jar,	6	Bundle-ClassPath: tptp-models.jar,
7	fastxpath.jar	7	fastxpath.jar
8	Bundle-Activator: org.eclipse.hyades.models.plugin.ModelsPlugin$Implementation	8	Bundle-Activator: org.eclipse.hyades.models.plugin.ModelsPlugin$Implementation




	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




 * <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

Lines 229-236 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/impl/Common_DatapoolPackageImpl.java (-3 / +25 lines)
229	* <!-- end-user-doc -->	229	* <!-- end-user-doc -->
230	* @generated	230	* @generated
231	*/	231	*/
		232	public EAttribute getDPLDatapool_Challenge() {
		233	return (EAttribute)dplDatapoolEClass.getEStructuralFeatures().get(0);
		234	}
		235
		236	/**
		237	* <!-- begin-user-doc -->
		238	* <!-- end-user-doc -->
		239	* @generated
		240	*/
232	public EReference getDPLDatapool_EquivalenceClasses() {	241	public EReference getDPLDatapool_EquivalenceClasses() {
233	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(0);	242	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(1);
234	}	243	}
235		244
236	/**	245	/**
Lines 239-245 Link Here
239	* @generated	248	* @generated
240	*/	249	*/
241	public EReference getDPLDatapool_DatapoolSpec() {	250	public EReference getDPLDatapool_DatapoolSpec() {
242	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(1);	251	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(2);
243	}	252	}
244		253
245	/**	254	/**
Lines 346-353 Link Here
346	* <!-- end-user-doc -->	355	* <!-- end-user-doc -->
347	* @generated	356	* @generated
348	*/	357	*/
		358	public EAttribute getDPLVariable_Encrypted() {
		359	return (EAttribute)dplVariableEClass.getEStructuralFeatures().get(2);
		360	}
		361
		362	/**
		363	* <!-- begin-user-doc -->
		364	* <!-- end-user-doc -->
		365	* @generated
		366	*/
349	public EReference getDPLVariable_Variables() {	367	public EReference getDPLVariable_Variables() {
350	return (EReference)dplVariableEClass.getEStructuralFeatures().get(2);	368	return (EReference)dplVariableEClass.getEStructuralFeatures().get(3);
351	}	369	}
352		370
353	/**	371	/**
Lines 404-412 Link Here
404	dplVariableEClass = createEClass(DPL_VARIABLE);	422	dplVariableEClass = createEClass(DPL_VARIABLE);
405	createEAttribute(dplVariableEClass, DPL_VARIABLE__TYPE);	423	createEAttribute(dplVariableEClass, DPL_VARIABLE__TYPE);
406	createEAttribute(dplVariableEClass, DPL_VARIABLE__ROLE);	424	createEAttribute(dplVariableEClass, DPL_VARIABLE__ROLE);
		425	createEAttribute(dplVariableEClass, DPL_VARIABLE__ENCRYPTED);
407	createEReference(dplVariableEClass, DPL_VARIABLE__VARIABLES);	426	createEReference(dplVariableEClass, DPL_VARIABLE__VARIABLES);
408		427
409	dplDatapoolEClass = createEClass(DPL_DATAPOOL);	428	dplDatapoolEClass = createEClass(DPL_DATAPOOL);
		429	createEAttribute(dplDatapoolEClass, DPL_DATAPOOL__CHALLENGE);
410	createEReference(dplDatapoolEClass, DPL_DATAPOOL__EQUIVALENCE_CLASSES);	430	createEReference(dplDatapoolEClass, DPL_DATAPOOL__EQUIVALENCE_CLASSES);
411	createEReference(dplDatapoolEClass, DPL_DATAPOOL__DATAPOOL_SPEC);	431	createEReference(dplDatapoolEClass, DPL_DATAPOOL__DATAPOOL_SPEC);
412		432
Lines 466-474 Link Here
466	initEClass(dplVariableEClass, DPLVariable.class, "DPLVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);	486	initEClass(dplVariableEClass, DPLVariable.class, "DPLVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
467	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);	487	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);
468	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);	488	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);
		489	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);
469	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);	490	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);
470		491
471	initEClass(dplDatapoolEClass, DPLDatapool.class, "DPLDatapool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);	492	initEClass(dplDatapoolEClass, DPLDatapool.class, "DPLDatapool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
		493	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);
472	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);	494	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);
473	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);	495	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);
474		496




 * <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()
	 */




 * <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

Return to bug 202695

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 31-36 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/DPLDatapool.java (-1 / +28 lines)
31	* <p>	31	* <p>
32	* The following features are supported:	32	* The following features are supported:
33	* <ul>	33	* <ul>
		34	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}</li>
34	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}</li>	35	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}</li>
35	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getDatapoolSpec <em>Datapool Spec</em>}</li>	36	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getDatapoolSpec <em>Datapool Spec</em>}</li>
36	* </ul>	37	* </ul>
Lines 40-46 Link Here
40	* @model	41	* @model
41	* @generated	42	* @generated
42	*/	43	*/
43	public interface DPLDatapool extends CFGClass, CMNNamedElement, IDatapool{	44	public interface DPLDatapool extends CFGClass, CMNNamedElement, IDatapool {
44	/**	45	/**
45	* <!-- begin-user-doc -->	46	* <!-- begin-user-doc -->
46	* <!-- end-user-doc -->	47	* <!-- end-user-doc -->
Lines 49-54 Link Here
49	String copyright = "";	50	String copyright = "";
50		51
51	/**	52	/**
		53	* Returns the value of the '<em><b>Challenge</b></em>' attribute.
		54	* <!-- begin-user-doc -->
		55	* <!-- end-user-doc -->
		56	* <!-- begin-model-doc -->
		57	* This string is used to determine whether a user supplied password for an encrypted datapool is correct.
		58	* <!-- end-model-doc -->
		59	* @return the value of the '<em>Challenge</em>' attribute.
		60	* @see #setChallenge(String)
		61	* @see org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage#getDPLDatapool_Challenge()
		62	* @model
		63	* @generated
		64	*/
		65	String getChallenge();
		66
		67	/**
		68	* Sets the value of the '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}' attribute.
		69	* <!-- begin-user-doc -->
		70	* <!-- end-user-doc -->
		71	* @param value the new value of the '<em>Challenge</em>' attribute.
		72	* @see #getChallenge()
		73	* @generated
		74	*/
		75	void setChallenge(String value);
		76
		77	/**
52	* Returns the value of the '<em><b>Equivalence Classes</b></em>' containment reference list.	78	* Returns the value of the '<em><b>Equivalence Classes</b></em>' containment reference list.
53	* The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLEquivalenceClass}.	79	* The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLEquivalenceClass}.
54	* <!-- begin-user-doc -->	80	* <!-- begin-user-doc -->
Lines 90-93 Link Here
90	*/	116	*/
91	void setDatapoolSpec(DPLDatapoolSpec value);	117	void setDatapoolSpec(DPLDatapoolSpec value);
92		118
		119
93	} // DPLDatapool	120	} // DPLDatapool