Browse Source

Fixed a bunch of typos in SCCD model

Yentl Van Tendeloo 8 years ago
parent
commit
94eccea6a0
1 changed files with 25 additions and 111 deletions
  1. 25 111
      wrappers/classes/modelverse.xml

+ 25 - 111
wrappers/classes/modelverse.xml

@@ -248,7 +248,9 @@
                     </state>
                 </state>
 
-                <state id="operations">
+                <state id="operations" initial="model_list">
+                    <history id="history" type="deep"/>
+
                     <state id="model_list">
                         <onentry>
                             <raise event="request">
@@ -281,7 +283,7 @@
                                 </raise>
                             </onentry>
 
-                            <transition cond="self.expect_response('Success')" target="../../wait_for_action/history">
+                            <transition cond="self.expect_response('Success')" target="../../../wait_for_action/history">
                                 <raise event="result">
                                     <parameter expr="None"/>
                                 </raise>
@@ -349,7 +351,7 @@
                                 </raise>
                             </onentry>
 
-                            <transition cond="self.expect_response('Success')" target="../../wait_for_action/history">
+                            <transition cond="self.expect_response('Success')" target="../../../wait_for_action/history">
                                 <raise event="result">
                                     <parameter expr="None"/>
                                 </raise>
@@ -439,7 +441,7 @@
                                 </script>
 
                                 <raise event="result">
-                                    <parameter expr="self.context">
+                                    <parameter expr="self.context"/>
                                 </raise>
                             </onentry>
 
@@ -448,7 +450,7 @@
                         </state>
 
                         <state id="edit_metamodel">
-                            <transition cond="self.expect_response('Model loaded, ready for commands!')" target="../../wait_for_action/modelling/scripted"/>
+                            <transition cond="self.expect_response('Model loaded, ready for commands!')" target="../../../wait_for_action/modelling/scripted"/>
                             <transition cond="self.expect_response('Waiting for model constructors...')" target="../send_model"/>
                         </state>
 
@@ -459,7 +461,7 @@
                                 </raise>
                             </onentry>
 
-                            <transition cond="self.expect_response('Success')" target="../../wait_for_action/megamodelling">
+                            <transition cond="self.expect_response('Success')" target="../../../wait_for_action/megamodelling">
                                 <raise event="result">
                                     <parameter expr="None"/>
                                 </raise>
@@ -479,7 +481,7 @@
                                 </script>
 
                                 <raise event="result">
-                                    <parameter expr="self.context">
+                                    <parameter expr="self.context"/>
                                 </raise>
                             </onentry>
 
@@ -488,7 +490,7 @@
                         </state>
 
                         <state id="edit_metamodel">
-                            <transition cond="self.expect_response('Model loaded, ready for commands!')" target="../../wait_for_action/modelling/scripted"/>
+                            <transition cond="self.expect_response('Model loaded, ready for commands!')" target="../../../wait_for_action/modelling/scripted"/>
                             <transition cond="self.expect_response('Waiting for code constructors...')" target="../send_model"/>
                         </state>
 
@@ -499,7 +501,7 @@
                                 </raise>
                             </onentry>
 
-                            <transition cond="self.expect_response('Success')" target="../../wait_for_action/megamodelling">
+                            <transition cond="self.expect_response('Success')" target="../../../wait_for_action/megamodelling">
                                 <raise event="result">
                                     <parameter expr="None"/>
                                 </raise>
@@ -519,7 +521,7 @@
                                 </script>
 
                                 <raise event="result">
-                                    <parameter expr="self.context">
+                                    <parameter expr="self.context"/>
                                 </raise>
                             </onentry>
 
@@ -528,8 +530,8 @@
                         </state>
 
                         <state id="edit_metamodel">
-                            <transition cond="self.expect_response('Model loaded, ready for commands!')" target="../../wait_for_action/modelling/scripted"/>
-                            <transition cond="self.expect_response('Success')" target="../../wait_for_action/megamodelling">
+                            <transition cond="self.expect_response('Model loaded, ready for commands!')" target="../../../wait_for_action/modelling/scripted"/>
+                            <transition cond="self.expect_response('Success')" target="../../../wait_for_action/megamodelling">
                                 <raise event="result">
                                     <parameter expr="None"/>
                                 </raise>
@@ -557,7 +559,7 @@
                         </state>
 
                         <state id="dialog">
-                            <transition cond="self.expect_response('Success', pop=False) or self.expect_response('Failure', pop=False)" target="../done">
+                            <transition cond="self.expect_response('Success', pop=False) or self.expect_response('Failure', pop=False)" target="../../../wait_for_action/history">
                                 <raise event="result">
                                     <parameter expr="self.responses.pop(0)"/>
                                 </raise>
@@ -597,7 +599,7 @@
                         </state>
 
                         <state id="dialog">
-                            <transition cond="self.expect_response('Success', pop=False) or self.expect_response('Failure', pop=False)" target="../done">
+                            <transition cond="self.expect_response('Success', pop=False) or self.expect_response('Failure', pop=False)" target="../../../wait_for_action/history">
                                 <raise event="result">
                                     <parameter expr="self.responses.pop(0)"/>
                                 </raise>
