[#704] mark JvmMember.identifier non derived + settable

Signed-off-by: Christian Dietrich <[email protected]>
eclipse · Aug 9, 2021 · 4cecbe3 · 4cecbe3
1 parent d234bd9
commit 4cecbe3
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/org.eclipse.xtext.common.types/emf-gen/org/eclipse/xtext/common/types/JvmMember.java b/org.eclipse.xtext.common.types/emf-gen/org/eclipse/xtext/common/types/JvmMember.java
@@ -107,12 +107,23 @@ public interface JvmMember extends JvmAnnotationTarget
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
+	 * @see #setIdentifier(String)
 	 * @see org.eclipse.xtext.common.types.TypesPackage#getJvmMember_Identifier()
-	 * @model transient="true" changeable="false" derived="true"
+	 * @model transient="true"
 	 * @generated
 	 */
 	String getIdentifier();
 
+	/**
+	 * Sets the value of the '{@link org.eclipse.xtext.common.types.JvmMember#getIdentifier <em>Identifier</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Identifier</em>' attribute.
+	 * @see #getIdentifier()
+	 * @generated
+	 */
+	void setIdentifier(String value);
+
 	/**
 	 * Returns the value of the '<em><b>Deprecated</b></em>' attribute.
 	 * <!-- begin-user-doc -->

diff --git a/...eclipse.xtext.common.types/emf-gen/org/eclipse/xtext/common/types/impl/JvmMemberImpl.java b/...eclipse.xtext.common.types/emf-gen/org/eclipse/xtext/common/types/impl/JvmMemberImpl.java
@@ -260,6 +260,20 @@ public String getIdentifier()
 		return identifier;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIdentifier(String newIdentifier)
+	{
+		String oldIdentifier = identifier;
+		identifier = newIdentifier;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TypesPackage.JVM_MEMBER__IDENTIFIER, oldIdentifier, identifier));
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -420,6 +434,9 @@ public void eSet(int featureID, Object newValue)
 			case TypesPackage.JVM_MEMBER__SIMPLE_NAME:
 				setSimpleName((String)newValue);
 				return;
+			case TypesPackage.JVM_MEMBER__IDENTIFIER:
+				setIdentifier((String)newValue);
+				return;
 			case TypesPackage.JVM_MEMBER__DEPRECATED:
 				setDeprecated((Boolean)newValue);
 				return;
@@ -446,6 +463,9 @@ public void eUnset(int featureID)
 			case TypesPackage.JVM_MEMBER__SIMPLE_NAME:
 				setSimpleName(SIMPLE_NAME_EDEFAULT);
 				return;
+			case TypesPackage.JVM_MEMBER__IDENTIFIER:
+				setIdentifier(IDENTIFIER_EDEFAULT);
+				return;
 			case TypesPackage.JVM_MEMBER__DEPRECATED:
 				unsetDeprecated();
 				return;

diff --git a/...ipse.xtext.common.types/emf-gen/org/eclipse/xtext/common/types/impl/TypesPackageImpl.java b/...ipse.xtext.common.types/emf-gen/org/eclipse/xtext/common/types/impl/TypesPackageImpl.java
@@ -2453,7 +2453,7 @@ public void initializePackageContents()
 		initEReference(getJvmMember_DeclaringType(), this.getJvmDeclaredType(), this.getJvmDeclaredType_Members(), "declaringType", null, 0, 1, JvmMember.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getJvmMember_Visibility(), this.getJvmVisibility(), "visibility", null, 0, 1, JvmMember.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getJvmMember_SimpleName(), ecorePackage.getEString(), "simpleName", null, 0, 1, JvmMember.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJvmMember_Identifier(), ecorePackage.getEString(), "identifier", null, 0, 1, JvmMember.class, IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEAttribute(getJvmMember_Identifier(), ecorePackage.getEString(), "identifier", null, 0, 1, JvmMember.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getJvmMember_Deprecated(), ecorePackage.getEBoolean(), "deprecated", null, 0, 1, JvmMember.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		op = addEOperation(jvmMemberEClass, null, "internalSetIdentifier", 0, 1, IS_UNIQUE, IS_ORDERED);

diff --git a/org.eclipse.xtext.common.types/model/JavaVMTypes.ecore b/org.eclipse.xtext.common.types/model/JavaVMTypes.ecore
@@ -211,7 +211,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" eType="#//JvmVisibility"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="simpleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        changeable="false" transient="true" derived="true"/>
+        transient="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="deprecated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         unsettable="true"/>
   </eClassifiers>