diff --git a/models/109.session b/models/109.session index 62fabae..5dd7608 100644 --- a/models/109.session +++ b/models/109.session @@ -1,16 +1,20 @@ -window_sizes 1920 1017 450 1465 971 0 +window_sizes 1917 1008 532 1380 962 0 diagrams - active classdiagram_ref 149613 // design-model - 1465 971 100 A4 45 0 + classdiagram_ref 149613 // design-model + 1380 962 100 A4 0 0 + active statediagram_ref 156141 // state-diagram + 1380 962 90 A4 0 0 end show_stereotypes -selected sequencediagram_ref 135021 // 5-7-odbiorIdentyfikatora +selected transition_ref 130669 // open attribute_ref 128123 // numer - class_ref 173037 // Sprawdzenie_Stanu_Konta - class_ref 172653 // Operator_Kart_Platniczych - operation_ref 138989 // BlockCard - class_ref 172397 // Karta + class_ref 179693 // IStrategiaTransakcje + class_ref 179821 // ISensoryAdapter + class_ref 179949 // SensorKarta + state_ref 129261 // giveoutCash + state_ref 128237 // cardInserted + state_ref 129133 // printConfirmation end end diff --git a/models/149613.diagram b/models/149613.diagram index 89b3d42..e7b4f56 100644 --- a/models/149613.diagram +++ b/models/149613.diagram @@ -42,14 +42,14 @@ classcanvas 131181 class_ref 179693 // IStrategiaTransakcje end note 131949 "Dodany wzorzec Strategy Sterowanie logika aplikacji w zaleznosci od wybranej opcji transakcji." - xyzwh 250.8 583.6 2000 159 79 + xyzwh 249.8 563.6 2000 159 79 classcanvas 132205 class_ref 179821 // ISensoryAdapter classdiagramsettings show_members_full_definition yes member_max_width 0 end xyz 301.8 353.4 2000 end note 132717 "Dodany wzorzec Adapter Udostepnianie interfejsow wszystkich sensorow za pomoca jednego pomocniczego interfejsu, zwracajacego dane w przystepnej strukturze." - xyzwh 614 369 2000 155 121 + xyzwh 620 324 2000 155 121 classcanvas 132973 class_ref 180205 // SensoryEkranu classdiagramsettings member_max_width 0 end xyz 230.2 209.2 2012 diff --git a/models/156141.diagram b/models/156141.diagram new file mode 100644 index 0000000..c43f629 --- /dev/null +++ b/models/156141.diagram @@ -0,0 +1,118 @@ +format 224 + +pseudostatecanvas 128237 pseudostate_ref 128237 // final + xyz 290.6 845.8 2000 +end +pseudostatecanvas 128365 pseudostate_ref 128365 // initial + xyz 378.8 68.8 2000 +end +statecanvas 128749 state_ref 128237 // cardInserted + + xyzwh 346.4 128.6 2000 91 33 +end +statecanvas 128877 state_ref 128365 // chooseOptionMenu + + xyzwh 432.4 231.8 2000 129 33 +end +statecanvas 129517 state_ref 128493 // withdrawMode - askForAmount + + xyzwh 449.4 308.6 2000 195 33 +end +statecanvas 129773 state_ref 128749 // witdrawingMoney + + xyzwh 496 419 2000 119 33 +end +statecanvas 129901 state_ref 128877 // confirmationNeeded? + + xyzwh 486 491.8 2000 139 33 +end +statecanvas 130029 state_ref 129005 // returnCard + + xyzwh 257.8 762.1 2000 81 33 +end +statecanvas 130157 state_ref 129133 // printConfirmation + + xyzwh 575.6 579 2000 119 33 +end +statecanvas 135021 state_ref 129261 // giveoutCash + + xyzwh 492.4 664 2006 89 33 +end +transitioncanvas 129261 transition_ref 128109 // Authentication Passed + decenter_begin 768 + + from ref 128749 z 2001 label "Authentication Passed" xyz 456.5 184.5 3000 to ref 128877 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 130285 transition_ref 128365 // Card Insertion + decenter_end 460 + + from ref 128365 z 2001 label "Card Insertion" xyz 399 101 3000 to ref 128749 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 130541 transition_ref 128493 // Choose 'Withdraw Money' + decenter_begin 930 + decenter_end 542 + + from ref 128877 z 2001 label "Choose 'Withdraw Money'" xyz 563.5 281 3000 to ref 129517 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 130925 transition_ref 128749 // Bank approves transaction + decenter_end 444 + + from ref 129517 z 2001 label "Bank approves transaction" xyz 555 373.5 3000 to ref 129773 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 131181 transition_ref 129005 // Authentication Failed + decenter_end 111 + + from ref 128749 z 2001 label "Authentication Failed" xyz 212.5 180.5 3000 to point 267.6 238 + line 131309 z 2001 to ref 130029 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 132973 transition_ref 129389 // + + from ref 129773 z 2001 to ref 129901 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 133101 transition_ref 129517 // Yes + + from ref 129901 z 2001 label "Yes" xyz 604 538.5 3000 to ref 130157 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 133485 transition_ref 129901 // + decenter_begin 566 + + from ref 130029 z 2001 to ref 128237 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 133741 transition_ref 130029 // Bank does not approve transaction + decenter_begin 46 + decenter_end 216 + + from ref 129517 z 2001 label "Bank does not approve transaction" xyz 313 277 3000 to ref 128877 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 134637 transition_ref 130413 // Exit + + from ref 128877 z 2001 label "Exit" xyz 365 228 3000 to point 300.8 243 + line 134765 z 2001 to ref 130029 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 135149 transition_ref 130541 // No + decenter_begin 358 + + from ref 129901 z 2007 label "No" xyz 516.5 585 3000 to ref 135021 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 135277 transition_ref 130669 // + + from ref 130157 z 2007 to ref 135021 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 135405 transition_ref 130797 // + + from ref 135021 z 2007 to ref 130029 + write_horizontally default show_definition default drawing_language default +end +end diff --git a/models/models.prj b/models/models.prj index 8c429aa..75db5c7 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 224 "models" - revision 23 + revision 24 modified_by 109 "s452664" @@ -222,15 +222,15 @@ format 224 relation_ref 163437 // dokonuje> end - classrelation 183149 // (posiada>) + classrelation 183149 // posiada> relation_ref 172653 // posiada> end - classrelation 183917 // (posiada>) + classrelation 183917 // posiada> relation_ref 173165 // posiada> end - classrelation 184685 // (posiada>) + classrelation 184685 // posiada> relation_ref 173677 // posiada> end end @@ -2418,15 +2418,15 @@ format 224 b multiplicity "1" parent class_ref 179821 // ISensoryAdapter end - classrelation 183405 // (posiada>) + classrelation 183405 // posiada> relation_ref 172781 // posiada> end - classrelation 184173 // (posiada>) + classrelation 184173 // posiada> relation_ref 173293 // posiada> end - classrelation 184941 // (posiada>) + classrelation 184941 // posiada> relation_ref 173805 // posiada> end end @@ -2683,7 +2683,7 @@ ${members}}; a role_name "" multiplicity "1" private classrelation_ref 183021 // (posiada>) b role_name "" multiplicity "1..*" private - classrelation_ref 183149 // (posiada>) + classrelation_ref 183149 // posiada> end operation 146157 "IsHardwareOk" @@ -2711,7 +2711,7 @@ ${members}}; a role_name "" multiplicity "1" private classrelation_ref 183277 // (posiada>) b role_name "" multiplicity "1..*" private - classrelation_ref 183405 // (posiada>) + classrelation_ref 183405 // posiada> end classrelation 183533 // (obsluguje) @@ -2744,7 +2744,7 @@ ${members}}; a role_name "" multiplicity "1" private classrelation_ref 183789 // (posiada>) b role_name "" multiplicity "1..*" private - classrelation_ref 183917 // (posiada>) + classrelation_ref 183917 // posiada> end operation 146669 "IsHardwareOk" @@ -2762,7 +2762,7 @@ ${members}}; a role_name "" multiplicity "1" private classrelation_ref 184045 // (posiada>) b role_name "" multiplicity "1..*" private - classrelation_ref 184173 // (posiada>) + classrelation_ref 184173 // posiada> end classrelation 184301 // (obsluguje) @@ -2795,7 +2795,7 @@ ${members}}; a role_name "" multiplicity "1" private classrelation_ref 184557 // (posiada>) b role_name "" multiplicity "1..*" private - classrelation_ref 184685 // (posiada>) + classrelation_ref 184685 // posiada> end operation 147181 "IsHardwareOk" @@ -2813,7 +2813,7 @@ ${members}}; a role_name "" multiplicity "1" private classrelation_ref 184813 // (posiada>) b role_name "" multiplicity "1..*" private - classrelation_ref 184941 // (posiada>) + classrelation_ref 184941 // posiada> end classrelation 185069 // (obsluguje) @@ -2837,5 +2837,157 @@ ${members}}; b parent class_ref 179821 // ISensoryAdapter end end + + state 128109 "Diagram Stanow - Wyplata Gotowki" + stereotype "machine" + state 129261 "giveoutCash" + transition 130797 "" + on state_ref 129005 // returnCard + external + end + end + + statediagram 156141 "state-diagram" + statediagramsettings draw_all_relations no + end + size A4 + end + + pseudostate 128237 final "" + end + + pseudostate 128365 initial "" + transition 128365 "Card Insertion" + on state_ref 128237 // cardInserted + external + end + end + + state 128237 "cardInserted" + pseudostate 128621 join "" + end + + transition 128109 "Authentication Passed" + on state_ref 128365 // chooseOptionMenu + external + end + + transition 128237 "Authentication Failed" + on pseudostate_ref 128493 // final + external + end + + transition 129005 "Authentication Failed" + on state_ref 129005 // returnCard + external + end + end + + state 128365 "chooseOptionMenu" + transition 128493 "Choose 'Withdraw Money'" + on state_ref 128493 // withdrawMode - askForAmount + external + end + + transition 129261 "Exit" + on state_ref 129005 // returnCard + external + end + + transition 130157 "" + on state_ref 129005 // returnCard + external + end + + transition 130285 "" + on state_ref 129005 // returnCard + external + end + + transition 130413 "Exit" + on state_ref 129005 // returnCard + external + end + end + + pseudostate 128493 final "" + end + + state 128493 "withdrawMode - askForAmount" + transition 128621 "" + on state_ref 128621 // askForAmount + external + end + + transition 128749 "Bank approves transaction" + on state_ref 128749 // witdrawingMoney + external + end + + transition 128877 "Bank does not approve transaction" + on pseudostate_ref 128749 // final + external + end + + transition 129133 "Bank does not approve transaction" + on state_ref 128365 // chooseOptionMenu + external + end + + transition 130029 "Bank does not approve transaction" + on state_ref 128365 // chooseOptionMenu + external + end + end + + state 128621 "askForAmount" + end + + state 128749 "witdrawingMoney" + transition 129389 "" + on state_ref 128877 // confirmationNeeded? + external + end + end + + state 128877 "confirmationNeeded?" + transition 129517 "Yes" + on state_ref 129133 // printConfirmation + external + end + + transition 129645 "No" + on state_ref 129005 // returnCard + external + end + + transition 130541 "No" + on state_ref 129261 // giveoutCash + external + end + end + + state 129005 "returnCard" + transition 129901 "" + on pseudostate_ref 128237 // final + external + end + end + + state 129133 "printConfirmation" + transition 129773 "" + on state_ref 129005 // returnCard + external + end + + transition 130669 "" + on state_ref 129261 // giveoutCash + external + end + end + + pseudostate 128749 final "" + end + end end end