Clean context everywhere

wrappers/modelverse.py

@@ -179,7 +179,7 @@ def _process_OP(callback, taskname):
     p.join()
 
 def INPUT(action, parameters):
-    controller.addInput(Event("action", "action_in", [action, _next_ID(), None, parameters]))
+    controller.addInput(Event("action", "action_in", [action, _next_ID(), parameters]))
 
 def OUTPUT():
     while 1:

wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Wed May 23 11:39:36 2018
+Date:   Wed May 23 11:52:01 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
@@ -49,7 +49,7 @@ class Modelverse(RuntimeClassBase):
         self.responses = []
         self.http_clients = []
         self.registered_metamodel = {}
-        self.inputs = {}
+        self.inputs = []
         self.finish_output_thread = False
     
     def user_defined_destructor(self):
@@ -57,7 +57,7 @@ class Modelverse(RuntimeClassBase):
     
     
     # user defined method
-    def load_action(self, context):
+    def load_action(self):
         action = self.actions.pop(0)
         self.parameters = action["parameters"]
         self.current_ID = action["ID"]
@@ -106,7 +106,7 @@ class Modelverse(RuntimeClassBase):
     
     
     # user defined method
-    def expect_action(self, context, expected):
+    def expect_action(self, expected):
         if isinstance(expected, list):
             return self.actions and self.actions[0]["name"] in expected
         else:
@@ -114,13 +114,11 @@ class Modelverse(RuntimeClassBase):
     
     
     # user defined method
-    def expect_input(self, context, expected):
-        if None not in self.inputs:
-            return False
+    def expect_input(self, expected):
         if isinstance(expected, list):
-            return self.inputs[None] and self.inputs[None][0]["name"] in expected
+            return self.inputs and self.inputs[0]["name"] in expected
         else:
-            return self.inputs[None] and self.inputs[None][0]["name"] == expected
+            return self.inputs and self.inputs[0]["name"] == expected
     
     
     # builds Statechart structure
@@ -2281,148 +2279,148 @@ class Modelverse(RuntimeClassBase):
         return self.actions
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_0_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_0_guard(self, parameters):
-        return self.expect_action(None, 'element_list')
+        return self.expect_action('element_list')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_1_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_1_guard(self, parameters):
-        return self.expect_action(None, 'element_list_nice')
+        return self.expect_action('element_list_nice')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_2_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_2_guard(self, parameters):
-        return self.expect_action(None, 'types')
+        return self.expect_action('types')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_3_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_3_guard(self, parameters):
-        return self.expect_action(None, 'types_full')
+        return self.expect_action('types_full')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_4_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_4_guard(self, parameters):
-        return self.expect_action(None, 'read_info')
+        return self.expect_action('read_info')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_5_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_5_guard(self, parameters):
-        return self.expect_action(None, 'read_attrs')
+        return self.expect_action('read_attrs')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_6_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_6_guard(self, parameters):
-        return self.expect_action(None, 'read_defined_attrs')
+        return self.expect_action('read_defined_attrs')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_7_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_7_guard(self, parameters):
-        return self.expect_action(None, 'instantiate')
+        return self.expect_action('instantiate')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_8_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_8_guard(self, parameters):
-        return self.expect_action(None, 'delete_element')
+        return self.expect_action('delete_element')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_9_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_9_guard(self, parameters):
-        return self.expect_action(None, 'attr_assign')
+        return self.expect_action('attr_assign')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_10_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_10_guard(self, parameters):
-        return self.expect_action(None, 'attr_assign_code')
+        return self.expect_action('attr_assign_code')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_11_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_11_guard(self, parameters):
-        return self.expect_action(None, 'attr_delete')
+        return self.expect_action('attr_delete')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_12_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_12_guard(self, parameters):
-        return self.expect_action(None, 'attr_name')
+        return self.expect_action('attr_name')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_13_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_13_guard(self, parameters):
-        return self.expect_action(None, 'attr_type')
+        return self.expect_action('attr_type')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_14_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_14_guard(self, parameters):
-        return self.expect_action(None, 'attr_optional')
+        return self.expect_action('attr_optional')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_15_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_15_guard(self, parameters):
-        return self.expect_action(None, 'read_outgoing')
+        return self.expect_action('read_outgoing')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_16_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_16_guard(self, parameters):
-        return self.expect_action(None, 'read_incoming')
+        return self.expect_action('read_incoming')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_17_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_17_guard(self, parameters):
-        return self.expect_action(None, 'read_association_source')
+        return self.expect_action('read_association_source')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_18_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_18_guard(self, parameters):
-        return self.expect_action(None, 'read_association_destination')
+        return self.expect_action('read_association_destination')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_19_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_19_guard(self, parameters):
-        return self.expect_action(None, 'connections_between')
+        return self.expect_action('connections_between')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_20_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_20_guard(self, parameters):
-        return self.expect_action(None, 'define_attribute')
+        return self.expect_action('define_attribute')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_21_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_21_guard(self, parameters):
-        return self.expect_action(None, 'undefine_attribute')
+        return self.expect_action('undefine_attribute')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_22_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_22_guard(self, parameters):
-        return self.expect_action(None, 'all_instances')
+        return self.expect_action('all_instances')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_23_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_23_guard(self, parameters):
-        return self.expect_action(None, 'exit_save')
+        return self.expect_action('exit_save')
     
     def _init_0_exec(self, parameters):
         instance = parameters[0]
