Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
riseclipse-metamodel-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-metamodel-scl2003
Commits
e74b927f
Commit
e74b927f
authored
5 years ago
by
Dominique Marcadet
Browse files
Options
Downloads
Patches
Plain Diff
update to console changes
parent
403b163e
No related branches found
No related tags found
1 merge request
!50
Resolve "update to new console handling changes in Main"
Pipeline
#902
passed
5 years ago
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/utilities/SclModelLoader.java
+6
-10
6 additions, 10 deletions
...edf/riseclipse/iec61850/scl/utilities/SclModelLoader.java
with
6 additions
and
10 deletions
fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/utilities/SclModelLoader.java
+
6
−
10
View file @
e74b927f
...
...
@@ -24,20 +24,17 @@ import org.eclipse.emf.ecore.resource.Resource;
import
fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage
;
import
fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclResourceFactoryImpl
;
import
fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclResourceSetImpl
;
import
fr.centralesupelec.edf.riseclipse.util.
I
RiseClipseConsole
;
import
fr.centralesupelec.edf.riseclipse.util.
Abstract
RiseClipseConsole
;
import
fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseModelLoader
;
import
fr.centralesupelec.edf.riseclipse.util.TextRiseClipseConsole
;
public
class
SclModelLoader
extends
AbstractRiseClipseModelLoader
{
public
SclModelLoader
(
IRiseClipseConsole
console
)
{
super
(
console
);
public
SclModelLoader
()
{
reset
();
}
public
void
reset
()
{
super
.
reset
(
new
SclResourceSetImpl
(
false
,
console
));
super
.
reset
(
new
SclResourceSetImpl
(
false
));
// Register the appropriate resource factory to handle all file
// extensions.
...
...
@@ -51,7 +48,7 @@ public class SclModelLoader extends AbstractRiseClipseModelLoader {
public
Resource
loadWithoutValidation
(
String
name
)
{
Object
eValidator
=
EValidator
.
Registry
.
INSTANCE
.
remove
(
SclPackage
.
eINSTANCE
);
Resource
resource
=
load
(
name
);
Resource
resource
=
load
(
name
,
AbstractRiseClipseConsole
.
getConsole
()
);
if
(
eValidator
!=
null
)
{
EValidator
.
Registry
.
INSTANCE
.
put
(
SclPackage
.
eINSTANCE
,
eValidator
);
...
...
@@ -60,12 +57,11 @@ public class SclModelLoader extends AbstractRiseClipseModelLoader {
}
public
static
void
main
(
String
[]
args
)
{
IRiseClipseConsole
console
=
new
TextRiseClipseConsole
();
SclModelLoader
loader
=
new
SclModelLoader
(
console
);
SclModelLoader
loader
=
new
SclModelLoader
();
for
(
int
i
=
0
;
i
<
args
.
length
;
++
i
)
{
@SuppressWarnings
(
"unused"
)
Resource
resource
=
loader
.
load
(
args
[
i
]
);
Resource
resource
=
loader
.
load
(
args
[
i
]
,
AbstractRiseClipseConsole
.
getConsole
()
);
}
}
...
...
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