Attachment 81975 Details for Bug 202695 – Model change for encrypted datapool support

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

[patch] Model change for encrypted datapool support

202695.patch (text/plain), 25.20 KB, created by Joe Toomey

on 2007-11-02 12:01:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joe Toomey

Created: 2007-11-02 12:01:41 EDT

Size: 25.20 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.models
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models/META-INF/MANIFEST.MF,v
>retrieving revision 1.30
>diff -u -r1.30 MANIFEST.MF
>--- META-INF/MANIFEST.MF	23 Aug 2007 00:38:22 -0000	1.30
>+++ META-INF/MANIFEST.MF	2 Nov 2007 15:23:48 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.tptp.platform.models; singleton:=true
>-Bundle-Version: 4.3.100.qualifier
>+Bundle-Version: 4.4.0.qualifier
> Bundle-ClassPath: tptp-models.jar,
> fastxpath.jar
> Bundle-Activator: org.eclipse.hyades.models.plugin.ModelsPlugin$Implementation
>Index: src-test/org/eclipse/hyades/models/common/datapool/Common_DatapoolPackage.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models/src-test/org/eclipse/hyades/models/common/datapool/Common_DatapoolPackage.java,v
>retrieving revision 1.7
>diff -u -r1.7 Common_DatapoolPackage.java
>--- src-test/org/eclipse/hyades/models/common/datapool/Common_DatapoolPackage.java	27 Mar 2006 23:53:28 -0000	1.7
>+++ src-test/org/eclipse/hyades/models/common/datapool/Common_DatapoolPackage.java	2 Nov 2007 15:23:49 -0000
>@@ -330,13 +330,22 @@
> 	int DPL_VARIABLE__ROLE = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 1;
> 
> 	/**
>+	 * The feature id for the 'Encrypted' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DPL_VARIABLE__ENCRYPTED = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 2;
>+
>+	/**
> 	 * The feature id for the 'Variables' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DPL_VARIABLE__VARIABLES = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 2;
>+	int DPL_VARIABLE__VARIABLES = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 3;
> 
> 	/**
> 	 * The number of structural features of the 'DPL Variable' class.
>@@ -345,7 +354,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DPL_VARIABLE_FEATURE_COUNT = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 3;
>+	int DPL_VARIABLE_FEATURE_COUNT = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 4;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -402,13 +411,22 @@
> 	int DPL_DATAPOOL__INSTANTIATIONS = Common_ConfigurationPackage.CFG_CLASS__INSTANTIATIONS;
> 
> 	/**
>+	 * The feature id for the 'Challenge' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DPL_DATAPOOL__CHALLENGE = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 0;
>+
>+	/**
> 	 * The feature id for the 'Equivalence Classes' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DPL_DATAPOOL__EQUIVALENCE_CLASSES = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 0;
>+	int DPL_DATAPOOL__EQUIVALENCE_CLASSES = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The feature id for the 'Datapool Spec' containment reference.
>@@ -417,7 +435,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DPL_DATAPOOL__DATAPOOL_SPEC = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 1;
>+	int DPL_DATAPOOL__DATAPOOL_SPEC = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The number of structural features of the 'DPL Datapool' class.
>@@ -426,7 +444,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DPL_DATAPOOL_FEATURE_COUNT = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 2;
>+	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 DPL Role}' enum.
>@@ -471,6 +489,17 @@
> 	EClass getDPLDatapool();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge Challenge}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Challenge'.
>+	 * @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 Equivalence Classes}'.
> 	 * 
> 	 * 
>@@ -610,6 +639,17 @@
> 	EAttribute getDPLVariable_Role();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted Encrypted}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Encrypted'.
>+	 * @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 Variables}'.
> 	 * 
> 	 * 
>@@ -767,6 +807,14 @@
> 		EAttribute DPL_VARIABLE__ROLE = eINSTANCE.getDPLVariable_Role();
> 
> 		/**
>+		 * The meta object literal for the 'Encrypted' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DPL_VARIABLE__ENCRYPTED = eINSTANCE.getDPLVariable_Encrypted();
>+
>+		/**
> 		 * The meta object literal for the 'Variables' containment reference list feature.
> 		 * 
> 		 * 
>@@ -785,6 +833,14 @@
> 		EClass DPL_DATAPOOL = eINSTANCE.getDPLDatapool();
> 
> 		/**
>+		 * The meta object literal for the 'Challenge' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DPL_DATAPOOL__CHALLENGE = eINSTANCE.getDPLDatapool_Challenge();
>+
>+		/**
> 		 * The meta object literal for the 'Equivalence Classes' containment reference list feature.
> 		 * 
> 		 * 
>Index: src-test/org/eclipse/hyades/models/common/datapool/DPLDatapool.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models/src-test/org/eclipse/hyades/models/common/datapool/DPLDatapool.java,v
>retrieving revision 1.6
>diff -u -r1.6 DPLDatapool.java
>--- src-test/org/eclipse/hyades/models/common/datapool/DPLDatapool.java	8 Feb 2006 19:57:07 -0000	1.6
>+++ src-test/org/eclipse/hyades/models/common/datapool/DPLDatapool.java	2 Nov 2007 15:23:49 -0000
>@@ -31,6 +31,7 @@
> * 
> * The following features are supported:
> * <ul>
>+ * <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge Challenge}</li>
> * <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses Equivalence Classes}</li>
> * <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getDatapoolSpec Datapool Spec}</li>
> * </ul>
>@@ -40,7 +41,7 @@
> * @model
> * @generated
> */
>-public interface DPLDatapool extends CFGClass, CMNNamedElement, IDatapool{
>+public interface DPLDatapool extends CFGClass, CMNNamedElement, IDatapool {
> 	/**
> 	 * 
> 	 * 
>@@ -49,6 +50,31 @@
> 	String copyright = "";
> 
> 	/**
>+	 * Returns the value of the 'Challenge' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * This string is used to determine whether a user supplied password for an encrypted datapool is correct.
>+	 * 
>+	 * @return the value of the 'Challenge' 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 Challenge}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Challenge' attribute.
>+	 * @see #getChallenge()
>+	 * @generated
>+	 */
>+	void setChallenge(String value);
>+
>+	/**
> 	 * Returns the value of the 'Equivalence Classes' containment reference list.
> 	 * The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLEquivalenceClass}.
> 	 * 
>@@ -90,4 +116,5 @@
> 	 */
> 	void setDatapoolSpec(DPLDatapoolSpec value);
> 
>+	
> } // DPLDatapool
>Index: src-test/org/eclipse/hyades/models/common/datapool/DPLVariable.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models/src-test/org/eclipse/hyades/models/common/datapool/DPLVariable.java,v
>retrieving revision 1.6
>diff -u -r1.6 DPLVariable.java
>--- src-test/org/eclipse/hyades/models/common/datapool/DPLVariable.java	8 Feb 2006 19:57:07 -0000	1.6
>+++ src-test/org/eclipse/hyades/models/common/datapool/DPLVariable.java	2 Nov 2007 15:23:49 -0000
>@@ -32,6 +32,7 @@
> * <ul>
> * <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getType Type}</li>
> * <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getRole Role}</li>
>+ * <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted Encrypted}</li>
> * <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables Variables}</li>
> * </ul>
> * 
>@@ -40,7 +41,7 @@
> * @model
> * @generated
> */
>-public interface DPLVariable extends CMNNamedElement, IDatapoolVariable{
>+public interface DPLVariable extends CMNNamedElement, IDatapoolVariable {
> 	/**
> 	 * 
> 	 * 
>@@ -104,6 +105,36 @@
> 	void setRole(DPLRole value);
> 
> 	/**
>+	 * Returns the value of the 'Encrypted' attribute.
>+	 * The default value is <code>"false"</code>.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Encrypted' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * 
>+	 * This boolean specifies whether or not this DPLVariable is encrypted.
>+	 * 
>+	 * @return the value of the 'Encrypted' 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 Encrypted}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Encrypted' attribute.
>+	 * @see #isEncrypted()
>+	 * @generated
>+	 */
>+	void setEncrypted(boolean value);
>+
>+	/**
> 	 * Returns the value of the 'Variables' containment reference list.
> 	 * The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLVariable}.
> 	 * 
>@@ -119,4 +150,5 @@
> 	 */
> 	EList getVariables();
> 
>+	
> } // DPLVariable
>Index: src-test/org/eclipse/hyades/models/common/datapool/impl/Common_DatapoolPackageImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models/src-test/org/eclipse/hyades/models/common/datapool/impl/Common_DatapoolPackageImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 Common_DatapoolPackageImpl.java
>--- src-test/org/eclipse/hyades/models/common/datapool/impl/Common_DatapoolPackageImpl.java	27 Mar 2006 23:53:17 -0000	1.8
>+++ src-test/org/eclipse/hyades/models/common/datapool/impl/Common_DatapoolPackageImpl.java	2 Nov 2007 15:23:50 -0000
>@@ -229,8 +229,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getDPLDatapool_Challenge() {
>+		return (EAttribute)dplDatapoolEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EReference getDPLDatapool_EquivalenceClasses() {
>-		return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(0);
>+		return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -239,7 +248,7 @@
> 	 * @generated
> 	 */
> 	public EReference getDPLDatapool_DatapoolSpec() {
>-		return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(1);
>+		return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -346,8 +355,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getDPLVariable_Encrypted() {
>+		return (EAttribute)dplVariableEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EReference getDPLVariable_Variables() {
>-		return (EReference)dplVariableEClass.getEStructuralFeatures().get(2);
>+		return (EReference)dplVariableEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -404,9 +422,11 @@
> 		dplVariableEClass = createEClass(DPL_VARIABLE);
> 		createEAttribute(dplVariableEClass, DPL_VARIABLE__TYPE);
> 		createEAttribute(dplVariableEClass, DPL_VARIABLE__ROLE);
>+		createEAttribute(dplVariableEClass, DPL_VARIABLE__ENCRYPTED);
> 		createEReference(dplVariableEClass, DPL_VARIABLE__VARIABLES);
> 
> 		dplDatapoolEClass = createEClass(DPL_DATAPOOL);
>+		createEAttribute(dplDatapoolEClass, DPL_DATAPOOL__CHALLENGE);
> 		createEReference(dplDatapoolEClass, DPL_DATAPOOL__EQUIVALENCE_CLASSES);
> 		createEReference(dplDatapoolEClass, DPL_DATAPOOL__DATAPOOL_SPEC);
> 
>@@ -466,9 +486,11 @@
> 		initEClass(dplVariableEClass, DPLVariable.class, "DPLVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
> 		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);
> 		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);
>+		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);
> 		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);
> 
> 		initEClass(dplDatapoolEClass, DPLDatapool.class, "DPLDatapool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+		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);
> 		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);
> 		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);
> 
>Index: src-test/org/eclipse/hyades/models/common/datapool/impl/DPLDatapoolImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models/src-test/org/eclipse/hyades/models/common/datapool/impl/DPLDatapoolImpl.java,v
>retrieving revision 1.10
>diff -u -r1.10 DPLDatapoolImpl.java
>--- src-test/org/eclipse/hyades/models/common/datapool/impl/DPLDatapoolImpl.java	27 Mar 2006 23:53:17 -0000	1.10
>+++ src-test/org/eclipse/hyades/models/common/datapool/impl/DPLDatapoolImpl.java	2 Nov 2007 15:23:50 -0000
>@@ -54,6 +54,7 @@
> * 
> * The following features are implemented:
> * <ul>
>+ * <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLDatapoolImpl#getChallenge Challenge}</li>
> * <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLDatapoolImpl#getEquivalenceClasses Equivalence Classes}</li>
> * <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLDatapoolImpl#getDatapoolSpec Datapool Spec}</li>
> * </ul>
>@@ -72,6 +73,26 @@
> 	public static final String copyright = "";
> 
> 	/**
>+	 * The default value of the '{@link #getChallenge() Challenge}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getChallenge()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CHALLENGE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getChallenge() Challenge}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getChallenge()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String challenge = CHALLENGE_EDEFAULT;
>+
>+	/**
> 	 * The cached value of the '{@link #getEquivalenceClasses() Equivalence Classes}' containment reference list.
> 	 * 
> 	 * 
>@@ -131,6 +152,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getChallenge() {
>+		return challenge;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EList getEquivalenceClasses() {
> 		if (equivalenceClasses == null) {
> 			equivalenceClasses = new EObjectContainmentEList(DPLEquivalenceClass.class, this, Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES);
>@@ -203,6 +245,8 @@
> 	 */
> 	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:
>@@ -218,6 +262,9 @@
> 	 */
> 	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);
>@@ -236,6 +283,9 @@
> 	 */
> 	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;
>@@ -253,6 +303,8 @@
> 	 */
> 	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:
>@@ -261,6 +313,22 @@
> 		return super.eIsSet(featureID);
> 	}
> 
>+	/**
>+	 * 
>+	 * 
>+	 * @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()
> 	 */
>Index: src-test/org/eclipse/hyades/models/common/datapool/impl/DPLVariableImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models/src-test/org/eclipse/hyades/models/common/datapool/impl/DPLVariableImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 DPLVariableImpl.java
>--- src-test/org/eclipse/hyades/models/common/datapool/impl/DPLVariableImpl.java	27 Mar 2006 23:53:17 -0000	1.8
>+++ src-test/org/eclipse/hyades/models/common/datapool/impl/DPLVariableImpl.java	2 Nov 2007 15:23:50 -0000
>@@ -49,6 +49,7 @@
> * <ul>
> * <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#getType Type}</li>
> * <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#getRole Role}</li>
>+ * <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#isEncrypted Encrypted}</li>
> * <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#getVariables Variables}</li>
> * </ul>
> * 
>@@ -106,6 +107,26 @@
> 	protected DPLRole role = ROLE_EDEFAULT;
> 
> 	/**
>+	 * The default value of the '{@link #isEncrypted() Encrypted}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isEncrypted()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean ENCRYPTED_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isEncrypted() Encrypted}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isEncrypted()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean encrypted = ENCRYPTED_EDEFAULT;
>+
>+	/**
> 	 * The cached value of the '{@link #getVariables() Variables}' containment reference list.
> 	 * 
> 	 * 
>@@ -180,6 +201,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public boolean isEncrypted() {
>+		return encrypted;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EList getVariables() {
> 		if (variables == null) {
> 			variables = new EObjectContainmentEList(DPLVariable.class, this, Common_DatapoolPackage.DPL_VARIABLE__VARIABLES);
>@@ -211,6 +253,8 @@
> 				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();
> 		}
>@@ -230,6 +274,9 @@
> 			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);
>@@ -251,6 +298,9 @@
> 			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;
>@@ -268,7 +318,13 @@
> 			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();
> 		}
>@@ -288,10 +344,13 @@
> 		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

Actions: View | Diff

Attachments on bug 202695: 81975 | 87233 | 89835 | 90609 | 90847 | 91486 | 91605 | 92023 | 92024 | 92025 | 92132 | 92353 | 92399 | 92402 | 92550 | 92881 | 92885