@@ -629,7 +631,7 @@
                                 </script>
 
                                 <raise event="result">
-                                    <parameter expr="self.context">
+                                    <parameter expr="self.context"/>
                                 </raise>
                             </onentry>
 
@@ -638,8 +640,8 @@
                         </state>
 
                         <state id="edit_model">
-                            <transition cond="self.expect_response('Model loaded, ready for commands!')" target="../../wait_for_action/modelling/scripted"/>
-                            <transition cond="self.expect_response('Success')" target="../../wait_for_action/megamodelling">
+                            <transition cond="self.expect_response('Model loaded, ready for commands!')" target="../../../wait_for_action/modelling/scripted"/>
+                            <transition cond="self.expect_response('Success')" target="../../../wait_for_action/megamodelling">
                                 <raise event="result">
                                     <parameter expr="None"/>
                                 </raise>
@@ -995,7 +997,7 @@
                         </state>
 
                         <state id="created">
-                            <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
+                            <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../../wait_for_action/history">
                                 <raise event="result">
                                     <parameter expr="self.split_response(self.responses.pop(0))[0]"/>
                                 </raise>
@@ -1156,90 +1158,6 @@
                             </raise>
                         </transition>
                     </state>
-
-                    <state id="">
-                        <onentry>
-                            <raise event="request">
-                                <parameter expr="['']"/>
-                            </raise>
-                        </onentry>
-
-                        <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
-                            <raise event="result">
-                                <parameter expr="self.split_response(self.responses.pop(0))"/>
-                            </raise>
-                        </transition>
-                    </state>
-
-                    <state id="">
-                        <onentry>
-                            <raise event="request">
-                                <parameter expr="['']"/>
-                            </raise>
-                        </onentry>
-
-                        <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
-                            <raise event="result">
-                                <parameter expr="self.split_response(self.responses.pop(0))"/>
-                            </raise>
-                        </transition>
-                    </state>
-
-                    <state id="">
-                        <onentry>
-                            <raise event="request">
-                                <parameter expr="['']"/>
-                            </raise>
-                        </onentry>
-
-                        <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
-                            <raise event="result">
-                                <parameter expr="self.split_response(self.responses.pop(0))"/>
-                            </raise>
-                        </transition>
-                    </state>
-
-                    <state id="">
-                        <onentry>
-                            <raise event="request">
-                                <parameter expr="['']"/>
-                            </raise>
-                        </onentry>
-
-                        <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
-                            <raise event="result">
-                                <parameter expr="self.split_response(self.responses.pop(0))"/>
-                            </raise>
-                        </transition>
-                    </state>
-
-                    <state id="">
-                        <onentry>
-                            <raise event="request">
-                                <parameter expr="['']"/>
-                            </raise>
-                        </onentry>
-
-                        <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
-                            <raise event="result">
-                                <parameter expr="self.split_response(self.responses.pop(0))"/>
-                            </raise>
-                        </transition>
-                    </state>
-
-                    <state id="">
-                        <onentry>
-                            <raise event="request">
-                                <parameter expr="['']"/>
-                            </raise>
-                        </onentry>
-
-                        <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
-                            <raise event="result">
-                                <parameter expr="self.split_response(self.responses.pop(0))"/>
-                            </raise>
-                        </transition>
-                    </state>
                 </state>
 
                 <state id="wait_for_action" initial="disconnected">
@@ -1362,12 +1280,6 @@
                             </script>
                         </transition>
 
-                        <transition cond="self.expect_action(None, 'transformation_list')" target="../../operations/transformation_list">
-                            <script>
-                                self.load_action(None)
-                            </script>
-                        </transition>
-
                         <transition cond="self.expect_action(None, 'process_execute')" target="../../operations/process_execute">
                             <script>
                                 self.load_action(None)
@@ -1446,11 +1358,13 @@
                             </script>
                         </transition>
 
+                        <!--
                         <transition cond="self.expect_action(None, 'service_register')" target="../../operations/service_register">
                             <script>
                                 self.load_action(None)
                             </script>
                         </transition>
+                        -->
 
                         <transition cond="self.expect_action(None, 'conformance_delete')" target="../../operations/conformance_delete">
                             <script>
@@ -1483,11 +1397,11 @@
                                 self.context = None
                             </onentry>
 
-                            <transition cond="self.expect_action(self.context, 'exit')" target="../../wait_for_actions/megamodelling"/>
+                            <transition cond="self.expect_action(self.context, 'exit')" target="../../megamodelling"/>
                         </state>
 
                         <state id="scripted">
-                            <transition cond="self.expect_action(self.context, 'exit')" target="../../operations/history"/>
+                            <transition cond="self.expect_action(self.context, 'exit')" target="../../../operations/history"/>
                         </state>
 
                         <transition cond="self.expect_action(self.context, 'element_list')" target="../../operations/element_list">
@@ -1514,7 +1428,7 @@
                             </script>
                         </transition>
 
-                        <transition cond="self.expect_action(self.context, 'read')" target="../../operations/read">
+                        <transition cond="self.expect_action(self.context, 'read_info')" target="../../operations/read_info">
                             <script>
                                 self.load_action(self.context)
                             </script>