ensure proper class hierarchy

mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/000-EntityDefinitions/003-Relationships.yaml

@@ -382,6 +382,9 @@
   - IDR_BEM_Process__uses_loop__Executable_returning_Instance_Set: '{0fb2b538-eacb-418a-b7d8-43a584b85952}'
   - IDR_Executable_returning_Instance_Set__loop_used_by__BEM_Process: '{903e0a4b-f93b-420c-a11d-f34be76d0479}'
 
+  - IDR_BEM_Process__uses_order__Executable_returning_Attribute: '{0e1e6e71-e0ee-4b94-a912-ba1c6bebed2b}'
+  - IDR_Executable_returning_Attribute__order_used_by__BEM_Process: '{3c91d957-6a08-444e-b3b7-360cada2e30f}'
+
   - IDR_Build_Element_Method__has__BEM_Process: '{6f1811b0-4e58-4e66-8318-083b62aac5de}'
   - IDR_BEM_Process__for__Build_Element_Method: '{da991add-0a67-428c-9568-efba5633c91a}'
 

mocha-common/data/libraries/yaml/net.alcetech.Mocha.Debugging/000-EntityDefinitions/003-Relationships.yaml

@@ -379,6 +379,9 @@
   - IDR_BEM_Process__uses_loop__Executable_returning_Instance_Set: '{0fb2b538-eacb-418a-b7d8-43a584b85952}'
   - IDR_Executable_returning_Instance_Set__loop_used_by__BEM_Process: '{903e0a4b-f93b-420c-a11d-f34be76d0479}'
 
+  - IDR_BEM_Process__uses_order__Executable_returning_Attribute: '{0e1e6e71-e0ee-4b94-a912-ba1c6bebed2b}'
+  - IDR_Executable_returning_Attribute__order_used_by__BEM_Process: '{3c91d957-6a08-444e-b3b7-360cada2e30f}'
+
   - IDR_Build_Element_Method__has__BEM_Process: '{6f1811b0-4e58-4e66-8318-083b62aac5de}'
   - IDR_BEM_Process__for__Build_Element_Method: '{da991add-0a67-428c-9568-efba5633c91a}'
 

mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml

@@ -382,6 +382,9 @@
   - IDR_BEM_Process__uses_loop__Executable_returning_Instance_Set: '{0fb2b538-eacb-418a-b7d8-43a584b85952}'
   - IDR_Executable_returning_Instance_Set__loop_used_by__BEM_Process: '{903e0a4b-f93b-420c-a11d-f34be76d0479}'
 
+  - IDR_BEM_Process__uses_order__Executable_returning_Attribute: '{0e1e6e71-e0ee-4b94-a912-ba1c6bebed2b}'
+  - IDR_Executable_returning_Attribute__order_used_by__BEM_Process: '{3c91d957-6a08-444e-b3b7-360cada2e30f}'
+
   - IDR_Build_Element_Method__has__BEM_Process: '{6f1811b0-4e58-4e66-8318-083b62aac5de}'
   - IDR_BEM_Process__for__Build_Element_Method: '{da991add-0a67-428c-9568-efba5633c91a}'
 

mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00016-BEMProcess.yaml

@@ -36,7 +36,22 @@
     destinationClassId: '&IDC_BEMProcess;'
     siblingRelationshipId: '&IDR_BEM_Process__uses_loop__Executable_returning_Instance_Set;'
     singular: no
-    
+
+  - relationship: '&IDR_BEM_Process__uses_order__Executable_returning_Attribute;'
+    index: 72
+    sourceClassId: '&IDC_BEMProcess;'
+    type: 'uses order'
+    destinationClassId: '&IDC_ExecutableReturningAttribute;'
+    siblingRelationshipId: '&IDR_Executable_returning_Attribute__order_used_by__BEM_Process;'
+    singular: yes
+
+  - relationship: '&IDR_Executable_returning_Attribute__order_used_by__BEM_Process;'
+    index: 73
+    sourceClassId: '&IDC_ExecutableReturningAttribute;'
+    type: 'order used by'
+    destinationClassId: '&IDC_BEMProcess;'
+    siblingRelationshipId: '&IDR_BEM_Process__uses_order__Executable_returning_Attribute;'
+    singular: no
 
   - relationship: '&IDR_Element_Content__built_from__BEM_Process;'
     index: 105

mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00029-BuildElementMethod.yaml

@@ -43,9 +43,9 @@
 
   - relationship: '&IDR_Build_Element_Method__returns__Element;'
     index: 54
-    sourceClassId: '&IDC_BuildAttributeMethod;'
+    sourceClassId: '&IDC_BuildElementMethod;'
     type: 'returns'
-    destinationClassId: '&IDC_BuildElementMethod;'
+    destinationClassId: '&IDC_Element;'
     siblingRelationshipId: '&IDR_Element__returned_by__Build_Element_Method;'
     singular: no
 

mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00031-MethodWithStaticAndParms.yaml