@@ -2692,11 +2690,11 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response('Waiting for code constructors...')
     
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_wait_for_user_0_exec(self, parameters):
-        self.inputs[None].pop(0)
+        self.inputs.pop(0)
         self.raiseInternalEvent(Event("request", None, [True]))
     
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_wait_for_user_0_guard(self, parameters):
-        return None in self.inputs and self.inputs[None]
+        return self.inputs
     
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_upload_changes_0_exec(self, parameters):
         self.raiseInternalEvent(Event("request", None, [self.parameters[3]]))
@@ -3025,16 +3023,16 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response('Success')
     
     def _initialized_behaviour_wait_for_action_disconnected_0_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_disconnected_0_guard(self, parameters):
-        return self.expect_action(None, 'init')
+        return self.expect_action('init')
     
     def _initialized_behaviour_wait_for_action_connected_0_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_connected_0_guard(self, parameters):
-        return self.expect_action(None, 'login')
+        return self.expect_action('login')
     
     def _initialized_behaviour_wait_for_action_connected_1_guard(self, parameters):
         return self.expect_response('Success: ready for AL execution')
@@ -3058,10 +3056,10 @@ class Modelverse(RuntimeClassBase):
         return not (self.expect_response('Success', pop=False) or self.expect_response('Failure', pop=False)) and self.expect_response_partial('', pop=False)
     
     def _initialized_behaviour_wait_for_action_activity_SC_forwarding_2_exec(self, parameters):
-        self.raiseInternalEvent(Event("request", None, [self.inputs[None].pop(0)['parameters']]))
+        self.raiseInternalEvent(Event("request", None, [self.inputs.pop(0)['parameters']]))
     
     def _initialized_behaviour_wait_for_action_activity_SC_forwarding_2_guard(self, parameters):
-        return self.expect_input(None, 'data_input')
+        return self.expect_input('data_input')
     
     def _initialized_behaviour_wait_for_action_activity_OP_forwarding_0_guard(self, parameters):
         return self.expect_response_partial('Please perform manual operation ', pop=True)
@@ -3073,249 +3071,249 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response_partial('Please edit this model before sending next input: ', pop=False)
     
     def _initialized_behaviour_wait_for_action_activity_OP_forwarding_2_exec(self, parameters):
-        self.inputs[None].pop(0)
+        self.inputs.pop(0)
         self.raiseInternalEvent(Event("request", None, [0]))
     
     def _initialized_behaviour_wait_for_action_activity_OP_forwarding_2_guard(self, parameters):
-        return None in self.inputs and self.inputs[None]
+        return self.inputs
     
     def _initialized_behaviour_wait_for_action_megamodelling_0_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_0_guard(self, parameters):
-        return self.expect_action(None, 'model_list')
+        return self.expect_action('model_list')
     
     def _initialized_behaviour_wait_for_action_megamodelling_1_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_1_guard(self, parameters):
-        return self.expect_action(None, 'model_add')
+        return self.expect_action('model_add')
     
     def _initialized_behaviour_wait_for_action_megamodelling_2_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_2_guard(self, parameters):
-        return self.expect_action(None, 'model_move')
+        return self.expect_action('model_move')
     
     def _initialized_behaviour_wait_for_action_megamodelling_3_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_3_guard(self, parameters):
-        return self.expect_action(None, 'model_delete')
+        return self.expect_action('model_delete')
     
     def _initialized_behaviour_wait_for_action_megamodelling_4_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_4_guard(self, parameters):
-        return self.expect_action(None, 'model_list_full')
+        return self.expect_action('model_list_full')
     
     def _initialized_behaviour_wait_for_action_megamodelling_5_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_5_guard(self, parameters):
-        return self.expect_action(None, 'verify')
+        return self.expect_action('verify')
     
     def _initialized_behaviour_wait_for_action_megamodelling_6_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_6_guard(self, parameters):
-        return self.expect_action(None, 'alter_context')
+        return self.expect_action('alter_context')
     
     def _initialized_behaviour_wait_for_action_megamodelling_7_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_7_guard(self, parameters):
-        return self.expect_action(None, 'model_overwrite')
+        return self.expect_action('model_overwrite')
     
     def _initialized_behaviour_wait_for_action_megamodelling_8_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_8_guard(self, parameters):
-        return self.expect_action(None, 'disconnect')
+        return self.expect_action('disconnect')
     
     def _initialized_behaviour_wait_for_action_megamodelling_9_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_9_guard(self, parameters):
-        return self.expect_action(None, 'user_logout')
+        return self.expect_action('user_logout')
     
     def _initialized_behaviour_wait_for_action_megamodelling_10_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_10_guard(self, parameters):
-        return self.expect_action(None, 'user_delete')
+        return self.expect_action('user_delete')
     
     def _initialized_behaviour_wait_for_action_megamodelling_11_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_11_guard(self, parameters):
-        return self.expect_action(None, 'model_render')
+        return self.expect_action('model_render')
     
     def _initialized_behaviour_wait_for_action_megamodelling_12_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_12_guard(self, parameters):
-        return self.expect_action(None, 'model_rendered')
+        return self.expect_action('model_rendered')
     
     def _initialized_behaviour_wait_for_action_megamodelling_13_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_13_guard(self, parameters):
-        return self.expect_action(None, 'transformation_between')
+        return self.expect_action('transformation_between')
     
     def _initialized_behaviour_wait_for_action_megamodelling_14_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_14_guard(self, parameters):
-        return self.expect_action(None, 'transformation_signature')
+        return self.expect_action('transformation_signature')
     
     def _initialized_behaviour_wait_for_action_megamodelling_15_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_15_guard(self, parameters):
-        return self.expect_action(None, 'process_signature')
+        return self.expect_action('process_signature')
     
     def _initialized_behaviour_wait_for_action_megamodelling_16_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_16_guard(self, parameters):
-        return self.expect_action(None, 'transformation_add_MT')
+        return self.expect_action('transformation_add_MT')
     
     def _initialized_behaviour_wait_for_action_megamodelling_17_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_17_guard(self, parameters):
-        return self.expect_action(None, 'transformation_add_AL')
+        return self.expect_action('transformation_add_AL')
     
     def _initialized_behaviour_wait_for_action_megamodelling_18_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_18_guard(self, parameters):
-        return self.expect_action(None, 'transformation_add_MANUAL')
+        return self.expect_action('transformation_add_MANUAL')
     
     def _initialized_behaviour_wait_for_action_megamodelling_19_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_19_guard(self, parameters):
-        return self.expect_action(None, 'transformation_execute')
+        return self.expect_action('transformation_execute')
     
     def _initialized_behaviour_wait_for_action_megamodelling_20_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_20_guard(self, parameters):
-        return self.expect_action(None, 'process_execute')
+        return self.expect_action('process_execute')
     
     def _initialized_behaviour_wait_for_action_megamodelling_21_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_21_guard(self, parameters):
-        return self.expect_action(None, 'permission_modify')
+        return self.expect_action('permission_modify')
     
     def _initialized_behaviour_wait_for_action_megamodelling_22_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_22_guard(self, parameters):
-        return self.expect_action(None, 'permission_owner')
+        return self.expect_action('permission_owner')
     
     def _initialized_behaviour_wait_for_action_megamodelling_23_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_23_guard(self, parameters):
-        return self.expect_action(None, 'permission_group')
+        return self.expect_action('permission_group')
     
     def _initialized_behaviour_wait_for_action_megamodelling_24_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_24_guard(self, parameters):
-        return self.expect_action(None, 'group_create')
+        return self.expect_action('group_create')
     
     def _initialized_behaviour_wait_for_action_megamodelling_25_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_25_guard(self, parameters):
-        return self.expect_action(None, 'group_delete')
+        return self.expect_action('group_delete')
     
     def _initialized_behaviour_wait_for_action_megamodelling_26_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_26_guard(self, parameters):
-        return self.expect_action(None, 'group_owner_add')
+        return self.expect_action('group_owner_add')
     
     def _initialized_behaviour_wait_for_action_megamodelling_27_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_27_guard(self, parameters):
-        return self.expect_action(None, 'group_owner_delete')
+        return self.expect_action('group_owner_delete')
     
     def _initialized_behaviour_wait_for_action_megamodelling_28_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_28_guard(self, parameters):
-        return self.expect_action(None, 'group_join')
+        return self.expect_action('group_join')
     
     def _initialized_behaviour_wait_for_action_megamodelling_29_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_29_guard(self, parameters):
-        return self.expect_action(None, 'group_kick')
+        return self.expect_action('group_kick')
     
     def _initialized_behaviour_wait_for_action_megamodelling_30_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_30_guard(self, parameters):
-        return self.expect_action(None, 'group_list')
+        return self.expect_action('group_list')
     
     def _initialized_behaviour_wait_for_action_megamodelling_31_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_31_guard(self, parameters):
-        return self.expect_action(None, 'admin_promote')
+        return self.expect_action('admin_promote')
     
     def _initialized_behaviour_wait_for_action_megamodelling_32_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_32_guard(self, parameters):
-        return self.expect_action(None, 'admin_demote')
+        return self.expect_action('admin_demote')
     
     def _initialized_behaviour_wait_for_action_megamodelling_33_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_33_guard(self, parameters):
-        return self.expect_action(None, 'conformance_delete')
+        return self.expect_action('conformance_delete')
     
     def _initialized_behaviour_wait_for_action_megamodelling_34_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_34_guard(self, parameters):
-        return self.expect_action(None, 'conformance_add')
+        return self.expect_action('conformance_add')
     
     def _initialized_behaviour_wait_for_action_megamodelling_35_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_35_guard(self, parameters):
-        return self.expect_action(None, 'folder_create')
+        return self.expect_action('folder_create')
     
     def _initialized_behaviour_wait_for_action_megamodelling_36_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_36_guard(self, parameters):
-        return self.expect_action(None, 'model_types')
+        return self.expect_action('model_types')
     
     def _initialized_behaviour_wait_for_action_megamodelling_37_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_37_guard(self, parameters):
