From 4b9e113c74e1c72c948597395e77f2f50aa6fa86 Mon Sep 17 00:00:00 2001 From: Szymon Date: Wed, 10 Feb 2021 08:55:46 +0100 Subject: [PATCH] =?UTF-8?q?Poprawka=20diagram=C3=B3w=20interakcji?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/128002.diagram | 15 ++--- models/128130.diagram | 136 +++++++++++++++------------------------- models/128258.diagram | 60 +++++------------- models/134786.diagram | 44 +++++-------- models/135042.diagram | 142 +++++++++++++++++++++++------------------- models/135046.diagram | 26 ++++---- models/135298.diagram | 124 +++++++++++++++++++----------------- models/135426.diagram | 16 ++--- models/2.session | 13 ++-- models/models.prj | 31 ++++++++- 10 files changed, 289 insertions(+), 318 deletions(-) diff --git a/models/128002.diagram b/models/128002.diagram index f7b9357..b18e5c9 100644 --- a/models/128002.diagram +++ b/models/128002.diagram @@ -8,22 +8,20 @@ classinstance 128258 class_ref 128515 // Czytnik_kart name "" xyz 458.381 80.5657 2000 life_line_z 2000 classinstance 128386 class_ref 128771 // Karta_klienta name "" xyz 608.037 80.5657 2000 life_line_z 2000 -note 131458 "Kontroler" - xyzwh 218.036 10.5836 2000 79 35 durationcanvas 128898 classinstance_ref 128002 // :Klient - xyzwh 161 175 2010 11 40 + xyzwh 165 175 2010 11 40 end durationcanvas 129026 classinstance_ref 128130 // :Bankomat - xyzwh 317 151 2010 11 348 + xyzwh 324 151 2010 11 348 end durationcanvas 129282 classinstance_ref 128258 // :Czytnik_kart - xyzwh 489 319 2010 11 88 + xyzwh 497 319 2010 11 88 end durationcanvas 129666 classinstance_ref 128386 // :Karta_klienta - xyzwh 641 414 2010 11 76 + xyzwh 648 414 2010 11 76 end durationcanvas 129922 classinstance_ref 128258 // :Czytnik_kart - xyzwh 489 196 2010 11 65 + xyzwh 497 196 2010 11 65 end msg 129154 synchronous from durationcanvas_ref 128898 @@ -62,7 +60,4 @@ msg 130178 return yz 239 2015 explicitmsg "czyKartaPoprawna" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 359 225 -line 131586 -_-_ decenter_begin 504 - from ref 131458 z 2001 to point 320 25 - line 131714 z 2001 to ref 128130 end diff --git a/models/128130.diagram b/models/128130.diagram index bcf4716..b8efaca 100644 --- a/models/128130.diagram +++ b/models/128130.diagram @@ -10,180 +10,146 @@ classinstance 128642 class_ref 137731 // Komunikat name "" xyz 667 58 2000 life_line_z 2000 classinstance 131074 class_ref 128387 // Ekran_dotykowy name "" xyz 522 55 2000 life_line_z 2000 -classinstance 132738 class_ref 128131 // System_autoryzacji_uzytkownika +classinstance 132738 class_ref 128131 // ISystem_autoryzacji_uzytkownika name "" xyz 986 53 2000 life_line_z 2000 classinstance 133250 class_ref 156932 // autoryzacjaKlientaHandler name "" xyz 778 58 2000 life_line_z 2000 -durationcanvas 128898 classinstance_ref 128002 // :Klient - xyzwh 33 131 2010 11 29 -end -durationcanvas 129026 classinstance_ref 128258 // :Bankomat - xyzwh 236 129 2010 11 115 -end durationcanvas 130690 classinstance_ref 128002 // :Klient - xyzwh 33 260 2010 11 42 + xyzwh 37 127 2010 11 42 end durationcanvas 130818 classinstance_ref 128386 // :Klawiatura - xyzwh 422 259 2010 11 44 -end -durationcanvas 131458 classinstance_ref 128642 // :Komunikat - xyzwh 693 145 2010 11 36 -end -durationcanvas 131714 classinstance_ref 131074 // :Ekran_dotykowy - xyzwh 564 203 2010 11 42 + xyzwh 426 126 2010 11 44 end durationcanvas 131970 classinstance_ref 128258 // :Bankomat - xyzwh 236 345 2010 11 33 + xyzwh 243 212 2010 11 33 end durationcanvas 132098 classinstance_ref 128386 // :Klawiatura - xyzwh 422 348 2010 11 25 + xyzwh 426 215 2010 11 25 end durationcanvas 132354 classinstance_ref 128386 // :Klawiatura - xyzwh 422 398 2010 11 30 + xyzwh 426 265 2010 11 30 end durationcanvas 132482 classinstance_ref 128258 // :Bankomat - xyzwh 236 399 2010 11 30 + xyzwh 243 266 2010 11 30 end durationcanvas 133378 classinstance_ref 128258 // :Bankomat - xyzwh 236 432 2010 11 41 + xyzwh 243 299 2010 11 41 end durationcanvas 133506 classinstance_ref 133250 // :autoryzacjaKlientaHandler - xyzwh 843 442 2010 11 290 + xyzwh 856 309 2010 11 290 overlappingdurationcanvas 134786 - xyzwh 849 697 2020 11 30 + xyzwh 862 564 2020 11 30 end end -durationcanvas 133762 classinstance_ref 132738 // :System_autoryzacji_uzytkownika - xyzwh 1069 454 2010 11 31 +durationcanvas 133762 classinstance_ref 132738 // :ISystem_autoryzacji_uzytkownika + xyzwh 1087 321 2010 11 31 end -durationcanvas 134018 classinstance_ref 132738 // :System_autoryzacji_uzytkownika - xyzwh 1069 507 2010 11 36 +durationcanvas 134018 classinstance_ref 132738 // :ISystem_autoryzacji_uzytkownika + xyzwh 1087 374 2010 11 36 end -durationcanvas 134274 classinstance_ref 132738 // :System_autoryzacji_uzytkownika - xyzwh 1069 571 2010 11 25 +durationcanvas 134274 classinstance_ref 132738 // :ISystem_autoryzacji_uzytkownika + xyzwh 1087 438 2010 11 25 end -durationcanvas 134530 classinstance_ref 132738 // :System_autoryzacji_uzytkownika - xyzwh 1069 623 2010 11 31 +durationcanvas 134530 classinstance_ref 132738 // :ISystem_autoryzacji_uzytkownika + xyzwh 1087 490 2010 11 31 end durationcanvas 135042 classinstance_ref 133250 // :autoryzacjaKlientaHandler - xyzwh 843 752 2010 11 30 + xyzwh 856 625 2010 11 30 end durationcanvas 135170 classinstance_ref 128258 // :Bankomat - xyzwh 236 745 2010 11 45 + xyzwh 243 618 2010 11 45 end durationcanvas 135426 classinstance_ref 128258 // :Bankomat - xyzwh 236 821 2010 11 40 + xyzwh 243 694 2010 11 40 end durationcanvas 135554 classinstance_ref 128642 // :Komunikat - xyzwh 693 821 2010 11 25 + xyzwh 700 694 2010 11 25 end durationcanvas 136194 classinstance_ref 128258 // :Bankomat - xyzwh 236 905 2010 11 32 + xyzwh 243 778 2010 11 32 end durationcanvas 136322 classinstance_ref 131074 // :Ekran_dotykowy - xyzwh 564 905 2010 11 35 + xyzwh 572 778 2010 11 35 end -msg 129154 synchronous - from durationcanvas_ref 128898 - to durationcanvas_ref 129026 - yz 143 2015 explicitmsg "autoryzujKlienta()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "karta: Karta" - label_xy 78 129 msg 130946 synchronous from durationcanvas_ref 130690 to durationcanvas_ref 130818 - yz 275 2015 explicitmsg "wprowadzPin()" + yz 142 2015 explicitmsg "wprowadzPin()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "pin: int" - label_xy 95 261 -msg 131586 synchronous - from durationcanvas_ref 129026 - to durationcanvas_ref 131458 - yz 158 2015 explicitmsg "komunikat()" - stereotype "<>" xyz 445 172 3000 - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "tresc: string, czasTrwania: int" - label_xy 396 145 -msg 131842 synchronous - from durationcanvas_ref 129026 - to durationcanvas_ref 131714 - yz 216 2015 explicitmsg "wyswietlKomunikat()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "komunikat: Komunikat" - label_xy 306 202 + label_xy 95 128 msg 132226 synchronous from durationcanvas_ref 131970 to durationcanvas_ref 132098 - yz 355 2015 explicitmsg "czytajPin()" + yz 222 2015 explicitmsg "czytajPin()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "pin: int" - label_xy 290 341 + label_xy 290 208 msg 132610 return from durationcanvas_ref 132354 to durationcanvas_ref 132482 - yz 408 2015 explicitmsg "pin" + yz 275 2015 explicitmsg "pin" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 330 394 + label_xy 330 261 msg 133634 synchronous from durationcanvas_ref 133378 to durationcanvas_ref 133506 - yz 447 2015 msg operation_ref 141828 // "rozpocznijAutoryzacje()" + yz 314 2015 msg operation_ref 141828 // "rozpocznijAutoryzacje()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "karta: Karta" - label_xy 462 433 + label_xy 462 300 msg 133890 synchronous from durationcanvas_ref 133506 to durationcanvas_ref 133762 - yz 459 2020 explicitmsg "sprawdzKarte()" + yz 326 2020 explicitmsg "sprawdzKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "karta: Karta" - label_xy 877 445 + label_xy 877 312 msg 134146 return from durationcanvas_ref 134018 to durationcanvas_ref 133506 - yz 517 2015 explicitmsg "statusKarty" + yz 384 2015 explicitmsg "statusKarty" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 916 503 + label_xy 916 370 msg 134402 synchronous from durationcanvas_ref 133506 to durationcanvas_ref 134274 - yz 577 2015 explicitmsg "sprawdzPin()" + yz 444 2015 explicitmsg "sprawdzPin()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "pin: int" - label_xy 896 563 + label_xy 896 430 msg 134658 return from durationcanvas_ref 134530 to durationcanvas_ref 133506 - yz 633 2015 explicitmsg "statusAutoryzacji" - stereotype "<>" xyz 922 647 3000 + yz 500 2015 explicitmsg "statusAutoryzacji" + stereotype "<>" xyz 922 514 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 906 619 + label_xy 906 486 reflexivemsg 134914 synchronous to durationcanvas_ref 134786 - yz 697 2025 msg operation_ref 149124 // "zakonczAutoryzacje()" + yz 564 2025 msg operation_ref 149124 // "zakonczAutoryzacje()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 883 695 + label_xy 883 562 msg 135298 return from durationcanvas_ref 135042 to durationcanvas_ref 135170 - yz 760 2015 explicitmsg "statusAutoryzacji" - stereotype "<>" xyz 490 772 3000 + yz 633 2015 explicitmsg "statusAutoryzacji" + stereotype "<>" xyz 492 645 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 470 745 + label_xy 472 618 msg 135682 synchronous from durationcanvas_ref 135426 to durationcanvas_ref 135554 - yz 828 2015 explicitmsg "komunikat()" - stereotype "<>" xyz 446 842 3000 + yz 701 2015 explicitmsg "komunikat()" + stereotype "<>" xyz 448 715 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "tresc: string, czasTrwania: int" - label_xy 373 814 + label_xy 375 687 msg 136450 synchronous from durationcanvas_ref 136194 to durationcanvas_ref 136322 - yz 913 2015 explicitmsg "wyswietlKomunikat()" + yz 786 2015 explicitmsg "wyswietlKomunikat()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "komunikat: Komunikat" - label_xy 304 899 + label_xy 306 772 end diff --git a/models/128258.diagram b/models/128258.diagram index 52e5db8..cc8b100 100644 --- a/models/128258.diagram +++ b/models/128258.diagram @@ -12,80 +12,54 @@ end classinstance 129794 class_ref 128387 // Ekran_dotykowy name "" xyz 612 4 2000 life_line_z 2000 durationcanvas 129410 classinstance_ref 128642 // :Bankomat - xyzwh 246 238 2010 11 40 + xyzwh 253 161 2010 11 40 end durationcanvas 129538 classinstance_ref 128130 // :Komunikat - xyzwh 490 238 2010 11 25 + xyzwh 497 161 2010 11 25 end durationcanvas 129922 classinstance_ref 128002 // :Klient - xyzwh 88 153 2010 11 40 + xyzwh 92 76 2010 11 40 end durationcanvas 130050 classinstance_ref 129794 // :Ekran_dotykowy - xyzwh 654 153 2010 11 25 + xyzwh 662 76 2010 11 25 end durationcanvas 130306 classinstance_ref 129794 // :Ekran_dotykowy - xyzwh 654 189 2010 11 28 + xyzwh 662 112 2010 11 28 end durationcanvas 130434 classinstance_ref 128642 // :Bankomat - xyzwh 246 190 2010 11 25 -end -durationcanvas 130690 classinstance_ref 128642 // :Bankomat - xyzwh 246 71 2010 11 40 -end -durationcanvas 130818 classinstance_ref 129794 // :Ekran_dotykowy - xyzwh 654 79 2010 11 35 + xyzwh 253 113 2010 11 25 end durationcanvas 131074 classinstance_ref 128642 // :Bankomat - xyzwh 246 317 2010 11 40 + xyzwh 253 240 2010 11 40 end durationcanvas 131202 classinstance_ref 129794 // :Ekran_dotykowy - xyzwh 654 317 2010 11 25 -end -durationcanvas 131458 classinstance_ref 128642 // :Bankomat - xyzwh 246 403 2010 11 32 -end -durationcanvas 131586 classinstance_ref 128386 // :transakcjaHandler - xyzwh 817 404 2010 11 25 + xyzwh 662 240 2010 11 25 end msg 129666 synchronous from durationcanvas_ref 129410 to durationcanvas_ref 129538 - yz 242 2015 explicitmsg "komunikat()" - stereotype "<>" xyz 346 256 3000 + yz 165 2015 explicitmsg "komunikat()" + stereotype "<>" xyz 337 179 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "tresc: string, czasTrwania: int" - label_xy 272 227 + label_xy 263 150 msg 130178 synchronous from durationcanvas_ref 129922 to durationcanvas_ref 130050 - yz 160 2015 explicitmsg "wybierzTransakcje()" + yz 83 2015 msg operation_ref 135042 // "wyplataGotowki()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "transakcja: string" - label_xy 303 146 + label_xy 294 69 msg 130562 return from durationcanvas_ref 130306 to durationcanvas_ref 130434 - yz 195 2015 explicitmsg "wyplataGotowki" + yz 118 2015 explicitmsg "wyplataGotowki" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 367 182 -msg 130946 synchronous - from durationcanvas_ref 130690 - to durationcanvas_ref 130818 - yz 88 2015 explicitmsg "wyswietlDostepneTransakcje()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 320 74 + label_xy 358 105 msg 131330 synchronous from durationcanvas_ref 131074 to durationcanvas_ref 131202 - yz 322 2015 explicitmsg "wyswietlKomunikat()" + yz 245 2015 explicitmsg "wyswietlKomunikat()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "komunikat: Komunikat" - label_xy 280 309 -msg 131714 synchronous - from durationcanvas_ref 131458 - to durationcanvas_ref 131586 - yz 410 2015 explicitmsg "rozpocznijTransakcje()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "transakcja : string, in karta : Karta_klienta" - label_xy 463 397 + label_xy 271 232 end diff --git a/models/134786.diagram b/models/134786.diagram index 9d1776e..6394626 100644 --- a/models/134786.diagram +++ b/models/134786.diagram @@ -12,65 +12,53 @@ classinstance 128514 class_ref 128387 // Ekran_dotykowy name "" xyz 547 8 2000 life_line_z 2000 classinstance 129922 class_ref 135172 // Rolka_z_pieniedzmi name "" xyz 687 8 2000 life_line_z 2000 -durationcanvas 128642 classinstance_ref 128130 // :Bankomat - xyzwh 171 68 2010 11 40 -end -durationcanvas 128770 classinstance_ref 128514 // :Ekran_dotykowy - xyzwh 589 68 2010 11 25 -end durationcanvas 129026 classinstance_ref 128002 // :Klient - xyzwh 60 140 2010 11 40 + xyzwh 64 73 2010 11 40 end durationcanvas 129154 classinstance_ref 128386 // :Klawiatura - xyzwh 475 140 2010 11 25 + xyzwh 479 73 2010 11 25 end durationcanvas 129538 classinstance_ref 128386 // :Klawiatura - xyzwh 475 187 2010 11 32 + xyzwh 479 120 2010 11 32 end durationcanvas 129666 classinstance_ref 128130 // :Bankomat - xyzwh 171 187 2010 11 25 + xyzwh 178 120 2010 11 25 end durationcanvas 130050 classinstance_ref 128130 // :Bankomat - xyzwh 171 249 2010 11 37 + xyzwh 178 182 2010 11 37 end durationcanvas 130178 classinstance_ref 129922 // :Rolka_z_pieniedzmi - xyzwh 736 247 2010 11 39 + xyzwh 747 180 2010 11 39 end durationcanvas 130434 classinstance_ref 129922 // :Rolka_z_pieniedzmi - xyzwh 736 311 2010 11 28 + xyzwh 747 244 2010 11 28 end durationcanvas 130562 classinstance_ref 128130 // :Bankomat - xyzwh 171 312 2010 11 25 + xyzwh 178 245 2010 11 25 end -msg 128898 synchronous - from durationcanvas_ref 128642 - to durationcanvas_ref 128770 - yz 76 2015 explicitmsg "wyswietlProponowaneKwoty()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 313 62 msg 129282 synchronous from durationcanvas_ref 129026 to durationcanvas_ref 129154 - yz 148 2015 explicitmsg "wybierzKwote()" + yz 81 2015 explicitmsg "wybierzKwote()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "wartosc: int" - label_xy 204 134 + label_xy 209 67 msg 129794 return from durationcanvas_ref 129538 to durationcanvas_ref 129666 - yz 194 2015 explicitmsg "wartosc" + yz 127 2015 explicitmsg "wartosc" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 283 181 + label_xy 288 114 msg 130306 synchronous from durationcanvas_ref 130050 to durationcanvas_ref 130178 - yz 261 2015 explicitmsg "sprawdzDostepnoscBanknotow()" + yz 194 2015 explicitmsg "sprawdzDostepnoscBanknotow()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 340 248 + label_xy 345 181 msg 130690 return from durationcanvas_ref 130434 to durationcanvas_ref 130562 - yz 319 2015 explicitmsg "czyWyplataMozliwa" + yz 252 2015 explicitmsg "czyWyplataMozliwa" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 411 305 + label_xy 416 238 end diff --git a/models/135042.diagram b/models/135042.diagram index 838c50d..f9ca763 100644 --- a/models/135042.diagram +++ b/models/135042.diagram @@ -12,169 +12,181 @@ 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 140 2010 11 40 end -durationcanvas 130306 classinstance_ref 129282 // :Czytnik_banknotow - xyzwh 394 72 2010 11 25 +durationcanvas 130306 classinstance_ref 129282 // :Czytnik_kart + xyzwh 384 140 2010 11 25 end -durationcanvas 130818 classinstance_ref 129282 // :Czytnik_banknotow - xyzwh 394 130 2010 11 40 +durationcanvas 130818 classinstance_ref 129282 // :Czytnik_kart + xyzwh 384 198 2010 11 40 end durationcanvas 130946 classinstance_ref 130562 // :Komunikat - xyzwh 563 130 2010 11 25 + xyzwh 570 198 2010 11 25 end durationcanvas 131202 classinstance_ref 128130 // :Bankomat - xyzwh 228 197 2010 11 40 + xyzwh 235 265 2010 11 40 end durationcanvas 131330 classinstance_ref 130690 // :Ekran_dotykowy - xyzwh 721 197 2010 11 25 + xyzwh 729 265 2010 11 25 end durationcanvas 131970 classinstance_ref 128130 // :Bankomat - xyzwh 228 276 2010 11 40 + xyzwh 235 344 2010 11 40 end -durationcanvas 132098 classinstance_ref 129282 // :Czytnik_banknotow - xyzwh 394 276 2010 11 25 +durationcanvas 132098 classinstance_ref 129282 // :Czytnik_kart + xyzwh 384 344 2010 11 25 end -durationcanvas 132354 classinstance_ref 129282 // :Czytnik_banknotow - xyzwh 394 348 2010 11 40 +durationcanvas 132354 classinstance_ref 129282 // :Czytnik_kart + xyzwh 384 416 2010 11 40 end durationcanvas 132482 classinstance_ref 128130 // :Bankomat - xyzwh 228 348 2010 11 25 + xyzwh 235 416 2010 11 25 end durationcanvas 132738 classinstance_ref 128130 // :Bankomat - xyzwh 228 405 2010 11 40 + xyzwh 235 473 2010 11 40 end durationcanvas 133634 classinstance_ref 128130 // :Bankomat - xyzwh 228 498 2010 11 40 + xyzwh 235 566 2010 11 40 end -durationcanvas 133762 classinstance_ref 129282 // :Czytnik_banknotow - xyzwh 394 498 2010 11 25 +durationcanvas 133762 classinstance_ref 129282 // :Czytnik_kart + xyzwh 384 566 2010 11 25 end -durationcanvas 134018 classinstance_ref 129282 // :Czytnik_banknotow - xyzwh 394 560 2010 11 40 +durationcanvas 134018 classinstance_ref 129282 // :Czytnik_kart + xyzwh 384 628 2010 11 40 end durationcanvas 134146 classinstance_ref 128130 // :Bankomat - xyzwh 228 560 2010 11 25 + xyzwh 235 628 2010 11 25 end durationcanvas 134402 classinstance_ref 128130 // :Bankomat - xyzwh 228 606 2010 11 40 + xyzwh 235 674 2010 11 40 end durationcanvas 134658 classinstance_ref 128130 // :Bankomat - xyzwh 228 810 2010 11 40 + xyzwh 235 878 2010 11 40 end -durationcanvas 134786 classinstance_ref 129282 // :Czytnik_banknotow - xyzwh 394 810 2010 11 25 +durationcanvas 134786 classinstance_ref 129282 // :Czytnik_kart + xyzwh 384 878 2010 11 25 end durationcanvas 135042 classinstance_ref 128130 // :Bankomat - xyzwh 228 679 2010 11 40 + xyzwh 235 747 2010 11 40 end -durationcanvas 135170 classinstance_ref 129282 // :Czytnik_banknotow - xyzwh 394 679 2010 11 25 +durationcanvas 135170 classinstance_ref 129282 // :Czytnik_kart + xyzwh 384 747 2010 11 25 end -durationcanvas 135426 classinstance_ref 129282 // :Czytnik_banknotow - xyzwh 394 735 2010 11 40 +durationcanvas 135426 classinstance_ref 129282 // :Czytnik_kart + xyzwh 384 803 2010 11 40 end durationcanvas 135554 classinstance_ref 128130 // :Bankomat - xyzwh 228 735 2010 11 25 + xyzwh 235 803 2010 11 25 end durationcanvas 135810 classinstance_ref 128130 // :Bankomat - xyzwh 228 883 2010 11 40 + xyzwh 235 951 2010 11 40 end durationcanvas 135938 classinstance_ref 130562 // :Komunikat - xyzwh 563 883 2010 11 25 + xyzwh 570 951 2010 11 25 end durationcanvas 136194 classinstance_ref 128130 // :Bankomat - xyzwh 228 954 2010 11 40 + xyzwh 235 1022 2010 11 40 end durationcanvas 136322 classinstance_ref 130690 // :Ekran_dotykowy - xyzwh 721 954 2010 11 25 + xyzwh 729 1022 2010 11 25 +end +durationcanvas 136578 classinstance_ref 128002 // :Klient + xyzwh 92 92 2010 11 41 +end +durationcanvas 136706 classinstance_ref 128130 // :Bankomat + xyzwh 235 92 2010 11 38 end msg 130434 synchronous from durationcanvas_ref 130178 to durationcanvas_ref 130306 - yz 79 2015 msg operation_ref 128002 // "wydajBanknoty()" + yz 147 2015 msg operation_ref 128002 // "wydajBanknoty()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 275 65 + label_xy 272 133 msg 131074 synchronous from durationcanvas_ref 130818 to durationcanvas_ref 130946 - yz 130 2015 explicitmsg "komunikat()" - stereotype "<>" xyz 457 144 3000 + yz 198 2015 explicitmsg "komunikat()" + stereotype "<>" xyz 454 212 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "tresc: string, czasTrwania: int" - label_xy 384 116 + label_xy 381 184 msg 131458 synchronous from durationcanvas_ref 131202 to durationcanvas_ref 131330 - yz 197 2015 explicitmsg "wyswietlKomunikat()" + yz 265 2015 explicitmsg "wyswietlKomunikat()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "komunikat: Komunikat" - label_xy 386 177 + label_xy 383 245 msg 132226 synchronous from durationcanvas_ref 131970 to durationcanvas_ref 132098 - yz 277 2015 msg operation_ref 128258 // "czyGotowkaOdebrana()" + yz 345 2015 msg operation_ref 128258 // "czyGotowkaOdebrana()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 257 263 + label_xy 254 331 msg 132610 return from durationcanvas_ref 132354 to durationcanvas_ref 132482 - yz 348 2015 explicitmsg "czyOdebrana" + yz 416 2015 explicitmsg "czyOdebrana" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 283 334 + label_xy 280 402 reflexivemsg 132866 synchronous to durationcanvas_ref 132738 - yz 405 2015 explicitmsg "[czyOdebrana=false]wydajSygnalDzwiekowy()" + yz 473 2015 explicitmsg "[czyOdebrana=false]wydajSygnalDzwiekowy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 133 386 + label_xy 133 454 msg 133890 synchronous from durationcanvas_ref 133634 to durationcanvas_ref 133762 - yz 498 2015 msg operation_ref 128258 // "czyGotowkaOdebrana()" + yz 566 2015 msg operation_ref 128258 // "czyGotowkaOdebrana()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 257 484 + label_xy 254 552 msg 134274 return from durationcanvas_ref 134018 to durationcanvas_ref 134146 - yz 560 2015 explicitmsg "czyOdebrana" + yz 628 2015 explicitmsg "czyOdebrana" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 283 546 + label_xy 280 614 reflexivemsg 134530 synchronous to durationcanvas_ref 134402 - yz 606 2015 explicitmsg "[czyOdebrana=false]wydajSygnalDzwiekowy()" + yz 674 2015 explicitmsg "[czyOdebrana=false]wydajSygnalDzwiekowy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 133 592 + label_xy 133 660 msg 134914 synchronous from durationcanvas_ref 134658 to durationcanvas_ref 134786 - yz 810 2015 explicitmsg "[czyodebrana=false] wciagnijGotwoke()" + yz 878 2015 explicitmsg "[czyodebrana=false] wciagnijGotwoke()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 220 791 + label_xy 217 859 msg 135298 synchronous from durationcanvas_ref 135042 to durationcanvas_ref 135170 - yz 679 2015 msg operation_ref 128258 // "czyGotowkaOdebrana()" + yz 747 2015 msg operation_ref 128258 // "czyGotowkaOdebrana()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 257 665 + label_xy 254 733 msg 135682 return from durationcanvas_ref 135426 to durationcanvas_ref 135554 - yz 735 2015 explicitmsg "czyOdebrana" + yz 803 2015 explicitmsg "czyOdebrana" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 283 721 + label_xy 280 789 msg 136066 synchronous from durationcanvas_ref 135810 to durationcanvas_ref 135938 - yz 883 2015 explicitmsg "komunikatGotowkaWciagnieta()" - stereotype "<>" xyz 374 897 3000 + yz 951 2015 explicitmsg "komunikatGotowkaWciagnieta()" + stereotype "<>" xyz 371 965 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "tresc: string, czasTrwania: int" - label_xy 265 871 + label_xy 262 939 msg 136450 synchronous from durationcanvas_ref 136194 to durationcanvas_ref 136322 - yz 954 2015 explicitmsg "wyswietlKomunikat()" + yz 1022 2015 explicitmsg "wyswietlKomunikat()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "komunikatGotowkaWciagnieta: Komunikat" - label_xy 330 940 + label_xy 327 1008 +msg 136834 synchronous + from durationcanvas_ref 136578 + to durationcanvas_ref 136706 + yz 92 2015 msg operation_ref 134914 // "odbierzGotowke()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 119 76 end diff --git a/models/135046.diagram b/models/135046.diagram index 14b40ff..f40b7cf 100644 --- a/models/135046.diagram +++ b/models/135046.diagram @@ -13,7 +13,7 @@ durationcanvas 128518 classinstance_ref 128006 // :Klient xyzwh 59 118 2010 11 40 end durationcanvas 128646 classinstance_ref 128134 // :Bankomat - xyzwh 269 123 2010 11 251 + xyzwh 269 122 2010 11 263 end durationcanvas 130822 classinstance_ref 128262 // :Ekran_dotykowy xyzwh 471 169 2010 11 49 @@ -27,37 +27,37 @@ end msg 128774 synchronous from durationcanvas_ref 128518 to durationcanvas_ref 128646 - yz 132 2015 msg operation_ref 129926 // "wydrukowaniePotwierdzenia()" + yz 131 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 + label_xy 84 115 msg 130950 synchronous from durationcanvas_ref 128646 to durationcanvas_ref 130822 - yz 173 2015 msg operation_ref 150532 // "jakaDecyzja()" + yz 172 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 + label_xy 336 156 msg 131078 return from durationcanvas_ref 130822 to durationcanvas_ref 128646 - yz 207 2015 explicitmsg "decyzja" + yz 206 2015 explicitmsg "decyzja" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 353 191 + label_xy 353 190 msg 131334 synchronous from durationcanvas_ref 128646 to durationcanvas_ref 131206 - yz 256 2015 explicitmsg "[decyzja = true] drukujPotwierdzenie()" + yz 255 2015 explicitmsg "[decyzja = true] drukujPotwierdzenie()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 402 242 + label_xy 402 241 msg 131462 return from durationcanvas_ref 131206 to durationcanvas_ref 128646 - yz 298 2015 explicitmsg "potwierdzenie" + yz 297 2015 explicitmsg "potwierdzenie" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 451 282 + label_xy 451 281 msg 131718 return from durationcanvas_ref 128646 to durationcanvas_ref 131590 - yz 355 2015 explicitmsg "[decyzja = true] potwierdzenie" + yz 354 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 339 + label_xy 82 338 end diff --git a/models/135298.diagram b/models/135298.diagram index d5926fc..f94ad8d 100644 --- a/models/135298.diagram +++ b/models/135298.diagram @@ -12,169 +12,181 @@ 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 235 72 2010 11 40 + xyzwh 235 137 2010 11 40 end durationcanvas 130306 classinstance_ref 129282 // :Czytnik_kart - xyzwh 402 72 2010 11 25 + xyzwh 402 137 2010 11 25 end durationcanvas 130818 classinstance_ref 129282 // :Czytnik_kart - xyzwh 402 130 2010 11 40 + xyzwh 402 195 2010 11 40 end durationcanvas 130946 classinstance_ref 130562 // :Komunikat - xyzwh 570 130 2010 11 25 + xyzwh 570 195 2010 11 25 end durationcanvas 131202 classinstance_ref 128130 // :Bankomat - xyzwh 235 197 2010 11 40 + xyzwh 235 262 2010 11 40 end durationcanvas 131330 classinstance_ref 130690 // :Ekran_dotykowy - xyzwh 729 197 2010 11 25 + xyzwh 729 262 2010 11 25 end durationcanvas 131970 classinstance_ref 128130 // :Bankomat - xyzwh 235 276 2010 11 40 + xyzwh 235 341 2010 11 40 end durationcanvas 132098 classinstance_ref 129282 // :Czytnik_kart - xyzwh 402 276 2010 11 25 + xyzwh 402 341 2010 11 25 end durationcanvas 132354 classinstance_ref 129282 // :Czytnik_kart - xyzwh 402 348 2010 11 40 + xyzwh 402 413 2010 11 40 end durationcanvas 132482 classinstance_ref 128130 // :Bankomat - xyzwh 235 348 2010 11 25 + xyzwh 235 413 2010 11 25 end durationcanvas 132738 classinstance_ref 128130 // :Bankomat - xyzwh 235 405 2010 11 40 + xyzwh 235 470 2010 11 40 end durationcanvas 133634 classinstance_ref 128130 // :Bankomat - xyzwh 235 498 2010 11 40 + xyzwh 235 563 2010 11 40 end durationcanvas 133762 classinstance_ref 129282 // :Czytnik_kart - xyzwh 402 498 2010 11 25 + xyzwh 402 563 2010 11 25 end durationcanvas 134018 classinstance_ref 129282 // :Czytnik_kart - xyzwh 402 560 2010 11 40 + xyzwh 402 625 2010 11 40 end durationcanvas 134146 classinstance_ref 128130 // :Bankomat - xyzwh 235 560 2010 11 25 + xyzwh 235 625 2010 11 25 end durationcanvas 134402 classinstance_ref 128130 // :Bankomat - xyzwh 235 606 2010 11 40 + xyzwh 235 671 2010 11 40 end durationcanvas 134658 classinstance_ref 128130 // :Bankomat - xyzwh 235 810 2010 11 40 + xyzwh 235 875 2010 11 40 end durationcanvas 134786 classinstance_ref 129282 // :Czytnik_kart - xyzwh 402 810 2010 11 25 + xyzwh 402 875 2010 11 25 end durationcanvas 135042 classinstance_ref 128130 // :Bankomat - xyzwh 235 679 2010 11 40 + xyzwh 235 744 2010 11 40 end durationcanvas 135170 classinstance_ref 129282 // :Czytnik_kart - xyzwh 402 679 2010 11 25 + xyzwh 402 744 2010 11 25 end durationcanvas 135426 classinstance_ref 129282 // :Czytnik_kart - xyzwh 402 735 2010 11 40 + xyzwh 402 800 2010 11 40 end durationcanvas 135554 classinstance_ref 128130 // :Bankomat - xyzwh 235 735 2010 11 25 + xyzwh 235 800 2010 11 25 end durationcanvas 135810 classinstance_ref 128130 // :Bankomat - xyzwh 235 883 2010 11 40 + xyzwh 235 948 2010 11 40 end durationcanvas 135938 classinstance_ref 130562 // :Komunikat - xyzwh 570 883 2010 11 25 + xyzwh 570 948 2010 11 25 end durationcanvas 136194 classinstance_ref 128130 // :Bankomat - xyzwh 235 954 2010 11 40 + xyzwh 235 1019 2010 11 40 end durationcanvas 136322 classinstance_ref 130690 // :Ekran_dotykowy - xyzwh 729 954 2010 11 25 + xyzwh 729 1019 2010 11 25 +end +durationcanvas 136578 classinstance_ref 128002 // :Klient + xyzwh 92 94 2010 11 40 +end +durationcanvas 136706 classinstance_ref 128130 // :Bankomat + xyzwh 235 94 2010 11 25 end msg 130434 synchronous from durationcanvas_ref 130178 to durationcanvas_ref 130306 - yz 79 2015 explicitmsg "wydajKarte()" + yz 144 2015 explicitmsg "wydajKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 274 64 + label_xy 272 129 msg 131074 synchronous from durationcanvas_ref 130818 to durationcanvas_ref 130946 - yz 130 2015 explicitmsg "komunikat()" - stereotype "<>" xyz 457 144 3000 + yz 195 2015 explicitmsg "komunikat()" + stereotype "<>" xyz 455 209 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "tresc: string, czasTrwania: int" - label_xy 384 116 + label_xy 382 181 msg 131458 synchronous from durationcanvas_ref 131202 to durationcanvas_ref 131330 - yz 197 2015 explicitmsg "wyswietlKomunikat()" + yz 262 2015 explicitmsg "wyswietlKomunikat()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "komunikat: Komunikat" - label_xy 386 177 + label_xy 384 242 msg 132226 synchronous from durationcanvas_ref 131970 to durationcanvas_ref 132098 - yz 277 2015 msg operation_ref 151044 // "czyOdebranaKarta()" + yz 342 2015 msg operation_ref 151044 // "czyOdebranaKarta()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 257 263 + label_xy 255 328 msg 132610 return from durationcanvas_ref 132354 to durationcanvas_ref 132482 - yz 348 2015 explicitmsg "czyOdebrana" + yz 413 2015 explicitmsg "czyOdebrana" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 283 334 + label_xy 281 399 reflexivemsg 132866 synchronous to durationcanvas_ref 132738 - yz 405 2015 explicitmsg "[czyOdebrana=false]wydajSygnalDzwiekowy()" + yz 470 2015 explicitmsg "[czyOdebrana=false]wydajSygnalDzwiekowy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 133 386 + label_xy 133 451 msg 133890 synchronous from durationcanvas_ref 133634 to durationcanvas_ref 133762 - yz 498 2015 msg operation_ref 128258 // "czyGotowkaOdebrana()" + yz 563 2015 msg operation_ref 128258 // "czyGotowkaOdebrana()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 257 484 + label_xy 255 549 msg 134274 return from durationcanvas_ref 134018 to durationcanvas_ref 134146 - yz 560 2015 explicitmsg "czyOdebrana" + yz 625 2015 explicitmsg "czyOdebrana" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 283 546 + label_xy 281 611 reflexivemsg 134530 synchronous to durationcanvas_ref 134402 - yz 606 2015 explicitmsg "[czyOdebrana=false]wydajSygnalDzwiekowy()" + yz 671 2015 explicitmsg "[czyOdebrana=false]wydajSygnalDzwiekowy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 133 592 + label_xy 133 657 msg 134914 synchronous from durationcanvas_ref 134658 to durationcanvas_ref 134786 - yz 810 2015 explicitmsg "[czyodebrana=false] wciagnijKarte()" + yz 875 2015 explicitmsg "[czyodebrana=false] wciagnijKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 220 791 + label_xy 218 856 msg 135298 synchronous from durationcanvas_ref 135042 to durationcanvas_ref 135170 - yz 679 2015 msg operation_ref 151044 // "czyOdebranaKarta()" + yz 744 2015 msg operation_ref 151044 // "czyOdebranaKarta()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 257 665 + label_xy 255 730 msg 135682 return from durationcanvas_ref 135426 to durationcanvas_ref 135554 - yz 735 2015 explicitmsg "czyOdebrana" + yz 800 2015 explicitmsg "czyOdebrana" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 283 721 + label_xy 281 786 msg 136066 synchronous from durationcanvas_ref 135810 to durationcanvas_ref 135938 - yz 883 2015 explicitmsg "komunikatKartaWciagnieta()" - stereotype "<>" xyz 374 897 3000 + yz 948 2015 explicitmsg "komunikatKartaWciagnieta()" + stereotype "<>" xyz 372 962 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "tresc: string, czasTrwania: int" - label_xy 265 871 + label_xy 263 936 msg 136450 synchronous from durationcanvas_ref 136194 to durationcanvas_ref 136322 - yz 954 2015 explicitmsg "wyswietlKomunikat()" + yz 1019 2015 explicitmsg "wyswietlKomunikat()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "komunikatKartaWciagnieta: Komunikat" - label_xy 330 940 + label_xy 328 1005 +msg 136834 synchronous + from durationcanvas_ref 136578 + to durationcanvas_ref 136706 + yz 94 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 129 78 end diff --git a/models/135426.diagram b/models/135426.diagram index 259c6c3..8b351b4 100644 --- a/models/135426.diagram +++ b/models/135426.diagram @@ -11,28 +11,28 @@ classinstance 128386 class_ref 134532 // Drukarka_potwierdzen classinstance 128898 class_ref 137731 // Komunikat name "" xyz 630 4 2000 life_line_z 2000 durationcanvas 128514 classinstance_ref 128002 // :Klient - xyzwh 145 82 2010 11 40 + xyzwh 149 82 2010 11 40 end durationcanvas 128642 classinstance_ref 128130 // :Bankomat - xyzwh 302 82 2010 11 25 + xyzwh 309 82 2010 11 25 end durationcanvas 129026 classinstance_ref 128130 // :Bankomat - xyzwh 302 146 2010 11 40 + xyzwh 309 146 2010 11 40 end durationcanvas 129154 classinstance_ref 128386 // :Drukarka_potwierdzen - xyzwh 835 146 2010 11 25 + xyzwh 844 146 2010 11 25 end durationcanvas 129410 classinstance_ref 128130 // :Bankomat - xyzwh 302 212 2010 11 40 + xyzwh 309 212 2010 11 40 end durationcanvas 129538 classinstance_ref 128898 // :Komunikat - xyzwh 656 212 2010 11 25 + xyzwh 663 212 2010 11 25 end durationcanvas 129794 classinstance_ref 128130 // :Bankomat - xyzwh 302 292 2010 11 40 + xyzwh 309 292 2010 11 40 end durationcanvas 129922 classinstance_ref 128258 // :Ekran_dotykowy - xyzwh 491 292 2010 11 25 + xyzwh 499 292 2010 11 25 end msg 128770 synchronous from durationcanvas_ref 128514 diff --git a/models/2.session b/models/2.session index 1142bcb..493d6ec 100644 --- a/models/2.session +++ b/models/2.session @@ -1,13 +1,10 @@ -window_sizes 1920 1017 450 1465 867 104 +window_sizes 1680 987 292 1383 834 104 -diagrams - active sequencediagram_ref 135426 // 1-8-odebraniePotwierdzenia - 1172 693 100 A1 0 0 -end show_stereotypes -selected class_ref 137731 // Komunikat +selected classdiagram_ref 147972 // design-model open - classview_ref 128003 // domain - classview_ref 128006 // design + class_ref 128387 // Ekran_dotykowy + class_ref 129155 // Bankomat + class_ref 169988 // System_autoryzacji_uzytkownika_Mbank_adapter end end diff --git a/models/models.prj b/models/models.prj index e7c8788..7273f7d 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 23 - modified_by 4 "Adam" + revision 24 + modified_by 2 "Szymon" @@ -350,6 +350,18 @@ ${members}} + end + + operation 135042 "wyplataGotowki" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + end end @@ -836,6 +848,9 @@ ${members}} class 129155 "Bankomat" visibility package + nactuals 1 + actual class class_ref 128515 // Czytnik_kart + rank 0 explicit_value "" cpp_decl "" java_decl "${comment}${@}${visibility}${static}${final}${abstract}class ${name}${extends}${implements} { ${members}} @@ -1431,6 +1446,18 @@ ${members}} + end + + operation 134914 "odbierzGotowke" + public explicit_return_type "" + nparams 0 + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{ + ${body}} +" + + + end end