Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
riseclipse-metamodel-scl2003
Manage
Activity
Members
Labels
Plan
Issues
4
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
RiseClipseGroup
riseclipse-metamodel-scl2003
Commits
7f64b2d5
Commit
7f64b2d5
authored
4 years ago
by
Dominique Marcadet
Browse files
Options
Downloads
Patches
Plain Diff
first trial to take SDO into account
parent
9c160ad9
No related branches found
No related tags found
1 merge request
!59
WIP: Resolve "correct explicit links from FCDA"
Pipeline
#4593
passed with stages
in 37 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
+21
-2
21 additions, 2 deletions
...alesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
with
21 additions
and
2 deletions
fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
+
21
−
2
View file @
7f64b2d5
...
...
@@ -1091,6 +1091,8 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
@Override
protected
void
doBuildExplicitLinks
(
IRiseClipseConsole
console
)
{
//@formatter:off
// see Issue #13
super
.
doBuildExplicitLinks
(
console
);
...
...
@@ -1263,13 +1265,29 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
else
{
// daName – if missing, all attributes with functional characteristic given by fc are selected.
if
(
getFc
()
==
null
)
return
;
if
(
getFc
()
==
null
)
{
console
.
warning
(
"[SCL links] FCDA (line "
,
getLineNumber
(),
") does not refer to any AbstractDataAttribute because FC is empty"
);
return
;
}
doType
// We select either DAs contained in DOType or DAs contained in SDOs contained in DOType
if
(
doType
.
getDA
().
size
()
>
0
)
{
doType
.
getDA
()
.
stream
()
.
filter
(
da
->
da
.
getFc
().
equals
(
getFc
()
)
)
.
collect
(
Collectors
.
toCollection
(
()
->
getRefersToAbstractDataAttribute
()
)
);
}
else
{
doType
.
getSDO
()
.
stream
()
.
map
(
sdo
->
sdo
.
getRefersToDOType
()
)
.
flatMap
(
dotype
->
dotype
.
getDA
().
stream
()
)
.
filter
(
da
->
da
.
getFc
().
equals
(
getFc
()
)
)
.
collect
(
Collectors
.
toCollection
(
()
->
getRefersToAbstractDataAttribute
()
)
);
}
if
(
getRefersToAbstractDataAttribute
().
size
()
>
0
)
{
for
(
AbstractDataAttribute
a
:
getRefersToAbstractDataAttribute
()
)
{
...
...
@@ -1284,6 +1302,7 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
}
}
//@formatter:on
}
}
//FCDAImpl
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment