diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/graphitifeatures/ChangeConfigurationFeature.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/graphitifeatures/ChangeConfigurationFeature.java index 5123b3f26afb034b06801563aa222db41f9addb9..49dfb21292c6a1cfa14917ddbec85311dea2a955 100644 --- a/org.framed.iorm.ui/src/org/framed/iorm/ui/graphitifeatures/ChangeConfigurationFeature.java +++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/graphitifeatures/ChangeConfigurationFeature.java @@ -82,8 +82,6 @@ public class ChangeConfigurationFeature extends AbstractCustomFeature { //Step 2 FRaMEDFeature framedFeature = FeaturemodelFactory.eINSTANCE.createFRaMEDFeature(); framedFeature.setName(FeatureName.getByName(editorFeature.getName())); - if(editorFeatureConfiguration.getManualFeatures().contains(editorFeature)) - framedFeature.setManuallySelected(true); framedFeatureConfiguration.getFeatures().add(framedFeature); } //Step 3 diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java index b862e51c3834a5ceef98deb4476a2db61957185b..318fb0e59bf5be26381230c5689a93488038ed83 100644 --- a/org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java +++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java @@ -376,10 +376,10 @@ public class MultipageEditor extends FormEditor implements ISelectionListener, I //check if(editorFeatures != null) editorFeatures.synchronizeConfigurationEditorAndModelConfiguration(); - refreshFile(); boolean transformationSuccessful = transformModel(); if(!transformationSuccessful) throw new TransformationFailedException(); MultipageEditorSynchronizationService.synchronize(); + refreshFile(); } } diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/util/EditorInputUtil.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/util/EditorInputUtil.java index fea0d85eb203b9c36fc959e7a0c9b9edf339abbc..c6598aecb6ae60864f4ddb0d6deffbf480320662 100644 --- a/org.framed.iorm.ui/src/org/framed/iorm/ui/util/EditorInputUtil.java +++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/util/EditorInputUtil.java @@ -29,7 +29,6 @@ public class EditorInputUtil { * @return the generated editor input */ public static IFileEditorInput getIFileEditorInputForResource(Resource resource) { - System.out.println(resource); IPath path = new Path(resource.getURI().toFileString()); IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path); return new FileEditorInput(file); diff --git a/org.framed.orm.transformation/epsilon/CompartmentType.etl b/org.framed.orm.transformation/epsilon/CompartmentType.etl index 95b03482666659997e2a442dfd3bd2f6378f5a0c..32ca75e4f07a3da442d16f043dcd50b15512e4d2 100644 --- a/org.framed.orm.transformation/epsilon/CompartmentType.etl +++ b/org.framed.orm.transformation/epsilon/CompartmentType.etl @@ -58,7 +58,7 @@ rule CompartmentType n.getRelationships().add(e); } else if ( e.instanceOf(target!RoleInheritance)) { t.~parent.relations.add(e); - } + } } } diff --git a/org.framed.orm.transformation/epsilon/Group.etl b/org.framed.orm.transformation/epsilon/Group.etl index a2b0438aebf2ceb4f35fea7c3b19fcd0928d5acf..819088390723aa0a436286435f9eb629b5c62e0d 100644 --- a/org.framed.orm.transformation/epsilon/Group.etl +++ b/org.framed.orm.transformation/epsilon/Group.etl @@ -8,10 +8,15 @@ rule Group var children = s.`model`; if (not (children == null)) { - 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) { var e = elem.equivalent(); - if(not(e==null))t.getElements().add(e); + 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); + } } }