Commit 24743d60 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '20-attribute-kdaparticipant-is-missing-in-gsesettings' into 'master'

Resolve "attribute kdaParticipant is missing in GSESettings"

Closes #20

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!18
parents 7ba8af94 2eb56c4b
......@@ -1046,3 +1046,4 @@ _UI_McSecurity_GSESettings_feature = GSE Settings
_UI_McSecurity_SMVSettings_feature = SMV Settings
_UI_McSecurity_signature_feature = Signature
_UI_McSecurity_encryption_feature = Encryption
_UI_GSESettings_kdaParticipant_feature = Kda Participant
......@@ -64,6 +64,7 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
addAppIDPropertyDescriptor(object);
addDataLabelPropertyDescriptor(object);
addKdaParticipantPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -112,6 +113,28 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
null));
}
/**
* This adds a property descriptor for the Kda Participant feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addKdaParticipantPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_GSESettings_kdaParticipant_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_GSESettings_kdaParticipant_feature", "_UI_GSESettings_type"),
SclPackage.eINSTANCE.getGSESettings_KdaParticipant(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
......@@ -183,6 +206,7 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
switch (notification.getFeatureID(GSESettings.class)) {
case SclPackage.GSE_SETTINGS__APP_ID:
case SclPackage.GSE_SETTINGS__DATA_LABEL:
case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
case SclPackage.GSE_SETTINGS__MC_SECURITY:
......
......@@ -1023,6 +1023,8 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="McSecurity" ordered="false"
eType="#//McSecurity" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//McSecurity/GSESettings"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="kdaParticipant" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
unsettable="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GSSE" eSuperTypes="#//ServiceWithMax">
<eStructuralFeatures xsi:type="ecore:EReference" name="Services" ordered="false"
......
......@@ -577,6 +577,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//GSESettings/dataLabel"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//GSESettings/Services"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//GSESettings/McSecurity"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//GSESettings/kdaParticipant"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//GSSE">
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//GSSE/Services"/>
......
......@@ -31,6 +31,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.scl;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getDataLabel <em>Data Label</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getServices <em>Services</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getMcSecurity <em>Mc Security</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getKdaParticipant <em>Kda Participant</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getGSESettings()
......@@ -233,4 +234,57 @@ public interface GSESettings extends ServiceSettings {
*/
boolean isSetMcSecurity();
/**
* Returns the value of the '<em><b>Kda Participant</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Kda Participant</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Kda Participant</em>' attribute.
* @see #isSetKdaParticipant()
* @see #unsetKdaParticipant()
* @see #setKdaParticipant(Boolean)
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getGSESettings_KdaParticipant()
* @model unsettable="true"
* @generated
*/
Boolean getKdaParticipant();
/**
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getKdaParticipant <em>Kda Participant</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Kda Participant</em>' attribute.
* @see #isSetKdaParticipant()
* @see #unsetKdaParticipant()
* @see #getKdaParticipant()
* @generated
*/
void setKdaParticipant(Boolean value);
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getKdaParticipant <em>Kda Participant</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetKdaParticipant()
* @see #getKdaParticipant()
* @see #setKdaParticipant(Boolean)
* @generated
*/
void unsetKdaParticipant();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getKdaParticipant <em>Kda Participant</em>}' attribute is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Kda Participant</em>' attribute is set.
* @see #unsetKdaParticipant()
* @see #getKdaParticipant()
* @see #setKdaParticipant(Boolean)
* @generated
*/
boolean isSetKdaParticipant();
} // GSESettings
......@@ -9785,6 +9785,15 @@ public interface SclPackage extends EPackage {
*/
int GSE_SETTINGS__MC_SECURITY = SERVICE_SETTINGS_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Kda Participant</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GSE_SETTINGS__KDA_PARTICIPANT = SERVICE_SETTINGS_FEATURE_COUNT + 4;
/**
* The number of structural features of the '<em>GSE Settings</em>' class.
* <!-- begin-user-doc -->
......@@ -9792,7 +9801,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int GSE_SETTINGS_FEATURE_COUNT = SERVICE_SETTINGS_FEATURE_COUNT + 4;
int GSE_SETTINGS_FEATURE_COUNT = SERVICE_SETTINGS_FEATURE_COUNT + 5;
/**
* The number of operations of the '<em>GSE Settings</em>' class.
......@@ -22754,6 +22763,17 @@ public interface SclPackage extends EPackage {
*/
EReference getGSESettings_McSecurity();
/**
* Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getKdaParticipant <em>Kda Participant</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Kda Participant</em>'.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getKdaParticipant()
* @see #getGSESettings()
* @generated
*/
EAttribute getGSESettings_KdaParticipant();
/**
* Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSSE <em>GSSE</em>}'.
* <!-- begin-user-doc -->
......
......@@ -43,6 +43,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.Services;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.GSESettingsImpl#getDataLabel <em>Data Label</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.GSESettingsImpl#getServices <em>Services</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.GSESettingsImpl#getMcSecurity <em>Mc Security</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.GSESettingsImpl#getKdaParticipant <em>Kda Participant</em>}</li>
* </ul>
*
* @generated
......@@ -125,6 +126,35 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
*/
protected boolean mcSecurityESet;
/**
* The default value of the '{@link #getKdaParticipant() <em>Kda Participant</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getKdaParticipant()
* @generated
* @ordered
*/
protected static final Boolean KDA_PARTICIPANT_EDEFAULT = null;
/**
* The cached value of the '{@link #getKdaParticipant() <em>Kda Participant</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getKdaParticipant()
* @generated
* @ordered
*/
protected Boolean kdaParticipant = KDA_PARTICIPANT_EDEFAULT;
/**
* This is true if the Kda Participant attribute has been set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
protected boolean kdaParticipantESet;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -372,6 +402,52 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
return mcSecurityESet;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public Boolean getKdaParticipant() {
return kdaParticipant;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public void setKdaParticipant(Boolean newKdaParticipant) {
Boolean oldKdaParticipant = kdaParticipant;
kdaParticipant = newKdaParticipant;
boolean oldKdaParticipantESet = kdaParticipantESet;
kdaParticipantESet = true;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_SETTINGS__KDA_PARTICIPANT, oldKdaParticipant, kdaParticipant, !oldKdaParticipantESet));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public void unsetKdaParticipant() {
Boolean oldKdaParticipant = kdaParticipant;
boolean oldKdaParticipantESet = kdaParticipantESet;
kdaParticipant = KDA_PARTICIPANT_EDEFAULT;
kdaParticipantESet = false;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_SETTINGS__KDA_PARTICIPANT, oldKdaParticipant, KDA_PARTICIPANT_EDEFAULT, oldKdaParticipantESet));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public boolean isSetKdaParticipant() {
return kdaParticipantESet;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -438,6 +514,8 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
return getServices();
case SclPackage.GSE_SETTINGS__MC_SECURITY:
return getMcSecurity();
case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
return getKdaParticipant();
}
return super.eGet(featureID, resolve, coreType);
}
......@@ -462,6 +540,9 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
case SclPackage.GSE_SETTINGS__MC_SECURITY:
setMcSecurity((McSecurity)newValue);
return;
case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
setKdaParticipant((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
}
......@@ -486,6 +567,9 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
case SclPackage.GSE_SETTINGS__MC_SECURITY:
unsetMcSecurity();
return;
case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
unsetKdaParticipant();
return;
}
super.eUnset(featureID);
}
......@@ -506,6 +590,8 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
return getServices() != null;
case SclPackage.GSE_SETTINGS__MC_SECURITY:
return isSetMcSecurity();
case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
return isSetKdaParticipant();
}
return super.eIsSet(featureID);
}
......@@ -524,6 +610,8 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
if (appIDESet) result.append(appID); else result.append("<unset>");
result.append(", dataLabel: ");
if (dataLabelESet) result.append(dataLabel); else result.append("<unset>");
result.append(", kdaParticipant: ");
if (kdaParticipantESet) result.append(kdaParticipant); else result.append("<unset>");
result.append(')');
return result.toString();
}
......
......@@ -5357,6 +5357,15 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
return (EReference)getGSESettings().getEStructuralFeatures().get(3);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EAttribute getGSESettings_KdaParticipant() {
return (EAttribute)getGSESettings().getEStructuralFeatures().get(4);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......
......@@ -1023,6 +1023,8 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="McSecurity" ordered="false"
eType="#//McSecurity" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//McSecurity/GSESettings"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="kdaParticipant" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
unsettable="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GSSE" eSuperTypes="#//ServiceWithMax">
<eStructuralFeatures xsi:type="ecore:EReference" name="Services" ordered="false"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment