From bff177de95afba1db07cc0301b19444846902327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Szybowski?= Date: Tue, 2 Feb 2021 22:47:46 +0100 Subject: [PATCH] aktualizacja diagramu klas --- models/128212_2.d | 42 ++++ models/134530.diagram | 2 +- models/134530_2.d | 59 ++++++ models/134658.diagram | 2 +- models/134658_2.d | 65 ++++++ models/134786_2.d | 38 ++++ models/134914_2.d | 42 ++++ models/147796.diagram | 92 ++++++-- models/147796_2.d | 39 ++++ models/160980.diagram | 34 ++- models/160980_2.d | 33 +-- models/2.session | 10 +- models/models.prj | 477 ++++++++++++++++++++++++++++++++++++++++-- 13 files changed, 874 insertions(+), 61 deletions(-) create mode 100644 models/128212_2.d create mode 100644 models/134530_2.d create mode 100644 models/134658_2.d create mode 100644 models/134786_2.d create mode 100644 models/134914_2.d create mode 100644 models/147796_2.d diff --git a/models/128212_2.d b/models/128212_2.d new file mode 100644 index 0000000..b82d0c4 --- /dev/null +++ b/models/128212_2.d @@ -0,0 +1,42 @@ +format 224 + +classinstance 128340 class_ref 156628 // Klient + drawing_mode actor name "" xyz 103 17 2000 life_line_z 2000 +classinstance 128468 class_ref 156756 // AutomatKontroler + name "" xyz 234 26 2000 life_line_z 2000 +classinstance 129620 class_ref 142036 // lista_produktow + name "" xyz 454 29 2000 life_line_z 2000 +durationcanvas 128724 classinstance_ref 128340 // :Klient + xyzwh 114 115 2010 11 177 +end +durationcanvas 128852 classinstance_ref 128468 // :AutomatKontroler + xyzwh 278 117 2010 11 138 +end +durationcanvas 129748 classinstance_ref 129620 // :lista_produktow + xyzwh 494 157 2010 11 94 +end +msg 128980 synchronous + from durationcanvas_ref 128724 + to durationcanvas_ref 128852 + yz 119 2015 explicitmsg "wybierzProdukt(numer:int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 148 103 +msg 129876 synchronous + from durationcanvas_ref 128852 + to durationcanvas_ref 129748 + yz 157 2015 explicitmsg "pobierzProdukt(numer:int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 336 143 +msg 130004 return + from durationcanvas_ref 129748 + to durationcanvas_ref 128852 + yz 213 2015 explicitmsg "produkt" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 373 199 +msg 130132 return + from durationcanvas_ref 128852 + to durationcanvas_ref 128724 + yz 231 2015 explicitmsg "produkt" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 183 217 +end diff --git a/models/134530.diagram b/models/134530.diagram index 44439ce..caf71d3 100644 --- a/models/134530.diagram +++ b/models/134530.diagram @@ -41,7 +41,7 @@ msg 129154 synchronous msg 129410 synchronous from durationcanvas_ref 129026 to durationcanvas_ref 129282 - yz 118 2015 explicitmsg "wybierzKodProduktu(numer :int)" + yz 118 2015 explicitmsg "pobierzProdukt(numer :int)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 531 104 msg 129538 return diff --git a/models/134530_2.d b/models/134530_2.d new file mode 100644 index 0000000..44439ce --- /dev/null +++ b/models/134530_2.d @@ -0,0 +1,59 @@ +format 224 + +classinstance 128002 class_ref 156628 // Klient + name "" xyz 97 4 2000 life_line_z 2000 +classinstance 128130 class_ref 134530 // KlawiaturaKontroler + name "" xyz 244 12 2000 life_line_z 2000 +classinstance 128258 class_ref 156756 // AutomatKontroler + name "" xyz 458 15 2000 life_line_z 2000 +classinstance 128386 class_ref 134658 // ListaProduktow + name "" xyz 662 11 2005 life_line_z 2000 +durationcanvas 128514 classinstance_ref 128002 // :Klient + xyzwh 108 102 2010 11 40 +end +durationcanvas 128642 classinstance_ref 128130 // :KlawiaturaKontroler + xyzwh 294 102 2010 11 80 +end +durationcanvas 129026 classinstance_ref 128258 // :AutomatKontroler + xyzwh 502 109 2010 11 91 +end +durationcanvas 129282 classinstance_ref 128386 // :ListaProduktow + xyzwh 701 118 2010 11 82 +end +msg 128770 synchronous + from durationcanvas_ref 128514 + to durationcanvas_ref 128642 + yz 102 2015 explicitmsg "wybierzKodProduktu(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 91 88 +msg 128898 return + from durationcanvas_ref 128642 + to durationcanvas_ref 128514 + yz 127 2020 explicitmsg "produkt = wybierzKodProduktu(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 99 112 +msg 129154 synchronous + from durationcanvas_ref 128642 + to durationcanvas_ref 129026 + yz 109 2015 explicitmsg "wybierzKodProduktu(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 327 95 +msg 129410 synchronous + from durationcanvas_ref 129026 + to durationcanvas_ref 129282 + yz 118 2015 explicitmsg "wybierzKodProduktu(numer :int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 531 104 +msg 129538 return + from durationcanvas_ref 129282 + to durationcanvas_ref 129026 + yz 189 2020 explicitmsg "produkt = wybierzKodProduktu(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 507 173 +msg 129666 return + from durationcanvas_ref 129026 + to durationcanvas_ref 128642 + yz 158 3005 explicitmsg "produkt = wybierzKodProduktu(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 303 144 +end diff --git a/models/134658.diagram b/models/134658.diagram index 4001dd3..8eb2a8f 100644 --- a/models/134658.diagram +++ b/models/134658.diagram @@ -38,7 +38,7 @@ msg 128770 synchronous msg 129026 synchronous from durationcanvas_ref 128642 to durationcanvas_ref 128898 - yz 157 2015 explicitmsg "przekarzPieniadze(monety: money, banknoty: money)" + yz 157 2015 explicitmsg "przekazPieniadze(monety: money, banknoty: money)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 217 143 msg 129282 synchronous diff --git a/models/134658_2.d b/models/134658_2.d new file mode 100644 index 0000000..4001dd3 --- /dev/null +++ b/models/134658_2.d @@ -0,0 +1,65 @@ +format 224 + +classinstance 128002 class_ref 156628 // Klient + name "" xyz 27 37 2000 life_line_z 2000 +classinstance 128130 class_ref 134786 // KasetaKontroler + name "" xyz 208 32 2000 life_line_z 2000 +classinstance 128258 class_ref 156756 // AutomatKontroler + name "" xyz 387 36 2000 life_line_z 2000 +classinstance 128386 class_ref 134914 // EkranKontroler + name "" xyz 608 39 2000 life_line_z 2000 +durationcanvas 128514 classinstance_ref 128002 // :Klient + xyzwh 38 149 2010 11 41 +end +durationcanvas 128642 classinstance_ref 128130 // :KasetaKontroler + xyzwh 249 149 2010 11 135 + overlappingdurationcanvas 129666 + xyzwh 255 184 2020 11 25 + end + overlappingdurationcanvas 129922 + xyzwh 255 253 2020 11 25 + end +end +durationcanvas 128898 classinstance_ref 128258 // :AutomatKontroler + xyzwh 431 157 2010 11 26 +end +durationcanvas 129154 classinstance_ref 128386 // :EkranKontroler + xyzwh 645 168 2010 11 81 + overlappingdurationcanvas 129410 + xyzwh 651 177 2020 11 66 + end +end +msg 128770 synchronous + from durationcanvas_ref 128514 + to durationcanvas_ref 128642 + yz 149 2015 explicitmsg "wprowadzPieniadze(monety: money, banknoty: money)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy -31 135 +msg 129026 synchronous + from durationcanvas_ref 128642 + to durationcanvas_ref 128898 + yz 157 2015 explicitmsg "przekarzPieniadze(monety: money, banknoty: money)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 217 143 +msg 129282 synchronous + from durationcanvas_ref 128898 + to durationcanvas_ref 129154 + yz 168 2020 explicitmsg "wyswietlKwote(monety: money, banknoty: money, produkt: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 392 154 +reflexivemsg 129538 synchronous + to durationcanvas_ref 129410 + yz 177 2025 explicitmsg "wyswietPozostalalKwote(monety: money, banknoty: money, produkt: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 665 186 +reflexivemsg 129794 synchronous + to durationcanvas_ref 129666 + yz 184 2025 explicitmsg "sprawdzMonety(monety: money)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 196 170 +reflexivemsg 130050 synchronous + to durationcanvas_ref 129922 + yz 253 2025 explicitmsg "sprawdzBanknoty(banknoty: money)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 186 239 +end diff --git a/models/134786_2.d b/models/134786_2.d new file mode 100644 index 0000000..75ab92b --- /dev/null +++ b/models/134786_2.d @@ -0,0 +1,38 @@ +format 224 + +classinstance 128002 class_ref 156628 // Klient + name "" xyz 62 4 2000 life_line_z 2000 +classinstance 128130 class_ref 135042 // PodajnikKontroler + name "" xyz 164 21 2000 life_line_z 2000 +classinstance 128258 class_ref 156756 // AutomatKontroler + name "" xyz 346 25 2000 life_line_z 2000 +durationcanvas 128386 classinstance_ref 128258 // :AutomatKontroler + xyzwh 390 100 2010 11 59 + overlappingdurationcanvas 129026 + xyzwh 396 128 2020 11 25 + end +end +durationcanvas 128514 classinstance_ref 128130 // :PodajnikKontroler + xyzwh 207 100 2010 11 25 +end +durationcanvas 128770 classinstance_ref 128002 // :Klient + xyzwh 73 115 2010 11 25 +end +msg 128642 synchronous + from durationcanvas_ref 128386 + to durationcanvas_ref 128514 + yz 100 2015 explicitmsg "wydajProdukt(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 244 86 +msg 128898 synchronous + from durationcanvas_ref 128514 + to durationcanvas_ref 128770 + yz 115 2020 explicitmsg "wydajProdukt(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 85 101 +reflexivemsg 129154 synchronous + to durationcanvas_ref 129026 + yz 128 2025 explicitmsg "potwierdzPlatnosc(monety: money, banknoty: money, produkt: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 258 114 +end diff --git a/models/134914_2.d b/models/134914_2.d new file mode 100644 index 0000000..d48b73f --- /dev/null +++ b/models/134914_2.d @@ -0,0 +1,42 @@ +format 224 + +classinstance 128002 class_ref 156628 // Klient + name "" xyz 63 4 2000 life_line_z 2000 +classinstance 128130 class_ref 156756 // AutomatKontroler + name "" xyz 246 17 2000 life_line_z 2000 +classinstance 128770 class_ref 134786 // KasetaKontroler + name "" xyz 599 22 2000 life_line_z 2000 +durationcanvas 128258 classinstance_ref 128002 // :Klient + xyzwh 74 92 2010 11 40 +end +durationcanvas 128386 classinstance_ref 128130 // :AutomatKontroler + xyzwh 290 92 2010 11 73 +end +durationcanvas 128898 classinstance_ref 128770 // :KasetaKontroler + xyzwh 640 98 2010 11 67 +end +msg 128514 synchronous + from durationcanvas_ref 128258 + to durationcanvas_ref 128386 + yz 92 2015 explicitmsg "anulujZakup(produkt: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 123 77 +msg 128642 return + from durationcanvas_ref 128386 + to durationcanvas_ref 128258 + yz 114 2015 explicitmsg "pieniadze = anulujZakup(produkt: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 99 105 +msg 129026 synchronous + from durationcanvas_ref 128386 + to durationcanvas_ref 128898 + yz 98 2020 explicitmsg "zwrocPieniadze(monety: money, banknoty: money, produkt: int))" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 317 81 +msg 129154 return + from durationcanvas_ref 128898 + to durationcanvas_ref 128386 + yz 154 2020 explicitmsg "kwota = zwrocPieniadze(monety: money, banknoty: money, produkt: int))" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 304 138 +end diff --git a/models/147796.diagram b/models/147796.diagram index 913d548..b78aa32 100644 --- a/models/147796.diagram +++ b/models/147796.diagram @@ -1,39 +1,107 @@ -format 223 +format 224 classcanvas 128084 class_ref 156756 // AutomatKontroler classdiagramsettings member_max_width 0 end - xyzwh 152 180 2000 141 81 + xyzwh 338.84 307.507 2000 265 97 end classcanvas 128212 class_ref 142036 // lista_produktow classdiagramsettings member_max_width 0 end - xyzwh 533 81 2000 109 49 + xyzwh 662.672 363.084 2000 119 59 +end +classcanvas 128514 class_ref 141570 // kaseta + classdiagramsettings show_members_full_definition yes member_max_width 0 end + xyzwh 125.461 33.9281 2000 332 123 +end +classcanvas 128770 class_ref 141698 // ekran + classdiagramsettings hide_attributes no hide_operations no show_members_full_definition yes member_max_width 0 end + xyzwh 498.203 37.113 2000 255 101 +end +classcanvas 129154 class_ref 141826 // podajnik + classdiagramsettings member_max_width 0 end + xyzwh 583.797 190.832 2000 253 93 end classcanvas 129236 class_ref 129112 // terminal classdiagramsettings member_max_width 0 end - xyzwh 499 428 2000 123 59 + xyzwh 579.849 473.664 2000 221 59 +end +classcanvas 129538 class_ref 141954 // zwrot + classdiagramsettings show_members_full_definition yes member_max_width 0 end + xyz 82.2405 280.574 2000 end classcanvas 129620 class_ref 141140 // platnosc - classdiagramsettings member_max_width 0 end - xyzwh 124 440 2000 139 59 + classdiagramsettings show_members_full_definition yes member_max_width 0 end + xyzwh 90.7072 492.527 2000 255 59 +end +classcanvas 129666 class_ref 142082 // klawiatura + classdiagramsettings show_members_full_definition yes member_max_width 0 end + xyz 82.5971 388.058 2000 +end +classcanvas 130434 class_ref 142210 // tacka_zwrotu_pieniedzy + classdiagramsettings show_members_full_definition yes member_max_width 0 end + xyz 16.2927 177.049 2005 +end +classcanvas 130690 class_ref 142338 // karta_platnicza + classdiagramsettings show_members_full_definition yes member_max_width 0 end + xyz 315.768 559.078 3005 +end +classcanvas 130818 class_ref 142466 // numer_karty + classdiagramsettings show_members_full_definition yes member_max_width 0 end + xyz 514.652 564.832 3005 +end +relationcanvas 128898 relation_ref 128130 // zawiera + from ref 128084 z 2001 to point 332.342 262.791 + line 129410 z 2001 label "zawiera" italic max_width 255 xyz 329 210.5 3000 to ref 128514 + no_role_a no_role_b + multiplicity_a_pos 290 161 3000 multiplicity_b_pos 384 319 3000 end relationcanvas 128980 relation_ref 153172 // from ref 128084 z 2001 to ref 128212 - role_a_pos 484 99 3000 no_role_b - multiplicity_a_pos 516 124 3000 multiplicity_b_pos 302 200 3000 + role_a_pos 613 366 3000 no_role_b + multiplicity_a_pos 645 391 3000 multiplicity_b_pos 612 382 3000 +end +relationcanvas 129026 relation_ref 128258 // zawiera + from ref 128084 z 2001 label "zawiera" italic max_width 255 xyz 523.5 207.5 3000 to ref 128770 + no_role_a no_role_b + multiplicity_a_pos 573 144 3000 multiplicity_b_pos 483 288 3000 +end +relationcanvas 129282 relation_ref 128386 // zawiera + from ref 128084 z 2001 label "zawiera" italic max_width 255 xyz 566 280 3000 to ref 129154 + no_role_a no_role_b + multiplicity_a_pos 592 283 3000 multiplicity_b_pos 571 309 3000 end relationcanvas 129364 relation_ref 153300 // from ref 128084 z 2001 to ref 129236 - role_a_pos 468 415 3000 no_role_b - multiplicity_a_pos 453 410 3000 multiplicity_b_pos 289 273 3000 + role_a_pos 596 460 3000 no_role_b + multiplicity_a_pos 630 485 3000 multiplicity_b_pos 553 416 3000 +end +relationcanvas 129794 relation_ref 128514 // zawiera + from ref 128084 z 2001 label "zawiera" italic max_width 255 xyz 305 372.5 3000 to ref 129666 + no_role_a no_role_b + multiplicity_a_pos 334 397 3000 multiplicity_b_pos 321 395 3000 end relationcanvas 130260 relation_ref 153556 // from ref 128084 z 2001 to ref 129620 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 130306 relation_ref 128770 // zarzadza + from ref 129666 z 2001 label "zarzadza" italic max_width 255 xyz 211.5 354 3000 to ref 129538 + no_role_a no_role_b + multiplicity_a_pos 179 345 3000 multiplicity_b_pos 183 369 3000 +end relationcanvas 130388 relation_ref 153428 // from ref 128084 z 2001 to ref 129620 - role_a_pos 205 421 3000 no_role_b - multiplicity_a_pos 179 421 3000 multiplicity_b_pos 200 267 3000 + role_a_pos 267 467 3000 no_role_b + multiplicity_a_pos 267 492 3000 multiplicity_b_pos 376 404 3000 +end +relationcanvas 130562 relation_ref 128898 // zarzadza + from ref 129538 z 2006 label "zarzadza" italic max_width 255 xyz 137 242.5 3000 to ref 130434 + no_role_a no_role_b + multiplicity_a_pos 134 242 3000 multiplicity_b_pos 155 261 3000 +end +relationcanvas 130946 relation_ref 129026 // zawiera + from ref 130690 z 3006 label "zawiera" italic max_width 255 xyz 448.5 578.5 3000 to ref 130818 + no_role_a no_role_b + multiplicity_a_pos 497 601 3000 multiplicity_b_pos 435 599 3000 end end diff --git a/models/147796_2.d b/models/147796_2.d new file mode 100644 index 0000000..74c2e5d --- /dev/null +++ b/models/147796_2.d @@ -0,0 +1,39 @@ +format 224 + +classcanvas 128084 class_ref 156756 // AutomatKontroler + classdiagramsettings member_max_width 0 end + xyzwh 152 180 2000 141 81 +end +classcanvas 128212 class_ref 142036 // lista_produktow + classdiagramsettings member_max_width 0 end + xyzwh 533 81 2000 109 49 +end +classcanvas 129236 class_ref 129112 // terminal + classdiagramsettings member_max_width 0 end + xyzwh 499 428 2000 123 59 +end +classcanvas 129620 class_ref 141140 // platnosc + classdiagramsettings member_max_width 0 end + xyzwh 124 440 2000 139 59 +end +relationcanvas 128980 relation_ref 153172 // + from ref 128084 z 2001 to ref 128212 + role_a_pos 484 99 3000 no_role_b + multiplicity_a_pos 516 124 3000 multiplicity_b_pos 302 200 3000 +end +relationcanvas 129364 relation_ref 153300 // + from ref 128084 z 2001 to ref 129236 + role_a_pos 468 415 3000 no_role_b + multiplicity_a_pos 453 410 3000 multiplicity_b_pos 289 273 3000 +end +relationcanvas 130260 relation_ref 153556 // + from ref 128084 z 2001 to ref 129620 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 130388 relation_ref 153428 // + from ref 128084 z 2001 to ref 129620 + role_a_pos 205 421 3000 no_role_b + multiplicity_a_pos 179 421 3000 multiplicity_b_pos 200 267 3000 +end +end diff --git a/models/160980.diagram b/models/160980.diagram index 658a90a..2438cf4 100644 --- a/models/160980.diagram +++ b/models/160980.diagram @@ -1,11 +1,11 @@ -format 223 +format 224 pseudostatecanvas 128084 pseudostate_ref 128084 // initial - xyz 81 92 2000 + xyz 80 108 2000 end statecanvas 128212 state_ref 128212 // Produkt Wybrany - xyzwh 31 201 2000 115 33 + xyzwh 32 206 2000 115 33 end statecanvas 128340 state_ref 128340 // Produkt Oplacony @@ -23,7 +23,7 @@ pseudostatecanvas 128980 pseudostate_ref 128340 // final Zakup Anulowany end statecanvas 129876 state_ref 128596 // Oczekiwanie na Zaplate - xyzwh 248 203 2000 149 33 + xyzwh 249 205 2000 149 33 end note 134356 "wrzuconaKwota < cenaProduktu " xyzwh 266 26 2006 123 49 @@ -33,57 +33,55 @@ note 134612 "wrzuconaKwota >= cenaProduktu" xyzwh 270 365 2000 103 65 transitioncanvas 128724 transition_ref 128084 // wydajProdukt - from ref 128340 z 2001 label "wydajProdukt" xyz 443 539 3000 to ref 128596 + from ref 128340 z 2001 label "wydajProdukt" xyz 443 539 2001 to ref 128596 write_horizontally default show_definition default drawing_language default end transitioncanvas 128852 transition_ref 128212 // pobierzSrodki - from ref 128468 z 2001 label "pobierzSrodki" xyz 458 331 3000 to ref 128340 + from ref 128468 z 2001 label "pobierzSrodki" xyz 458 331 2001 to ref 128340 write_horizontally default show_definition default drawing_language default end transitioncanvas 129108 transition_ref 128340 // odrzucTransakcje - from ref 128468 z 2001 label "odrzucTransakcje" max_width 14 xyz 644 476 3000 to point 634 640 + from ref 128468 z 2001 label "odrzucTransakcje" max_width 14 xyz 644 476 2001 to point 634 640 line 134228 z 2001 to point 636 700 line 129236 z 2001 to ref 128980 write_horizontally default show_definition default drawing_language default end -transitioncanvas 129748 transition_ref 128468 // wybierzProdukt - - from ref 128084 z 2001 label "wybierzProdukt" xyz 10 145 3000 to ref 128212 - write_horizontally default show_definition default drawing_language default -end transitioncanvas 130644 transition_ref 128724 // oplacProdukt + decenter_begin 393 - from ref 128212 z 2001 label "oplacProdukt" xyz 159 199 3000 to ref 129876 + from ref 128212 z 2001 label "oplacProdukt" xyz 165 213 2001 to ref 129876 write_horizontally default show_definition default drawing_language default end transitioncanvas 132052 transition_ref 129108 // wrzucGotowke decenter_begin 906 decenter_end 134 - from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 288 77 3000 to point 379 94 - line 132180 z 2001 to point 263 93 + from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 289 79 2001 to point 380 96 + line 132180 z 2001 to point 264 95 line 132308 z 2001 to ref 129876 write_horizontally default show_definition default drawing_language default end transitioncanvas 132564 transition_ref 129236 // przylozKarteDoTerminala - from ref 129876 z 2001 label "przylozKarteDoTerminala" xyz 424 199 3000 to ref 128468 + from ref 129876 z 2001 label "przylozKarteDoTerminala" xyz 425 202 2001 to ref 128468 write_horizontally default show_definition default drawing_language default end transitioncanvas 132692 transition_ref 129364 // wrzucGotowke decenter_begin 865 decenter_end 75 - from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 278.5 351 3000 to point 378 443 + from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 279 354 2001 to point 378 443 line 134740 z 2001 to ref 128340 write_horizontally default show_definition default drawing_language default end transitioncanvas 132820 transition_ref 129492 // anulujZakup decenter_begin 79 - from ref 129876 z 2001 label "anulujZakup" xyz 185 449 3000 to ref 128980 + from ref 129876 z 2001 label "anulujZakup" xyz 186 452 2001 to ref 128980 write_horizontally default show_definition default drawing_language default end +line 128642 -_-_ + from ref 128084 z 2001 to ref 128212 end diff --git a/models/160980_2.d b/models/160980_2.d index 7c1354f..f537bb5 100644 --- a/models/160980_2.d +++ b/models/160980_2.d @@ -1,11 +1,15 @@ format 224 pseudostatecanvas 128084 pseudostate_ref 128084 // initial - xyz 81 92 2000 + xyz 83 39 2000 +end +statecanvas 128130 state_ref 128002 // Stan Poczatkowy + + xyzwh 34 106 2006 113 33 end statecanvas 128212 state_ref 128212 // Produkt Wybrany - xyzwh 31 201 2000 115 33 + xyzwh 32 206 2000 115 33 end statecanvas 128340 state_ref 128340 // Produkt Oplacony @@ -23,7 +27,7 @@ pseudostatecanvas 128980 pseudostate_ref 128340 // final Zakup Anulowany end statecanvas 129876 state_ref 128596 // Oczekiwanie na Zaplate - xyzwh 248 203 2000 149 33 + xyzwh 249 205 2000 149 33 end note 134356 "wrzuconaKwota < cenaProduktu " xyzwh 266 26 2006 123 49 @@ -31,6 +35,11 @@ note 134484 "srodkiNaKoncie < cenaProduktu" xyzwh 644 498 2000 119 47 note 134612 "wrzuconaKwota >= cenaProduktu" xyzwh 270 365 2000 103 65 +transitioncanvas 128258 transition_ref 128002 // wybierzProdukt + + from ref 128130 z 2007 label "wybierzProdukt" xyz 51 164 3000 to ref 128212 + write_horizontally default show_definition default drawing_language default +end transitioncanvas 128724 transition_ref 128084 // wydajProdukt from ref 128340 z 2001 label "wydajProdukt" xyz 443 539 2001 to ref 128596 @@ -48,42 +57,38 @@ transitioncanvas 129108 transition_ref 128340 // odrzucTransakcje line 129236 z 2001 to ref 128980 write_horizontally default show_definition default drawing_language default end -transitioncanvas 129748 transition_ref 128468 // wybierzProdukt - - from ref 128084 z 2001 label "wybierzProdukt" xyz 10 145 2001 to ref 128212 - write_horizontally default show_definition default drawing_language default -end transitioncanvas 130644 transition_ref 128724 // oplacProdukt + decenter_begin 393 - from ref 128212 z 2001 label "oplacProdukt" xyz 159 199 2001 to ref 129876 + from ref 128212 z 2001 label "oplacProdukt" xyz 165 213 2001 to ref 129876 write_horizontally default show_definition default drawing_language default end transitioncanvas 132052 transition_ref 129108 // wrzucGotowke decenter_begin 906 decenter_end 134 - from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 288 77 2001 to point 379 94 - line 132180 z 2001 to point 263 93 + from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 289 79 2001 to point 380 96 + line 132180 z 2001 to point 264 95 line 132308 z 2001 to ref 129876 write_horizontally default show_definition default drawing_language default end transitioncanvas 132564 transition_ref 129236 // przylozKarteDoTerminala - from ref 129876 z 2001 label "przylozKarteDoTerminala" xyz 424 199 2001 to ref 128468 + from ref 129876 z 2001 label "przylozKarteDoTerminala" xyz 425.5 202.5 2001 to ref 128468 write_horizontally default show_definition default drawing_language default end transitioncanvas 132692 transition_ref 129364 // wrzucGotowke decenter_begin 865 decenter_end 75 - from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 278 351 2001 to point 378 443 + from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 279.5 354 2001 to point 378 443 line 134740 z 2001 to ref 128340 write_horizontally default show_definition default drawing_language default end transitioncanvas 132820 transition_ref 129492 // anulujZakup decenter_begin 79 - from ref 129876 z 2001 label "anulujZakup" xyz 185 449 2001 to ref 128980 + from ref 129876 z 2001 label "anulujZakup" xyz 186.5 452 2001 to ref 128980 write_horizontally default show_definition default drawing_language default end end diff --git a/models/2.session b/models/2.session index 4b68838..77afe0c 100644 --- a/models/2.session +++ b/models/2.session @@ -1,11 +1,17 @@ window_sizes 1920 1017 450 1465 867 104 diagrams - active statediagram_ref 160980 // zakupProduktu + sequencediagram_ref 134530 // 1-1-wyborKoduProduktuPakowanego 1172 693 100 A4 0 0 + sequencediagram_ref 134658 // 1-2-wprowadzenieMonetyBanknotu + 114 86 100 A4 0 28 + sequencediagram_ref 134786 // 1-3-odbiorProduktu + 114 86 100 A4 0 0 + active sequencediagram_ref 134914 // 1-4-anulowanieZakupu + 1465 867 100 A4 0 0 end show_stereotypes -selected state_ref 128084 // zakupProduktu +selected class_ref 156628 // Klient open state_ref 128084 // zakupProduktu end diff --git a/models/models.prj b/models/models.prj index 41e3cbb..82d745e 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 224 "models" - revision 21 + revision 22 modified_by 2 "luksz" @@ -331,8 +331,9 @@ format 224 end operation 128340 "pobierzNumerKarty" - public explicit_return_type "" - nparams 0 + public explicit_return_type "int" + nparams 1 + param in name "numerKarty" explicit_type "int" @@ -472,7 +473,7 @@ format 224 end attribute 146516 "kwota" - private explicit_type "Wartosc" + private explicit_type "money" cpp_decl "" java_decl "" php_decl "" @@ -487,8 +488,9 @@ format 224 end operation 128724 "aktywujSposobPlatnosci" - public explicit_return_type "" - nparams 0 + public explicit_return_type "void" + nparams 1 + param in name "platnosc" explicit_type "string" @@ -701,6 +703,17 @@ format 224 + end + + attribute 129282 "produkty" + private explicit_type "array" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn end end @@ -1102,8 +1115,9 @@ format 224 mysql_decl "" operation 128084 "wybierzProdukt" - public explicit_return_type "int" - nparams 0 + public explicit_return_type "void" + nparams 1 + param in name "produkt" explicit_type "int" @@ -1119,8 +1133,9 @@ format 224 end operation 128212 "przylozKarte" - public explicit_return_type "" - nparams 0 + public explicit_return_type "void" + nparams 1 + param in name "karta" type class_ref 142338 // karta_platnicza @@ -1150,13 +1165,49 @@ format 224 end operation 128596 "wybierzSposobPlatnosci" - public explicit_return_type "" - nparams 0 + public explicit_return_type "string" + nparams 1 + param in name "platnosc" explicit_type "string" + end + + classrelation 128002 // + relation 128002 ---|> + a public + classrelation_ref 128002 // + b parent class_ref 141570 // kaseta + end + + classrelation 128130 // (zawiera) + relation 128130 ---> name "zawiera" + a role_name "" multiplicity "1" private + classrelation_ref 128130 // (zawiera) + b multiplicity "*" parent class_ref 141570 // kaseta + end + + classrelation 128258 // (zawiera) + relation 128258 ---> name "zawiera" + a role_name "" multiplicity "1" private + classrelation_ref 128258 // (zawiera) + b multiplicity "1" parent class_ref 141698 // ekran + end + + classrelation 128386 // (zawiera) + relation 128386 ---> name "zawiera" + a role_name "" multiplicity "1" private + classrelation_ref 128386 // (zawiera) + b multiplicity "1" parent class_ref 141826 // podajnik + end + + classrelation 128514 // (zawiera) + relation 128514 ---> name "zawiera" + a role_name "" multiplicity "1" private + classrelation_ref 128514 // (zawiera) + b multiplicity "1" parent class_ref 142082 // klawiatura end end @@ -1183,7 +1234,7 @@ format 224 end classdiagram 147796 "design-model" - classdiagramsettings member_max_width 0 end + classdiagramsettings draw_all_relations no show_members_full_definition yes member_max_width 0 end size A4 end @@ -1279,6 +1330,23 @@ format 224 external end end + + stateaction 128002 + end + + state 128002 "Stan Poczatkowy" + transition 128002 "wybierzProdukt" + on state_ref 128212 // Produkt Wybrany + external + end + + transition 128130 "" + on state_ref 128002 // Stan Poczatkowy + end + end + + pseudostate 128002 fork "" + end end sequencediagram 134530 "1-1-wyborKoduProduktuPakowanego" @@ -1360,5 +1428,388 @@ format 224 sequencediagramsettings end overlapping_bars size A4 end + + class 141570 "kaseta" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + ncouples 1 + key "" value "" + operation 128002 "przekazPieniadze" + public explicit_return_type "void" + nparams 2 + param in name "monety" explicit_type "money" + param in name "banknoty" explicit_type "money" + + + + + + end + + operation 128130 "sprawdzMonety" + public explicit_return_type "bool" + nparams 1 + param in name "monety" explicit_type "money" + + + + + + end + + operation 128258 "sprawdzBanknoty" + public explicit_return_type "bool" + nparams 1 + param in name "banknoty" explicit_type "money" + + + + + + end + + attribute 128130 "kwota" + private explicit_type "money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 128258 "moneta" + private explicit_type "money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 128386 "banknot" + private explicit_type "money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end + + class 141698 "ekran" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + operation 128386 "wyswietlKwote" + public explicit_return_type "void" + nparams 1 + param in name "kwota" explicit_type "money" + + + + + + end + + operation 128514 "wyswietlPozostalaKwote" + public explicit_return_type "void" + nparams 1 + param in name "kwota" explicit_type "money" + + + + + + end + + operation 128642 "wyswietlNumerProduktu" + public explicit_return_type "void" + nparams 1 + param in name "produkt" explicit_type "int" + + + + + + end + + attribute 128514 "kwota" + private explicit_type "money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end + + class 141826 "podajnik" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + operation 128770 "wydajProduktPakowany" + public explicit_return_type "void" + nparams 1 + param in name "produkt" explicit_type "int" + + + + + + end + + operation 128898 "wydajProduktPrzygotowany" + public explicit_return_type "void" + nparams 1 + param in name "produkt" explicit_type "int" + + + + + + end + + attribute 129154 "produkt" + private explicit_type "int" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end + + class 141954 "zwrot" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 128642 "kwotaZwrotu" + private explicit_type "money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 129282 "zwrocPieniadze" + public explicit_return_type "void" + nparams 1 + param in name "kwotaZwrotu" explicit_type "int" + + + + + + end + + classrelation 128898 // (zarzadza) + relation 128898 ---> name "zarzadza" + a role_name "" multiplicity "1" private + classrelation_ref 128898 // (zarzadza) + b multiplicity "1" parent class_ref 142210 // tacka_zwrotu_pieniedzy + end + end + + class 142082 "klawiatura" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 128898 "numerProduktu" + private explicit_type "int" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 129410 "wprowadzNumerProduktu" + public explicit_return_type "void" + nparams 1 + param in name "produkt" explicit_type "int" + + + + + + end + + operation 129538 "anulujZakup" + public explicit_return_type "void" + nparams 1 + param in name "produkt" explicit_type "int" + + + + + + end + + classrelation 128642 // + relation 128642 ---> + a role_name "" private + classrelation_ref 128642 // + b parent class_ref 142082 // klawiatura + end + + classrelation 128770 // (zarzadza) + relation 128770 ---> name "zarzadza" + a role_name "" multiplicity "1" private + classrelation_ref 128770 // (zarzadza) + b multiplicity "1" parent class_ref 141954 // zwrot + end + end + + class 142210 "tacka_zwrotu_pieniedzy" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 129026 "zwroconaKwota" + private explicit_type "money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 129666 "ZwrocPieniadze" + public explicit_return_type "void" + nparams 1 + param in name "kwotaZwrotu" explicit_type "int" + + + + + + end + end + + class 142338 "karta_platnicza" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 129410 "cvc" + private explicit_type "short" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 129538 "dataWaznosci" + private explicit_type "date" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + classrelation 129026 // (zawiera) + relation 129026 ---> name "zawiera" + a role_name "" multiplicity "1" private + classrelation_ref 129026 // (zawiera) + b multiplicity "1" parent class_ref 142466 // numer_karty + end + end + + class 142466 "numer_karty" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 129666 "id" + private explicit_type "int" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 129794 "idKonta" + private explicit_type "int" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end end end