Fix add_AL when there are no input/output parameters

unit/log_output.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:   Mon Aug 28 10:53:51 2017
+Date:   Thu Nov  9 14:10:11 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   Logging
@@ -77,7 +77,6 @@ class Logging(RuntimeClassBase):
     def _init_0_exec(self, parameters):
         value = parameters[0]
         self.log.append(value)
-        print("Got value: " + str(value))
     
     def initializeStatechart(self):
         # enter default state
@@ -96,11 +95,11 @@ class ObjectManager(ObjectManagerBase):
             raise Exception("Cannot instantiate class " + class_name)
         return instance
 
-class Controller(ThreadsControllerBase):
-    def __init__(self, log, keep_running = None, behind_schedule_callback = None):
-        if keep_running == None: keep_running = True
+class Controller(EventLoopControllerBase):
+    def __init__(self, log, event_loop_callbacks, finished_callback = None, behind_schedule_callback = None):
+        if finished_callback == None: finished_callback = None
         if behind_schedule_callback == None: behind_schedule_callback = None
-        ThreadsControllerBase.__init__(self, ObjectManager(self), keep_running, behind_schedule_callback)
+        EventLoopControllerBase.__init__(self, ObjectManager(self), event_loop_callbacks, finished_callback, behind_schedule_callback)
         self.addInputPort("inp")
         self.addOutputPort("outp")
         self.object_manager.createInstance("Logging", [log])

unit/log_output.xml

@@ -20,7 +20,6 @@
                     <parameter name="value"/>
                     <script>
                         self.log.append(value)
-                        print("Got value: " + str(value))
                     </script>
                 </transition>
 
@@ -29,11 +28,7 @@
                 <transition event="terminate" port="inp" target="../finished"/>
             </state>
 
-            <state id="finished">
-                <script>
-                    print("FINISHED")
-                </script>
-            </state>
+            <state id="finished"/>
         </scxml>
     </class>
 </diagram>

wrappers/classes/modelverse.xml

@@ -168,7 +168,7 @@
                         </raise>
                         <script>
                             self.responses.append(json.loads(data))
-                            #print("Got data: " + str(json.loads(data)))
+                            print("Got data: " + str(json.loads(data)))
                         </script>
                     </transition>
 
@@ -649,9 +649,8 @@
 
                             <state id="edit_metamodel">
                                 <transition cond="self.expect_response('Model loaded, ready for commands!')" target="../../../../going_scripted"/>
-                                <transition cond="self.expect_response('Waiting for code constructors...')" target="../send_model"/>
                             </state>
-
+                               
                             <state id="send_model">
                                 <onentry>
                                     <raise event="request">
@@ -665,6 +664,8 @@
                                     </raise>
                                 </transition>
                             </state>
+
+                            <transition cond="self.expect_response('Waiting for code constructors...')" target="send_model"/>
                         </state>
 
                         <state id="transformation_add_MANUAL" initial="send_metadata">

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:   Thu Nov  9 13:32:52 2017
+Date:   Thu Nov  9 14:20:45 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
@@ -1012,10 +1012,6 @@ class Modelverse(RuntimeClassBase):
         _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0.setTrigger(None)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0_guard)
         self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/edit_metamodel"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0)
-        _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_1 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/edit_metamodel"], [self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/send_model"]])
-        _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_1.setTrigger(None)
-        _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_1.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_1_guard)
-        self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/edit_metamodel"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_1)
         
         # transition /initialized/behaviour/operations/store_on_scripted/transformation_add_AL/send_model
         _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_model_0 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/send_model"], [self.states["/initialized/behaviour/wait_for_action/megamodelling"]])
@@ -1798,6 +1794,12 @@ class Modelverse(RuntimeClassBase):
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_0.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_MT_0_guard)
         self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MT"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_MT_0)
         
+        # transition /initialized/behaviour/operations/store_on_scripted/transformation_add_AL
+        _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_0 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL"], [self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/send_model"]])
+        _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_0.setTrigger(None)
+        _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_0.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_AL_0_guard)
+        self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_AL_0)
+        
         # transition /initialized/behaviour/operations/store_on_scripted/process_execute/enacting
         _initialized_behaviour_operations_store_on_scripted_process_execute_enacting_0 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/process_execute/enacting"], [self.states["/initialized/behaviour/operations/store_on_scripted/process_execute/executing"]])
         _initialized_behaviour_operations_store_on_scripted_process_execute_enacting_0.setTrigger(None)
@@ -2222,6 +2224,9 @@ class Modelverse(RuntimeClassBase):
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_0_guard(self, parameters):
         return self.expect_response_partial('', pop=False)
     
+    def _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_0_guard(self, parameters):
+        return self.expect_response('Waiting for code constructors...')
+    
     def _initialized_behaviour_operations_store_on_scripted_process_execute_enacting_0_guard(self, parameters):
         return self.expect_response('Success', pop=True)
     
@@ -2429,7 +2434,7 @@ class Modelverse(RuntimeClassBase):
         data = parameters[0]
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, self.http_clients[1], Event("HTTP_input", None, [urllib.urlencode({"op": "get_output", "taskname": self.taskname}), "parent"])]))
         self.responses.append(json.loads(data))
-        #print("Got data: " + str(json.loads(data)))
+        print("Got data: " + str(json.loads(data)))
     
     def _initialized_http_mapper_init_3_guard(self, parameters):
         data = parameters[0]
@@ -2656,9 +2661,6 @@ class Modelverse(RuntimeClassBase):
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0_guard(self, parameters):
         return self.expect_response('Model loaded, ready for commands!')
     
-    def _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_1_guard(self, parameters):
-        return self.expect_response('Waiting for code constructors...')
-    
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_model_0_exec(self, parameters):
         self.raiseInternalEvent(Event("result", None, [None]))