Skip to content
Snippets Groups Projects
Commit 1e91f7bc authored by Kevin Kassin's avatar Kevin Kassin
Browse files

Commit 18.9 1:00 Uhr

refreshing a editors files is now the last thing done on saving the
editor,
deleted if-clause that was always false from code,
the transformation now allows relations in a group
parent 2f92c2d4
No related branches found
No related tags found
No related merge requests found
...@@ -82,8 +82,6 @@ public class ChangeConfigurationFeature extends AbstractCustomFeature { ...@@ -82,8 +82,6 @@ public class ChangeConfigurationFeature extends AbstractCustomFeature {
//Step 2 //Step 2
FRaMEDFeature framedFeature = FeaturemodelFactory.eINSTANCE.createFRaMEDFeature(); FRaMEDFeature framedFeature = FeaturemodelFactory.eINSTANCE.createFRaMEDFeature();
framedFeature.setName(FeatureName.getByName(editorFeature.getName())); framedFeature.setName(FeatureName.getByName(editorFeature.getName()));
if(editorFeatureConfiguration.getManualFeatures().contains(editorFeature))
framedFeature.setManuallySelected(true);
framedFeatureConfiguration.getFeatures().add(framedFeature); framedFeatureConfiguration.getFeatures().add(framedFeature);
} }
//Step 3 //Step 3
......
...@@ -376,10 +376,10 @@ public class MultipageEditor extends FormEditor implements ISelectionListener, I ...@@ -376,10 +376,10 @@ public class MultipageEditor extends FormEditor implements ISelectionListener, I
//check //check
if(editorFeatures != null) if(editorFeatures != null)
editorFeatures.synchronizeConfigurationEditorAndModelConfiguration(); editorFeatures.synchronizeConfigurationEditorAndModelConfiguration();
refreshFile();
boolean transformationSuccessful = transformModel(); boolean transformationSuccessful = transformModel();
if(!transformationSuccessful) throw new TransformationFailedException(); if(!transformationSuccessful) throw new TransformationFailedException();
MultipageEditorSynchronizationService.synchronize(); MultipageEditorSynchronizationService.synchronize();
refreshFile();
} }
} }
......
...@@ -29,7 +29,6 @@ public class EditorInputUtil { ...@@ -29,7 +29,6 @@ public class EditorInputUtil {
* @return the generated editor input * @return the generated editor input
*/ */
public static IFileEditorInput getIFileEditorInputForResource(Resource resource) { public static IFileEditorInput getIFileEditorInputForResource(Resource resource) {
System.out.println(resource);
IPath path = new Path(resource.getURI().toFileString()); IPath path = new Path(resource.getURI().toFileString());
IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path); IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
return new FileEditorInput(file); return new FileEditorInput(file);
......
...@@ -11,8 +11,13 @@ rule Group ...@@ -11,8 +11,13 @@ rule Group
for (e in children.elements) e.~features=s.~features; for (e in children.elements) e.~features=s.~features;
for (elem : source!ModelElement in children.elements) { for (elem : source!ModelElement in children.elements) {
var e = elem.equivalent(); var e = elem.equivalent();
if(e.instanceOf(target!Inheritance) or
e.instanceOf(target!Fulfillment)) {
if(not(e==null)) t.getRelations().add(e);
} else {
if(not(e==null)) t.getElements().add(e); if(not(e==null)) t.getElements().add(e);
} }
} }
}
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment