From b05a6f2d417d58043438fde2a94716ea3a6a52ea Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 27 Jan 2021 19:06:12 +0100 Subject: [PATCH] Auto stash before merge of "master" and "origin/master" --- models/128132.diagram | 8 +++++ models/128260.diagram | 62 +++++++++++++++++++++++++++++++++++++ models/134788.diagram | 26 ++++++++++++++++ models/4.session | 23 +++++--------- models/models.prj | 71 ++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 174 insertions(+), 16 deletions(-) create mode 100644 models/128132.diagram create mode 100644 models/128260.diagram create mode 100644 models/134788.diagram diff --git a/models/128132.diagram b/models/128132.diagram new file mode 100644 index 0000000..cb20d73 --- /dev/null +++ b/models/128132.diagram @@ -0,0 +1,8 @@ +format 223 + +classinstance 128132 class_ref 157060 // empty:empty + name "" xyz 242.6 91.6 2000 +note 128260 "klient" + xyzwh 88.8 88.6 2000 111 47 +no_msg +end diff --git a/models/128260.diagram b/models/128260.diagram new file mode 100644 index 0000000..6fe45f0 --- /dev/null +++ b/models/128260.diagram @@ -0,0 +1,62 @@ +format 223 + +classinstance 128132 class_ref 129283 // Klient + drawing_mode actor name "" xyz 130.498 5.3278 2005 life_line_z 2000 +classinstance 128644 class_ref 129155 // Bankomat + name "" xyz 710.552 4.18857 2005 life_line_z 2000 +classinstance 130180 class_ref 163844 // ObslugaKartyKontroler + name "" xyz 1239.27 4.78857 2010 life_line_z 2000 +classinstance 132868 class_ref 128259 // Bank + name "" xyz 129.278 582.242 2010 life_line_z 2000 +durationcanvas 129156 classinstance_ref 128132 // :Klient + xyzwh 167 262 2010 11 49 +end +durationcanvas 129284 classinstance_ref 128644 // :Bankomat + xyzwh 780 255 2010 11 82 +end +durationcanvas 129540 classinstance_ref 128132 // :Klient + xyzwh 167 79 2010 11 97 +end +durationcanvas 129668 classinstance_ref 128644 // :Bankomat + xyzwh 780 72 2010 11 56 +end +durationcanvas 130308 classinstance_ref 130180 // :ObslugaKartyKontroler + xyzwh 1391 89 2010 11 120 + overlappingdurationcanvas 132612 + xyzwh 1397 157 2020 11 45 + end +end +durationcanvas 132356 classinstance_ref 128644 // :Bankomat + xyzwh 780 116 2010 11 85 +end +msg 129412 synchronous + from durationcanvas_ref 129156 + to durationcanvas_ref 129284 + yz 302 2015 explicitmsg "wybierzTransakcje(transakcja: Transakcja)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 225 261 +msg 129796 synchronous + from durationcanvas_ref 129540 + to durationcanvas_ref 129668 + yz 91 2015 explicitmsg "wlozKarte(karta: Karta)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 253 63 +msg 130436 asynchronous + from durationcanvas_ref 129668 + to durationcanvas_ref 130308 + yz 118 2015 explicitmsg "sprawdzKarte(karta: Karta)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 905 81 +msg 132484 synchronous + from durationcanvas_ref 129540 + to durationcanvas_ref 132356 + yz 148 2015 explicitmsg "wprowadzPin(pin: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 238 120 +msg 132740 synchronous + from durationcanvas_ref 132356 + to durationcanvas_ref 132612 + yz 188 2025 explicitmsg "autoryzujKlienta(karta: Karta, pin: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 880 155 +end diff --git a/models/134788.diagram b/models/134788.diagram new file mode 100644 index 0000000..2e24cbd --- /dev/null +++ b/models/134788.diagram @@ -0,0 +1,26 @@ +format 223 + +classcanvas 128004 class_ref 129155 // Bankomat + classdiagramsettings member_max_width 0 end + xyzwh 544.2 100.3 2000 285 192 +end +classcanvas 128132 class_ref 128771 // Karta_klienta + classdiagramsettings member_max_width 0 end + xyz 51.6 146.8 2000 +end +classcanvas 130052 class_ref 128515 // Czytnik_kart + classdiagramsettings member_max_width 0 end + xyz 114.1 523.1 2000 +end +relationcanvas 128260 relation_ref 162180 // + from ref 128004 z 2001 to point 411.8 200.2 + line 129540 z 2001 to ref 128132 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 130436 relation_ref 162692 // nrKarty := pobierzNrKarty(karta: Karta_klienta) + from ref 128004 z 2001 label "nrKarty := pobierzNrKarty(karta: Karta_klienta)" italic max_width 255 xyz 168.5 374.5 3000 to ref 130052 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +end diff --git a/models/4.session b/models/4.session index a95ab87..616bf47 100644 --- a/models/4.session +++ b/models/4.session @@ -1,21 +1,14 @@ -window_sizes 3000 1875 275 2715 1576 216 - +window_sizes 3840 2035 731 3099 1727 216 +windowsvista_style diagrams - active classdiagram_ref 128003 // domain-model - 2899 1506 119 Custom 260 0 + classdiagram_ref 134788 // design-model + 2479 1381 100 A4 0 0 + active sequencediagram_ref 128260 // usecase3 + 2479 1381 100 Custom 0 0 end show_stereotypes -selected attribute_ref 136708 // nazwisko +selected sequencediagram_ref 128260 // usecase3 open - class_ref 128003 // System_komunikacji_z_bankiem - class_ref 128899 // Serwisant - class_ref 129283 // Klient - class_ref 129411 // Zaopatrzeniowiec - class_ref 137731 // Komunikat - class_ref 135300 // Banknot - class_ref 136196 // Karta_serwisanta - class_ref 136452 // Awaria_hardware_bankomatu - class_ref 136580 // Awaria_systemowa - class_ref 150276 // kod_bledu + classview_ref 128004 // design end end diff --git a/models/models.prj b/models/models.prj index b6ffc60..40a2e33 100644 --- a/models/models.prj +++ b/models/models.prj @@ -857,6 +857,75 @@ ${members}} mysql_decl "" MysqlColumn end + + operation 128004 "pobierzNrKarty" + public explicit_return_type "string" + nparams 1 + param in name "karta" type class_ref 128771 // Karta_klienta + + java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{ + ${body}} +" + + + + end + + classrelation 170756 // + relation 162180 ---> + a role_name "" private + java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value}; +" + classrelation_ref 170756 // + b parent class_ref 128771 // Karta_klienta + end + + classrelation 170884 // + relation 162308 ---> + a role_name "" private + java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value}; +" + classrelation_ref 170884 // + b parent class_ref 129155 // Bankomat + end + + attribute 158084 "czytnik_kart" + private type class_ref 128515 // Czytnik_kart + cpp_decl "" + java_decl " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value}; +" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + classrelation 171012 // + relation 162436 ---> + a role_name "" private + java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value}; +" + classrelation_ref 171012 // + b parent class_ref 128515 // Czytnik_kart + end + + classrelation 171140 // + relation 162564 ---|> + a public + java "${type}" + classrelation_ref 171140 // + b parent class_ref 128515 // Czytnik_kart + end + + classrelation 171268 // (nrKarty := pobierzNrKarty(karta: Karta_klienta)) + relation 162692 ---> name "nrKarty := pobierzNrKarty(karta: Karta_klienta)" + a role_name "" private + java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value}; +" + classrelation_ref 171268 // (nrKarty := pobierzNrKarty(karta: Karta_klienta)) + b parent class_ref 128515 // Czytnik_kart + end end class 129283 "Klient" @@ -2776,7 +2845,7 @@ ${members}} end end - sequencediagram 128518 "2-5-wybórOpcjiPotwierdzeniaOperacji" + sequencediagram 128518 "2-5-wyb�rOpcjiPotwierdzeniaOperacji" sequencediagramsettings end overlapping_bars size A3 end