modified ecl and editpolicies

org.framed.iorm.ui/core/attributeAndOperation/AttributeAndOperation.ecl

-//NaturalType 
-Create_Attribute NaturalType (true) when true;  
-Create_Operation NaturalType (true) when true;  
-Create_Property NaturalType (true) when true;  
-Add_Property NaturalType (true) when true;   
-
-//NaturalType
-Create_Attribute DataType (true) when true;  
-Create_Operation DataType (true) when true;  
-Create_Property DataType (true) when true;  
-Add_Property DataType (true) when true;  

org.framed.iorm.ui/core/fulfillment/Fulfillment.ecl

-//Fullfillment or Players??  
-Start Fulfillment (Naturals) when IsSourceType(NaturalType);  
-Add Fulfillment (Naturals) when IsSourceType(NaturalType) and IsTargetType(CompartmentType);
-Create Fulfillment (Naturals) when IsSourceType(NaturalType) and IsTargetType(CompartmentType);
-Reconnect Fulfillment (Naturals) when IsSourceType(NaturalType) and IsTargetType(CompartmentType);
-
-Start Fulfillment (Roles) when IsSourceType(RoleType);
-Add Fulfillment (Roles) when IsSourceType(RoleType) and IsTargetType(CompartmentType);
-Create Fulfillment (Roles) when IsSourceType(RoleType) and IsTargetType(CompartmentType);
-Reconnect Fulfillment (Roles) when IsSourceType(RoleType) and IsTargetType(CompartmentType);
-
-Start Fulfillment (Compartments) when IsSourceType(CompartmentType);
-Add Fulfillment (Compartments) when IsSourceType(CompartmentType) and IsTargetType(CompartmentType) and !SourceEqualsTarget();
-Create Fulfillment (Compartments) when IsSourceType(CompartmentType) and IsTargetType(CompartmentType) and !SourceEqualsTarget();
-Reconnect Fulfillment (Compartments) when IsSourceType(CompartmentType) and IsTargetType(CompartmentType) and !SourceEqualsTarget();
-
-Start Fulfillment (Dates) when IsSourceType(DataType);
-Add Fulfillment (Dates) when IsSourceType(DataType);
-Create Fulfillment (Dates) when IsSourceType(DataType);
-Reconnect Fulfillment (Dates) when IsSourceType(DataType);
-
-Execute Fulfillment (true) when true;

org.framed.iorm.ui/core/group/Group.ecl

 Add Group (true) when true; 
 Create Group (true) when true;
+Direct_Edit Group (true) when true;
 

org.framed.iorm.ui/core/group/Group.editpolicy

@@ -8,4 +8,8 @@
     <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
     <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
   </policies>
+  <policies action="Direct_Edit" actionType="Group">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
 </editpolicymodel:Model>

org.framed.iorm.ui/core/inheritance/Inheritance.ecl

-//Inheritance  
-Start Inheritance (Naturals) when IsSourceType(NaturalType); 
-Add Inheritance (Naturals) when IsSourceType(NaturalType) and SourceEqualsTargetType() and !SourceEqualsTarget();
-Reconnect Inheritance (Naturals) when IsSourceType(NaturalType) and SourceEqualsTargetType() and !SourceEqualsTarget();
-Create Inheritance (Naturals) when IsSourceType(NaturalType) and SourceEqualsTargetType() and !SourceEqualsTarget();
-
-Execute Inheritance (true) when true;
- 

org.framed.iorm.ui/core/naturaltype/NaturalType.ecl

 Add NaturalType (true) when true; 
 Create NaturalType (true) when true;
+Direct_Edit NaturalType (true) when true;
 

org.framed.iorm.ui/core/naturaltype/NaturalType.editpolicy

@@ -8,4 +8,8 @@
     <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
     <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
   </policies>
+  <policies action="Direct_Edit" actionType="NaturalType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
 </editpolicymodel:Model>

org.framed.iorm.ui/core/rolemodel/RoleModel.ecl

+//compartmentTypes
+//If Compartment_Types is not set, then only one CompartmentType can be
+//added in the top-level view (This will be named RoleModel).  
+Add CompartmentType (!Compartment_Types) when !InType(CompartmentType) and !ContainsCompartment();
+Create CompartmentType (!Compartment_Types) when !InType(CompartmentType) and !ContainsCompartment();
+Direct_Edit CompartmentType (true) when true;
+  
\ No newline at end of file

org.framed.iorm.ui/core/rolemodel/RoleModel.editpolicy

+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Add" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:NotFeatureRule">
+      <rule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
+    </featureRule>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:NotConstraintRule">
+        <rule xsi:type="editpolicymodel:InType" type="CompartmentType"/>
+      </rules>
+      <rules xsi:type="editpolicymodel:NotConstraintRule">
+        <rule xsi:type="editpolicymodel:ContainsCompartment"/>
+      </rules>
+    </constraintRule>
+  </policies>
+  <policies actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:NotFeatureRule">
+      <rule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
+    </featureRule>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:NotConstraintRule">
+        <rule xsi:type="editpolicymodel:InType" type="CompartmentType"/>
+      </rules>
+      <rules xsi:type="editpolicymodel:NotConstraintRule">
+        <rule xsi:type="editpolicymodel:ContainsCompartment"/>
+      </rules>
+    </constraintRule>
+  </policies>
+  <policies action="Direct_Edit" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+</editpolicymodel:Model>

org.framed.iorm.ui/core/roletype/RoleType.ecl

+Add RoleType (true) when InType(CompartmentType);   
+Create RoleType (true) when InType(CompartmentType); 
+Direct_Edit RoleType (true) when InType(CompartmentType);
\ No newline at end of file

org.framed.iorm.ui/core/roletype/RoleType.editpolicy