-        return self.expect_action(None, 'service_register')
+        return self.expect_action('service_register')
     
     def _initialized_behaviour_wait_for_action_megamodelling_38_exec(self, parameters):
         self.raiseInternalEvent(Event("result", None, [None]))
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_megamodelling_38_guard(self, parameters):
-        return self.expect_action(None, 'exit_save')
+        return self.expect_action('exit_save')
     
     def _initialized_behaviour_wait_for_action_megamodelling_39_guard(self, parameters):
-        return self.expect_action(None, ['element_list', 'element_list_nice', 'types', 'types_full', 'read_info', 'read_attrs', 'read_defined_attrs', 'instantiate', 'delete_element', 'attr_assign', 'attr_assign_code', 'attr_delete', 'read_outgoing', 'read_incoming', 'read_association_source', 'read_association_destination', 'connections_between', 'define_attribute', 'undefine_attribute', 'all_instances', 'attr_optional', 'attr_type', 'attr_name'])
+        return self.expect_action(['element_list', 'element_list_nice', 'types', 'types_full', 'read_info', 'read_attrs', 'read_defined_attrs', 'instantiate', 'delete_element', 'attr_assign', 'attr_assign_code', 'attr_delete', 'read_outgoing', 'read_incoming', 'read_association_source', 'read_association_destination', 'connections_between', 'define_attribute', 'undefine_attribute', 'all_instances', 'attr_optional', 'attr_type', 'attr_name'])
     
     def _initialized_behaviour_wait_for_action_service_0_exec(self, parameters):
         import modelverse
@@ -3327,16 +3325,16 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response_partial('', pop=False)
     
     def _initialized_behaviour_wait_for_action_service_1_exec(self, parameters):
-        self.load_action(None)
+        self.load_action()
     
     def _initialized_behaviour_wait_for_action_service_1_guard(self, parameters):
-        return self.expect_action(None, 'service_stop')
+        return self.expect_action('service_stop')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_manual_0_guard(self, parameters):
-        return self.expect_action(None, 'exit')
+        return self.expect_action('exit')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_manual_1_guard(self, parameters):
-        return self.expect_action(None, 'drop')
+        return self.expect_action('drop')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_manual_2_guard(self, parameters):
         return self.actions and self.actions[0]['parameters'][0] != self.current_model
@@ -3345,13 +3343,13 @@ class Modelverse(RuntimeClassBase):
         self.raiseInternalEvent(Event("request", None, ['exit']))
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_scripted_0_guard(self, parameters):
-        return self.expect_action(None, 'exit')
+        return self.expect_action('exit')
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_scripted_1_exec(self, parameters):
         self.raiseInternalEvent(Event("request", None, ['drop']))
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_scripted_1_guard(self, parameters):
-        return self.expect_action(None, 'drop')
+        return self.expect_action('drop')
     
     def _initialized_behaviour_going_manual_init_0_guard(self, parameters):
         return self.current_model in self.registered_metamodel
@@ -3385,8 +3383,7 @@ class Modelverse(RuntimeClassBase):
     def _initialized_queue_queue_0_exec(self, parameters):
         action_name = parameters[0]
         ID = parameters[1]
-        context_ID = parameters[2]
-        parameters = parameters[3]
+        parameters = parameters[2]
         self.actions.append({"name": action_name, "ID": ID, "parameters": parameters})
     
     def _initialized_queue_queue_1_exec(self, parameters):
@@ -3411,7 +3408,7 @@ class Modelverse(RuntimeClassBase):
     
     def _initialized_queue_queue_5_exec(self, parameters):
         value = parameters[0]
-        self.inputs.setdefault(None, []).append({"name": "data_input", "parameters": value})
+        self.inputs.append({"name": "data_input", "parameters": value})
     
     def initializeStatechart(self):
         # enter default state