Commit b0a27258 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '23-load-appns-and-snsd-files' into 'master'

Resolve "load .AppNS and .snsd files"

Closes #23

See merge request !22
parents 51577a33 cf4efceb
Pipeline #7673 passed with stages
in 29 seconds
......@@ -583,3 +583,6 @@ _UI_Enumeration_referredByAttributeType_feature = Referred By Attribute Type
_UI_AgAttributeType_refersToBasicType_feature = Refers To Basic Type
_UI_AgAttributeType_refersToConstructedAttribute_feature = Refers To Constructed Attribute
_UI_AgAttributeType_refersToEnumeration_feature = Refers To Enumeration
_UI_Doc_referredByTitledClass_feature = Referred By Titled Class
_UI_DocumentedClass_refersToDescDoc_feature = Refers To Desc Doc
_UI_TitledClass_refersToTitleDoc_feature = Refers To Title Doc
......@@ -78,6 +78,7 @@ public class DocItemProvider extends NsdObjectItemProvider {
addReferredByDocumentedClassPropertyDescriptor( object );
addReferredByFunctionalConstraintPropertyDescriptor( object );
addReferredByAgPresenceConditionDerivedStatisticsPropertyDescriptor( object );
addReferredByTitledClassPropertyDescriptor( object );
}
return itemPropertyDescriptors;
}
......@@ -279,6 +280,28 @@ public class DocItemProvider extends NsdObjectItemProvider {
null ) );
}
/**
* This adds a property descriptor for the Referred By Titled Class feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByTitledClassPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_Doc_referredByTitledClass_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_Doc_referredByTitledClass_feature",
"_UI_Doc_type" ),
NsdPackage.Literals.DOC__REFERRED_BY_TITLED_CLASS,
true,
false,
true,
null,
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
......
......@@ -63,7 +63,7 @@ public class DocumentedClassItemProvider extends NsdObjectItemProvider {
addDeprecatedPropertyDescriptor( object );
addDescIDPropertyDescriptor( object );
addInformativePropertyDescriptor( object );
addRefersToDocPropertyDescriptor( object );
addRefersToDescDocPropertyDescriptor( object );
}
return itemPropertyDescriptors;
}
......@@ -135,19 +135,19 @@ public class DocumentedClassItemProvider extends NsdObjectItemProvider {
}
/**
* This adds a property descriptor for the Refers To Doc feature.
* This adds a property descriptor for the Refers To Desc Doc feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToDocPropertyDescriptor( Object object ) {
protected void addRefersToDescDocPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_DocumentedClass_refersToDoc_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_DocumentedClass_refersToDoc_feature",
getString( "_UI_DocumentedClass_refersToDescDoc_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_DocumentedClass_refersToDescDoc_feature",
"_UI_DocumentedClass_type" ),
NsdPackage.Literals.DOCUMENTED_CLASS__REFERS_TO_DOC,
NsdPackage.Literals.DOCUMENTED_CLASS__REFERS_TO_DESC_DOC,
true,
false,
true,
......
......@@ -595,29 +595,6 @@ public class NsdItemProviderAdapterFactory extends NsdAdapterFactory
return docItemProvider;
}
/**
* This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected DocumentedClassItemProvider documentedClassItemProvider;
/**
* This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Adapter createDocumentedClassAdapter() {
if( documentedClassItemProvider == null ) {
documentedClassItemProvider = new DocumentedClassItemProvider( this );
}
return documentedClassItemProvider;
}
/**
* This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration} instances.
* <!-- begin-user-doc -->
......@@ -1170,29 +1147,6 @@ public class NsdItemProviderAdapterFactory extends NsdAdapterFactory
return subDataObjectItemProvider;
}
/**
* This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected TitledClassItemProvider titledClassItemProvider;
/**
* This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Adapter createTitledClassAdapter() {
if( titledClassItemProvider == null ) {
titledClassItemProvider = new TitledClassItemProvider( this );
}
return titledClassItemProvider;
}
/**
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
......@@ -1320,7 +1274,6 @@ public class NsdItemProviderAdapterFactory extends NsdAdapterFactory
if( dataObjectItemProvider != null ) dataObjectItemProvider.dispose();
if( dataSetMemberOfItemProvider != null ) dataSetMemberOfItemProvider.dispose();
if( docItemProvider != null ) docItemProvider.dispose();
if( documentedClassItemProvider != null ) documentedClassItemProvider.dispose();
if( enumerationItemProvider != null ) enumerationItemProvider.dispose();
if( enumerationsItemProvider != null ) enumerationsItemProvider.dispose();
if( functionalConstraintItemProvider != null ) functionalConstraintItemProvider.dispose();
......@@ -1345,7 +1298,6 @@ public class NsdItemProviderAdapterFactory extends NsdAdapterFactory
if( serviceTypeRealizationsItemProvider != null ) serviceTypeRealizationsItemProvider.dispose();
if( subDataAttributeItemProvider != null ) subDataAttributeItemProvider.dispose();
if( subDataObjectItemProvider != null ) subDataObjectItemProvider.dispose();
if( titledClassItemProvider != null ) titledClassItemProvider.dispose();
}
}
......@@ -62,6 +62,7 @@ public class TitledClassItemProvider extends DocumentedClassItemProvider {
super.getPropertyDescriptors( object );
addTitleIDPropertyDescriptor( object );
addRefersToTitleDocPropertyDescriptor( object );
}
return itemPropertyDescriptors;
}
......@@ -88,6 +89,28 @@ public class TitledClassItemProvider extends DocumentedClassItemProvider {
null ) );
}
/**
* This adds a property descriptor for the Refers To Title Doc feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToTitleDocPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_TitledClass_refersToTitleDoc_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_TitledClass_refersToTitleDoc_feature",
"_UI_TitledClass_type" ),
NsdPackage.Literals.TITLED_CLASS__REFERS_TO_TITLE_DOC,
true,
false,
true,
null,
null,
null ) );
}
/**
* This returns TitledClass.gif.
* <!-- begin-user-doc -->
......
......@@ -919,15 +919,18 @@
eOpposite="#//BasicType/refersToDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByDocumentedClass"
ordered="false" upperBound="-1" eType="#//DocumentedClass" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//DocumentedClass/refersToDoc"/>
unsettable="true" resolveProxies="false" eOpposite="#//DocumentedClass/refersToDescDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByFunctionalConstraint"
ordered="false" upperBound="-1" eType="#//FunctionalConstraint" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//FunctionalConstraint/refersToDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByAgPresenceConditionDerivedStatistics"
ordered="false" upperBound="-1" eType="#//AgPresenceConditionDerivedStatistics"
transient="true" unsettable="true" resolveProxies="false" eOpposite="#//AgPresenceConditionDerivedStatistics/refersToDsPresCondArgsDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByTitledClass"
ordered="false" upperBound="-1" eType="#//TitledClass" transient="true" unsettable="true"
resolveProxies="false" eOpposite="#//TitledClass/refersToTitleDoc"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DocumentedClass" eSuperTypes="#//NsdObject">
<eClassifiers xsi:type="ecore:EClass" name="DocumentedClass" abstract="true" eSuperTypes="#//NsdObject">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="tDocumentedClass"/>
<details key="kind" value="empty"/>
......@@ -953,7 +956,7 @@
<details key="name" value="informative"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="refersToDoc" ordered="false"
<eStructuralFeatures xsi:type="ecore:EReference" name="refersToDescDoc" ordered="false"
eType="#//Doc" transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Doc/referredByDocumentedClass"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Enumeration" eSuperTypes="#//TitledClass">
......@@ -1268,30 +1271,6 @@
<details key="name" value="tNS"/>
<details key="kind" value="elementOnly"/>
</eAnnotations>
<eOperations name="findCDC" eType="#//CDC">
<eParameters name="cDCName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eParameters name="console" eType="#//IRiseClipseConsole"/>
</eOperations>
<eOperations name="findPresenceCondition" eType="#//PresenceCondition">
<eParameters name="presenceConditionName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eParameters name="console" eType="#//IRiseClipseConsole"/>
</eOperations>
<eOperations name="findFunctionalConstraint" eType="#//FunctionalConstraint">
<eParameters name="functionalConstraintAbbreviation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eParameters name="console" eType="#//IRiseClipseConsole"/>
</eOperations>
<eOperations name="findEnumeration" eType="#//Enumeration">
<eParameters name="enumerationName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eParameters name="console" eType="#//IRiseClipseConsole"/>
</eOperations>
<eOperations name="findBasicType" eType="#//BasicType">
<eParameters name="basicTypeName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eParameters name="console" eType="#//IRiseClipseConsole"/>
</eOperations>
<eOperations name="findConstructedAttribute" eType="#//ConstructedAttribute">
<eParameters name="constructedAttributeName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eParameters name="console" eType="#//IRiseClipseConsole"/>
</eOperations>
<eStructuralFeatures xsi:type="ecore:EReference" name="changes" ordered="false"
eType="#//Changes" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//Changes/parentNS">
......@@ -1867,7 +1846,7 @@
ordered="false" eType="#//DataAttribute" transient="true" unsettable="true"
resolveProxies="false" eOpposite="#//DataAttribute/referredBySubDataObjectAsMaxIndexAttribute"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TitledClass" eSuperTypes="#//DocumentedClass">
<eClassifiers xsi:type="ecore:EClass" name="TitledClass" abstract="true" eSuperTypes="#//DocumentedClass">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="tTitledClass"/>
<details key="kind" value="empty"/>
......@@ -1885,6 +1864,8 @@
<details key="name" value="titleID"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="refersToTitleDoc" ordered="false"
eType="#//Doc" transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Doc/referredByTitledClass"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="UndefinedAttributeTypeKind">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
......
......@@ -257,12 +257,13 @@
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByDocumentedClass"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByFunctionalConstraint"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByAgPresenceConditionDerivedStatistics"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByTitledClass"/>
</genClasses>
<genClasses ecoreClass="nsd.ecore#//DocumentedClass">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DocumentedClass/deprecated"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DocumentedClass/descID"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DocumentedClass/informative"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//DocumentedClass/refersToDoc"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//DocumentedClass/refersToDescDoc"/>
</genClasses>
<genClasses ecoreClass="nsd.ecore#//Enumeration">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//Enumeration/literal"/>
......@@ -329,30 +330,6 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/cDCs"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/lNClasses"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//NS/referredByDependsOn"/>
<genOperations ecoreOperation="nsd.ecore#//NS/findCDC">
<genParameters ecoreParameter="nsd.ecore#//NS/findCDC/cDCName"/>
<genParameters ecoreParameter="nsd.ecore#//NS/findCDC/console"/>
</genOperations>
<genOperations ecoreOperation="nsd.ecore#//NS/findPresenceCondition">
<genParameters ecoreParameter="nsd.ecore#//NS/findPresenceCondition/presenceConditionName"/>
<genParameters ecoreParameter="nsd.ecore#//NS/findPresenceCondition/console"/>
</genOperations>
<genOperations ecoreOperation="nsd.ecore#//NS/findFunctionalConstraint">
<genParameters ecoreParameter="nsd.ecore#//NS/findFunctionalConstraint/functionalConstraintAbbreviation"/>
<genParameters ecoreParameter="nsd.ecore#//NS/findFunctionalConstraint/console"/>
</genOperations>
<genOperations ecoreOperation="nsd.ecore#//NS/findEnumeration">
<genParameters ecoreParameter="nsd.ecore#//NS/findEnumeration/enumerationName"/>
<genParameters ecoreParameter="nsd.ecore#//NS/findEnumeration/console"/>
</genOperations>
<genOperations ecoreOperation="nsd.ecore#//NS/findBasicType">
<genParameters ecoreParameter="nsd.ecore#//NS/findBasicType/basicTypeName"/>
<genParameters ecoreParameter="nsd.ecore#//NS/findBasicType/console"/>
</genOperations>
<genOperations ecoreOperation="nsd.ecore#//NS/findConstructedAttribute">
<genParameters ecoreParameter="nsd.ecore#//NS/findConstructedAttribute/constructedAttributeName"/>
<genParameters ecoreParameter="nsd.ecore#//NS/findConstructedAttribute/console"/>
</genOperations>
</genClasses>
<genClasses ecoreClass="nsd.ecore#//NSDoc">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//NSDoc/doc"/>
......@@ -436,6 +413,7 @@
</genClasses>
<genClasses ecoreClass="nsd.ecore#//TitledClass">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//TitledClass/titleID"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//TitledClass/refersToTitleDoc"/>
</genClasses>
<genClasses image="false" ecoreClass="nsd.ecore#//NsdObject">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//NsdObject/lineNumber"/>
......
......@@ -105,6 +105,7 @@ public interface AbstractLNClass extends AnyLNClass {
* @model opposite="abstractLNClass" resolveProxies="false" unsettable="true" ordered="false"
* @generated
*/
@Override
LNClasses getParentLNClasses();
/**
......
......@@ -44,6 +44,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByDocumentedClass <em>Referred By Documented Class</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByFunctionalConstraint <em>Referred By Functional Constraint</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByAgPresenceConditionDerivedStatistics <em>Referred By Ag Presence Condition Derived Statistics</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByTitledClass <em>Referred By Titled Class</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDoc()
......@@ -366,15 +367,15 @@ public interface Doc extends NsdObject {
/**
* Returns the value of the '<em><b>Referred By Documented Class</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDoc <em>Refers To Doc</em>}'.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDescDoc <em>Refers To Desc Doc</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Referred By Documented Class</em>' reference list.
* @see #isSetReferredByDocumentedClass()
* @see #unsetReferredByDocumentedClass()
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDoc_ReferredByDocumentedClass()
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDoc
* @model opposite="refersToDoc" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDescDoc
* @model opposite="refersToDescDoc" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
EList< DocumentedClass > getReferredByDocumentedClass();
......@@ -474,4 +475,41 @@ public interface Doc extends NsdObject {
*/
boolean isSetReferredByAgPresenceConditionDerivedStatistics();
/**
* Returns the value of the '<em><b>Referred By Titled Class</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass#getRefersToTitleDoc <em>Refers To Title Doc</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Referred By Titled Class</em>' reference list.
* @see #isSetReferredByTitledClass()
* @see #unsetReferredByTitledClass()
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDoc_ReferredByTitledClass()
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass#getRefersToTitleDoc
* @model opposite="refersToTitleDoc" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
EList< TitledClass > getReferredByTitledClass();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByTitledClass <em>Referred By Titled Class</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetReferredByTitledClass()
* @see #getReferredByTitledClass()
* @generated
*/
void unsetReferredByTitledClass();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByTitledClass <em>Referred By Titled Class</em>}' reference list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Referred By Titled Class</em>' reference list is set.
* @see #unsetReferredByTitledClass()
* @see #getReferredByTitledClass()
* @generated
*/
boolean isSetReferredByTitledClass();
} // Doc
......@@ -31,11 +31,12 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isDeprecated <em>Deprecated</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getDescID <em>Desc ID</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#isInformative <em>Informative</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDoc <em>Refers To Doc</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDescDoc <em>Refers To Desc Doc</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentedClass()
* @model extendedMetaData="name='tDocumentedClass' kind='empty'"
* @model abstract="true"
* extendedMetaData="name='tDocumentedClass' kind='empty'"
* @generated
*/
public interface DocumentedClass extends NsdObject {
......@@ -192,54 +193,54 @@ public interface DocumentedClass extends NsdObject {
boolean isSetInformative();
/**
* Returns the value of the '<em><b>Refers To Doc</b></em>' reference.
* Returns the value of the '<em><b>Refers To Desc Doc</b></em>' reference.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByDocumentedClass <em>Referred By Documented Class</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Refers To Doc</em>' reference.
* @see #isSetRefersToDoc()
* @see #unsetRefersToDoc()
* @see #setRefersToDoc(Doc)
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentedClass_RefersToDoc()
* @return the value of the '<em>Refers To Desc Doc</em>' reference.
* @see #isSetRefersToDescDoc()
* @see #unsetRefersToDescDoc()
* @see #setRefersToDescDoc(Doc)
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getDocumentedClass_RefersToDescDoc()
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByDocumentedClass
* @model opposite="referredByDocumentedClass" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
Doc getRefersToDoc();
Doc getRefersToDescDoc();
/**
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDoc <em>Refers To Doc</em>}' reference.
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDescDoc <em>Refers To Desc Doc</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Refers To Doc</em>' reference.
* @see #isSetRefersToDoc()
* @see #unsetRefersToDoc()
* @see #getRefersToDoc()
* @param value the new value of the '<em>Refers To Desc Doc</em>' reference.
* @see #isSetRefersToDescDoc()
* @see #unsetRefersToDescDoc()
* @see #getRefersToDescDoc()
* @generated
*/
void setRefersToDoc( Doc value );
void setRefersToDescDoc( Doc value );
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDoc <em>Refers To Doc</em>}' reference.
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDescDoc <em>Refers To Desc Doc</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetRefersToDoc()
* @see #getRefersToDoc()
* @see #setRefersToDoc(Doc)
* @see #isSetRefersToDescDoc()
* @see #getRefersToDescDoc()
* @see #setRefersToDescDoc(Doc)
* @generated
*/
void unsetRefersToDoc();
void unsetRefersToDescDoc();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDoc <em>Refers To Doc</em>}' reference is set.
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass#getRefersToDescDoc <em>Refers To Desc Doc</em>}' reference is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Refers To Doc</em>' reference is set.
* @see #unsetRefersToDoc()
* @see #getRefersToDoc()
* @see #setRefersToDoc(Doc)
* @return whether the value of the '<em>Refers To Desc Doc</em>' reference is set.
* @see #unsetRefersToDescDoc()
* @see #getRefersToDescDoc()
* @see #setRefersToDescDoc(Doc)
* @generated
*/
boolean isSetRefersToDoc();
boolean isSetRefersToDescDoc();
} // DocumentedClass
......@@ -19,7 +19,6 @@
*/
package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
import org.eclipse.emf.common.util.EList;
/**
......@@ -610,53 +609,4 @@ public interface NS extends Copyrighted, AgNSIdentification, AgUML, AgNSdesc {
*/
boolean isSetReferredByDependsOn();
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model consoleType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.IRiseClipseConsole"
* @generated
*/
CDC findCDC( String cDCName, IRiseClipseConsole console );
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model consoleType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.IRiseClipseConsole"
* @generated
*/
PresenceCondition findPresenceCondition( String presenceConditionName, IRiseClipseConsole console );
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model consoleType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.IRiseClipseConsole"
* @generated
*/
FunctionalConstraint findFunctionalConstraint( String functionalConstraintAbbreviation,
IRiseClipseConsole console );
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model consoleType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.IRiseClipseConsole"
* @generated
*/
Enumeration findEnumeration( String enumerationName, IRiseClipseConsole console );
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model consoleType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.IRiseClipseConsole"
* @generated
*/
BasicType findBasicType( String basicTypeName, IRiseClipseConsole console );
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model consoleType="fr.centralesupelec.edf.riseclipse.iec61850.nsd.IRiseClipseConsole"
* @generated
*/
ConstructedAttribute findConstructedAttribute( String constructedAttributeName, IRiseClipseConsole console );
} // NS
......@@ -236,15 +236,6 @@ public interface NsdFactory extends EFactory {
*/
Doc createDoc();
/**
* Returns a new object of class '<em>Documented Class</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return a new object of class '<em>Documented Class</em>'.
* @generated
*/
DocumentedClass createDocumentedClass();
/**
* Returns a new object of class '<em>Enumeration</em>'.
* <!-- begin-user-doc -->
......@@ -461,15 +452,6 @@ public interface NsdFactory extends EFactory {
*/
SubDataObject createSubDataObject();
/**
* Returns a new object of class '<em>Titled Class</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return a new object of class '<em>Titled Class</em>'.
* @generated
*/
TitledClass createTitledClass();
/**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
......
......@@ -164,4 +164,6 @@ public interface ServiceDataAttribute extends DocumentedClass, AgPresenceConditi
*/
void setParentServiceCDC( ServiceCDC value );
DataAttribute toDataAttribute();
} // ServiceDataAttribute
......@@ -29,10 +29,12 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
* </p>
* <ul>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass#getTitleID <em>Title ID</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.TitledClass#getRefersToTitleDoc <em>Refers To Title Doc</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTitledClass()
* @model extendedMetaData="name='tTitledClass' kind='empty'"
* @model abstract="true"
* extendedMetaData="name='tTitledClass' kind='empty'"
* annotation="http://www.eclipse.org/emf/2002/Ecore constraints='titleIDAttributeRequired'"
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot titleIDAttributeRequired='Tuple {\n\tmessage : String = \'The titleID attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.titleID &lt;&gt; null\n}.status'"
* @generated
......@@ -88,4 +90,55 @@ public interface TitledClass extends DocumentedClass {
*/
boolean isSetTitleID();
/**
* Returns the value of the '<em><b>Refers To Title Doc</b></em>' reference.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByTitledClass <em>Referred By Titled Class</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Refers To Title Doc</em>' reference.
* @see #isSetRefersToTitleDoc()
* @see #unsetRefersToTitleDoc()
* @see #setRefersToTitleDoc(Doc)
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getTitledClass_RefersToTitleDoc()
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByTitledClass
* @model opposite="referredByTitledClass" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
Doc getRefersToTitleDoc();
/**