Forráskód Böngészése

Remove the catch-all error for "Please repeat the password"

Yentl Van Tendeloo 8 éve
szülő
commit
68ca9f8eef
2 módosított fájl, 14 hozzáadás és 6 törlés
  1. 1 0
      classes/modelverse/modelverse.xml
  2. 13 6
      frontend.py

+ 1 - 0
classes/modelverse/modelverse.xml

@@ -261,6 +261,7 @@
                         </state>
 
                         <state id="wait_prompt_existing">
+                            <transition cond="self.expect_response('Please repeat the password', pop=True)" target="."/>
                             <transition cond="self.expect_response('Welcome to the Model Management Interface v2.0!', pop=True)" target="../login_ok"/>
                             <transition cond="self.expect_response('Wrong password!', pop=True)" target="../../../wait_for_action/connected">
                                 <raise event="exception">

+ 13 - 6
frontend.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 Oct 30 11:26:57 2017
+Date:   Mon Oct 30 14:04:29 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   Modelverse Visual Editor - Tkinter Version 
@@ -1283,15 +1283,19 @@ class Modelverse(RuntimeClassBase):
         self.states["/initialized/behaviour/operations/login/wait_prompt_2"].addTransition(_initialized_behaviour_operations_login_wait_prompt_2_1)
         
         # transition /initialized/behaviour/operations/login/wait_prompt_existing
-        _initialized_behaviour_operations_login_wait_prompt_existing_0 = Transition(self, self.states["/initialized/behaviour/operations/login/wait_prompt_existing"], [self.states["/initialized/behaviour/operations/login/login_ok"]])
+        _initialized_behaviour_operations_login_wait_prompt_existing_0 = Transition(self, self.states["/initialized/behaviour/operations/login/wait_prompt_existing"], [self.states["/initialized/behaviour/operations/login/wait_prompt_existing"]])
         _initialized_behaviour_operations_login_wait_prompt_existing_0.setTrigger(None)
         _initialized_behaviour_operations_login_wait_prompt_existing_0.setGuard(self._initialized_behaviour_operations_login_wait_prompt_existing_0_guard)
         self.states["/initialized/behaviour/operations/login/wait_prompt_existing"].addTransition(_initialized_behaviour_operations_login_wait_prompt_existing_0)
-        _initialized_behaviour_operations_login_wait_prompt_existing_1 = Transition(self, self.states["/initialized/behaviour/operations/login/wait_prompt_existing"], [self.states["/initialized/behaviour/wait_for_action/connected"]])
-        _initialized_behaviour_operations_login_wait_prompt_existing_1.setAction(self._initialized_behaviour_operations_login_wait_prompt_existing_1_exec)
+        _initialized_behaviour_operations_login_wait_prompt_existing_1 = Transition(self, self.states["/initialized/behaviour/operations/login/wait_prompt_existing"], [self.states["/initialized/behaviour/operations/login/login_ok"]])
         _initialized_behaviour_operations_login_wait_prompt_existing_1.setTrigger(None)
         _initialized_behaviour_operations_login_wait_prompt_existing_1.setGuard(self._initialized_behaviour_operations_login_wait_prompt_existing_1_guard)
         self.states["/initialized/behaviour/operations/login/wait_prompt_existing"].addTransition(_initialized_behaviour_operations_login_wait_prompt_existing_1)
+        _initialized_behaviour_operations_login_wait_prompt_existing_2 = Transition(self, self.states["/initialized/behaviour/operations/login/wait_prompt_existing"], [self.states["/initialized/behaviour/wait_for_action/connected"]])
+        _initialized_behaviour_operations_login_wait_prompt_existing_2.setAction(self._initialized_behaviour_operations_login_wait_prompt_existing_2_exec)
+        _initialized_behaviour_operations_login_wait_prompt_existing_2.setTrigger(None)
+        _initialized_behaviour_operations_login_wait_prompt_existing_2.setGuard(self._initialized_behaviour_operations_login_wait_prompt_existing_2_guard)
+        self.states["/initialized/behaviour/operations/login/wait_prompt_existing"].addTransition(_initialized_behaviour_operations_login_wait_prompt_existing_2)
         
         # transition /initialized/behaviour/operations/login/login_ok
         _initialized_behaviour_operations_login_login_ok_0 = Transition(self, self.states["/initialized/behaviour/operations/login/login_ok"], [self.states["/initialized/behaviour/wait_for_action/megamodelling"]])
@@ -2849,12 +2853,15 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response('This is a new user: please give password!', pop=True)
     
     def _initialized_behaviour_operations_login_wait_prompt_existing_0_guard(self, parameters):
+        return self.expect_response('Please repeat the password', pop=True)
+    
+    def _initialized_behaviour_operations_login_wait_prompt_existing_1_guard(self, parameters):
         return self.expect_response('Welcome to the Model Management Interface v2.0!', pop=True)
     
-    def _initialized_behaviour_operations_login_wait_prompt_existing_1_exec(self, parameters):
+    def _initialized_behaviour_operations_login_wait_prompt_existing_2_exec(self, parameters):
         self.raiseInternalEvent(Event("exception", None, ['PermissionDenied', 'Permission denied!']))
     
-    def _initialized_behaviour_operations_login_wait_prompt_existing_1_guard(self, parameters):
+    def _initialized_behaviour_operations_login_wait_prompt_existing_2_guard(self, parameters):
         return self.expect_response('Wrong password!', pop=True)
     
     def _initialized_behaviour_operations_login_login_ok_0_exec(self, parameters):