From 59daf16e04a4303765ed85904c7e43d48af5f693 Mon Sep 17 00:00:00 2001 From: Maciej Czajka Date: Mon, 1 Feb 2021 18:38:01 +0100 Subject: [PATCH] poprawki --- models/128006.diagram | 77 ++++-------- models/128134.diagram | 32 ++--- models/128262.diagram | 8 +- models/128390.diagram | 15 +-- models/128518.diagram | 48 +++----- models/135046.diagram | 12 +- models/135174.diagram | 11 +- models/135298.diagram | 52 ++++---- models/141316.diagram | 42 +++---- models/147972.diagram | 28 ++--- models/6.session | 35 ++---- models/models.prj | 270 ++++++++++++++++++++++++++++++++++-------- 12 files changed, 377 insertions(+), 253 deletions(-) diff --git a/models/128006.diagram b/models/128006.diagram index 3a2c6e4..51883ed 100644 --- a/models/128006.diagram +++ b/models/128006.diagram @@ -11,70 +11,38 @@ end classinstancecanvas 129542 classinstance_ref 128262 // xyz 476 68 2005 life_line_z 2000 end -classinstancecanvas 130054 classinstance_ref 128390 // - xyz 839 174 2005 life_line_z 2000 -end classinstance 130950 class_ref 137347 // Konto name "" xyz 676 124 2000 life_line_z 2000 -durationcanvas 131078 classinstance_ref 129542 // :Karta_klienta - xyzwh 509 351 2010 11 46 -end -durationcanvas 131206 classinstance_ref 130950 // :Konto - xyzwh 695 332 2010 11 56 -end -durationcanvas 131462 classinstance_ref 130950 // :Konto - xyzwh 695 408 2010 11 81 -end -durationcanvas 131590 classinstance_ref 130054 // :Baza_danych - xyzwh 874 400 2010 11 73 -end +classinstance 135942 class_ref 128259 // Bank + name "" xyz 865 209 2000 life_line_z 2000 durationcanvas 133894 classinstance_ref 128006 // :Klient - xyzwh 48 79 2010 11 49 + xyzwh 52 79 2010 11 49 end durationcanvas 134022 classinstance_ref 128134 // :Bankomat - xyzwh 206 84 2010 11 130 + xyzwh 213 84 2010 11 130 end durationcanvas 134278 classinstance_ref 128646 // :Czytnik_kart - xyzwh 373 113 2010 11 52 + xyzwh 381 113 2010 11 52 end durationcanvas 134662 classinstance_ref 129542 // :Karta_klienta - xyzwh 509 187 2010 11 52 + xyzwh 516 187 2010 11 52 end durationcanvas 134918 classinstance_ref 130950 // :Konto - xyzwh 695 216 2010 11 87 + xyzwh 695 216 2010 11 106 end -durationcanvas 135558 classinstance_ref 130054 // :Baza_danych - xyzwh 874 237 2010 11 66 +durationcanvas 136070 classinstance_ref 135942 // :Bank + xyzwh 884 259 2010 11 62 end -msg 131334 synchronous - from durationcanvas_ref 131078 - to durationcanvas_ref 131206 - yz 362 2015 explicitmsg "new(numerKarty)" - stereotype "<>" xyz 596 378 3000 - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 581 346 -msg 131718 synchronous - from durationcanvas_ref 131462 - to durationcanvas_ref 131590 - yz 413 2015 explicitmsg "pobierzDane(numerKarty)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 734 398 -msg 132614 return - from durationcanvas_ref 131590 - to durationcanvas_ref 131462 - yz 462 2015 explicitmsg "daneKonta" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 772 446 msg 134150 synchronous from durationcanvas_ref 133894 to durationcanvas_ref 134022 - yz 97 2015 explicitmsg "wlozKarte()" + yz 97 2015 msg operation_ref 128006 // "wlozKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 104 81 msg 134406 synchronous from durationcanvas_ref 134022 to durationcanvas_ref 134278 - yz 117 2020 explicitmsg "pobierzNumerKarty()" + yz 117 2020 msg operation_ref 128134 // "pobierzNumerKarty()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 239 101 msg 134534 return @@ -86,27 +54,30 @@ msg 134534 return msg 134790 synchronous from durationcanvas_ref 134022 to durationcanvas_ref 134662 - yz 194 2015 explicitmsg "new(numerKarty)" + yz 194 2015 explicitmsg "new()" stereotype "<>" xyz 336 210 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "numerKarty" label_xy 321 178 msg 135046 synchronous from durationcanvas_ref 134662 to durationcanvas_ref 134918 - yz 221 2015 explicitmsg "new(numerKarty)" + yz 221 2015 explicitmsg "new()" stereotype "<>" xyz 577 237 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "numerKarty" label_xy 562 205 -msg 135686 synchronous +msg 136198 synchronous from durationcanvas_ref 134918 - to durationcanvas_ref 135558 - yz 242 2015 explicitmsg "pobierzDane(numerKarty)" + to durationcanvas_ref 136070 + yz 264 2015 msg operation_ref 128262 // "pobierzDane()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 720 226 -msg 135814 return - from durationcanvas_ref 135558 + args "numerKarty" + label_xy 724 249 +msg 136326 return + from durationcanvas_ref 136070 to durationcanvas_ref 134918 - yz 279 2015 explicitmsg "daneKonta" + yz 298 2015 explicitmsg "daneKonta" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 762 263 + label_xy 764 282 end diff --git a/models/128134.diagram b/models/128134.diagram index ef34478..9b0f174 100644 --- a/models/128134.diagram +++ b/models/128134.diagram @@ -12,16 +12,16 @@ classinstance 129542 class_ref 128771 // Karta_klienta classinstance 130054 class_ref 137731 // Komunikat name "" xyz 667 287 2000 life_line_z 2000 durationcanvas 128262 classinstance_ref 128006 // :Klient - xyzwh 84 99.4 2010 11 40 + xyzwh 73 99 2010 11 40 end durationcanvas 128390 classinstance_ref 128134 // :Bankomat - xyzwh 307 108 2010 11 26 + xyzwh 289 108 2010 11 26 end durationcanvas 128774 classinstance_ref 128134 // :Bankomat - xyzwh 278 155 2010 11 318 + xyzwh 289 155 2010 11 333 end durationcanvas 128902 classinstance_ref 128646 // :Klawiatura - xyzwh 430 151 2010 11 86 + xyzwh 442 151 2010 11 86 end durationcanvas 132742 classinstance_ref 129542 // :Karta_klienta xyzwh 567 251 2010 11 70 @@ -29,21 +29,21 @@ end durationcanvas 133126 classinstance_ref 130054 // :Komunikat xyzwh 700 340 2010 11 81 end -durationcanvas 133510 classinstance_ref 128006 // :Klient - xyzwh 66 448 2010 11 25 +durationcanvas 134022 classinstance_ref 128006 // :Klient + xyzwh 73 457 2010 11 31 end msg 128518 synchronous from durationcanvas_ref 128262 to durationcanvas_ref 128390 - yz 117 2015 explicitmsg "wprowadzPin()" + yz 117 2015 msg operation_ref 142084 // "wprowadzPin()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 139 101 msg 129030 synchronous from durationcanvas_ref 128774 to durationcanvas_ref 128902 - yz 165 2015 explicitmsg "odczytajPin()" + yz 165 2015 msg operation_ref 142212 // "czytajPin()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 330 149 + label_xy 342 149 msg 132102 return from durationcanvas_ref 128902 to durationcanvas_ref 128774 @@ -53,8 +53,9 @@ msg 132102 return msg 132870 synchronous from durationcanvas_ref 128774 to durationcanvas_ref 132742 - yz 259 2015 explicitmsg "weryfikujPin(pin)" + yz 259 2015 msg operation_ref 128390 // "weryfikujPin()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "pin" label_xy 381 243 msg 132998 return from durationcanvas_ref 132742 @@ -65,8 +66,9 @@ msg 132998 return msg 133254 synchronous from durationcanvas_ref 128774 to durationcanvas_ref 133126 - yz 349 2015 explicitmsg "komunikatPin(rezultatWeryfikacji)" + yz 349 2015 msg operation_ref 128518 // "komunikatPin()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "rezultatWeryfikacji" label_xy 397 333 msg 133382 return from durationcanvas_ref 133126 @@ -74,10 +76,10 @@ msg 133382 return yz 390 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 464 374 -msg 133638 return +msg 134150 return from durationcanvas_ref 128774 - to durationcanvas_ref 133510 - yz 458 2015 explicitmsg "wyswietlKomunikat(komunikat)" + to durationcanvas_ref 134022 + yz 465 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 88 442 + label_xy 156 449 end diff --git a/models/128262.diagram b/models/128262.diagram index 684c546..e8ff5b3 100644 --- a/models/128262.diagram +++ b/models/128262.diagram @@ -22,13 +22,13 @@ end msg 128646 asynchronous from durationcanvas_ref 128390 to durationcanvas_ref 128518 - yz 110 2015 explicitmsg "wplataGotowki()" + yz 110 2015 msg operation_ref 128774 // "wplataGotowki()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 127 96 msg 130054 synchronous from durationcanvas_ref 128518 to durationcanvas_ref 129926 - yz 146 2015 explicitmsg "komunikatWplata()" + yz 146 2015 msg operation_ref 128902 // "komunikatWplata()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 312 130 msg 130182 return @@ -40,7 +40,7 @@ msg 130182 return msg 130438 return from durationcanvas_ref 128518 to durationcanvas_ref 130310 - yz 250 2015 explicitmsg "wyswietlKomunikat(komunikat)" + yz 250 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 79 235 + label_xy 135 237 end diff --git a/models/128390.diagram b/models/128390.diagram index 5b589a3..389de7b 100644 --- a/models/128390.diagram +++ b/models/128390.diagram @@ -16,8 +16,8 @@ end durationcanvas 128646 classinstance_ref 128134 // :Bankomat xyzwh 265 92 2010 11 290 end -durationcanvas 130822 classinstance_ref 128262 // :Czytnik_banknotow - xyzwh 449 141 2010 11 68 +durationcanvas 130822 classinstance_ref 128262 // :Czytnik_kart + xyzwh 429 141 2010 11 68 end durationcanvas 131206 classinstance_ref 128390 // :Komunikat xyzwh 580 220 2010 11 104 @@ -28,13 +28,13 @@ end msg 128774 synchronous from durationcanvas_ref 128518 to durationcanvas_ref 128646 - yz 106 2015 explicitmsg "wlozBanknoty()" + yz 106 2015 msg operation_ref 129030 // "wlozBanknoty()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 122 90 msg 130950 synchronous from durationcanvas_ref 128646 to durationcanvas_ref 130822 - yz 149 2015 explicitmsg "przeliczBanknoty()" + yz 149 2015 msg operation_ref 129158 // "przeliczBanknoty()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 308 133 msg 131078 return @@ -46,8 +46,9 @@ msg 131078 return msg 131334 synchronous from durationcanvas_ref 128646 to durationcanvas_ref 131206 - yz 255 2015 explicitmsg "komunikatSumaBanknotow(sumaBanknotow)" + yz 255 2015 msg operation_ref 129286 // "komunikatSumaBanknotow()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "sumaBanknotow" label_xy 296 239 msg 131462 return from durationcanvas_ref 131206 @@ -58,7 +59,7 @@ msg 131462 return msg 131718 return from durationcanvas_ref 128646 to durationcanvas_ref 131590 - yz 356 2015 explicitmsg "wyswietlKomunikat(komunikat)" + yz 356 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 81 341 + label_xy 130 342 end diff --git a/models/128518.diagram b/models/128518.diagram index 8cd4c9e..dc7c653 100644 --- a/models/128518.diagram +++ b/models/128518.diagram @@ -13,42 +13,37 @@ classinstance 128518 class_ref 137347 // Konto name "" xyz 817 184 2000 life_line_z 2000 classinstance 128646 class_ref 137731 // Komunikat name "" xyz 1179 405 2000 life_line_z 2000 -classinstance 131846 class_ref 128006 // Baza_danych - name "" xyz 1021 246 2000 life_line_z 2000 durationcanvas 128774 classinstance_ref 128006 // :Klient - xyzwh 74 84 2010 11 40 + xyzwh 78 84 2010 11 40 end durationcanvas 128902 classinstance_ref 128134 // :Bankomat - xyzwh 304 89 2010 11 486 + xyzwh 311 89 2010 11 486 end durationcanvas 133254 classinstance_ref 128262 // :Ekran_dotykowy - xyzwh 481 122 2010 11 63 + xyzwh 489 122 2010 11 63 end durationcanvas 133638 classinstance_ref 128390 // :Karta_klienta - xyzwh 633 205 2010 11 234 + xyzwh 640 205 2010 11 234 end durationcanvas 133894 classinstance_ref 128518 // :Konto xyzwh 836 236 2010 11 170 end -durationcanvas 134150 classinstance_ref 131846 // :Baza_danych - xyzwh 1056 305 2010 11 54 -end durationcanvas 134790 classinstance_ref 128646 // :Komunikat - xyzwh 1205 482 2010 11 56 + xyzwh 1212 482 2010 11 56 end durationcanvas 135174 classinstance_ref 128006 // :Klient - xyzwh 74 555 2010 11 25 + xyzwh 78 555 2010 11 25 end msg 129030 synchronous from durationcanvas_ref 128774 to durationcanvas_ref 128902 - yz 99 2015 explicitmsg "potwierdzenieOperacji()" + yz 99 2015 msg operation_ref 129414 // "potwierdzenieOperacji()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 133 83 msg 133382 synchronous from durationcanvas_ref 128902 to durationcanvas_ref 133254 - yz 135 2015 explicitmsg "jakaDecyzja()" + yz 135 2015 msg operation_ref 150532 // "jakaDecyzja()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 366 119 msg 133510 return @@ -60,27 +55,17 @@ msg 133510 return msg 133766 synchronous from durationcanvas_ref 128902 to durationcanvas_ref 133638 - yz 216 2015 explicitmsg "[decyzja = true] zasilKonto(sumaBanknotow)" + yz 216 2015 explicitmsg "[decyzja = true] zasilKonto()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 351 200 + args "sumaBanknotow" + label_xy 363 202 msg 134022 synchronous from durationcanvas_ref 133638 to durationcanvas_ref 133894 - yz 256 2015 explicitmsg "dodajKwote(sumaBanknotow)" + yz 256 2015 msg operation_ref 129670 // "dodajKwote()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "sumaBanknotow" label_xy 658 240 -msg 134278 synchronous - from durationcanvas_ref 133894 - to durationcanvas_ref 134150 - yz 311 2015 explicitmsg "dodajKwote(sumaBanknotow)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 870 295 -msg 134406 return - from durationcanvas_ref 134150 - to durationcanvas_ref 133894 - yz 342 2015 explicitmsg "rezultat" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 934 326 msg 134534 return from durationcanvas_ref 133894 to durationcanvas_ref 133638 @@ -96,8 +81,9 @@ msg 134662 return msg 134918 synchronous from durationcanvas_ref 128902 to durationcanvas_ref 134790 - yz 488 2015 explicitmsg "komunikatPotwierdzenieOperacji(decyzja, rezultat)" + yz 488 2015 msg operation_ref 129798 // "komunikatPotwierdzenieOperacji()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "decyzja, rezultat" label_xy 647 472 msg 135046 return from durationcanvas_ref 134790 @@ -108,7 +94,7 @@ msg 135046 return msg 135302 return from durationcanvas_ref 128902 to durationcanvas_ref 135174 - yz 561 2015 explicitmsg "wyswietlKomunikat(komunikat)" + yz 561 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 111 545 + label_xy 172 546 end diff --git a/models/135046.diagram b/models/135046.diagram index cf14218..14b40ff 100644 --- a/models/135046.diagram +++ b/models/135046.diagram @@ -27,13 +27,13 @@ end msg 128774 synchronous from durationcanvas_ref 128518 to durationcanvas_ref 128646 - yz 132 2015 explicitmsg "wydrukowaniePotweirdzenia()" + yz 132 2015 msg operation_ref 129926 // "wydrukowaniePotwierdzenia()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 84 116 msg 130950 synchronous from durationcanvas_ref 128646 to durationcanvas_ref 130822 - yz 173 2015 explicitmsg "jakaDecyzja()" + yz 173 2015 msg operation_ref 150532 // "jakaDecyzja()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 336 157 msg 131078 return @@ -45,9 +45,9 @@ msg 131078 return msg 131334 synchronous from durationcanvas_ref 128646 to durationcanvas_ref 131206 - yz 257 2015 explicitmsg "[decyzja = treu] drukuj()" + yz 256 2015 explicitmsg "[decyzja = true] drukujPotwierdzenie()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 421 241 + label_xy 402 242 msg 131462 return from durationcanvas_ref 131206 to durationcanvas_ref 128646 @@ -57,7 +57,7 @@ msg 131462 return msg 131718 return from durationcanvas_ref 128646 to durationcanvas_ref 131590 - yz 357 2015 explicitmsg "[decyzja = true] potwierdzenie" + yz 355 2015 explicitmsg "[decyzja = true] potwierdzenie" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 82 341 + label_xy 82 339 end diff --git a/models/135174.diagram b/models/135174.diagram index f1df76b..cb8736c 100644 --- a/models/135174.diagram +++ b/models/135174.diagram @@ -27,13 +27,13 @@ end msg 128774 synchronous from durationcanvas_ref 128518 to durationcanvas_ref 128646 - yz 88 2015 explicitmsg "odbierzKarte()" + yz 88 2015 msg operation_ref 130438 // "odbierzKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 165 72 msg 130950 synchronous from durationcanvas_ref 128646 to durationcanvas_ref 130822 - yz 128 2015 explicitmsg "wydajKarte()" + yz 128 2015 msg operation_ref 150788 // "wydajKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 348 112 msg 131078 return @@ -45,8 +45,9 @@ msg 131078 return msg 131334 synchronous from durationcanvas_ref 128646 to durationcanvas_ref 131206 - yz 228 2015 explicitmsg "komunikatOdbierzKarte(rezultat)" + yz 228 2015 msg operation_ref 130566 // "komunikatOdbierzKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "rezultat" label_xy 371 212 msg 131462 return from durationcanvas_ref 131206 @@ -57,7 +58,7 @@ msg 131462 return msg 131718 return from durationcanvas_ref 128646 to durationcanvas_ref 131590 - yz 347 2015 explicitmsg "wyswietlKomunikat(komunikat)" + yz 347 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 116 331 + label_xy 166 329 end diff --git a/models/135298.diagram b/models/135298.diagram index 6273f95..d5926fc 100644 --- a/models/135298.diagram +++ b/models/135298.diagram @@ -12,82 +12,82 @@ classinstance 130562 class_ref 137731 // Komunikat classinstance 130690 class_ref 128387 // Ekran_dotykowy name "" xyz 679 4 2000 life_line_z 2000 durationcanvas 130178 classinstance_ref 128130 // :Bankomat - xyzwh 228 72 2010 11 40 + xyzwh 235 72 2010 11 40 end durationcanvas 130306 classinstance_ref 129282 // :Czytnik_kart - xyzwh 394 72 2010 11 25 + xyzwh 402 72 2010 11 25 end durationcanvas 130818 classinstance_ref 129282 // :Czytnik_kart - xyzwh 394 130 2010 11 40 + xyzwh 402 130 2010 11 40 end durationcanvas 130946 classinstance_ref 130562 // :Komunikat - xyzwh 563 130 2010 11 25 + xyzwh 570 130 2010 11 25 end durationcanvas 131202 classinstance_ref 128130 // :Bankomat - xyzwh 228 197 2010 11 40 + xyzwh 235 197 2010 11 40 end durationcanvas 131330 classinstance_ref 130690 // :Ekran_dotykowy - xyzwh 721 197 2010 11 25 + xyzwh 729 197 2010 11 25 end durationcanvas 131970 classinstance_ref 128130 // :Bankomat - xyzwh 228 276 2010 11 40 + xyzwh 235 276 2010 11 40 end durationcanvas 132098 classinstance_ref 129282 // :Czytnik_kart - xyzwh 394 276 2010 11 25 + xyzwh 402 276 2010 11 25 end durationcanvas 132354 classinstance_ref 129282 // :Czytnik_kart - xyzwh 394 348 2010 11 40 + xyzwh 402 348 2010 11 40 end durationcanvas 132482 classinstance_ref 128130 // :Bankomat - xyzwh 228 348 2010 11 25 + xyzwh 235 348 2010 11 25 end durationcanvas 132738 classinstance_ref 128130 // :Bankomat - xyzwh 228 405 2010 11 40 + xyzwh 235 405 2010 11 40 end durationcanvas 133634 classinstance_ref 128130 // :Bankomat - xyzwh 228 498 2010 11 40 + xyzwh 235 498 2010 11 40 end durationcanvas 133762 classinstance_ref 129282 // :Czytnik_kart - xyzwh 394 498 2010 11 25 + xyzwh 402 498 2010 11 25 end durationcanvas 134018 classinstance_ref 129282 // :Czytnik_kart - xyzwh 394 560 2010 11 40 + xyzwh 402 560 2010 11 40 end durationcanvas 134146 classinstance_ref 128130 // :Bankomat - xyzwh 228 560 2010 11 25 + xyzwh 235 560 2010 11 25 end durationcanvas 134402 classinstance_ref 128130 // :Bankomat - xyzwh 228 606 2010 11 40 + xyzwh 235 606 2010 11 40 end durationcanvas 134658 classinstance_ref 128130 // :Bankomat - xyzwh 228 810 2010 11 40 + xyzwh 235 810 2010 11 40 end durationcanvas 134786 classinstance_ref 129282 // :Czytnik_kart - xyzwh 394 810 2010 11 25 + xyzwh 402 810 2010 11 25 end durationcanvas 135042 classinstance_ref 128130 // :Bankomat - xyzwh 228 679 2010 11 40 + xyzwh 235 679 2010 11 40 end durationcanvas 135170 classinstance_ref 129282 // :Czytnik_kart - xyzwh 394 679 2010 11 25 + xyzwh 402 679 2010 11 25 end durationcanvas 135426 classinstance_ref 129282 // :Czytnik_kart - xyzwh 394 735 2010 11 40 + xyzwh 402 735 2010 11 40 end durationcanvas 135554 classinstance_ref 128130 // :Bankomat - xyzwh 228 735 2010 11 25 + xyzwh 235 735 2010 11 25 end durationcanvas 135810 classinstance_ref 128130 // :Bankomat - xyzwh 228 883 2010 11 40 + xyzwh 235 883 2010 11 40 end durationcanvas 135938 classinstance_ref 130562 // :Komunikat - xyzwh 563 883 2010 11 25 + xyzwh 570 883 2010 11 25 end durationcanvas 136194 classinstance_ref 128130 // :Bankomat - xyzwh 228 954 2010 11 40 + xyzwh 235 954 2010 11 40 end durationcanvas 136322 classinstance_ref 130690 // :Ekran_dotykowy - xyzwh 721 954 2010 11 25 + xyzwh 729 954 2010 11 25 end msg 130434 synchronous from durationcanvas_ref 130178 diff --git a/models/141316.diagram b/models/141316.diagram index 3d0a395..8aa52d0 100644 --- a/models/141316.diagram +++ b/models/141316.diagram @@ -15,67 +15,67 @@ classinstance 129412 class_ref 128387 // Ekran_dotykowy classinstance 129540 class_ref 137731 // Komunikat name "" xyz 902.2 18.8 2005 life_line_z 2000 durationcanvas 128644 classinstance_ref 128132 // :Bankomat - xyzwh 340 117 2010 11 40 + xyzwh 322 117 2010 11 40 end durationcanvas 128772 classinstance_ref 128516 // :Czytnik_kart - xyzwh 730 118 2010 11 25 + xyzwh 708 118 2010 11 25 end durationcanvas 129028 classinstance_ref 128516 // :Czytnik_kart - xyzwh 730 400 2010 11 50 + xyzwh 708 400 2010 11 50 end durationcanvas 129156 classinstance_ref 128132 // :Bankomat - xyzwh 340 398 2010 11 55 + xyzwh 322 398 2010 11 55 end durationcanvas 129668 classinstance_ref 128516 // :Czytnik_kart - xyzwh 730 167 2010 11 40 + xyzwh 708 167 2010 11 40 end durationcanvas 129796 classinstance_ref 129540 // :Komunikat - xyzwh 954 168 2010 11 25 + xyzwh 935 168 2010 11 25 end durationcanvas 130052 classinstance_ref 128132 // :Bankomat - xyzwh 340 271 2010 11 40 + xyzwh 322 271 2010 11 40 end durationcanvas 130180 classinstance_ref 129412 // :Ekran_dotykowy - xyzwh 1200 271 2010 11 25 + xyzwh 1169 271 2010 11 25 end durationcanvas 130436 classinstance_ref 128132 // :Bankomat - xyzwh 340 496 2010 11 40 + xyzwh 322 496 2010 11 40 end durationcanvas 130692 classinstance_ref 128132 // :Bankomat - xyzwh 340 346 2010 11 40 + xyzwh 322 346 2010 11 40 end durationcanvas 130820 classinstance_ref 128516 // :Czytnik_kart - xyzwh 730 346 2010 11 25 + xyzwh 708 346 2010 11 25 end durationcanvas 131076 classinstance_ref 128132 // :Bankomat - xyzwh 340 571 2010 11 40 + xyzwh 322 571 2010 11 40 end durationcanvas 131204 classinstance_ref 128516 // :Czytnik_kart - xyzwh 730 572 2010 11 25 + xyzwh 708 572 2010 11 25 end durationcanvas 131460 classinstance_ref 128516 // :Czytnik_kart - xyzwh 730 657 2010 11 40 + xyzwh 708 657 2010 11 40 end durationcanvas 131588 classinstance_ref 128132 // :Bankomat - xyzwh 340 658 2010 11 25 + xyzwh 322 658 2010 11 25 end durationcanvas 132100 classinstance_ref 128132 // :Bankomat - xyzwh 340 760 2010 11 40 + xyzwh 322 760 2010 11 40 end durationcanvas 132228 classinstance_ref 128516 // :Czytnik_kart - xyzwh 730 760 2010 11 25 + xyzwh 708 760 2010 11 25 end durationcanvas 132484 classinstance_ref 128132 // :Bankomat - xyzwh 340 867 2010 11 40 + xyzwh 322 867 2010 11 40 end durationcanvas 132612 classinstance_ref 129540 // :Komunikat - xyzwh 954 867 2010 11 25 + xyzwh 935 867 2010 11 25 end durationcanvas 132868 classinstance_ref 128132 // :Bankomat - xyzwh 340 1007 2010 11 40 + xyzwh 322 1007 2010 11 40 end durationcanvas 132996 classinstance_ref 129412 // :Ekran_dotykowy - xyzwh 1200 1007 2010 11 25 + xyzwh 1169 1007 2010 11 25 end msg 128900 synchronous from durationcanvas_ref 128644 diff --git a/models/147972.diagram b/models/147972.diagram index d0b967f..1d49527 100644 --- a/models/147972.diagram +++ b/models/147972.diagram @@ -57,9 +57,9 @@ classcanvas 132996 class_ref 143620 // Transakcja xyz 1254 820 2000 end relationcanvas 128644 relation_ref 146180 // < posiada - from ref 128004 z 2017 label "< posiada" italic max_width 255 xyz 578 255 2017 to ref 128516 + from ref 128004 z 2017 label "< posiada" italic max_width 255 xyz 590 287 2017 to ref 128516 no_role_a no_role_b - multiplicity_a_pos 781 290 3000 multiplicity_b_pos 457 292 3000 + multiplicity_a_pos 783 271 3000 multiplicity_b_pos 394 270 3000 end relationcanvas 128772 relation_ref 162436 // from ref 128004 z 2017 to ref 128516 @@ -77,20 +77,20 @@ relationcanvas 129156 relation_ref 162180 // no_multiplicity_a no_multiplicity_b end relationcanvas 129412 relation_ref 142980 // wyswietla > - from ref 128004 z 2017 label "wyswietla >" italic max_width 255 xyz 585 355.5 2017 to ref 129284 + from ref 128004 z 2017 label "wyswietla >" italic max_width 255 xyz 597 389 2017 to ref 129284 no_role_a no_role_b - multiplicity_a_pos 812 457 3000 multiplicity_b_pos 457 334 3000 + multiplicity_a_pos 812 465 3000 multiplicity_b_pos 394 305 3000 end relationcanvas 129796 relation_ref 145796 // < posiada decenter_end 469 - from ref 128004 z 2017 label "< posiada" italic max_width 255 xyz 422 595 2017 to ref 129668 + from ref 128004 z 2017 label "< posiada" italic max_width 255 xyz 437 640 2017 to ref 129668 no_role_a no_role_b - multiplicity_a_pos 503 714 3000 multiplicity_b_pos 396 509 3000 + multiplicity_a_pos 472 723 3000 multiplicity_b_pos 353 464 3000 end relationcanvas 130180 relation_ref 147204 // posiada > - from ref 128004 z 2017 label "posiada >" italic max_width 255 xyz 602.5 442 2017 to ref 129924 + from ref 128004 z 2017 label "posiada >" italic max_width 255 xyz 614 467 2017 to ref 129924 no_role_a no_role_b - multiplicity_a_pos 823 598 3000 multiplicity_b_pos 457 368 3000 + multiplicity_a_pos 825 594 3000 multiplicity_b_pos 394 328 3000 end relationcanvas 130948 relation_ref 145924 // from ref 128004 z 3006 to ref 130820 @@ -98,18 +98,18 @@ relationcanvas 130948 relation_ref 145924 // no_multiplicity_a no_multiplicity_b end relationcanvas 131076 relation_ref 146052 // < posiada - from ref 128004 z 3006 label "< posiada" italic max_width 255 xyz 596.5 548 3006 to ref 130820 + from ref 128004 z 3006 label "< posiada" italic max_width 255 xyz 607 574 3006 to ref 130820 no_role_a no_role_b - multiplicity_a_pos 816 771 3000 multiplicity_b_pos 457 414 3000 + multiplicity_a_pos 792 767 3000 multiplicity_b_pos 394 366 3000 end relationcanvas 131332 relation_ref 146564 // < posiada - from ref 131204 z 2017 label "< posiada" italic max_width 255 xyz 280.5 684.5 2017 to ref 128004 + from ref 131204 z 2017 label "< posiada" italic max_width 255 xyz 285 729 2017 to ref 128004 no_role_a no_role_b - multiplicity_a_pos 305 509 3000 multiplicity_b_pos 306 893 3000 + multiplicity_a_pos 275 464 3000 multiplicity_b_pos 274 902 3000 end relationcanvas 131588 relation_ref 136452 // posiada > - from ref 131460 z 2023 label "posiada >" italic max_width 255 xyz 121.5 741 2023 to ref 129028 + from ref 131460 z 2023 label "posiada >" italic max_width 255 xyz 128 756 2023 to ref 129028 no_role_a no_role_b - multiplicity_a_pos 154 711 3000 multiplicity_b_pos 142 800 3000 + multiplicity_a_pos 139 713 3000 multiplicity_b_pos 140 811 3000 end end diff --git a/models/6.session b/models/6.session index 7a4fd55..18ef530 100644 --- a/models/6.session +++ b/models/6.session @@ -1,29 +1,18 @@ -window_sizes 1125 835 450 670 685 104 +window_sizes 1601 910 450 1146 757 104 -diagrams - sequencediagram_ref 128006 // 2-1-wlozenieKartyDoBankomatu - 1172 693 100 A3 0 0 - active sequencediagram_ref 134532 // 3-2-wprowadzeniePinu - 670 685 100 Custom 0 0 - sequencediagram_ref 128004 // 3-1-wlozKarte - 114 86 100 Custom 0 0 - sequencediagram_ref 128134 // 2-2-wprowadzeniePinu - 114 86 100 Custom 0 0 - sequencediagram_ref 128262 // 2-3-wybranieOperacjiWplatyGotowki - 114 86 100 A4 0 0 - sequencediagram_ref 128390 // 2-4-wlozenieBanknotow - 114 86 100 A4 0 0 - sequencediagram_ref 128518 // 2-5-wyborOpcjiPotwierdzeniaOperacji - 114 86 100 A2 0 0 - sequencediagram_ref 135046 // 2-6-wyborOpcjiWydrukowaniaPotwierdzenia - 114 86 100 A3 0 0 - sequencediagram_ref 135174 // 2-7-odebranieKarty - 114 86 100 A3 0 0 -end show_stereotypes -selected sequencediagram_ref 134532 // 3-2-wprowadzeniePinu +selected classdiagram_ref 128003 // domain-model open - classview_ref 128003 // domain + class_ref 128259 // Bank + class_ref 128387 // Ekran_dotykowy + class_ref 128515 // Czytnik_kart + class_ref 128643 // Klawiatura + class_ref 128771 // Karta_klienta + class_ref 129155 // Bankomat + class_ref 129283 // Klient + class_ref 137347 // Konto + class_ref 137731 // Komunikat + operation_ref 151428 // drukujPotwierdzenie classview_ref 128006 // design end end diff --git a/models/models.prj b/models/models.prj index 0334aca..0f4bbf6 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 17 - modified_by 4 "Adam" + revision 18 + modified_by 6 "macie" @@ -266,6 +266,18 @@ ${members}} mysql_decl "" MysqlColumn end + + operation 128262 "pobierzDane" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end end class 128387 "Ekran_dotykowy" @@ -306,7 +318,7 @@ ${members}} end - operation 150532 "jakaDecyzja()" + operation 150532 "jakaDecyzja" public explicit_return_type "" nparams 0 @@ -315,6 +327,7 @@ ${members}} end + end class 128515 "Czytnik_kart" @@ -377,7 +390,7 @@ ${members}} end - operation 150788 "wydajKarte()" + operation 150788 "wydajKarte" public explicit_return_type "" nparams 0 @@ -409,6 +422,30 @@ ${members}} + end + + operation 128134 "pobierzNumerKarty" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 129158 "przeliczBanknoty" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + end end @@ -428,7 +465,7 @@ ${members}} relation_ref 147076 // posiada > end - classrelation 153732 // (posiada >) + classrelation 153732 // posiada > relation_ref 147204 // posiada > end @@ -444,7 +481,7 @@ ${members}} MysqlColumn end - operation 142212 "czytajPin()" + operation 142212 "czytajPin" public explicit_return_type "" nparams 0 @@ -506,6 +543,30 @@ ${members}} mysql_decl "" MysqlColumn end + + operation 128390 "weryfikujPin" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 130310 "zasilKonto" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end end class 128899 "Serwisant" @@ -923,7 +984,7 @@ ${members}} b role_name "" multiplicity "1" private java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value}; " - classrelation_ref 153732 // (posiada >) + classrelation_ref 153732 // posiada > end classrelation 154372 // (umozliwia >) @@ -1066,16 +1127,6 @@ ${members}} - end - - operation 141956 "wyswietlKomunikat()" - public explicit_return_type "" - nparams 0 - - - - - end operation 142084 "wprowadzPin" @@ -1167,13 +1218,85 @@ ${members}} end - classrelation 177668 // wykonuje () + classrelation 177668 // relation 169092 ---|> a public java "${type}" - classrelation_ref 177668 // wykonuje () + classrelation_ref 177668 // b parent class_ref 143620 // Transakcja end + + operation 128006 "wlozKarte" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 128774 "wplataGotowki" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 129030 "wlozBanknoty" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 129414 "potwierdzenieOperacji" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 129926 "wydrukowaniePotwierdzenia" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 130438 "odbierzKarte" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end end class 129283 "Klient" @@ -1257,6 +1380,7 @@ ${members}} mysql_decl "" MysqlColumn end + end class 129411 "Zaopatrzeniowiec" @@ -1918,6 +2042,18 @@ ${members}} mysql_decl "" MysqlColumn end + + operation 129670 "dodajKwote" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end end class 137475 "Dysk" @@ -2041,6 +2177,66 @@ ${members}} mysql_decl "" MysqlColumn end + + operation 128518 "komunikatPin" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 128902 "komunikatWplata" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 129286 "komunikatSumaBanknotow" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 129798 "komunikatPotwierdzenieOperacji" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + operation 130566 "komunikatOdbierzKarte" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + + end end class 134532 "Drukarka_potwierdzen" @@ -2099,7 +2295,7 @@ ${members}} MysqlColumn end - operation 151428 "drukujPotwierdzenie()" + operation 151428 "drukujPotwierdzenie" public explicit_return_type "" nparams 0 @@ -2110,6 +2306,7 @@ ${members}} end + end class 134660 "Sprawdzenie_stanu_konta" @@ -3039,11 +3236,6 @@ ${members}} mysql_decl "" end - - classdiagram 147972 "design-model" - classdiagramsettings draw_all_relations no member_max_width 0 end - size A1 - end end classview 128006 "design" @@ -3066,6 +3258,11 @@ ${members}} activitydiagramsettings end + classdiagram 147972 "design-model" + classdiagramsettings draw_all_relations no member_max_width 0 end + size A1 + end + sequencediagram 128006 "2-1-wlozenieKartyDoBankomatu" sequencediagramsettings end overlapping_bars size A3 @@ -3095,28 +3292,6 @@ ${members}} end end - class 128006 "Baza_danych" - visibility package - cpp_decl "" - java_decl "${comment}${@}${visibility}${static}${final}${abstract}class ${name}${extends}${implements} { -${members}} -" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - end - - classinstance 128390 "" - type class_ref 128006 // Baza_danych - attributes - end - relations - end - end - sequencediagram 128134 "2-2-wprowadzeniePinu" sequencediagramsettings end overlapping_bars size 5000x1188 @@ -3484,6 +3659,5 @@ ${members}} pseudostate 135556 final "" end end - end end