Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
riseclipse-metamodel-nsd2016
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-nsd2016
Commits
9154c4dc
Commit
9154c4dc
authored
5 years ago
by
Dominique Marcadet
Browse files
Options
Downloads
Patches
Plain Diff
update to console changes
parent
0d2eed15
No related branches found
Branches containing commit
No related tags found
1 merge request
!25
Resolve "update to new console handling changes in Main"
Pipeline
#1324
failed
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.nsd.utilities/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/utilities/NsdModelLoader.java
+4
-6
4 additions, 6 deletions
...edf/riseclipse/iec61850/nsd/utilities/NsdModelLoader.java
with
4 additions
and
6 deletions
fr.centralesupelec.edf.riseclipse.iec61850.nsd.utilities/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/utilities/NsdModelLoader.java
+
4
−
6
View file @
9154c4dc
...
...
@@ -23,20 +23,18 @@ import org.eclipse.emf.ecore.resource.Resource;
import
fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage
;
import
fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceFactoryImpl
;
import
fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl
;
import
fr.centralesupelec.edf.riseclipse.util.
I
RiseClipseConsole
;
import
fr.centralesupelec.edf.riseclipse.util.
Abstract
RiseClipseConsole
;
import
fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseModelLoader
;
public
class
NsdModelLoader
extends
AbstractRiseClipseModelLoader
{
public
NsdModelLoader
(
IRiseClipseConsole
console
)
{
super
(
console
);
public
NsdModelLoader
()
{
reset
();
}
// @Override
public
void
reset
()
{
super
.
reset
(
new
NsdResourceSetImpl
(
false
,
console
)
);
super
.
reset
(
new
NsdResourceSetImpl
(
false
));
// Register the appropriate resource factory to handle all file
// extensions.
...
...
@@ -55,7 +53,7 @@ public class NsdModelLoader extends AbstractRiseClipseModelLoader {
public
Resource
loadWithoutValidation
(
String
name
)
{
Object
eValidator
=
EValidator
.
Registry
.
INSTANCE
.
remove
(
NsdPackage
.
eINSTANCE
);
Resource
resource
=
load
(
name
);
Resource
resource
=
load
(
name
,
AbstractRiseClipseConsole
.
getConsole
()
);
if
(
eValidator
!=
null
)
{
EValidator
.
Registry
.
INSTANCE
.
put
(
NsdPackage
.
eINSTANCE
,
eValidator
);
...
...
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