Commit 8cfe4d93 authored by Dominique Marcadet's avatar Dominique Marcadet

smpRate and samplesPerSec attributes recognized

SMVSettings has one attribute smpRate and one sub-element SmpRate. The
first is handled by EMF as an attribute smpRateAttribute with metadata
giving its true name (smpRate). However, if the kind=attribute metadata
is not present, the name metadata is not taken into acccount. And if the
name, kind and namespace metadata are given, it does not work either !
parent fd790d1a
...@@ -1370,13 +1370,15 @@ ...@@ -1370,13 +1370,15 @@
eType="#//ServiceSettingsEnum" defaultValueLiteral="Fix" unsettable="true"> eType="#//ServiceSettingsEnum" defaultValueLiteral="Fix" unsettable="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="smpRate"/> <details key="name" value="smpRate"/>
<details key="kind" value="attribute"/>
</eAnnotations> </eAnnotations>
</eStructuralFeatures> </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="samplesPerSecAttribute" <eStructuralFeatures xsi:type="ecore:EAttribute" name="samplesPerSecAttribute"
ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="false" unsettable="true"> defaultValueLiteral="false" unsettable="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="SamplesPerSec"/> <details key="name" value="samplesPerSec"/>
<details key="kind" value="attribute"/>
</eAnnotations> </eAnnotations>
</eStructuralFeatures> </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="pdcTimeStamp" ordered="false" <eStructuralFeatures xsi:type="ecore:EAttribute" name="pdcTimeStamp" ordered="false"
......
...@@ -181,7 +181,7 @@ public interface SMVSettings extends ServiceSettings { ...@@ -181,7 +181,7 @@ public interface SMVSettings extends ServiceSettings {
* @see #setSmpRateAttribute(ServiceSettingsEnum) * @see #setSmpRateAttribute(ServiceSettingsEnum)
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getSMVSettings_SmpRateAttribute() * @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getSMVSettings_SmpRateAttribute()
* @model default="Fix" unsettable="true" ordered="false" * @model default="Fix" unsettable="true" ordered="false"
* extendedMetaData="name='smpRate'" * extendedMetaData="name='smpRate' kind='attribute'"
* @generated * @generated
*/ */
ServiceSettingsEnum getSmpRateAttribute(); ServiceSettingsEnum getSmpRateAttribute();
...@@ -237,7 +237,7 @@ public interface SMVSettings extends ServiceSettings { ...@@ -237,7 +237,7 @@ public interface SMVSettings extends ServiceSettings {
* @see #setSamplesPerSecAttribute(boolean) * @see #setSamplesPerSecAttribute(boolean)
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getSMVSettings_SamplesPerSecAttribute() * @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getSMVSettings_SamplesPerSecAttribute()
* @model default="false" unsettable="true" ordered="false" * @model default="false" unsettable="true" ordered="false"
* extendedMetaData="name='SamplesPerSec'" * extendedMetaData="name='samplesPerSec' kind='attribute'"
* @generated * @generated
*/ */
boolean isSamplesPerSecAttribute(); boolean isSamplesPerSecAttribute();
......
...@@ -1370,13 +1370,15 @@ ...@@ -1370,13 +1370,15 @@
eType="#//ServiceSettingsEnum" defaultValueLiteral="Fix" unsettable="true"> eType="#//ServiceSettingsEnum" defaultValueLiteral="Fix" unsettable="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="smpRate"/> <details key="name" value="smpRate"/>
<details key="kind" value="attribute"/>
</eAnnotations> </eAnnotations>
</eStructuralFeatures> </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="samplesPerSecAttribute" <eStructuralFeatures xsi:type="ecore:EAttribute" name="samplesPerSecAttribute"
ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="false" unsettable="true"> defaultValueLiteral="false" unsettable="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="SamplesPerSec"/> <details key="name" value="samplesPerSec"/>
<details key="kind" value="attribute"/>
</eAnnotations> </eAnnotations>
</eStructuralFeatures> </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="pdcTimeStamp" ordered="false" <eStructuralFeatures xsi:type="ecore:EAttribute" name="pdcTimeStamp" 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