update rules

org.framed.iorm.ui/core/standardPolicies.editpolicy

@@ -59,6 +59,33 @@
     <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Relationships"/>
     <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
   </policies>
+  <policies action="Start" actionType="Relationship">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
+  </policies>
+  <policies action="Add" actionType="Relationship">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:IsTargetType" type="RoleType"/>
+      <rules xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
+    </constraintRule>
+  </policies>
+  <policies action="Add" actionType="RelationshipExclusion">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Start" actionType="RelationshipExclusion">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Add" actionType="RelationshipImplication">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Start" actionType="RelationshipImplication">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
   <policies action="Add" actionType="Fulfillment">
     <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Naturals"/>
     <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
@@ -105,22 +132,6 @@
     <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Dates"/>
     <constraintRule xsi:type="editpolicymodel:IsSourceType" type="DataType"/>
   </policies>
-  <policies action="Add" actionType="RelationshipExclusion">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Start" actionType="RelationshipExclusion">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Add" actionType="RelationshipImplication">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Start" actionType="RelationshipImplication">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
   <policies action="Start" actionType="Inheritance">
     <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Inheritance"/>
     <constraintRule xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
@@ -169,14 +180,6 @@
       <rules xsi:type="editpolicymodel:SourceEqualsTargetType"/>
     </constraintRule>
   </policies>
-  <policies action="Add" actionType="RoleType">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
-  </policies>
-  <policies actionType="RoleType">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
-  </policies>
   <policies action="Add" actionType="CompartmentType">
     <featureRule xsi:type="editpolicymodel:NotFeatureRule">
       <rule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
@@ -215,23 +218,12 @@
       <rule xsi:type="editpolicymodel:InCompartment"/>
     </constraintRule>
   </policies>
-  <policies action="Start" actionType="Relationship">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
-  </policies>
-  <policies action="Add" actionType="Relationship">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:IsTargetType" type="RoleType"/>
-      <rules xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
-    </constraintRule>
-  </policies>
   <policies action="Add" actionType="DataType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Dates"/>
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Types"/>
     <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
   </policies>
   <policies actionType="DataType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Dates"/>
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Types"/>
     <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
   </policies>
   <policies action="Add" actionType="RoleGroup">
@@ -242,6 +234,14 @@
     <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Group_Constraints"/>
     <constraintRule xsi:type="editpolicymodel:InCompartment"/>
   </policies>
+  <policies action="Add" actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
+  </policies>
+  <policies actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
+  </policies>
   <policies action="Add" actionType="NaturalType">
     <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
     <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
@@ -278,4 +278,20 @@
     <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
     <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
   </policies>
+  <policies action="Execute" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Execute" actionType="Relationship">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Execute" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Execute" actionType="Inheritance">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
 </editpolicymodel:Model>

org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyHandler.java

@@ -101,8 +101,9 @@ public class EditPolicyHandler {
 	}
 	
 	public boolean canDirectEdit(IDirectEditingContext context, Type type) {
-		List<ConstraintRule> constraints = this.getConstraints(ActionEnum.DIRECT_EDIT, type);
-		return this.checkConstraints(constraints, context, type);
+		return true;
+		//List<ConstraintRule> constraints = this.getConstraints(ActionEnum.DIRECT_EDIT, type);
+		//return this.checkConstraints(constraints, context, type);
 	}
 	
 	private boolean checkConstraints(List<ConstraintRule> constraints, Object context, Type type)

org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/FeatureRuleVisitor.java

@@ -69,7 +69,7 @@ public class FeatureRuleVisitor {
 
  		for (FRaMEDFeature feature : this.configuration.getFeatures()) {
  			features.add(feature.getName().getName());
- 			System.out.println("EditPolicyHandler featureEnabled: " + feature.getName().getName());
+ 			//System.out.println("EditPolicyHandler featureEnabled: " + feature.getName().getName());
  		}
 
  		if(features.contains(rule.getFeatureName().getName())) {