Skip to content
Snippets Groups Projects
Commit 2878efc1 authored by nullsub's avatar nullsub
Browse files

refresh policies on config change

parent b0bf814c
No related branches found
No related tags found
No related merge requests found
...@@ -115,6 +115,10 @@ ...@@ -115,6 +115,10 @@
<featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/> <featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/> <constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies> </policies>
<policies action="Start" actionType="RelationshipExclusion">
<featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies>
<policies actionType="RelationshipExclusion"> <policies actionType="RelationshipExclusion">
<featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/> <featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/> <constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
...@@ -123,10 +127,18 @@ ...@@ -123,10 +127,18 @@
<featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/> <featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/> <constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies> </policies>
<policies action="Start" actionType="RelationshipImplication">
<featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies>
<policies actionType="RelationshipImplication"> <policies actionType="RelationshipImplication">
<featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/> <featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/> <constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies> </policies>
<policies action="Start" actionType="Inheritance">
<featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Role_Inheritance"/>
<constraintRule xsi:type="Editpolicymodel:IsSourceType" type="RoleType"/>
</policies>
<policies action="Add" actionType="Inheritance"> <policies action="Add" actionType="Inheritance">
<featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Role_Inheritance"/> <featureRule xsi:type="Editpolicymodel:IsFeature" featureName="Role_Inheritance"/>
<constraintRule xsi:type="Editpolicymodel:AndConstraintRule"> <constraintRule xsi:type="Editpolicymodel:AndConstraintRule">
...@@ -233,10 +245,6 @@ ...@@ -233,10 +245,6 @@
<featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/> <featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/> <constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies> </policies>
<policies actionType="Inheritance">
<featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies>
<policies actionType="NaturalType"> <policies actionType="NaturalType">
<featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/> <featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/> <constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
...@@ -245,11 +253,11 @@ ...@@ -245,11 +253,11 @@
<featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/> <featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/> <constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies> </policies>
<policies actionType="RoleGroup"> <policies actionType="Inheritance">
<featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/> <featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/> <constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies> </policies>
<policies action="Start" actionType="Inheritance"> <policies actionType="RoleGroup">
<featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/> <featureRule xsi:type="Editpolicymodel:TrueFeatureRule"/>
<constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/> <constraintRule xsi:type="Editpolicymodel:TrueConstraintRule"/>
</policies> </policies>
......
...@@ -4,6 +4,7 @@ import org.eclipse.gef.commands.Command; ...@@ -4,6 +4,7 @@ import org.eclipse.gef.commands.Command;
import org.eclipse.graphiti.features.custom.ICustomFeature; import org.eclipse.graphiti.features.custom.ICustomFeature;
import org.eclipse.swt.widgets.TreeItem; import org.eclipse.swt.widgets.TreeItem;
import org.framed.iorm.ui.UILiterals; import org.framed.iorm.ui.UILiterals;
import org.framed.iorm.ui.editPolicy.EditPolicyService;
import org.framed.iorm.ui.subeditors.FRaMEDDiagramEditor; import org.framed.iorm.ui.subeditors.FRaMEDDiagramEditor;
import org.framed.iorm.ui.subeditors.FRaMEDFeatureEditor; import org.framed.iorm.ui.subeditors.FRaMEDFeatureEditor;
...@@ -74,6 +75,8 @@ public class ChangeConfigurationCommand extends Command { ...@@ -74,6 +75,8 @@ public class ChangeConfigurationCommand extends Command {
ChangeConfigurationContext changeConfigurationContext = new ChangeConfigurationContext(); ChangeConfigurationContext changeConfigurationContext = new ChangeConfigurationContext();
changeConfigurationContext.setBehaviorEditor(behaviorDiagramEditor); changeConfigurationContext.setBehaviorEditor(behaviorDiagramEditor);
changeConfigurationContext.setConfiguration(featureEditor.getConfiguration()); changeConfigurationContext.setConfiguration(featureEditor.getConfiguration());
EditPolicyService.setDirty();
if(changeConfigurationFeature.canExecute(changeConfigurationContext)) { if(changeConfigurationFeature.canExecute(changeConfigurationContext)) {
//Step 4 //Step 4
changeConfigurationFeature.execute(changeConfigurationContext); changeConfigurationFeature.execute(changeConfigurationContext);
......
...@@ -28,7 +28,6 @@ import org.framed.iorm.ui.UIUtil; ...@@ -28,7 +28,6 @@ import org.framed.iorm.ui.UIUtil;
*/ */
public class EditPolicyService { public class EditPolicyService {
private static List<Editpolicymodel.Model> editpolicymodels; private static List<Editpolicymodel.Model> editpolicymodels;
/** /**
...@@ -47,7 +46,6 @@ public class EditPolicyService { ...@@ -47,7 +46,6 @@ public class EditPolicyService {
public static EditPolicyHandler getHandler(Diagram diagram0) public static EditPolicyHandler getHandler(Diagram diagram0)
{ {
if(diagram0 == null) { if(diagram0 == null) {
System.out.println("diagram in getHandler is null!"); System.out.println("diagram in getHandler is null!");
return null; return null;
...@@ -136,6 +134,11 @@ public class EditPolicyService { ...@@ -136,6 +134,11 @@ public class EditPolicyService {
} }
} }
public static void setDirty() {
//empty handlers to reload config
EditPolicyService.editPolicyHandlers = new HashMap<>();
}
/** /**
* do SAT checking whether policies can be used together * do SAT checking whether policies can be used together
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment