From 36c5337e1d3c600535718054639194092eb86dc8 Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Tue, 28 May 2019 23:16:25 +0200
Subject: [PATCH] use NsIdentification to get doc
---
.../nsd/provider/LNClassesItemProvider.java | 3 -
.../NsdItemProviderAdapterFactory.java | 72 -------------------
.../model/nsd.ecore | 6 +-
.../iec61850/nsd/AbstractLNClass.java | 4 +-
.../iec61850/nsd/DocumentedClass.java | 3 +-
.../riseclipse/iec61850/nsd/NsdFactory.java | 27 -------
.../riseclipse/iec61850/nsd/TitledClass.java | 3 +-
.../iec61850/nsd/impl/AbbreviationImpl.java | 3 +-
.../nsd/impl/AbstractLNClassImpl.java | 2 +-
.../iec61850/nsd/impl/AnyLNClassImpl.java | 15 ++--
.../iec61850/nsd/impl/BasicTypeImpl.java | 4 +-
.../riseclipse/iec61850/nsd/impl/CDCImpl.java | 6 ++
.../nsd/impl/ConstructedAttributeImpl.java | 14 ++++
.../iec61850/nsd/impl/DataAttributeImpl.java | 10 ++-
.../iec61850/nsd/impl/DataObjectImpl.java | 19 +++--
.../iec61850/nsd/impl/DependsOnImpl.java | 10 +--
.../nsd/impl/DocumentedClassImpl.java | 10 ++-
.../iec61850/nsd/impl/EnumerationImpl.java | 6 ++
.../nsd/impl/FunctionalConstraintImpl.java | 6 +-
.../iec61850/nsd/impl/LNClassImpl.java | 1 +
.../iec61850/nsd/impl/LiteralImpl.java | 6 ++
.../riseclipse/iec61850/nsd/impl/NSImpl.java | 7 +-
.../iec61850/nsd/impl/NsdFactoryImpl.java | 39 ----------
.../iec61850/nsd/impl/NsdPackageImpl.java | 6 +-
.../nsd/impl/PresenceConditionImpl.java | 6 +-
.../nsd/impl/ServiceDataAttributeImpl.java | 10 ++-
.../iec61850/nsd/impl/ServiceNSImpl.java | 6 +-
.../nsd/impl/ServiceParameterImpl.java | 6 ++
.../nsd/impl/SubDataAttributeImpl.java | 14 +++-
.../iec61850/nsd/impl/SubDataObjectImpl.java | 14 +++-
.../iec61850/nsd/impl/TitledClassImpl.java | 2 +-
...ntification.java => NsIdentification.java} | 10 +--
.../iec61850/nsd/util/NsdResourceSetImpl.java | 17 ++---
33 files changed, 170 insertions(+), 197 deletions(-)
rename fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/{NSIdentification.java => NsIdentification.java} (88%)
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassesItemProvider.java
index b6c162f..207c425 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassesItemProvider.java
@@ -149,9 +149,6 @@ public class LNClassesItemProvider extends NsdObjectItemProvider {
protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
super.collectNewChildDescriptors( newChildDescriptors, object );
- newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LN_CLASSES__ABSTRACT_LN_CLASS,
- NsdFactory.eINSTANCE.createAbstractLNClass() ) );
-
newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LN_CLASSES__LN_CLASS,
NsdFactory.eINSTANCE.createLNClass() ) );
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdItemProviderAdapterFactory.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdItemProviderAdapterFactory.java
index 63c5dd0..81aec4d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdItemProviderAdapterFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdItemProviderAdapterFactory.java
@@ -227,29 +227,6 @@ public class NsdItemProviderAdapterFactory extends NsdAdapterFactory
return abbreviationsItemProvider;
}
- /**
- * This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected AbstractLNClassItemProvider abstractLNClassItemProvider;
-
- /**
- * This creates an adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createAbstractLNClassAdapter() {
- if( abstractLNClassItemProvider == null ) {
- abstractLNClassItemProvider = new AbstractLNClassItemProvider( this );
- }
-
- return abstractLNClassItemProvider;
- }
-
/**
* This keeps track of the one adapter used for all {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.ApplicableServiceNS} instances.
* <!-- begin-user-doc -->
@@ -595,29 +572,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 +1124,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 -->
@@ -1304,7 +1235,6 @@ public class NsdItemProviderAdapterFactory extends NsdAdapterFactory
if( serviceTypeItemProvider != null ) serviceTypeItemProvider.dispose();
if( abbreviationItemProvider != null ) abbreviationItemProvider.dispose();
if( abbreviationsItemProvider != null ) abbreviationsItemProvider.dispose();
- if( abstractLNClassItemProvider != null ) abstractLNClassItemProvider.dispose();
if( applicableServiceNSItemProvider != null ) applicableServiceNSItemProvider.dispose();
if( applicableServicesItemProvider != null ) applicableServicesItemProvider.dispose();
if( basicTypeItemProvider != null ) basicTypeItemProvider.dispose();
@@ -1320,7 +1250,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 +1274,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();
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.ecore b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.ecore
index 21a928e..4ed916b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.ecore
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/model/nsd.ecore
@@ -171,7 +171,7 @@
eType="#//ServiceNS" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//ServiceNS/abbreviations"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AbstractLNClass" eSuperTypes="#//AnyLNClass">
+ <eClassifiers xsi:type="ecore:EClass" name="AbstractLNClass" abstract="true" eSuperTypes="#//AnyLNClass">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="tAbstractLNClass"/>
<details key="kind" value="elementOnly"/>
@@ -927,7 +927,7 @@
ordered="false" upperBound="-1" eType="#//AgPresenceConditionDerivedStatistics"
transient="true" unsettable="true" resolveProxies="false" eOpposite="#//AgPresenceConditionDerivedStatistics/refersToDsPresCondArgsDoc"/>
</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"/>
@@ -1867,7 +1867,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"/>
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AbstractLNClass.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AbstractLNClass.java
index aaac90e..64fff62 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AbstractLNClass.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/AbstractLNClass.java
@@ -36,7 +36,8 @@ import org.eclipse.emf.common.util.EList;
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getAbstractLNClass()
- * @model extendedMetaData="name='tAbstractLNClass' kind='elementOnly'"
+ * @model abstract="true"
+ * extendedMetaData="name='tAbstractLNClass' kind='elementOnly'"
* annotation="http://www.eclipse.org/emf/2002/Ecore constraints='nameAttributeRequired'"
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nameAttributeRequired='Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status'"
* @generated
@@ -105,6 +106,7 @@ public interface AbstractLNClass extends AnyLNClass {
* @model opposite="abstractLNClass" resolveProxies="false" unsettable="true" ordered="false"
* @generated
*/
+ @Override
LNClasses getParentLNClasses();
/**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentedClass.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentedClass.java
index b5bdb3c..69beabe 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentedClass.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DocumentedClass.java
@@ -35,7 +35,8 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
* </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 {
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdFactory.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdFactory.java
index a7e0a84..5777842 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/NsdFactory.java
@@ -92,15 +92,6 @@ public interface NsdFactory extends EFactory {
*/
Abbreviations createAbbreviations();
- /**
- * Returns a new object of class '<em>Abstract LN Class</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Abstract LN Class</em>'.
- * @generated
- */
- AbstractLNClass createAbstractLNClass();
-
/**
* Returns a new object of class '<em>Applicable Service NS</em>'.
* <!-- begin-user-doc -->
@@ -236,15 +227,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 +443,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 -->
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TitledClass.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TitledClass.java
index b1f077d..9b77bec 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TitledClass.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/TitledClass.java
@@ -32,7 +32,8 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd;
* </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 <> null\n}.status'"
* @generated
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java
index 2c636c7..9570481 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java
@@ -23,6 +23,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -583,7 +584,7 @@ public class AbbreviationImpl extends NsdObjectImpl implements Abbreviation {
if( isSetDescID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = (( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getDescID() );
+ Doc doc = (( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( new NsIdentification( getParentAbbreviations().getParentNS() ), getDescID() );
if( doc != null ) setRefersToDoc( doc );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java
index b55bdd5..49583dd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java
@@ -52,7 +52,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
*
* @generated
*/
-public class AbstractLNClassImpl extends AnyLNClassImpl implements AbstractLNClass {
+public abstract class AbstractLNClassImpl extends AnyLNClassImpl implements AbstractLNClass {
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java
index 844f506..44e8b28 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java
@@ -24,6 +24,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
import fr.centralesupelec.edf.riseclipse.util.RiseClipseFatalException;
@@ -520,7 +521,7 @@ public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNCla
if( isSetBase() ) {
String messagePrefix = "[NSD links] while resolving link from AnyLNClass (name: " + getName()
- + ", NS id: " + getParentLNClasses().getParentNS().getId() + ", line: " + getLineNumber() + "): ";
+ + ", NS id: " + getParentLNClasses().getParentNS().getId() + ", line: " + getLineNumber() + "): ";
// This code assumes that the referred AbstractLNClass is in the same NS
// TODO: check that it is right
@@ -532,9 +533,10 @@ public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNCla
.ifPresent( abstractLNClass -> setRefersToAbstractLNClass( abstractLNClass ) );
if( isSetRefersToAbstractLNClass() ) {
- console.info( "[NSD links] AbstractLNClass (name: " + getBase() + ") refers by AnyLNClass (name: " + getName()
- + ") in NS (id:" + getParentLNClasses().getParentNS().getId() + ") found in NS (id:"
- + getRefersToAbstractLNClass().getParentLNClasses().getParentNS().getId() + ")" );
+ console.info(
+ "[NSD links] AbstractLNClass (name: " + getBase() + ") refers by AnyLNClass (name: " + getName()
+ + ") in NS (id:" + getParentLNClasses().getParentNS().getId() + ") found in NS (id:"
+ + getRefersToAbstractLNClass().getParentLNClasses().getParentNS().getId() + ")" );
}
else {
console.warning( messagePrefix + "AbstractLNClass (name: " + getBase() + ") not found" );
@@ -544,4 +546,9 @@ public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNCla
return false;
}
+ @Override
+ protected NsIdentification getNsIdentification() {
+ return new NsIdentification( getParentLNClasses().getParentNS() );
+ }
+
} //AnyLNClassImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java
index cf359b8..20dae4c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java
@@ -24,6 +24,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -651,7 +652,8 @@ public class BasicTypeImpl extends NsdObjectImpl implements BasicType {
if( isSetDescID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getDescID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() )
+ .findDoc( new NsIdentification( getParentBasicTypes().getParentNS() ), getDescID() );
if( doc != null ) setRefersToDoc( doc );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java
index 499f9c4..56b80f0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java
@@ -26,6 +26,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import java.util.Collection;
@@ -1119,4 +1120,9 @@ public class CDCImpl extends TitledClassImpl implements CDC {
return result.toString();
}
+ @Override
+ protected NsIdentification getNsIdentification() {
+ return new NsIdentification( getParentCDCs().getParentNS() );
+ }
+
} //CDCImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java
index 3f490d7..80d2fad 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java
@@ -20,11 +20,13 @@
package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgAttributeType;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgNSIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttributes;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import java.util.Collection;
@@ -537,4 +539,16 @@ public class ConstructedAttributeImpl extends TitledClassImpl implements Constru
return result.toString();
}
+ @Override
+ protected NsIdentification getNsIdentification() {
+ AgNSIdentification ns = null;
+ if( getParentConstructedAttributes() != null ) {
+ ns = getParentConstructedAttributes().getParentNS();
+ }
+ if(( ns == null ) && ( getParentServiceTypeRealizations() != null ) ) {
+ ns = getParentServiceTypeRealizations().getParentServiceNS();
+ }
+ return new NsIdentification( ns );
+ }
+
} //ConstructedAttributeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java
index d59f411..d45981a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java
@@ -38,6 +38,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -3701,11 +3702,18 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib
if( isSetPresCondArgsID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getPresCondArgsID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getNsIdentification(),
+ getPresCondArgsID() );
if( doc != null ) setRefersToPresCondArgsDoc( doc );
}
}
return false;
}
+
+ @Override
+ protected NsIdentification getNsIdentification() {
+ return new NsIdentification( getParentCDC().getParentCDCs().getParentNS() );
+ }
+
} //DataAttributeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java
index 764179f..cc7dccc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java
@@ -31,6 +31,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -2189,7 +2190,7 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject {
NS ns = getParentAnyLNClass().getParentLNClasses().getParentNS();
String messagePrefix = "[NSD links] while resolving link from DataObject (name: " + getName()
- + ", NS id: " + ns.getId() + ", line: " + getLineNumber() + "): ";
+ + ", NS id: " + ns.getId() + ", line: " + getLineNumber() + "): ";
if( isSetType() ) {
CDC foundCDC = ns.findCDC( getType(), console );
@@ -2226,7 +2227,8 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject {
}
else {
setRefersToPresenceConditionDerivedStatistics( foundPC );
- console.info( "[NSD links] PresenceCondition (name: " + getDsPresCond() + ") refers by DataObject (name: "
+ console.info( "[NSD links] PresenceCondition (name: " + getDsPresCond()
+ + ") refers by DataObject (name: "
+ getName() + ") in NS (id:" + getParentAnyLNClass().getParentLNClasses().getParentNS().getId()
+ ") found in NS (id:"
+ getRefersToPresenceConditionDerivedStatistics().getParentPresenceConditions().getParentNS()
@@ -2237,19 +2239,26 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject {
if( isSetPresCondArgsID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = (( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getPresCondArgsID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getNsIdentification(),
+ getPresCondArgsID() );
if( doc != null ) setRefersToPresCondArgsDoc( doc );
}
}
if( isSetDsPresCondArgsID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = (( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getDsPresCondArgsID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getNsIdentification(),
+ getDsPresCondArgsID() );
if( doc != null ) setRefersToDsPresCondArgsDoc( doc );
}
}
- return false;
+ return false;
+ }
+
+ @Override
+ protected NsIdentification getNsIdentification() {
+ return new NsIdentification( getParentAnyLNClass().getParentLNClasses().getParentNS() );
}
} //DataObjectImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java
index c55325e..5702d38 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java
@@ -24,7 +24,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DependsOn;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NSIdentification;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -910,16 +910,18 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn {
public boolean buildExplicitLinks( IRiseClipseConsole console, boolean forceUpdate ) {
if( super.buildExplicitLinks( console, forceUpdate ) ) return true;
- String messagePrefix = "[NSD links] while resolving link from DependsOn (NS id: " + new NSIdentification( getParentNS() ) + ", line: " + getLineNumber() + "): ";
+ String messagePrefix = "[NSD links] while resolving link from DependsOn (NS id: "
+ + new NsIdentification( getParentNS() ) + ", line: " + getLineNumber() + "): ";
- NSIdentification identification = new NSIdentification( getId(), getVersion(), getRevision(), getRelease() );
+ NsIdentification identification = new NsIdentification( getId(), getVersion(), getRevision(), getRelease() );
NS ns = ( ( NsdResourceSetImpl ) eResource().getResourceSet() ).getNS( identification );
if( ns == null ) {
console.warning( messagePrefix + "NS (id: " + identification + ") not found" );
}
else {
setRefersToNS( ns );
- console.info( "[NSD links] NS (id: " + identification + ") refers by DependsOn in NS (id:" + new NSIdentification( getParentNS() ) + ") found" );
+ console.info( "[NSD links] NS (id: " + identification + ") refers by DependsOn in NS (id:"
+ + new NsIdentification( getParentNS() ) + ") found" );
}
return false;
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java
index f763e73..dcf59af 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java
@@ -22,6 +22,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DocumentedClass;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -49,7 +50,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
*
* @generated
*/
-public class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClass {
+public abstract class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClass {
/**
* The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
* <!-- begin-user-doc -->
@@ -594,10 +595,11 @@ public class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClas
@Override
public boolean buildExplicitLinks( IRiseClipseConsole console, boolean forceUpdate ) {
if( super.buildExplicitLinks( console, forceUpdate ) ) return true;
-
+
if( isSetDescID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = (( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getDescID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getNsIdentification(),
+ getDescID() );
if( doc != null ) setRefersToDoc( doc );
}
}
@@ -605,4 +607,6 @@ public class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClas
return false;
}
+ protected abstract NsIdentification getNsIdentification();
+
} //DocumentedClassImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java
index e74ac24..575a6fe 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java
@@ -25,6 +25,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
import java.util.Collection;
@@ -806,4 +807,9 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration {
return false;
}
+ @Override
+ protected NsIdentification getNsIdentification() {
+ return new NsIdentification( getParentEnumerations().getParentNS() );
+ }
+
} //EnumerationImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java
index e9ff7a2..37b337b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java
@@ -25,6 +25,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraints;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -903,10 +904,11 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona
@Override
public boolean buildExplicitLinks( IRiseClipseConsole console, boolean forceUpdate ) {
if( super.buildExplicitLinks( console, forceUpdate ) ) return true;
-
+
if( isSetDescID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = (( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getDescID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() )
+ .findDoc( new NsIdentification( getParentFunctionalConstraints().getParentNS() ), getDescID() );
if( doc != null ) setRefersToDoc( doc );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java
index 65ef445..b6014a1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java
@@ -22,6 +22,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClasses;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import org.eclipse.emf.common.notify.Notification;
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java
index 3c02c06..75240db 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java
@@ -22,6 +22,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import org.eclipse.emf.common.notify.Notification;
@@ -424,4 +425,9 @@ public class LiteralImpl extends DocumentedClassImpl implements Literal {
return result.toString();
}
+ @Override
+ protected NsIdentification getNsIdentification() {
+ return new NsIdentification( getParentEnumeration().getParentEnumerations().getParentNS() );
+ }
+
} //LiteralImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java
index ecdc8d7..db6ada4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java
@@ -42,6 +42,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PubStage;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
import java.lang.reflect.InvocationTargetException;
@@ -1846,7 +1847,8 @@ public class NSImpl extends CopyrightedImpl implements NS {
* @generated NOT
*/
@Override
- public ConstructedAttribute findConstructedAttribute( String constructedAttributeName, IRiseClipseConsole console ) {
+ public ConstructedAttribute findConstructedAttribute( String constructedAttributeName,
+ IRiseClipseConsole console ) {
if( isSetConstructedAttributes() ) {
ConstructedAttribute found = getConstructedAttributes().getConstructedAttribute().stream()
.filter( ca -> ca.getName().equals( constructedAttributeName ) ).findAny().orElse( null );
@@ -2923,7 +2925,8 @@ public class NSImpl extends CopyrightedImpl implements NS {
if( isSetDescID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getDescID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() )
+ .findDoc( new NsIdentification( this ), getDescID() );
if( doc != null ) setRefersToDoc( doc );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdFactoryImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdFactoryImpl.java
index e85a0d7..33e9737 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdFactoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdFactoryImpl.java
@@ -90,8 +90,6 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
return createAbbreviation();
case NsdPackage.ABBREVIATIONS:
return createAbbreviations();
- case NsdPackage.ABSTRACT_LN_CLASS:
- return createAbstractLNClass();
case NsdPackage.APPLICABLE_SERVICE_NS:
return createApplicableServiceNS();
case NsdPackage.APPLICABLE_SERVICES:
@@ -122,8 +120,6 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
return createDataSetMemberOf();
case NsdPackage.DOC:
return createDoc();
- case NsdPackage.DOCUMENTED_CLASS:
- return createDocumentedClass();
case NsdPackage.ENUMERATION:
return createEnumeration();
case NsdPackage.ENUMERATIONS:
@@ -172,8 +168,6 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
return createSubDataAttribute();
case NsdPackage.SUB_DATA_OBJECT:
return createSubDataObject();
- case NsdPackage.TITLED_CLASS:
- return createTitledClass();
default:
throw new IllegalArgumentException( "The class '" + eClass.getName() + "' is not a valid classifier" );
}
@@ -325,17 +319,6 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
return abbreviations;
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public AbstractLNClass createAbstractLNClass() {
- AbstractLNClassImpl abstractLNClass = new AbstractLNClassImpl();
- return abstractLNClass;
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -501,17 +484,6 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
return doc;
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public DocumentedClass createDocumentedClass() {
- DocumentedClassImpl documentedClass = new DocumentedClassImpl();
- return documentedClass;
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -776,17 +748,6 @@ public class NsdFactoryImpl extends EFactoryImpl implements NsdFactory {
return subDataObject;
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public TitledClass createTitledClass() {
- TitledClassImpl titledClass = new TitledClassImpl();
- return titledClass;
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java
index 8697b97..2d671ba 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java
@@ -4566,7 +4566,7 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
"parentServiceNS", null, 0, 1, Abbreviations.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED );
- initEClass( abstractLNClassEClass, AbstractLNClass.class, "AbstractLNClass", !IS_ABSTRACT, !IS_INTERFACE,
+ initEClass( abstractLNClassEClass, AbstractLNClass.class, "AbstractLNClass", IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS );
initEAttribute( getAbstractLNClass_Name(), ecorePackage.getEString(), "name", null, 0, 1, AbstractLNClass.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
@@ -4889,7 +4889,7 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
"referredByAgPresenceConditionDerivedStatistics", null, 0, -1, Doc.class, IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED );
- initEClass( documentedClassEClass, DocumentedClass.class, "DocumentedClass", !IS_ABSTRACT, !IS_INTERFACE,
+ initEClass( documentedClassEClass, DocumentedClass.class, "DocumentedClass", IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS );
initEAttribute( getDocumentedClass_Deprecated(), theXMLTypePackage.getBoolean(), "deprecated", "false", 0, 1,
DocumentedClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
@@ -5330,7 +5330,7 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage {
0, 1, SubDataObject.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
!IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED );
- initEClass( titledClassEClass, TitledClass.class, "TitledClass", !IS_ABSTRACT, !IS_INTERFACE,
+ initEClass( titledClassEClass, TitledClass.class, "TitledClass", IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS );
initEAttribute( getTitledClass_TitleID(), ecorePackage.getEString(), "titleID", null, 0, 1, TitledClass.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED );
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java
index 3489f1e..82a8552 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java
@@ -28,6 +28,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceConditions;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -1102,10 +1103,11 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond
@Override
public boolean buildExplicitLinks( IRiseClipseConsole console, boolean forceUpdate ) {
if( super.buildExplicitLinks( console, forceUpdate ) ) return true;
-
+
if( isSetDescID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = (( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getDescID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() )
+ .findDoc( new NsIdentification( getParentPresenceConditions().getParentNS() ), getDescID() );
if( doc != null ) setRefersToDoc( doc );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java
index 9299297..0da289e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java
@@ -31,6 +31,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDC;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -1845,7 +1846,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser
if( isSetPresCondArgsID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getPresCondArgsID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc(
+ new NsIdentification( getParentServiceCDC().getParentServiceCDCs().getParentServiceNS() ),
+ getPresCondArgsID() );
if( doc != null ) setRefersToPresCondArgsDoc( doc );
}
}
@@ -1853,4 +1856,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser
return false;
}
+ @Override
+ protected NsIdentification getNsIdentification() {
+ return new NsIdentification( getParentServiceCDC().getParentServiceCDCs().getParentServiceNS() );
+ }
+
} //ServiceDataAttributeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java
index 848d742..0af2e13 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java
@@ -33,6 +33,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceCDCs;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceConstructedAttributes;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceNS;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceTypeRealizations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -2246,10 +2247,11 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS {
@Override
public boolean buildExplicitLinks( IRiseClipseConsole console, boolean forceUpdate ) {
if( super.buildExplicitLinks( console, forceUpdate ) ) return true;
-
+
if( isSetDescID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = (( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getDescID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() )
+ .findDoc( new NsIdentification( this ), getDescID() );
if( doc != null ) setRefersToDoc( doc );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java
index 564c2bc..20bff56 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java
@@ -28,6 +28,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ServiceParameter;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import java.math.BigDecimal;
@@ -1357,4 +1358,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service
return result.toString();
}
+ @Override
+ protected NsIdentification getNsIdentification() {
+ return new NsIdentification( getParentCDC().getParentCDCs().getParentNS() );
+ }
+
} //ServiceParameterImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java
index eb82a42..2e5a9df 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java
@@ -22,6 +22,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgArray;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgAttributeType;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgAttributeTypeAndValues;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgNSIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgPresenceCondition;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute;
@@ -33,6 +34,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -2497,7 +2499,8 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData
if( isSetPresCondArgsID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getPresCondArgsID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getNsIdentification(),
+ getPresCondArgsID() );
if( doc != null ) setRefersToPresCondArgsDoc( doc );
}
}
@@ -2505,4 +2508,13 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData
return false;
}
+ @Override
+ protected NsIdentification getNsIdentification() {
+ AgNSIdentification parent = getParentConstructedAttribute().getParentConstructedAttributes().getParentNS();
+ if( parent == null ) {
+ parent = getParentConstructedAttribute().getParentServiceTypeRealizations().getParentServiceNS();
+ }
+ return new NsIdentification( parent );
+ }
+
} //SubDataAttributeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java
index e1a370f..2d7b79f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java
@@ -30,6 +30,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
@@ -2185,7 +2186,7 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj
NS ns = getParentCDC().getParentCDCs().getParentNS();
String messagePrefix = "[NSD links] while resolving link from SubDataObject (name: " + getName()
- + ", NS id: " + ns.getId() + ", line: " + getLineNumber() + "): ";
+ + ", NS id: " + ns.getId() + ", line: " + getLineNumber() + "): ";
if( isSetType() ) {
CDC foundCDC = ns.findCDC( getType(), console );
@@ -2209,7 +2210,8 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj
}
else {
setRefersToPresenceCondition( foundPC );
- console.info( "[NSD links] PresenceCondition (name: " + getPresCond() + ") refers by SubDataObject (name: "
+ console.info( "[NSD links] PresenceCondition (name: " + getPresCond()
+ + ") refers by SubDataObject (name: "
+ getName() + ") in NS (id:" + ns.getId() + ") found in NS (id:"
+ getRefersToPresenceCondition().getParentPresenceConditions().getParentNS().getId() + ")" );
}
@@ -2253,7 +2255,8 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj
if( isSetPresCondArgsID() ) {
if( this.eResource().getResourceSet() instanceof NsdResourceSetImpl ) {
- Doc doc = (( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getPresCondArgsID() );
+ Doc doc = ( ( NsdResourceSetImpl ) this.eResource().getResourceSet() ).findDoc( getNsIdentification(),
+ getPresCondArgsID() );
if( doc != null ) setRefersToPresCondArgsDoc( doc );
}
}
@@ -2261,4 +2264,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj
return false;
}
+ @Override
+ protected NsIdentification getNsIdentification() {
+ return new NsIdentification( getParentCDC().getParentCDCs().getParentNS() );
+ }
+
} //SubDataObjectImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java
index 071f7b7..da40f0b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java
@@ -41,7 +41,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
*
* @generated
*/
-public class TitledClassImpl extends DocumentedClassImpl implements TitledClass {
+public abstract class TitledClassImpl extends DocumentedClassImpl implements TitledClass {
/**
* The default value of the '{@link #getTitleID() <em>Title ID</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NSIdentification.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsIdentification.java
similarity index 88%
rename from fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NSIdentification.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsIdentification.java
index f9b0e78..651ad96 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NSIdentification.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsIdentification.java
@@ -23,13 +23,13 @@ import java.util.Objects;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgNSIdentification;
-public class NSIdentification {
+public class NsIdentification {
private String id;
private Integer version;
private String revision;
private Integer release;
- public NSIdentification( String id, Integer version, String revision, Integer release ) {
+ public NsIdentification( String id, Integer version, String revision, Integer release ) {
super();
this.id = id;
this.version = version;
@@ -37,7 +37,7 @@ public class NSIdentification {
this.release = release;
}
- public NSIdentification( AgNSIdentification identification ) {
+ public NsIdentification( AgNSIdentification identification ) {
super();
this.id = identification.getId();
this.version = identification.getVersion();
@@ -55,14 +55,14 @@ public class NSIdentification {
if( this == obj ) return true;
if( obj == null ) return false;
if( getClass() != obj.getClass() ) return false;
- NSIdentification other = ( NSIdentification ) obj;
+ NsIdentification other = ( NsIdentification ) obj;
return Objects.equals( id, other.id ) && Objects.equals( release, other.release )
&& Objects.equals( revision, other.revision ) && Objects.equals( version, other.version );
}
@Override
public String toString() {
- return "NSIdentification [" + ( id != null ? "id=" + id + ", " : "" )
+ return "NsIdentification [" + ( id != null ? "id=" + id + ", " : "" )
+ ( version != null ? "version=" + version + ", " : "" )
+ ( revision != null ? "revision=" + revision + ", " : "" )
+ ( release != null ? "release=" + release : "" ) + "]";
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetImpl.java
index 8ec1674..48b94cc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.emf.ecore.resource.Resource;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviation;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Abbreviations;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgNSIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicType;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.BasicTypes;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC;
@@ -58,8 +59,8 @@ import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseResourceSet;
public class NsdResourceSetImpl extends AbstractRiseClipseResourceSet {
- private Map< NSIdentification, NS > nsdResources;
- private Map< NSIdentification, NSDoc > nsdocResources;
+ private Map< NsIdentification, NS > nsdResources;
+ private Map< NsIdentification, NSDoc > nsdocResources;
private NsdResourceFactoryImpl resourceFactory;
public NsdResourceSetImpl( boolean strictContent, IRiseClipseConsole console ) {
@@ -96,9 +97,9 @@ public class NsdResourceSetImpl extends AbstractRiseClipseResourceSet {
DocumentRoot root = (DocumentRoot) resource.getContents().get( 0 );
if( root.getNS() != null ) {
NS ns = ( NS ) root.getNS();
- NSIdentification id = new NSIdentification( ns );
+ NsIdentification id = new NsIdentification( ns );
if( nsdResources.get( id ) != null ) {
- AbstractRiseClipseConsole.getConsole().error( "There is already an NSD file with NSIdentification " + id + ", " + resource.getURI() + " is ignored" );
+ AbstractRiseClipseConsole.getConsole().error( "There is already an NSD file with NsIdentification " + id + ", " + resource.getURI() + " is ignored" );
this.getResources().remove( resource );
return;
}
@@ -107,9 +108,9 @@ public class NsdResourceSetImpl extends AbstractRiseClipseResourceSet {
}
if( root.getNSDoc() != null ) {
NSDoc nsdoc = ( NSDoc ) root.getNSDoc();
- NSIdentification id = new NSIdentification( nsdoc );
+ NsIdentification id = new NsIdentification( nsdoc );
if( nsdocResources.get( id ) != null ) {
- AbstractRiseClipseConsole.getConsole().error( "There is already an NSDoc file with NSIdentification " + id + ", " + resource.getURI() + " is ignored" );
+ AbstractRiseClipseConsole.getConsole().error( "There is already an NSDoc file with NsIdentification " + id + ", " + resource.getURI() + " is ignored" );
this.getResources().remove( resource );
return;
}
@@ -171,7 +172,7 @@ public class NsdResourceSetImpl extends AbstractRiseClipseResourceSet {
}
- public NS getNS( NSIdentification id ) {
+ public NS getNS( NsIdentification id ) {
return nsdResources.get( id );
}
@@ -386,7 +387,7 @@ public class NsdResourceSetImpl extends AbstractRiseClipseResourceSet {
return presenceConditionStream;
}
- public Doc findDoc( String id ) {
+ public Doc findDoc( NsIdentification identification, String id ) {
for( NSDoc nsdoc : nsdocResources.values() ) {
Optional< Doc > doc = nsdoc
.getDoc()
--
GitLab