+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Add" actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:InType" type="CompartmentType"/>
+  </policies>
+  <policies actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:InType" type="CompartmentType"/>
+  </policies>
+  <policies action="Direct_Edit" actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:InType" type="CompartmentType"/>
+  </policies>
+</editpolicymodel:Model>

org.framed.iorm.ui/modules/compartment/CompartmentTypes.ecl

 //compartmentTypes
-//If Compartment_Types is not set, then only one CompartmentType can be
-//added in the top-level view (This will be named RoleModel).  
-Add CompartmentType (!Compartment_Types) when !InType(CompartmentType) and !ContainsCompartment();
-Create CompartmentType (!Compartment_Types) when !InType(CompartmentType) and !ContainsCompartment();
 Add CompartmentType (Compartment_Types) when !InType(CompartmentType);
 Create CompartmentType (Compartment_Types) when !InType(CompartmentType);
\ No newline at end of file
-  
\ No newline at end of file

org.framed.iorm.ui/modules/compartment/CompartmentTypes.editpolicy

 <?xml version="1.0" encoding="ASCII"?>
 <editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
-  <policies action="Add" actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:NotFeatureRule">
-      <rule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
-    </featureRule>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:NotConstraintRule">
-        <rule xsi:type="editpolicymodel:InType" type="CompartmentType"/>
-      </rules>
-      <rules xsi:type="editpolicymodel:NotConstraintRule">
-        <rule xsi:type="editpolicymodel:ContainsCompartment"/>
-      </rules>
-    </constraintRule>
-  </policies>
-  <policies actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:NotFeatureRule">
-      <rule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
-    </featureRule>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:NotConstraintRule">
-        <rule xsi:type="editpolicymodel:InType" type="CompartmentType"/>
-      </rules>
-      <rules xsi:type="editpolicymodel:NotConstraintRule">
-        <rule xsi:type="editpolicymodel:ContainsCompartment"/>
-      </rules>
-    </constraintRule>
-  </policies>
   <policies action="Add" actionType="CompartmentType">
     <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
     <constraintRule xsi:type="editpolicymodel:NotConstraintRule">

org.framed.iorm.ui/modules/compartment/contains_compartments/ContainsCompartments.ecl

-//ContainsCompartments
-Add CompartmentType (Contains_Compartments) when InType(CompartmentType);
-Create CompartmentType (Contains_Compartments) when InType(CompartmentType); 
\ No newline at end of file

org.framed.iorm.ui/modules/compartment/inheritance/CompartmentInheritance.ecl

-//Inheritance or Role_Inheritance/Data_Type_Inheritance/Compartment_Inheritance     
-Start Inheritance (Compartment_Inheritance) when IsSourceType(CompartmentType); 
-Add Inheritance (Compartment_Inheritance) when IsSourceType(CompartmentType) and !SourceEqualsTarget() and SourceEqualsTargetType(); //acyclic
-Create Inheritance (Compartment_Inheritance) when IsSourceType(CompartmentType) and !SourceEqualsTarget() and SourceEqualsTargetType(); //acyclic
-   
\ No newline at end of file

org.framed.iorm.ui/modules/compartment/playing_own_roles/PlayingOwnRoles.ecl

-//Playing_own_roles 
-Start Fulfillment (Playable_by_Defining_Compartment) when IsSourceType(CompartmentType); 
-Add Fulfillment (Playable_by_Defining_Compartment) when IsSourceType(CompartmentType) and SourceEqualsTarget();
-Create Fulfillment (Playable_by_Defining_Compartment) when IsSourceType(CompartmentType) and SourceEqualsTarget();
-Reconnect Fulfillment (Playable_by_Defining_Compartment) when IsSourceType(CompartmentType) and SourceEqualsTarget();
\ No newline at end of file

org.framed.iorm.ui/modules/datatype/DataTypes.ecl

 //DataTypes
 Add DataType (Data_Types) when true;   
 Create DataType (Data_Types) when true; 
+Direct_Edit DataType (true) when true;
\ No newline at end of file

org.framed.iorm.ui/modules/datatype/DataTypes.editpolicy

@@ -8,4 +8,8 @@
     <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Types"/>
     <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
   </policies>
+  <policies action="Direct_Edit" actionType="DataType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
 </editpolicymodel:Model>

org.framed.iorm.ui/modules/datatype/inheritance/DataTypeInheritance.ecl

-//Inheritance or Role_Inheritance/Data_Type_Inheritance/Compartment_Inheritance
-Start Inheritance (Data_Type_Inheritance) when IsSourceType(DataType);  
-Add Inheritance (Data_Type_Inheritance) when IsSourceType(DataType) and !SourceEqualsTarget() and SourceEqualsTargetType(); // check acyclic
-Reconnect Inheritance (Data_Type_Inheritance) when IsSourceType(DataType) and !SourceEqualsTarget() and SourceEqualsTargetType();
-Create Inheritance (Data_Type_Inheritance) when IsSourceType(DataType) and !SourceEqualsTarget() and SourceEqualsTargetType(); // check acyclic // check acyclic
\ No newline at end of file

org.framed.iorm.ui/modules/relationship/Relationship.ecl

-//Relationships  
-Start Relationship (Relationships) when IsSourceType(RoleType);
-Add Relationship (Relationships) when IsTargetType(RoleType) and IsSourceType(RoleType) and !SourceEqualsTarget();
-Reconnect Relationship (Relationships) when IsTargetType(RoleType) and IsSourceType(RoleType) and !SourceEqualsTarget();
-Create Relationship (Relationships) when IsTargetType(RoleType) and IsSourceType(RoleType) and !SourceEqualsTarget();
- 
-Execute Relationship (Relationships) when true;