Commit fb7f94ce authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '13-doresolvelinks-should-call-the-overriding-method' into 'master'

Resolve "doResolveLinks() should call the overriding method"

Closes #13

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!12
parents 9e6cdd7c 6386e604
...@@ -1315,6 +1315,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN { ...@@ -1315,6 +1315,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// lnType The instantiable type definition of this logical node, reference to a LNodeType definition // lnType The instantiable type definition of this logical node, reference to a LNodeType definition
// lnClass The LN class according to IEC 61850-7-x // lnClass The LN class according to IEC 61850-7-x
// inst The LN instance number identifying this LN – an unsigned integer // inst The LN instance number identifying this LN – an unsigned integer
......
...@@ -977,6 +977,9 @@ public class AssociationImpl extends BaseElementImpl implements Association { ...@@ -977,6 +977,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// kind The kind of pre-configured association, pre-established or predefined // kind The kind of pre-configured association, pre-established or predefined
// associationID The identification of a pre-configured association (otherwise empty) // associationID The identification of a pre-configured association (otherwise empty)
// iedName The reference identifying the IED on which the client resides // iedName The reference identifying the IED on which the client resides
......
...@@ -212,6 +212,9 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA { ...@@ -212,6 +212,9 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// desc Some descriptive text for the attribute // desc Some descriptive text for the attribute
// name The attribute name; the type tAttributeEnum restricts to the attribute names from IEC 61850-7-3, plus new ones starting with lower case letters // name The attribute name; the type tAttributeEnum restricts to the attribute names from IEC 61850-7-3, plus new ones starting with lower case letters
// sAddr an optional short address of this BDA attribute // sAddr an optional short address of this BDA attribute
......
...@@ -980,6 +980,9 @@ public class ClientLNImpl extends ExplicitLinkResolverImpl implements ClientLN { ...@@ -980,6 +980,9 @@ public class ClientLNImpl extends ExplicitLinkResolverImpl implements ClientLN {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// iedName The name of the IED where the LN resides // iedName The name of the IED where the LN resides
// apRef The name of the access point via which the IED shall be accessed. Optional, not needed if the IED has only one access point. // apRef The name of the access point via which the IED shall be accessed. Optional, not needed if the IED has only one access point.
// ldInst The instance identification of the LD where the LN resides // ldInst The instance identification of the LD where the LN resides
......
...@@ -936,6 +936,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP { ...@@ -936,6 +936,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// iedName a name identifying the IED // iedName a name identifying the IED
// apName a name identifying this access point within the IED // apName a name identifying this access point within the IED
// desc some descriptive text for this access point at this subnetwork // desc some descriptive text for this access point at this subnetwork
......
...@@ -735,6 +735,9 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl ...@@ -735,6 +735,9 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// desc Textual description // desc Textual description
// ldInst The instance identification of the LD within this IED, on which the control block is located. // ldInst The instance identification of the LD within this IED, on which the control block is located.
// An LN is not necessary, as these control blocks are only in LLN0. // An LN is not necessary, as these control blocks are only in LLN0.
......
...@@ -463,6 +463,9 @@ public abstract class ControlImpl extends UnNamingImpl implements Control { ...@@ -463,6 +463,9 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// name Name of the report control block. This name is relative to the LN hosting the RCB, and shall be unique within the LN // name Name of the report control block. This name is relative to the LN hosting the RCB, and shall be unique within the LN
// desc The description text // desc The description text
// datSet The name of the data set to be sent by the report control block; datSet should only be missing within an ICD-File, // datSet The name of the data set to be sent by the report control block; datSet should only be missing within an ICD-File,
......
...@@ -796,6 +796,9 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA { ...@@ -796,6 +796,9 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// desc Some descriptive text for the attribute // desc Some descriptive text for the attribute
// name The attribute name; the type tAttributeEnum restricts to the attribute names from IEC 61850-7-3, plus new ones starting with lower case letters // name The attribute name; the type tAttributeEnum restricts to the attribute names from IEC 61850-7-3, plus new ones starting with lower case letters
// fc The functional constraint for this attribute; fc=SE always also implies fc=SG; fc=SG means that the values are visible, but not editable // fc The functional constraint for this attribute; fc=SE always also implies fc=SG; fc=SG means that the values are visible, but not editable
......
...@@ -539,6 +539,9 @@ public class DOImpl extends DataObjectImpl implements DO { ...@@ -539,6 +539,9 @@ public class DOImpl extends DataObjectImpl implements DO {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// name The data object name as specified for example in IEC 61850-7-4 // name The data object name as specified for example in IEC 61850-7-4
// type The type references the id of a DOType definition // type The type references the id of a DOType definition
// accessControl Access control definition for this DO. If it is missing then any higher-level // accessControl Access control definition for this DO. If it is missing then any higher-level
......
...@@ -1956,6 +1956,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef { ...@@ -1956,6 +1956,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// iedName The name of the IED from where the input comes // iedName The name of the IED from where the input comes
// ldInst The LD instance name from where the input comes // ldInst The LD instance name from where the input comes
// prefix The LN prefix // prefix The LN prefix
......
...@@ -1355,6 +1355,9 @@ public class FCDAImpl extends ExplicitLinkResolverImpl implements FCDA { ...@@ -1355,6 +1355,9 @@ public class FCDAImpl extends ExplicitLinkResolverImpl implements FCDA {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// ldInst The LD where the DO resides; shall always be specified except for GSSE // ldInst The LD where the DO resides; shall always be specified except for GSSE
// prefix Prefix identifying together with lnInst and lnClass the LN where the DO resides; optional, default value is the empty string // prefix Prefix identifying together with lnInst and lnClass the LN where the DO resides; optional, default value is the empty string
// lnClass LN class of the LN where the DO resides; shall always be specified except for GSSE DataLabel empty string // lnClass LN class of the LN where the DO resides; shall always be specified except for GSSE DataLabel empty string
......
...@@ -890,6 +890,9 @@ public class IEDNameImpl extends ExplicitLinkResolverImpl implements IEDName { ...@@ -890,6 +890,9 @@ public class IEDNameImpl extends ExplicitLinkResolverImpl implements IEDName {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
LDevice lDevice = getControlWithIEDName().getAnyLN().getLDevice(); LDevice lDevice = getControlWithIEDName().getAnyLN().getLDevice();
IED ied = lDevice.getIED(); IED ied = lDevice.getIED();
......
...@@ -1173,6 +1173,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode { ...@@ -1173,6 +1173,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// lnInst The LN instance identification. Can only be missing for lnClass=LLN0, meaning as value here the empty string // lnInst The LN instance identification. Can only be missing for lnClass=LLN0, meaning as value here the empty string
// lnClass The LN class as defined in IEC 61850-7-x // lnClass The LN class as defined in IEC 61850-7-x
// iedName The name of the IED which contains the LN, none if used for specification (default if attribute is not specified) // iedName The name of the IED which contains the LN, none if used for specification (default if attribute is not specified)
......
...@@ -1079,6 +1079,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont ...@@ -1079,6 +1079,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
LDevice lDevice = getAnyLN().getLDevice(); LDevice lDevice = getAnyLN().getLDevice();
IED ied = lDevice.getIED(); IED ied = lDevice.getIED();
......
...@@ -624,6 +624,9 @@ public class SDOImpl extends UnNamingImpl implements SDO { ...@@ -624,6 +624,9 @@ public class SDOImpl extends UnNamingImpl implements SDO {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// Resolve only if attribute has been read // Resolve only if attribute has been read
if( ! typeESet ) return; if( ! typeESet ) return;
......
...@@ -447,6 +447,9 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt { ...@@ -447,6 +447,9 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// Resolve only if attribute has been read // Resolve only if attribute has been read
// Cannot use isSetApName() Here // Cannot use isSetApName() Here
if( !apNameESet ) return; if( !apNameESet ) return;
......
...@@ -1385,6 +1385,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal { ...@@ -1385,6 +1385,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
@Override @Override
protected void doResolveLinks() { protected void doResolveLinks() {
// see Issue #13
super.doResolveLinks();
// name The optional relative name of the terminal at this Equipment. The default is the empty string, which means that the name // name The optional relative name of the terminal at this Equipment. The default is the empty string, which means that the name
// of the ConnectivityNode is also the terminal identification. // of the ConnectivityNode is also the terminal identification.
// desc Descriptive text to the terminal // desc Descriptive text to the terminal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment