Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
riseclipse-validator-scl2003
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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-validator-scl2003
Commits
14b24efd
Commit
14b24efd
authored
5 years ago
by
Dominique Marcadet
Browse files
Options
Downloads
Patches
Plain Diff
add an hidden door for easier debugging
parent
af93a7e0
No related branches found
No related tags found
1 merge request
!11
Resolve "complete validation by NSD"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
+35
-2
35 additions, 2 deletions
...clipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
with
35 additions
and
2 deletions
fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
+
35
−
2
View file @
14b24efd
...
...
@@ -23,7 +23,9 @@ import java.util.HashMap;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Stream
;
import
fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition
;
import
fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification
;
import
fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage
;
import
fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SclItemProviderAdapterFactory
;
...
...
@@ -73,12 +75,16 @@ public class RiseClipseValidatorSCL {
private
static
IRiseClipseConsole
console
;
private
static
boolean
hiddenDoor
=
false
;
private
static
void
usage
()
{
console
.
setLevel
(
IRiseClipseConsole
.
INFO_LEVEL
);
console
.
info
(
"java -jar RiseClipseValidatorSCL.jar --help"
);
console
.
info
(
"java -jar RiseClipseValidatorSCL.jar [--verbose | --info | --warning | --error] [--make-explicit-links] (<oclFile> | <nsdFile> | <sclFile>)+"
);
console
.
info
(
"Files ending with \".ocl\" are considered OCL files, "
+
"files ending with \".nsd\" are considered NSD files, "
+
"files ending with \".nsd\" are considered NS files, "
+
"files ending with \".snsd\" are considered ServiceNS files, "
+
"files ending with \".AppNS\" are considered ApplicableServiceNS files, "
+
"files ending with \".nsdoc\" are considered NSDoc files, "
+
"all others are considered SCL files"
);
System
.
exit
(
-
1
);
...
...
@@ -89,7 +95,9 @@ public class RiseClipseValidatorSCL {
displayLegal
();
console
.
info
(
"java -jar RiseClipseValidatorSCL.jar option* file*"
);
console
.
info
(
"\tFiles ending with \".ocl\" are considered OCL files,"
);
console
.
info
(
"\tfiles ending with \".nsd\" are considered NSD files,"
);
console
.
info
(
"\tfiles ending with \".nsd\" are considered NS files,"
);
console
.
info
(
"\tfiles ending with \".snsd\" are considered ServiceNS files,"
);
console
.
info
(
"\tfiles ending with \".AppNS\" are considered ApplicableServiceNS files (at most one should be given),"
);
console
.
info
(
"\tfiles ending with \".nsdoc\" are considered NSDoc files,"
);
console
.
info
(
"\tall others are considered SCL files."
);
console
.
info
(
""
);
...
...
@@ -159,6 +167,9 @@ public class RiseClipseValidatorSCL {
else
if
(
"--display-nsd-messages"
.
equals
(
args
[
i
]
)
)
{
displayNsdMessages
=
true
;
}
else
if
(
"--hidden-door"
.
equals
(
args
[
i
]
)
)
{
hiddenDoor
=
true
;
}
else
{
console
=
new
TextRiseClipseConsole
(
useColor
);
console
.
error
(
"Unrecognized option "
+
args
[
i
]
);
...
...
@@ -190,6 +201,14 @@ public class RiseClipseValidatorSCL {
nsdFiles
.
add
(
args
[
i
]
);
nsdValidation
=
true
;
}
else
if
(
args
[
i
].
endsWith
(
".snsd"
))
{
nsdFiles
.
add
(
args
[
i
]
);
nsdValidation
=
true
;
}
else
if
(
args
[
i
].
endsWith
(
".AppNS"
))
{
nsdFiles
.
add
(
args
[
i
]
);
nsdValidation
=
true
;
}
else
if
(
args
[
i
].
endsWith
(
".nsdoc"
))
{
nsdFiles
.
add
(
args
[
i
]
);
nsdValidation
=
true
;
...
...
@@ -198,6 +217,10 @@ public class RiseClipseValidatorSCL {
sclFiles
.
add
(
args
[
i
]
);
}
}
if
(
hiddenDoor
)
{
doHiddenDoor
(
oclFiles
,
nsdFiles
,
sclFiles
);
}
prepare
(
oclFiles
,
nsdFiles
,
displayNsdMessages
);
for
(
int
i
=
0
;
i
<
sclFiles
.
size
();
++
i
)
{
...
...
@@ -205,6 +228,16 @@ public class RiseClipseValidatorSCL {
}
}
private
static
void
doHiddenDoor
(
ArrayList
<
@NonNull
String
>
oclFiles
,
ArrayList
<
@NonNull
String
>
nsdFiles
,
ArrayList
<
String
>
sclFiles
)
{
prepare
(
oclFiles
,
nsdFiles
,
false
);
Stream
<
PresenceCondition
>
pc
=
nsdValidator
.
getNsdLoader
().
getResourceSet
().
getPresenceConditionStream
(
DEFAULT_NS_IDENTIFICATION
);
console
.
setLevel
(
IRiseClipseConsole
.
INFO_LEVEL
);
pc
.
forEach
(
c
->
console
.
info
(
"PresenceCondition "
+
c
.
getName
()
));
System
.
exit
(
0
);
}
private
static
void
displayLegal
()
{
console
.
info
(
"Copyright (c) 2019 CentraleSupélec & EDF."
);
console
.
info
(
...
...
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