diff --git a/models/134597_2.d b/models/134597_2.d deleted file mode 100644 index d11c5ac..0000000 --- a/models/134597_2.d +++ /dev/null @@ -1,219 +0,0 @@ -format 224 - -classcanvas 128008 class_ref 128008 // Coin - classdiagramsettings member_max_width 0 end - xyzwh 1605.59 768.08 2000 82 39 -end -classcanvas 128136 class_ref 128136 // Price - classdiagramsettings member_max_width 0 end - xyzwh 542.5 249.87 2000 117 65 -end -classcanvas 128154 class_ref 128154 // Product - classdiagramsettings member_max_width 0 end - xyzwh 354.288 517.246 2000 109 42 -end -classcanvas 128282 class_ref 128282 // Meal - classdiagramsettings member_max_width 0 end - xyzwh 758.632 503.346 2000 105 49 -end -classcanvas 128410 class_ref 128410 // Order - classdiagramsettings member_max_width 0 end - xyzwh 971.603 393.526 2000 141 186 -end -classcanvas 129178 class_ref 128666 // CardPayment - classdiagramsettings member_max_width 0 end - xyzwh 1403.87 391.153 2000 145 49 -end -classcanvas 129434 class_ref 128922 // Automat - classdiagramsettings member_max_width 0 end - xyzwh 730.436 534.731 2000 169 345 -end -classcanvas 129562 class_ref 129050 // Worker - classdiagramsettings member_max_width 0 end - xyzwh 728.489 832.722 2000 161 91 -end -classcanvas 129690 class_ref 129178 // Shelf - classdiagramsettings member_max_width 0 end - xyzwh 535.385 683.251 2000 125 90 -end -classcanvas 129800 class_ref 128026 // Ware - classdiagramsettings member_max_width 0 end - xyzwh 537.95 394.39 2000 127 49 -end -classcanvas 129818 class_ref 135706 // Payment - classdiagramsettings member_max_width 0 end - xyzwh 1250.06 389.762 2000 100 49 -end -classcanvas 129946 class_ref 135834 // CashPayment - classdiagramsettings member_max_width 0 end - xyzwh 1388.42 257.232 2000 145 59 -end -classcanvas 130074 class_ref 135962 // CoinCollectorAdapter - classdiagramsettings member_max_width 0 end - xyzwh 1201.01 643.607 2000 140 65 -end -classcanvas 131080 class_ref 128264 // PhoneNumber - classdiagramsettings member_max_width 0 end - xyzwh 208.29 902.15 2000 124 65 -end -classcanvas 131464 class_ref 128794 // Warehouse - classdiagramsettings member_max_width 0 end - xyzwh 91.59 394.64 2000 127 49 -end -classcanvas 131848 class_ref 128392 // ProductType - classdiagramsettings member_max_width 0 end - xyzwh 87.85 512.43 2000 118 49 -end -classcanvas 132104 class_ref 128520 // Date - classdiagramsettings member_max_width 0 end - xyzwh 992.13 240.62 2000 92 49 -end -classcanvas 132360 class_ref 128648 // Address - classdiagramsettings member_max_width 0 end - xyzwh 84.94 756.66 2000 91 81 -end -classcanvas 133000 class_ref 128776 // Money - classdiagramsettings member_max_width 0 end - xyzwh 1442.5 797.04 2000 80 49 -end -classcanvas 133128 class_ref 128904 // Cash - classdiagramsettings member_max_width 0 end - xyzwh 1610.17 843.17 2000 79 39 -end -classcanvas 133768 class_ref 135432 // Currency - classdiagramsettings member_max_width 0 end - xyzwh 1441.17 919.9 2000 87 39 -end -classcanvas 134024 class_ref 135560 // ZipCode - classdiagramsettings member_max_width 0 end - xyzwh 89.24 901.27 2000 80 65 -end -classcanvas 135432 class_ref 135688 // Card - classdiagramsettings member_max_width 0 end - xyzwh 1598.28 358.02 2000 93 107 -end -classcanvas 136840 class_ref 135816 // CashCollectorAdapter - classdiagramsettings member_max_width 0 end - xyzwh 1198.07 733.64 2000 145 65 -end -classcanvas 136968 class_ref 135944 // CollectorAdapter - classdiagramsettings member_max_width 0 end - xyz 1002.88 676.91 2000 -end -classcanvas 138504 class_ref 136072 // Culture - classdiagramsettings member_max_width 0 end - xyzwh 376.67 904.26 2000 139 59 -end -relationcanvas 128197 relation_ref 128197 // Posiada ^ - from ref 129690 z 2001 label "Posiada ^" italic max_width 255 xyz 598 548 2001 to ref 129800 - no_role_a no_role_b - multiplicity_a_pos 580 450 3000 multiplicity_b_pos 578 661 3000 -end -relationcanvas 128264 relation_ref 128008 // - from ref 128410 z 2001 label "Oplacone przez>" italic max_width 255 xyz 1128 401 2001 to ref 129818 - no_role_a no_role_b - multiplicity_a_pos 1233 420 3000 multiplicity_b_pos 1104 423 3000 -end -relationcanvas 131336 relation_ref 130440 // Ma - from ref 129434 z 2001 label "Ma" italic max_width 255 xyz 829 756 2001 to ref 129562 - no_role_a no_role_b - multiplicity_a_pos 779 883 3000 multiplicity_b_pos 822 883 3000 -end -relationcanvas 131592 relation_ref 130568 // >Posiada - from ref 131464 z 2001 label ">Posiada" italic max_width 255 xyz 356 402 2001 to ref 129800 - no_role_a no_role_b - multiplicity_a_pos 522 425 3000 multiplicity_b_pos 227 425 3000 -end -relationcanvas 131976 relation_ref 130696 // - from ref 128154 z 2001 to ref 129800 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 134920 relation_ref 138632 // - from ref 128282 z 2001 to ref 129800 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 135048 relation_ref 138760 // Posiada - from ref 132360 z 2001 label "Posiada" italic max_width 255 xyz 128 865 2001 to ref 134024 - no_role_a no_role_b - multiplicity_a_pos 111 882 3000 multiplicity_b_pos 111 836 3000 -end -relationcanvas 135560 relation_ref 139144 // Wymaga - from ref 129178 z 2001 label "Wymaga" italic max_width 255 xyz 1525 391 2001 to ref 135432 - no_role_a no_role_b - multiplicity_a_pos 1577 419 3000 multiplicity_b_pos 1559 420 3000 -end -relationcanvas 136072 relation_ref 139400 // - decenter_end 707 - from ref 129946 z 2001 to ref 129818 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 136200 relation_ref 139528 // - from ref 129178 z 2007 to ref 129818 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 137096 relation_ref 139656 // Posiada - from ref 129434 z 2001 label "Posiada" italic max_width 255 xyz 900 643 2001 to ref 136968 - no_role_a no_role_b - multiplicity_a_pos 978 713 3000 multiplicity_b_pos 912 713 3000 -end -relationcanvas 137224 relation_ref 139784 // - from ref 130074 z 2001 to ref 136968 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 137480 relation_ref 139912 // - from ref 136840 z 2001 to ref 136968 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 137608 relation_ref 140040 // - from ref 128008 z 2001 to ref 133000 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 137736 relation_ref 140168 // - from ref 133128 z 2007 to ref 133000 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 138248 relation_ref 140296 // Posiada - from ref 133000 z 2001 label "Posiada" italic max_width 255 xyz 1489 872 2001 to ref 133768 - no_role_a no_role_b - multiplicity_a_pos 1467 902 3000 multiplicity_b_pos 1466 847 3000 -end -relationcanvas 138632 relation_ref 146824 // Tworzy - decenter_begin 921 - from ref 129434 z 2001 label "Tworzy" italic max_width 255 xyz 934 700 2001 to ref 128410 - no_role_a no_role_b - multiplicity_a_pos 983 586 3000 multiplicity_b_pos 882 833 3000 -end -end diff --git a/models/141442_2.d b/models/141442_2.d new file mode 100644 index 0000000..f2209cf --- /dev/null +++ b/models/141442_2.d @@ -0,0 +1,105 @@ +format 224 + +classinstance 128130 class_ref 128538 // Client + drawing_mode actor name "" xyz 3.7234 4.04 2000 life_line_z 2000 +classinstance 128258 class_ref 128770 // TransactionController + name "" xyz 137.653 12.7234 2000 life_line_z 2000 +classinstance 128770 class_ref 135298 // Terminal + name "" xyz 440.11 18.3931 2000 life_line_z 2000 +classinstance 129282 class_ref 135554 // AuthorizationSystem + name "" xyz 587.396 16 2000 life_line_z 2000 +fragment 130050 "authorize == true" + xyzwh 3.86785 323.45 2005 680 108 +end +fragment 130434 "authorize == false and attempts < 3" + xyzwh 2.19819 431.175 2010 681 143 +end +fragment 131458 "authorize =- false and attempts == 3" + xyzwh 2 573 2015 682 140 +end +durationcanvas 128386 classinstance_ref 128130 // :Client + xyzwh 14 129 2010 11 40 +end +durationcanvas 128514 classinstance_ref 128258 // :TransactionController + xyzwh 190 136 2010 11 433 + overlappingdurationcanvas 129794 + xyzwh 196 373 2020 11 39 + end + overlappingdurationcanvas 130178 + xyzwh 196 461 2020 11 25 + end +end +durationcanvas 128898 classinstance_ref 128770 // :Terminal + xyzwh 461 138 2010 11 56 +end +durationcanvas 129410 classinstance_ref 129282 // :AuthorizationSystem + xyzwh 639 234 2010 11 88 +end +durationcanvas 130818 classinstance_ref 129282 // :AuthorizationSystem + xyzwh 639 511 2010 11 33 +end +durationcanvas 131202 classinstance_ref 128258 // :TransactionController + xyzwh 190 627 2010 11 40 +end +msg 128642 synchronous + from durationcanvas_ref 128386 + to durationcanvas_ref 128514 + yz 136 2015 explicitmsg "enterPIN" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 39 118 +msg 129026 synchronous + from durationcanvas_ref 128514 + to durationcanvas_ref 128898 + yz 144 2020 msg operation_ref 133890 // "getPIN()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "PIN:string" + label_xy 246 128 +msg 129154 return + from durationcanvas_ref 128898 + to durationcanvas_ref 128514 + yz 176 2015 explicitmsg "PIN" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 271 162 +msg 129538 synchronous + from durationcanvas_ref 128514 + to durationcanvas_ref 129410 + yz 240 2015 msg operation_ref 134146 // "authorize()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "card:Card, PIN:string" + label_xy 213 226 +msg 129666 return + from durationcanvas_ref 129410 + to durationcanvas_ref 128514 + yz 273 2015 explicitmsg "authorize" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 299 259 +reflexivemsg 129922 synchronous + to durationcanvas_ref 129794 + yz 373 2025 msg operation_ref 134274 // "displayPositiveMessage()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 234 372 +reflexivemsg 130306 synchronous + to durationcanvas_ref 130178 + yz 461 2025 msg operation_ref 134402 // "displayNegativeMessage()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 228 458 +msg 130946 synchronous + from durationcanvas_ref 128514 + to durationcanvas_ref 130818 + yz 511 2015 msg operation_ref 134146 // "authorize()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "card:Card, PIN:string" + label_xy 323 497 +msg 131074 return + from durationcanvas_ref 130818 + to durationcanvas_ref 128514 + yz 533 2015 explicitmsg "authorize" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 398 519 +reflexivemsg 131330 synchronous + to durationcanvas_ref 131202 + yz 627 2015 msg operation_ref 133122 // "cancelTransaction()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "transaction:Transaction" + label_xy 224 625 +end diff --git a/models/154498.diagram b/models/154498.diagram index f4f00ed..185ec23 100644 --- a/models/154498.diagram +++ b/models/154498.diagram @@ -2,102 +2,102 @@ format 224 classcanvas 139650 class_ref 128922 // Automat classdiagramsettings member_max_width 0 end - xyz 497.024 64.2654 2000 + xyz 497.524 64.1654 2000 end classcanvas 139778 class_ref 142600 // AutomatController classdiagramsettings member_max_width 0 end - xyz 36.1678 3.1796 2000 + xyz 36.7678 3.8796 2000 end classcanvas 140034 class_ref 128410 // Order classdiagramsettings member_max_width 0 end - xyz 1010.76 -0.154523 2000 + xyz 1010.26 -0.154523 2000 end classcanvas 140162 class_ref 135834 // CashPayment classdiagramsettings member_max_width 0 end - xyz 1433.86 621.7 2000 + xyz 1433.16 621.2 2000 end classcanvas 140674 class_ref 129178 // Shelf classdiagramsettings member_max_width 0 end - xyz 1024.93 124.269 2000 + xyz 1024.53 124.169 2000 end classcanvas 140930 class_ref 128666 // CardPayment classdiagramsettings member_max_width 0 end - xyz 1553.74 444.575 2000 + xyz 1553.14 444.275 2000 end classcanvas 141058 class_ref 136072 // Culture classdiagramsettings member_max_width 0 end - xyz 1389.11 104.342 2000 + xyz 1389.21 104.042 2000 end classcanvas 141186 class_ref 134853 // I18nService classdiagramsettings member_max_width 0 end - xyz 1010.19 213.336 2000 + xyz 1010.99 213.836 2000 end classcanvas 141570 class_ref 141765 // CollectorFactory classdiagramsettings member_max_width 0 end - xyz 989.314 300.883 2000 + xyz 989.914 300.483 2000 end classcanvas 141698 class_ref 135962 // CoinCollectorAdapter classdiagramsettings member_max_width 0 end - xyz 1408.8 221.176 2000 + xyz 1408.5 221.176 2000 end classcanvas 141826 class_ref 135816 // CashCollectorAdapter classdiagramsettings member_max_width 0 end - xyz 1410.62 358.998 2000 + xyz 1410.92 358.298 2000 end classcanvas 141954 class_ref 135944 // CollectorAdapter classdiagramsettings member_max_width 0 end - xyz 1238.43 295.372 2000 + xyz 1238.33 295.972 2000 end classcanvas 142210 class_ref 141637 // PaymentSelectorController classdiagramsettings member_max_width 0 end - xyz 38.0602 247.196 2000 + xyz 38.1602 247.296 2000 end classcanvas 143362 class_ref 149122 // PaymentService classdiagramsettings member_max_width 0 end - xyz 991.46 494.512 2000 + xyz 991.36 494.712 2000 end classcanvas 143746 class_ref 149250 // PaymentStrategy classdiagramsettings member_max_width 0 end - xyz 1224.87 489.247 2000 + xyz 1224.17 489.947 2000 end classcanvas 145282 class_ref 135109 // MealPrepearer classdiagramsettings member_max_width 0 end - xyz 498.805 464.746 2000 + xyz 498.605 464.946 2000 end classcanvas 145410 class_ref 129050 // Worker classdiagramsettings member_max_width 0 end - xyz 706.969 442.318 2000 + xyz 706.469 442.618 2000 end classcanvas 145794 class_ref 135298 // Terminal classdiagramsettings member_max_width 0 end - xyz 79.86 880.858 2000 + xyz 79.96 880.658 2000 end classcanvas 145922 class_ref 128770 // TransactionController classdiagramsettings member_max_width 0 end - xyz 42.6047 321.003 2000 + xyz 42.5047 321.903 2000 end classcanvas 146562 class_ref 135688 // Card classdiagramsettings member_max_width 0 end - xyz 1573.94 873.308 2000 + xyz 1573.94 873.708 2000 end classcanvas 147202 class_ref 142466 // Transaction classdiagramsettings member_max_width 0 end - xyz 513.502 721.8 2000 + xyz 513.302 721.3 2000 end classcanvas 147330 class_ref 135938 // TransactionConfirmation classdiagramsettings member_max_width 0 end - xyz 904.45 720.252 2000 + xyz 904.65 720.852 2000 end classcanvas 147714 class_ref 135554 // AuthorizationSystem classdiagramsettings member_max_width 0 end - xyz 1736.98 438.719 2000 + xyz 1736.98 438.519 2000 end note 149506 "2 odmienne rodzaje platnosci charakteryzujace sie odmienna implementacja" - xyzwh 1217.96 393.84 2006 121 89 + xyzwh 1217.26 393.14 2006 121 89 note 149634 "Adapter-wspolny interfejs dla kolektorow pieniedzy" - xyzwh 1230.64 211.4 2006 115 79 + xyzwh 1230.94 211.4 2006 115 79 note 149762 "Klasa odpowiedzialna za budowanie odpowiednich kolektorow. Wyrecza automat z tej odpowiedzialnosci" - xyzwh 984.6 350.68 2006 153 90 + xyzwh 984.6 351.18 2006 153 90 relationcanvas 139906 relation_ref 128258 // decenter_end 266 from ref 139778 z 2001 to ref 139650 @@ -163,7 +163,7 @@ relationcanvas 145538 relation_ref 130818 // ma end relationcanvas 145666 relation_ref 130946 // ma decenter_begin 483 - from ref 145282 z 2001 to point 623 486.6 + from ref 145282 z 2001 to point 623.5 486.8 line 150274 z 2001 label "ma" italic max_width 255 xyz 657 473 2001 to ref 145410 no_role_a no_role_b multiplicity_a_pos 689 491 3000 multiplicity_b_pos 630 493 3000 @@ -181,7 +181,7 @@ relationcanvas 146434 relation_ref 131330 // kontroluje end relationcanvas 146946 relation_ref 131458 // uzywa decenter_begin 592 - from ref 140930 z 2001 to point 1601.6 494.2 + from ref 140930 z 2001 to point 1601.3 494.6 line 149890 z 2001 label "uzywa" italic max_width 255 xyz 1591 673 2001 to ref 146562 no_role_a no_role_b multiplicity_a_pos 1590 861 3000 multiplicity_b_pos 1584 485 3000 @@ -194,12 +194,12 @@ end relationcanvas 147458 relation_ref 131714 // ma from ref 147202 z 2001 label "ma" italic max_width 255 xyz 778 729 2001 to ref 147330 no_role_a no_role_b - multiplicity_a_pos 892 749 3000 multiplicity_b_pos 676 749 3000 + multiplicity_a_pos 892 749 3000 multiplicity_b_pos 688 751 3000 end relationcanvas 147586 relation_ref 131842 // ma from ref 145922 z 2001 label "ma" italic max_width 255 xyz 370 566 2001 to ref 147202 no_role_a no_role_b - multiplicity_a_pos 544 738 3000 multiplicity_b_pos 208 481 3000 + multiplicity_a_pos 492 703 3000 multiplicity_b_pos 208 481 3000 end relationcanvas 147842 relation_ref 131970 // ma from ref 140930 z 2001 label "ma" italic max_width 255 xyz 1679 447 2001 to ref 147714 diff --git a/models/161026.diagram b/models/161026.diagram new file mode 100644 index 0000000..6edd2b4 --- /dev/null +++ b/models/161026.diagram @@ -0,0 +1,307 @@ +format 224 + +pseudostatecanvas 128002 pseudostate_ref 128002 // initial + xyz 377.112 21.9207 2000 +end +statecanvas 128130 state_ref 128130 // Produkt wybrany + + xyzwh 217.142 260.07 2000 115 33 +end +statecanvas 128642 state_ref 128258 // Posilek wybrany + + xyzwh 463.363 261.534 2000 111 33 +end +statecanvas 129922 state_ref 128386 // Zamowienie rozpoczete + + xyzwh 310.112 89.7223 2000 153 33 +end +pseudostatecanvas 130434 pseudostate_ref 128898 // choice + xyz 398.085 1576.54 2000 +end +statecanvas 130946 state_ref 128514 // Wybor platnosci + + xyzwh 372.673 803.034 2000 109 33 +end +statecanvas 131074 state_ref 128642 // Platnosc karta + + xyzwh 277.271 925.644 2000 99 33 +end +statecanvas 131202 state_ref 128770 // Platnosc gotowka + + xyzwh 533.701 917.932 2000 119 33 +end +statecanvas 131842 state_ref 128898 // Platnosc gotowka zaakceptowana + + xyzwh 412.505 1406.75 2000 207 33 +end +statecanvas 131970 state_ref 129026 // Odrzucona + + xyzwh 84.0747 958.957 2000 79 33 +end +statecanvas 132354 state_ref 129154 // Procesowanie platnosci + + xyzwh 202.202 1117.74 2000 153 33 +end +statecanvas 133378 state_ref 129282 // Gotowka wrzucona + + xyzwh 539.709 1071.39 2000 127 33 +end +statecanvas 134018 state_ref 129410 // Gotowka zaakceptowany + + xyzwh 457.968 1295.04 2000 157 33 +end +statecanvas 134274 state_ref 129538 // Gotowka odrzucony + + xyzwh 650.36 1294.18 2000 131 33 +end +statecanvas 135554 state_ref 129666 // Posilek oplacony + + xyzwh 586.803 1718.56 2000 113 33 +end +statecanvas 135682 state_ref 129794 // Produkt oplacony + + xyzwh 197.87 1887.85 2000 117 33 +end +pseudostatecanvas 136066 pseudostate_ref 129026 // final + xyz 248.674 2027.04 2000 +end +statecanvas 136322 state_ref 129922 // Posilek przygotowywany + + xyzwh 603.231 1903.37 2000 159 33 +end +pseudostatecanvas 136450 pseudostate_ref 129154 // final + xyz 680.415 2056.51 2000 +end +statecanvas 136834 state_ref 130050 // Produkt dostepny + + xyzwh 80.1157 450.577 2000 119 33 +end +statecanvas 136962 state_ref 130178 // Produkt niedostepny + + xyzwh 243.633 447.242 2000 137 33 +end +statecanvas 137090 state_ref 130306 // Posilek dostepny + + xyzwh 732.553 445.346 2000 117 33 +end +statecanvas 137218 state_ref 130434 // Posilek niedostepny + + xyzwh 463.221 444.882 2000 133 33 +end +pseudostatecanvas 138114 pseudostate_ref 129282 // final + xyz 417.065 649.718 2000 +end +pseudostatecanvas 139266 pseudostate_ref 129410 // final + xyz 97.5784 1161.3 2000 +end +pseudostatecanvas 140418 pseudostate_ref 129538 // final + xyz 1086.44 1189.18 2000 +end +statecanvas 140930 state_ref 130562 // Gotowka wydany + + xyzwh 860.68 1191.42 2000 117 33 +end +statecanvas 141442 state_ref 130690 // Platnosc karta zaakceptowana + + xyzwh 129.72 1400.16 2000 187 33 +end +statecanvas 141954 state_ref 130818 // Reszta wydana + + xyzwh 472.34 1497.86 2000 103 33 +end +transitioncanvas 130050 transition_ref 128770 // rozpocznij zamowienie + + from ref 128002 z 2001 label "rozpocznij zamowienie" xyz 331 56 3000 to ref 129922 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 130178 transition_ref 128898 // wybierz produkt + + from ref 129922 z 2001 label "wybierz produkt" xyz 289 197.5 3000 to ref 128130 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 130306 transition_ref 129026 // wybierz posilek + + from ref 129922 z 2001 label "wybierz posilek" xyz 400 182.5 3000 to ref 128642 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 131714 transition_ref 129666 // wybierz platnosc gotowka + + from ref 130946 z 2001 label "wybierz platnosc gotowka" xyz 491.5 869.5 3000 to ref 131202 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 132482 transition_ref 130050 // zaplac karta + + from ref 131074 z 2001 label "zaplac karta" xyz 272 1029 3000 to ref 132354 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 132994 transition_ref 130434 // transakcja odrzucona + + from ref 132354 z 2001 label "transakcja odrzucona" xyz 146.5 1044.5 3000 to ref 131970 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 133122 transition_ref 130562 // ponowienie platnosci + + from ref 131970 z 2001 label "ponowienie platnosci" xyz 157 927 3000 to ref 131074 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 133890 transition_ref 130818 // wrzuc monete + + from ref 131202 z 2001 label "wrzuc monete" xyz 561 1003 3000 to ref 133378 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 134146 transition_ref 130946 // zaakceptuj gotowke + decenter_end 277 + + from ref 133378 z 2001 label "zaakceptuj gotowke" xyz 423 1167 3000 to point 502.867 1086.86 + line 134786 z 2001 to ref 134018 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 134530 transition_ref 131074 // odrzuc gotowke + decenter_end 611 + + from ref 133378 z 2001 label "odrzuc gotowke" xyz 721 1163.5 3000 to point 724.468 1082.61 + line 135170 z 2001 to ref 134274 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 134658 transition_ref 131202 // wrzuc gotowke + decenter_begin 666 + + from ref 134018 z 2001 label "wrzuc gotowke" xyz 512.5 1192 3000 to point 562.708 1104.21 + line 134914 z 2001 to ref 133378 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 135042 transition_ref 131330 // wrzuc gotowke + decenter_begin 82 + decenter_end 898 + + from ref 134274 z 2001 label "wrzuc gotowke" xyz 611 1182 3000 to ref 133378 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 135298 transition_ref 131458 // zaakceptuj platnosc [gotowka zaakceptowana >= cena produktu/posilku] + decenter_end 572 + + from ref 134018 z 2001 label "zaakceptuj platnosc [gotowka zaakceptowana >= cena produktu/posilku]" xyz 535.5 1367 3000 to ref 131842 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 135810 transition_ref 131714 // wybrano produkt + + from ref 130434 z 2001 label "wybrano produkt" xyz 274 1699.5 3000 to ref 135682 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 135938 transition_ref 131842 // wybrano posilek + decenter_begin 755 + + from ref 130434 z 2001 label "wybrano posilek" xyz 526.5 1646 3000 to ref 135554 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 136194 transition_ref 131970 // wydaj produkt + + from ref 135682 z 2001 label "wydaj produkt" xyz 298.5 1968 3000 to ref 136066 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 136578 transition_ref 132098 // przygotuj posilek + + from ref 135554 z 2001 label "przygotuj posilek" xyz 694 1788.5 3000 to ref 136322 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 136706 transition_ref 132226 // wydaj posilek + decenter_begin 546 + + from ref 136322 z 2001 label "wydaj posilek" xyz 739 1975 3000 to ref 136450 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 137346 transition_ref 132354 // sprawdz dostepnosc + + from ref 128642 z 2001 label "sprawdz dostepnosc" xyz 678 246 3000 to point 791.32 273.04 + line 142338 z 2001 to ref 137090 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 137730 transition_ref 132610 // sprawdz dostepnosc + decenter_end 414 + + from ref 128642 z 2001 label "sprawdz dostepnosc" xyz 523 355.5 3000 to ref 137218 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 137858 transition_ref 132738 // sprawdz dostepnosc + decenter_end 261 + + from ref 128130 z 2001 label "sprawdz dostepnosc" xyz 191.5 354.5 3000 to ref 136962 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 137986 transition_ref 132866 // sprawdz dostepnosc + decenter_end 328 + + from ref 128130 z 2001 label "sprawdz dostepnosc" xyz 86 246 3000 to point 115.36 276.92 + line 142594 z 2001 to ref 136834 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 138498 transition_ref 132994 // anuluj zamowienie + + from ref 137218 z 2001 label "anuluj zamowienie" xyz 455.5 568.5 3000 to ref 138114 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 138626 transition_ref 133122 // anuluj zamowienie + + from ref 136962 z 2001 label "anuluj zamowienie" xyz 331.5 547.5 3000 to ref 138114 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 138754 transition_ref 133250 // przejdz do platnosci + decenter_begin 533 + + from ref 136834 z 2001 label "przejdz do platnosci" xyz 200 673 3000 to ref 130946 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 138882 transition_ref 133378 // przejdz do platnosci + + from ref 137090 z 2001 label "przejdz do platnosci" xyz 562 650.5 3000 to ref 130946 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 139522 transition_ref 133762 // wybierz platnosc karta + + from ref 130946 z 2001 label "wybierz platnosc karta" xyz 306 868 3000 to ref 131074 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 139650 transition_ref 133890 // anuluj zamowienie + + from ref 130946 z 2001 label "anuluj zamowienie" xyz 383 730 3000 to ref 138114 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 139778 transition_ref 134018 // anuluj zamowienie [platnosci odrzucone > 3] + + from ref 131970 z 2001 label "anuluj zamowienie [platnosci odrzucone > 3]" xyz 7 1078 3000 to ref 139266 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 141058 transition_ref 134274 // anuluj zamowienie + decenter_end 381 + + from ref 133378 z 2001 label "anuluj zamowienie" xyz 756 1053.5 3000 to point 898.7 1082.1 + line 141314 z 2001 to ref 140930 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 141186 transition_ref 134402 // anuluj zamowienie + + from ref 140930 z 2001 label "anuluj zamowienie" xyz 981 1227 3000 to ref 140418 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 141570 transition_ref 134530 // zaakceptuj platnosc + + from ref 132354 z 2001 label "zaakceptuj platnosc" xyz 201 1267 3000 to ref 141442 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 141826 transition_ref 134658 // + + from ref 141442 z 2001 to ref 130434 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 142082 transition_ref 134786 // wydaj reszte + decenter_begin 527 + + from ref 131842 z 2001 label "wydaj reszte" xyz 562 1458.5 3000 to ref 141954 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 142210 transition_ref 134914 // + + from ref 141954 z 2001 to ref 130434 + write_horizontally default show_definition default drawing_language default +end +end diff --git a/models/2.session b/models/2.session index 8f0abd8..700e5f1 100644 --- a/models/2.session +++ b/models/2.session @@ -1,10 +1,10 @@ -window_sizes 1920 1017 332 1583 867 104 +window_sizes 1920 1017 332 1583 866 105 diagrams sequencediagram_ref 141442 // 3-5-podanie_PINu 1266 693 100 A4 0 0 - active classdiagram_ref 134597 // domain-models - 114 86 80 A1 48 0 + active classdiagram_ref 154498 // design-model + 1583 866 90 A0 0 0 end show_stereotypes marked @@ -29,7 +29,7 @@ marked class_ref 135944 // CollectorAdapter class_ref 128410 // Order end -selected operation_ref 150658 // collect +selected classdiagram_ref 154498 // design-model open class_ref 129178 // Shelf class_ref 135834 // CashPayment diff --git a/models/models.prj b/models/models.prj index a9e70a9..94d5c41 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 224 "models" - revision 21 + revision 22 modified_by 2 "s452667" @@ -3002,5 +3002,312 @@ ${members}} sequencediagramsettings end overlapping_bars size A4 end + + state 128002 "state machine" + stereotype "machine" + statediagram 161026 "state-diagram" + statediagramsettings draw_all_relations no + end + size A0 + end + + pseudostate 128002 initial "" + transition 128770 "rozpocznij zamowienie" + on state_ref 128386 // Zamowienie rozpoczete + external + end + end + + state 128130 "Produkt wybrany" + transition 129410 "" + on state_ref 128514 // Wybor platnosci + external + end + + transition 132738 "sprawdz dostepnosc" + on state_ref 130178 // Produkt niedostepny + external + end + + transition 132866 "sprawdz dostepnosc" + on state_ref 130050 // Produkt dostepny + external + end + end + + pseudostate 128130 final "" + end + + state 128258 "Posilek wybrany" + transition 129154 "" + on state_ref 128258 // Posilek wybrany + end + + transition 129282 "" + on state_ref 128514 // Wybor platnosci + external + end + + transition 132354 "sprawdz dostepnosc" + on state_ref 130306 // Posilek dostepny + external + end + + transition 132482 "" + on state_ref 130434 // Posilek niedostepny + external + end + + transition 132610 "sprawdz dostepnosc" + on state_ref 130434 // Posilek niedostepny + external + end + end + + state 128386 "Zamowienie rozpoczete" + transition 128898 "wybierz produkt" + on state_ref 128130 // Produkt wybrany + external + end + + transition 129026 "wybierz posilek" + on state_ref 128258 // Posilek wybrany + external + end + end + + pseudostate 128898 choice "" + transition 131714 "wybrano produkt" + on state_ref 129794 // Produkt oplacony + external + end + + transition 131842 "wybrano posilek" + on state_ref 129666 // Posilek oplacony + external + end + end + + state 128514 "Wybor platnosci" + transition 129666 "wybierz platnosc gotowka" + on state_ref 128770 // Platnosc gotowka + external + end + + transition 133762 "wybierz platnosc karta" + on state_ref 128642 // Platnosc karta + external + end + + transition 133890 "anuluj zamowienie" + on pseudostate_ref 129282 // final + external + end + end + + state 128642 "Platnosc karta" + transition 129794 "" + on state_ref 128898 // Platnosc gotowka zaakceptowana + external + end + + transition 129922 "" + on state_ref 129026 // Odrzucona + external + end + + transition 130050 "zaplac karta" + on state_ref 129154 // Procesowanie platnosci + external + end + end + + state 128770 "Platnosc gotowka" + transition 130818 "wrzuc monete" + on state_ref 129282 // Gotowka wrzucona + external + end + end + + state 128898 "Platnosc gotowka zaakceptowana" + transition 131586 "" + on pseudostate_ref 128898 // choice + external + end + + transition 134786 "wydaj reszte" + on state_ref 130818 // Reszta wydana + external + end + end + + state 129026 "Odrzucona" + transition 130562 "ponowienie platnosci" + on state_ref 128642 // Platnosc karta + external + end + + transition 133634 "" + on pseudostate_ref 129282 // final + external + end + + transition 134018 "anuluj zamowienie [platnosci odrzucone > 3]" + on pseudostate_ref 129410 // final + external + end + end + + state 129154 "Procesowanie platnosci" + transition 130178 "" + on state_ref 129154 // Procesowanie platnosci + end + + transition 130306 "zaakceptuj platnosc" + on state_ref 128898 // Platnosc gotowka zaakceptowana + external + end + + transition 130434 "transakcja odrzucona" + on state_ref 129026 // Odrzucona + external + end + + transition 134530 "zaakceptuj platnosc" + on state_ref 130690 // Platnosc karta zaakceptowana + external + end + end + + state 129282 "Gotowka wrzucona" + transition 130690 "" + on state_ref 129282 // Gotowka wrzucona + end + + transition 130946 "zaakceptuj gotowke" + on state_ref 129410 // Gotowka zaakceptowany + external + end + + transition 131074 "odrzuc gotowke" + on state_ref 129538 // Gotowka odrzucony + external + end + + transition 134146 "" + on pseudostate_ref 129538 // final + external + end + + transition 134274 "anuluj zamowienie" + on state_ref 130562 // Gotowka wydany + external + end + end + + state 129410 "Gotowka zaakceptowany" + transition 131202 "wrzuc gotowke" + on state_ref 129282 // Gotowka wrzucona + external + end + + transition 131458 "zaakceptuj platnosc [gotowka zaakceptowana >= cena produktu/posilku]" + on state_ref 128898 // Platnosc gotowka zaakceptowana + external + end + end + + state 129538 "Gotowka odrzucony" + transition 131330 "wrzuc gotowke" + on state_ref 129282 // Gotowka wrzucona + external + end + end + + state 129666 "Posilek oplacony" + transition 132098 "przygotuj posilek" + on state_ref 129922 // Posilek przygotowywany + external + end + end + + state 129794 "Produkt oplacony" + transition 131970 "wydaj produkt" + on pseudostate_ref 129026 // final + external + end + end + + pseudostate 129026 final "" + end + + state 129922 "Posilek przygotowywany" + transition 132226 "wydaj posilek" + on pseudostate_ref 129154 // final + external + end + end + + pseudostate 129154 final "" + end + + state 130050 "Produkt dostepny" + transition 133250 "przejdz do platnosci" + on state_ref 128514 // Wybor platnosci + external + end + end + + state 130178 "Produkt niedostepny" + transition 133122 "anuluj zamowienie" + on pseudostate_ref 129282 // final + external + end + end + + state 130306 "Posilek dostepny" + transition 133378 "przejdz do platnosci" + on state_ref 128514 // Wybor platnosci + external + end + end + + state 130434 "Posilek niedostepny" + transition 132994 "anuluj zamowienie" + on pseudostate_ref 129282 // final + external + end + end + + pseudostate 129282 final "" + end + + pseudostate 129410 final "" + end + + pseudostate 129538 final "" + end + + state 130562 "Gotowka wydany" + transition 134402 "anuluj zamowienie" + on pseudostate_ref 129538 // final + external + end + end + + state 130690 "Platnosc karta zaakceptowana" + transition 134658 "" + on pseudostate_ref 128898 // choice + external + end + end + + state 130818 "Reszta wydana" + transition 134914 "" + on pseudostate_ref 128898 // choice + external + end + end + end end end