Commit 9679b14d authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '36-accept-attribute-segmentation-in-optfields' into 'master'

Resolve "accept attribute segmentation in OptFields"

Closes #36

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!32
parents 721cbf6d 36335ebc
......@@ -1092,3 +1092,5 @@ _UI_AgDATrgOp_dchg_feature = Dchg
_UI_AgDATrgOp_dupd_feature = Dupd
_UI_AgDATrgOp_qchg_feature = Qchg
_UI_AgVirtual_virtual_feature = Virtual
_UI_AgSmvOpts_dataRef_feature = Data Ref
_UI_AgOptFields_segmentation_feature = Segmentation
......@@ -85,6 +85,7 @@ public class AgOptFieldsItemProvider
addReasonCodePropertyDescriptor(object);
addSeqNumPropertyDescriptor(object);
addTimeStampPropertyDescriptor(object);
addSegmentationPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -265,6 +266,28 @@ public class AgOptFieldsItemProvider
null));
}
/**
* This adds a property descriptor for the Segmentation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addSegmentationPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AgOptFields_segmentation_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_segmentation_feature", "_UI_AgOptFields_type"),
SclPackage.eINSTANCE.getAgOptFields_Segmentation(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
......@@ -301,6 +324,7 @@ public class AgOptFieldsItemProvider
case SclPackage.AG_OPT_FIELDS__REASON_CODE:
case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
......
......@@ -84,6 +84,7 @@ public class AgSmvOptsItemProvider
addSecurityPropertyDescriptor(object);
addTimestampPropertyDescriptor(object);
addSynchSourceIdPropertyDescriptor(object);
addDataRefPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -242,6 +243,28 @@ public class AgSmvOptsItemProvider
null));
}
/**
* This adds a property descriptor for the Data Ref feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addDataRefPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AgSmvOpts_dataRef_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataRef_feature", "_UI_AgSmvOpts_type"),
SclPackage.eINSTANCE.getAgSmvOpts_DataRef(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
......@@ -277,6 +300,7 @@ public class AgSmvOptsItemProvider
case SclPackage.AG_SMV_OPTS__SECURITY:
case SclPackage.AG_SMV_OPTS__TIMESTAMP:
case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
case SclPackage.AG_SMV_OPTS__DATA_REF:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
......
......@@ -68,6 +68,7 @@ public class OptFieldsItemProvider
addReasonCodePropertyDescriptor(object);
addSeqNumPropertyDescriptor(object);
addTimeStampPropertyDescriptor(object);
addSegmentationPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -248,6 +249,28 @@ public class OptFieldsItemProvider
null));
}
/**
* This adds a property descriptor for the Segmentation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addSegmentationPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AgOptFields_segmentation_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_segmentation_feature", "_UI_AgOptFields_type"),
SclPackage.eINSTANCE.getAgOptFields_Segmentation(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This returns OptFields.gif.
* <!-- begin-user-doc -->
......@@ -292,6 +315,7 @@ public class OptFieldsItemProvider
case SclPackage.OPT_FIELDS__REASON_CODE:
case SclPackage.OPT_FIELDS__SEQ_NUM:
case SclPackage.OPT_FIELDS__TIME_STAMP:
case SclPackage.OPT_FIELDS__SEGMENTATION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
......
......@@ -67,6 +67,7 @@ public class SmvOptsItemProvider
addSecurityPropertyDescriptor(object);
addTimestampPropertyDescriptor(object);
addSynchSourceIdPropertyDescriptor(object);
addDataRefPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -225,6 +226,28 @@ public class SmvOptsItemProvider
null));
}
/**
* This adds a property descriptor for the Data Ref feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addDataRefPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AgSmvOpts_dataRef_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataRef_feature", "_UI_AgSmvOpts_type"),
SclPackage.eINSTANCE.getAgSmvOpts_DataRef(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This returns SmvOpts.gif.
* <!-- begin-user-doc -->
......@@ -268,6 +291,7 @@ public class SmvOptsItemProvider
case SclPackage.SMV_OPTS__SECURITY:
case SclPackage.SMV_OPTS__TIMESTAMP:
case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
case SclPackage.SMV_OPTS__DATA_REF:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
......
......@@ -2231,6 +2231,8 @@
unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="synchSourceId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="dataRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
unsettable="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AgOptFields" abstract="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="bufOvfl" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
......@@ -2249,6 +2251,8 @@
unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="timeStamp" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="segmentation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
unsettable="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AgDesc" abstract="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="desc" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
......
......@@ -1088,6 +1088,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgSmvOpts/security"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgSmvOpts/timestamp"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgSmvOpts/synchSourceId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgSmvOpts/dataRef"/>
</genClasses>
<genClasses image="false" ecoreClass="SCL.ecore#//AgOptFields">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgOptFields/bufOvfl"/>
......@@ -1098,6 +1099,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgOptFields/reasonCode"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgOptFields/seqNum"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgOptFields/timeStamp"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgOptFields/segmentation"/>
</genClasses>
<genClasses image="false" ecoreClass="SCL.ecore#//AgDesc">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AgDesc/desc"/>
......
......@@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getReasonCode <em>Reason Code</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getSeqNum <em>Seq Num</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getTimeStamp <em>Time Stamp</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getSegmentation <em>Segmentation</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAgOptFields()
......@@ -437,4 +438,53 @@ public interface AgOptFields extends EObject {
*/
boolean isSetTimeStamp();
/**
* Returns the value of the '<em><b>Segmentation</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Segmentation</em>' attribute.
* @see #isSetSegmentation()
* @see #unsetSegmentation()
* @see #setSegmentation(Boolean)
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAgOptFields_Segmentation()
* @model unsettable="true"
* @generated
*/
Boolean getSegmentation();
/**
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getSegmentation <em>Segmentation</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Segmentation</em>' attribute.
* @see #isSetSegmentation()
* @see #unsetSegmentation()
* @see #getSegmentation()
* @generated
*/
void setSegmentation(Boolean value);
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getSegmentation <em>Segmentation</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetSegmentation()
* @see #getSegmentation()
* @see #setSegmentation(Boolean)
* @generated
*/
void unsetSegmentation();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getSegmentation <em>Segmentation</em>}' attribute is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Segmentation</em>' attribute is set.
* @see #unsetSegmentation()
* @see #getSegmentation()
* @see #setSegmentation(Boolean)
* @generated
*/
boolean isSetSegmentation();
} // AgOptFields
......@@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getSecurity <em>Security</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getTimestamp <em>Timestamp</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getSynchSourceId <em>Synch Source Id</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getDataRef <em>Data Ref</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAgSmvOpts()
......@@ -387,4 +388,53 @@ public interface AgSmvOpts extends EObject {
*/
boolean isSetSynchSourceId();
/**
* Returns the value of the '<em><b>Data Ref</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Data Ref</em>' attribute.
* @see #isSetDataRef()
* @see #unsetDataRef()
* @see #setDataRef(Boolean)
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAgSmvOpts_DataRef()
* @model unsettable="true"
* @generated
*/
Boolean getDataRef();
/**
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getDataRef <em>Data Ref</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Data Ref</em>' attribute.
* @see #isSetDataRef()
* @see #unsetDataRef()
* @see #getDataRef()
* @generated
*/
void setDataRef(Boolean value);
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getDataRef <em>Data Ref</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetDataRef()
* @see #getDataRef()
* @see #setDataRef(Boolean)
* @generated
*/
void unsetDataRef();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getDataRef <em>Data Ref</em>}' attribute is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Data Ref</em>' attribute is set.
* @see #unsetDataRef()
* @see #getDataRef()
* @see #setDataRef(Boolean)
* @generated
*/
boolean isSetDataRef();
} // AgSmvOpts
......@@ -11703,6 +11703,15 @@ public interface SclPackage extends EPackage {
*/
int OPT_FIELDS__TIME_STAMP = SCL_OBJECT_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Segmentation</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int OPT_FIELDS__SEGMENTATION = SCL_OBJECT_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>Report Control</b></em>' container reference.
* <!-- begin-user-doc -->
......@@ -11710,7 +11719,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int OPT_FIELDS__REPORT_CONTROL = SCL_OBJECT_FEATURE_COUNT + 8;
int OPT_FIELDS__REPORT_CONTROL = SCL_OBJECT_FEATURE_COUNT + 9;
/**
* The number of structural features of the '<em>Opt Fields</em>' class.
......@@ -11719,7 +11728,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int OPT_FIELDS_FEATURE_COUNT = SCL_OBJECT_FEATURE_COUNT + 9;
int OPT_FIELDS_FEATURE_COUNT = SCL_OBJECT_FEATURE_COUNT + 10;
/**
* The number of operations of the '<em>Opt Fields</em>' class.
......@@ -13890,6 +13899,15 @@ public interface SclPackage extends EPackage {
*/
int SMV_OPTS__SYNCH_SOURCE_ID = SCL_OBJECT_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Data Ref</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int SMV_OPTS__DATA_REF = SCL_OBJECT_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Sampled Value Control</b></em>' container reference.
* <!-- begin-user-doc -->
......@@ -13897,7 +13915,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int SMV_OPTS__SAMPLED_VALUE_CONTROL = SCL_OBJECT_FEATURE_COUNT + 7;
int SMV_OPTS__SAMPLED_VALUE_CONTROL = SCL_OBJECT_FEATURE_COUNT + 8;
/**
* The number of structural features of the '<em>Smv Opts</em>' class.
......@@ -13906,7 +13924,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int SMV_OPTS_FEATURE_COUNT = SCL_OBJECT_FEATURE_COUNT + 8;
int SMV_OPTS_FEATURE_COUNT = SCL_OBJECT_FEATURE_COUNT + 9;
/**
* The number of operations of the '<em>Smv Opts</em>' class.
......@@ -18175,6 +18193,15 @@ public interface SclPackage extends EPackage {
*/
int AG_SMV_OPTS__SYNCH_SOURCE_ID = 6;
/**
* The feature id for the '<em><b>Data Ref</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int AG_SMV_OPTS__DATA_REF = 7;
/**
* The number of structural features of the '<em>Ag Smv Opts</em>' class.
* <!-- begin-user-doc -->
......@@ -18182,7 +18209,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int AG_SMV_OPTS_FEATURE_COUNT = 7;
int AG_SMV_OPTS_FEATURE_COUNT = 8;
/**
* The number of operations of the '<em>Ag Smv Opts</em>' class.
......@@ -18275,6 +18302,15 @@ public interface SclPackage extends EPackage {
*/
int AG_OPT_FIELDS__TIME_STAMP = 7;
/**
* The feature id for the '<em><b>Segmentation</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int AG_OPT_FIELDS__SEGMENTATION = 8;
/**
* The number of structural features of the '<em>Ag Opt Fields</em>' class.
* <!-- begin-user-doc -->
......@@ -18282,7 +18318,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int AG_OPT_FIELDS_FEATURE_COUNT = 8;
int AG_OPT_FIELDS_FEATURE_COUNT = 9;
/**
* The number of operations of the '<em>Ag Opt Fields</em>' class.
......@@ -21063,6 +21099,17 @@ public interface SclPackage extends EPackage {
*/
EAttribute getAgSmvOpts_SynchSourceId();
/**
* Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getDataRef <em>Data Ref</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Data Ref</em>'.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getDataRef()
* @see #getAgSmvOpts()
* @generated
*/
EAttribute getAgSmvOpts_DataRef();
/**
* Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields <em>Ag Opt Fields</em>}'.
* <!-- begin-user-doc -->
......@@ -21161,6 +21208,17 @@ public interface SclPackage extends EPackage {
*/
EAttribute getAgOptFields_TimeStamp();
/**
* Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getSegmentation <em>Segmentation</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Segmentation</em>'.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getSegmentation()
* @see #getAgOptFields()
* @generated
*/
EAttribute getAgOptFields_Segmentation();
/**
* Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDesc <em>Ag Desc</em>}'.
* <!-- begin-user-doc -->
......
......@@ -45,6 +45,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.AgOptFieldsImpl#getReasonCode <em>Reason Code</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.AgOptFieldsImpl#getSeqNum <em>Seq Num</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.AgOptFieldsImpl#getTimeStamp <em>Time Stamp</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.AgOptFieldsImpl#getSegmentation <em>Segmentation</em>}</li>
* </ul>
*
* @generated
......@@ -282,6 +283,35 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
*/
protected boolean timeStampESet;
/**
* The default value of the '{@link #getSegmentation() <em>Segmentation</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getSegmentation()
* @generated
* @ordered
*/
protected static final Boolean SEGMENTATION_EDEFAULT = null;
/**
* The cached value of the '{@link #getSegmentation() <em>Segmentation</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getSegmentation()
* @generated
* @ordered
*/
protected Boolean segmentation = SEGMENTATION_EDEFAULT;
/**
* This is true if the Segmentation attribute has been set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
protected boolean segmentationESet;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -701,6 +731,56 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
return timeStampESet;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Boolean getSegmentation() {
return segmentation;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void setSegmentation(Boolean newSegmentation) {
Boolean oldSegmentation = segmentation;
segmentation = newSegmentation;
boolean oldSegmentationESet = segmentationESet;
segmentationESet = true;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__SEGMENTATION, oldSegmentation, segmentation, !oldSegmentationESet));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void unsetSegmentation() {
Boolean oldSegmentation = segmentation;
boolean oldSegmentationESet = segmentationESet;
segmentation = SEGMENTATION_EDEFAULT;
segmentationESet = false;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__SEGMENTATION, oldSegmentation, SEGMENTATION_EDEFAULT, oldSegmentationESet));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public boolean isSetSegmentation() {
return segmentationESet;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -725,6 +805,8 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
return getSeqNum();
case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
return getTimeStamp();
case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
return getSegmentation();
}
return super.eGet(featureID, resolve, coreType);
}
......@@ -761,6 +843,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
setTimeStamp((Boolean)newValue);
return;
case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
setSegmentation((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
}
......@@ -797,6 +882,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
unsetTimeStamp();
return;
case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
unsetSegmentation();
return;
}
super.eUnset(featureID);
}
......@@ -825,6 +913,8 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
return isSetSeqNum();
case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
return isSetTimeStamp();
case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
return isSetSegmentation();
}
return super.eIsSet(featureID);
}
......@@ -855,6 +945,8 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
if (seqNumESet) result.append(seqNum); else result.append("<unset>");
result.append(", timeStamp: ");
if (timeStampESet) result.append(timeStamp); else result.append("<unset>");
result.append(", segmentation: ");
if (segmentationESet) result.append(segmentation); else result.append("<unset>");
result.append(')');
return result.toString();
}
......
......@@ -44,6 +44,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.AgSmvOptsImpl#getSecurity <em>Security</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.AgSmvOptsImpl#getTimestamp <em>Timestamp</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.AgSmvOptsImpl#getSynchSourceId <em>Synch Source Id</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.AgSmvOptsImpl#getDataRef <em>Data Ref</em>}</li>
* </ul>
*
* @generated
......@@ -252,6 +253,35 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
*/
protected boolean synchSourceIdESet;
/**
* The default value of the '{@link #getDataRef() <em>Data Ref</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getDataRef()
* @generated
* @ordered