@@ -0,0 +1,68 @@
+---
+- entityDefinitions:
+  - IDC_MethodWithStaticAndParms: '{09dc7d22-0993-4c28-b1d8-f8e43b6446ac}'
+  - IDR_Method_with_Static_and_Parms__uses_parm__Work_Data: '{5c7eafbe-952e-4720-b2ab-553414c274fc}'
+  - IDR_Method_with_Static_and_Parms__uses_required_parm__Work_Data: '{eeb6d2b5-48a7-4323-a9b0-e062010f681a}'
+  - IDR_Work_Data__parm_used_by__Method_with_Static_and_Parms: '{b11e9dfb-0755-4d59-bd26-f53c2f4f2454}'
+  - IDR_Work_Data__required_parm_used_by__Method_with_Static_and_Parms: '{d39ddadf-1497-4c7b-b29a-7c7668a6298a}'
+
+- library: '&IDL_MochaBaseSystem;'
+  instances:
+  - class:     '&IDC_MethodWithStaticAndParms;'
+    name:      Method with Static and Parms
+    index:     31
+    abstract:  yes
+    instancesLabeledByRAMB: '&IDMB_Method__get__Fully_Qualified_Name;'
+    translations:
+    - relationship: '&IDR_Class__has_title__Translation;'
+      values:
+      - languageInstanceId: '&IDI_Language_English;'
+        value: 'Method with Static and Parms'
+    relationships:
+    - instance: '&IDR_Method__for__Class;'
+      customTagName: 'forClassId'
+    - instance: '&IDR_Metadata_With_Access_Modifier__has__Access_Modifier;'
+      customTagName: 'accessModifierId'
+    - instance: '&IDR_Instance__for__Module;'
+      customTagName: 'moduleId'
+    - instance: '&IDR_Method__implements__Method;'
+      customTagName: 'implementsMethodId'
+    - instance: '&IDR_Method_with_Static_and_Parms__uses_parm__Work_Data;'
+      customTagName: 'optionalParameters'
+    - instance: '&IDR_Method_with_Static_and_Parms__uses_required_parm__Work_Data;'
+      customTagName: 'requiredParameters'
+    superclasses:
+    - instance: '&IDC_Method;'
+
+  - relationship: '&IDR_Method_with_Static_and_Parms__uses_parm__Work_Data;'
+    index: 119
+    sourceClassId: '&IDC_MethodWithStaticAndParms;'
+    type: 'uses parm'
+    destinationClassId: '&IDC_WorkData;'
+    siblingRelationshipId: '&IDR_Work_Data__parm_used_by__Method_with_Static_and_Parms;'
+    singular: no
+
+  - relationship: '&IDR_Work_Data__parm_used_by__Method_with_Static_and_Parms;'
+    index: 120
+    sourceClassId: '&IDC_WorkData;'
+    type: 'parm used by'
+    destinationClassId: '&IDC_MethodWithStaticAndParms;'
+    siblingRelationshipId: '&IDR_Method_with_Static_and_Parms__uses_parm__Work_Data;'
+    singular: no
+
+  - relationship: '&IDR_Method_with_Static_and_Parms__uses_required_parm__Work_Data;'
+    index: 169
+    sourceClassId: '&IDC_MethodWithStaticAndParms;'
+    type: 'uses required parm'
+    destinationClassId: '&IDC_WorkData;'
+    siblingRelationshipId: '&IDR_Work_Data__required_parm_used_by__Method_with_Static_and_Parms;'
+    singular: no
+
+  - relationship: '&IDR_Work_Data__required_parm_used_by__Method_with_Static_and_Parms;'
+    index: 170
+    sourceClassId: '&IDC_WorkData;'
+    type: 'required parm used by'
+    destinationClassId: '&IDC_MethodWithStaticAndParms;'
+    siblingRelationshipId: '&IDR_Method_with_Static_and_Parms__uses_required_parm__Work_Data;'
+    singular: no
+    

mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00085-ReturnElementMethodBinding.yaml

@@ -7,7 +7,7 @@
     customTagName: returnElementMethodBinding
     superclasses:
     - instance: '&IDC_MethodBinding;'
-    # - instance: '&IDC_ExecutableReturningElement;'
+    - instance: '&IDC_ExecutableReturningElement;'
     instancesLabeledByRAMB: '&IDMB_Method_Binding__get__Executes_Method_and_Method_Type_RAMB;'
     # defaultTask: '&IDI_Task_ViewReturnElementMethodBinding;'
     # relatedTasks:

mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01599-GroupLayout.yaml

@@ -11,6 +11,8 @@
     index: 1599
     customTagName: 'groupLayout'
     registerForTemplate: yes
+    superclasses:
+    - instance: '&IDC_Layout;'
     relationships:
     - instance: '&IDR_Group_Layout__uses__Group_Layout_Option;'
       customTagName: 'options'

mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/13038-ConditionalSelectAttributeMethod.yaml

@@ -14,6 +14,7 @@
     superclasses:
     - instance: '&IDC_Method;'
     - instance: '&IDC_ExecutableReturningAttribute;'
+    - instance: '&IDC_MethodWithStaticAndParms;'
     defaultTask: '&IDI_Task_ViewConditionalSelectAttributeMethod;'
     relatedTasks:
     - instance: '&IDI_Task_ViewConditionalSelectAttributeMethod;'

mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/13041-ConditionalSelectAttributeCase.yaml

@@ -6,7 +6,8 @@
     customTagName: conditionalSelectAttributeCase
     registerForTemplate: yes
     superclasses:
-    - '&IDC_ConditionalEvaluationCase;'
+    - instance: '&IDC_ConditionalEvaluationCase;'
+    - instance: '&IDC_ConditionGroup;'
     defaultTask: '&IDI_Task_ViewConditionalSelectAttributeCase;'
     relatedTasks:
     - instance: '&IDI_Task_ViewConditionalSelectAttributeCase;'