Skip to content

Handle Sirius forced resourceSet #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 16, 2019
Merged

Handle Sirius forced resourceSet #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fea32b4
handle resourceSet created by Sirius session
dvojtise Dec 13, 2019
23acbb8
warning if using both melange query and sirius returns a new resourceSet
dvojtise Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions ...rg/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,28 @@ private static Resource loadModel(IExecutionContext<?, ?, ?> context, boolean wi
try {
// Killing + restarting Sirius session for animation
killPreviousSiriusSession(context.getRunConfiguration().getAnimatorURI());
openNewSiriusSession(context, context.getRunConfiguration().getAnimatorURI(), resourceSet, modelURI,
Session session = openNewSiriusSession(context, context.getRunConfiguration().getAnimatorURI(), resourceSet, modelURI,
subMonitor,nsURIMapping);

// At this point Sirius has loaded the model, we just need to
// find it
for (Resource r : resourceSet.getResources()) {
if (r.getURI().equals(modelURI)) {
return r;
if(session.getTransactionalEditingDomain().getResourceSet() != resourceSet) {
// the session has created a different resourceSet than the one we provided
//we need to use the resource from it instead of the one from our resourceSet
// TODO check if this is still compatible with melange
// TODO maybe some simplification is possible !
if(useMelange) {
Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Sirius Session returned a new ResourceSet and you are using a melange query, this scenario has not been validated yet", new Exception()));
}
for (Resource r : session.getTransactionalEditingDomain().getResourceSet().getResources()) {
if (r.getURI().equals(modelURI)) {
return r;
}
}
} else {
for (Resource r : resourceSet.getResources()) {
if (r.getURI().equals(modelURI)) {
return r;
}
}
}
} catch (CoreException e) {
Expand Down