From 9f31fde5cccf0ac88a15b5a0a3b20da7651bb0e7 Mon Sep 17 00:00:00 2001 From: AdamCwiklinski <47983131+AdamCwiklinski@users.noreply.github.com> Date: Thu, 11 Feb 2021 13:07:41 +0100 Subject: [PATCH] V6.0 --- models/128002.diagram | 14 +++++++------- models/128026.diagram | 4 ++-- models/128044.diagram | 14 +++++++++----- models/128258.diagram | 4 ++-- models/128386.diagram | 24 ++++++++++++------------ models/134673.diagram | 18 +++++++++--------- models/134801.diagram | 16 ++++++++-------- models/134914.diagram | 6 +++--- models/134929.diagram | 10 +++++----- models/135042.diagram | 6 +++--- models/models.prj | 16 ++++++++++++++-- 11 files changed, 74 insertions(+), 58 deletions(-) diff --git a/models/128002.diagram b/models/128002.diagram index a6b89c7..cc7d7fd 100644 --- a/models/128002.diagram +++ b/models/128002.diagram @@ -6,26 +6,26 @@ classinstance 143746 class_ref 130604 // IPlatnoscGotowkaStrategy name "" xyz 875.6 7.6 2000 life_line_z 2000 classinstance 144002 class_ref 128002 // :Kasa name "" xyz 1240.4 14.1 2000 life_line_z 2000 -classinstance 144258 class_ref 128044 // Klient +classinstance 144258 class_ref 128044 // Aktor name "" xyz 49.7 13.1 2000 life_line_z 2000 classinstance 150146 class_ref 151340 // AutomatKontroler name "" xyz 264.4 9.8 2000 life_line_z 2000 classinstance 151426 class_ref 128940 // Magazyn name "" xyz 1422 4 2000 life_line_z 2000 durationcanvas 145922 classinstance_ref 144002 // ::Kasa - xyzwh 1259 251.8 2010 11 191 + xyzwh 1259 251 2010 11 191 end durationcanvas 149634 classinstance_ref 143618 // :IPlatnosc - xyzwh 600 219.6 2010 11 97 + xyzwh 600 219 2010 11 97 end durationcanvas 149890 classinstance_ref 143746 // :IPlatnoscGotowkaStrategy - xyzwh 941 243.4 2010 11 104 + xyzwh 941 243 2010 11 104 end -durationcanvas 150274 classinstance_ref 144258 // :Klient - xyzwh 60 102.8 2010 11 40 +durationcanvas 150274 classinstance_ref 144258 // :Aktor + xyzwh 60 102 2010 11 40 end durationcanvas 150402 classinstance_ref 150146 // :AutomatKontroler - xyzwh 311 106.5 2010 11 336 + xyzwh 308 106 2010 11 336 end durationcanvas 151938 classinstance_ref 151426 // :Magazyn xyzwh 1446 146 2010 11 65 diff --git a/models/128026.diagram b/models/128026.diagram index a489b14..7fd31c4 100644 --- a/models/128026.diagram +++ b/models/128026.diagram @@ -1,6 +1,6 @@ format 224 -classinstance 128026 class_ref 128044 // Klient +classinstance 128026 class_ref 128044 // Aktor name "" xyz 30 4.2 2000 life_line_z 2000 classinstance 128154 class_ref 151340 // AutomatKontroler name "" xyz 258 4 2000 life_line_z 2000 @@ -10,7 +10,7 @@ classinstance 128410 class_ref 129196 // ZewnetrznySystemObslugi name "" xyz 631.4 4 2000 life_line_z 2000 classinstance 129818 class_ref 128300 // PracownikObslugi name "" xyz 934 10.2 2000 life_line_z 2000 -durationcanvas 128538 classinstance_ref 128026 // :Klient +durationcanvas 128538 classinstance_ref 128026 // :Aktor xyzwh 41 105 2010 11 144 overlappingdurationcanvas 130330 xyzwh 47 210 2020 11 25 diff --git a/models/128044.diagram b/models/128044.diagram index cf6b837..cb32007 100644 --- a/models/128044.diagram +++ b/models/128044.diagram @@ -1,8 +1,12 @@ format 224 -classcanvas 128044 class_ref 128044 // Klient +classcanvas 128044 class_ref 128044 // Aktor classdiagramsettings member_max_width 0 end - xyz 818.57 97.4305 2000 + xyz 791.57 58.4305 2000 +end +classcanvas 128130 class_ref 141058 // System + classdiagramsettings member_max_width 0 end + xyz 909 54 2000 end classcanvas 128172 class_ref 128172 // Automat classdiagramsettings member_max_width 0 end @@ -127,10 +131,10 @@ relationcanvas 132268 relation_ref 128684 // realizuje > multiplicity_a_pos 1047 220 3000 multiplicity_b_pos 1047 196 3000 end relationcanvas 132396 relation_ref 128812 // dokonuje - from ref 128044 z 2001 label "dokonuje" italic max_width 255 xyz 808 157 2001 to point 777 187 + from ref 128044 z 2001 label "dokonuje" italic max_width 255 xyz 798.5 147.5 2001 to point 777 187 line 134188 z 2001 to ref 128940 no_role_a no_role_b - multiplicity_a_pos 767 199 3000 multiplicity_b_pos 805 138 3000 + multiplicity_a_pos 767 199 3000 multiplicity_b_pos 780 139 3000 end relationcanvas 132524 relation_ref 128940 // posiada from ref 131244 z 2006 label "posiada" italic max_width 255 xyz 434 470 2006 to ref 128172 @@ -143,7 +147,7 @@ relationcanvas 132652 relation_ref 129068 // zarzadza multiplicity_a_pos 1108 501 3000 multiplicity_b_pos 1101 479 3000 end relationcanvas 132780 relation_ref 129196 // posiada> - from ref 129068 z 2001 label "posiada>" italic max_width 255 xyz 562 230.5 2001 to ref 130348 + from ref 129068 z 2001 label "posiada>" italic max_width 255 xyz 562 230 2001 to ref 130348 no_role_a no_role_b multiplicity_a_pos 648 282 3000 multiplicity_b_pos 658 258 3000 end diff --git a/models/128258.diagram b/models/128258.diagram index c969079..5d89002 100644 --- a/models/128258.diagram +++ b/models/128258.diagram @@ -2,7 +2,7 @@ format 224 classinstance 128044 class_ref 134673 // AutomatController name "" xyz 186.56 4 2000 life_line_z 2000 -classinstance 128172 class_ref 128044 // Klient +classinstance 128172 class_ref 128044 // Aktor name "" xyz 29.8 4 2000 life_line_z 2000 classinstance 128300 class_ref 129964 // Produkt name "ZamówionyProdukt" xyz 776.76 5.08 2000 life_line_z 2000 @@ -13,7 +13,7 @@ classinstance 133250 class_ref 128940 // Magazyn durationcanvas 128258 classinstance_ref 128044 // :AutomatController xyzwh 231 69 2010 11 453 end -durationcanvas 128812 classinstance_ref 128172 // :Klient +durationcanvas 128812 classinstance_ref 128172 // :Aktor xyzwh 40 54 2010 11 44 end durationcanvas 129922 classinstance_ref 128300 // ZamówionyProdukt:Produkt diff --git a/models/128386.diagram b/models/128386.diagram index 3f0e23f..f52bb87 100644 --- a/models/128386.diagram +++ b/models/128386.diagram @@ -1,29 +1,29 @@ format 224 -classinstance 134914 class_ref 128044 // Klient - name "" xyz 56.9 18.9 2000 life_line_z 2000 +classinstance 134914 class_ref 128044 // Aktor + name "" xyz 56.26 18.96 2000 life_line_z 2000 classinstance 135810 class_ref 134673 // AutomatController - name "" xyz 376.76 6.2 2000 life_line_z 2000 + name "" xyz 376.64 6.04 2000 life_line_z 2000 classinstance 140418 class_ref 129964 // Produkt - name "ZamówionyProdukt" xyz 743.8 3.8 2000 life_line_z 2000 + name "ZamówionyProdukt" xyz 744.5 4.08 2000 life_line_z 2000 classinstance 142466 class_ref 134530 // Piekarnik - name "" xyz 1197 5.8 2000 life_line_z 2000 + name "" xyz 1197.5 5.64 2000 life_line_z 2000 classinstance 143234 class_ref 128940 // Magazyn - name "" xyz 1017 3.8 2000 life_line_z 2000 -durationcanvas 140034 classinstance_ref 134914 // :Klient - xyzwh 67 85.4 2010 11 197 + name "" xyz 1017.48 4.08 2000 life_line_z 2000 +durationcanvas 140034 classinstance_ref 134914 // :Aktor + xyzwh 67 85.54 2010 11 197 end durationcanvas 140162 classinstance_ref 135810 // :AutomatController - xyzwh 421 68 2010 11 308 + xyzwh 421 67.98 2010 11 308 end durationcanvas 140546 classinstance_ref 140418 // ZamówionyProdukt:Produkt - xyzwh 809 182 2010 11 101 + xyzwh 810 182.16 2010 11 101 end durationcanvas 142594 classinstance_ref 142466 // :Piekarnik - xyzwh 1220 303 2010 11 109 + xyzwh 1220 303.66 2010 11 109 end durationcanvas 143362 classinstance_ref 143234 // :Magazyn - xyzwh 1041 106 2010 11 53 + xyzwh 1041 106.16 2010 11 53 end msg 140290 synchronous from durationcanvas_ref 140034 diff --git a/models/134673.diagram b/models/134673.diagram index 98c363f..d2b8cf2 100644 --- a/models/134673.diagram +++ b/models/134673.diagram @@ -1,24 +1,24 @@ -format 223 +format 224 -classinstance 128017 class_ref 128044 // Klient +classinstance 128017 class_ref 128044 // Aktor drawing_mode actor name "" xyz 44 27 2005 life_line_z 2000 -classinstance 128145 class_ref 130732 // PlatnoscKarta +classinstance 128145 class_ref 130732 // IPlatnoscKartaStrategy name "" xyz 253 32 2005 life_line_z 2000 classinstance 128913 class_ref 129068 // SystemAutoryzacjiPlatnosci name "" xyz 466 32 2005 life_line_z 2000 note 129425 "Klasa PlatnoscKarta nastepnie przekazuje dalej (do klasy Platnosc) informacje o powodzeniu platnosci" xyzwh 104 329 2000 169 107 -durationcanvas 128273 classinstance_ref 128017 // :Klient - xyzwh 59 178 2010 11 163 +durationcanvas 128273 classinstance_ref 128017 // :Aktor + xyzwh 55 178 2010 11 163 end -durationcanvas 128401 classinstance_ref 128145 // :PlatnoscKarta - xyzwh 296 178 2010 11 194 +durationcanvas 128401 classinstance_ref 128145 // :IPlatnoscKartaStrategy + xyzwh 310 178 2010 11 194 overlappingdurationcanvas 128657 - xyzwh 302 204 2020 11 80 + xyzwh 316 204 2020 11 80 end end durationcanvas 129041 classinstance_ref 128913 // :SystemAutoryzacjiPlatnosci - xyzwh 550 218 2010 11 71 + xyzwh 535 218 2010 11 71 end msg 128529 synchronous from durationcanvas_ref 128273 diff --git a/models/134801.diagram b/models/134801.diagram index 8b33c62..aa83f6f 100644 --- a/models/134801.diagram +++ b/models/134801.diagram @@ -1,21 +1,21 @@ -format 223 +format 224 -classinstance 128017 class_ref 128044 // Klient +classinstance 128017 class_ref 128044 // Aktor drawing_mode actor name "" xyz 40 34 2005 life_line_z 2000 -classinstance 128145 class_ref 130732 // PlatnoscKarta +classinstance 128145 class_ref 130732 // IPlatnoscKartaStrategy name "" xyz 199 35 2005 life_line_z 2000 classinstance 128657 class_ref 129068 // SystemAutoryzacjiPlatnosci name "" xyz 372 33 2005 life_line_z 2000 note 129169 "Klasa PlatnoscKarta nastepnie przekazuje dalej (do klasy Platnosc) informacje o powodzeniu platnosci" xyzwh 72.5 277.5 2000 169 107 -durationcanvas 128273 classinstance_ref 128017 // :Klient - xyzwh 55 177 2010 11 101 +durationcanvas 128273 classinstance_ref 128017 // :Aktor + xyzwh 51 177 2010 11 101 end -durationcanvas 128401 classinstance_ref 128145 // :PlatnoscKarta - xyzwh 242 178 2010 11 132 +durationcanvas 128401 classinstance_ref 128145 // :IPlatnoscKartaStrategy + xyzwh 256 178 2010 11 132 end durationcanvas 128785 classinstance_ref 128657 // :SystemAutoryzacjiPlatnosci - xyzwh 456 190 2010 11 55 + xyzwh 441 190 2010 11 55 end msg 128529 synchronous from durationcanvas_ref 128273 diff --git a/models/134914.diagram b/models/134914.diagram index 9964705..2931d34 100644 --- a/models/134914.diagram +++ b/models/134914.diagram @@ -1,7 +1,7 @@ format 224 -classinstance 144258 class_ref 128172 // Automat - drawing_mode actor name "" xyz 42.7 13.1 2000 life_line_z 2000 +classinstance 144258 class_ref 141058 // System + drawing_mode actor name "" xyz 44.7 13.1 2000 life_line_z 2000 classinstance 150146 class_ref 151340 // AutomatKontroler name "" xyz 264.4 9.8 2000 life_line_z 2000 classinstance 151426 class_ref 129964 // Produkt @@ -14,7 +14,7 @@ end durationcanvas 151554 classinstance_ref 151426 // ZamówionyProdukt:Produkt xyzwh 983 103 2010 11 130 end -durationcanvas 151938 classinstance_ref 144258 // :Automat +durationcanvas 151938 classinstance_ref 144258 // :System xyzwh 60 79 2010 11 47 end durationcanvas 152834 classinstance_ref 152706 // :Magazyn diff --git a/models/134929.diagram b/models/134929.diagram index 3dd6428..bf573f4 100644 --- a/models/134929.diagram +++ b/models/134929.diagram @@ -1,20 +1,20 @@ format 224 -classinstance 128017 class_ref 128044 // Klient +classinstance 128017 class_ref 128044 // Aktor drawing_mode actor name "" xyz 47 8 2005 life_line_z 2000 classinstance 128145 class_ref 144428 // Kasa name "" xyz 572 20 2005 life_line_z 2000 note 129937 "Klient wrzuca gotowke" xyzwh 85 162 2000 163 41 -classinstance 130065 class_ref 130604 // PlatnoscGotowka +classinstance 130065 class_ref 130604 // IPlatnoscGotowkaStrategy name "" xyz 247 20 2005 life_line_z 2000 note 131217 "Klasa PlatnoscGotowka nastepnie przekazuje dalej (do klasy Platnosc) informacje o powodzeniu platnosci" xyzwh 105 338 2000 169 107 -durationcanvas 130193 classinstance_ref 128017 // :Klient +durationcanvas 130193 classinstance_ref 128017 // :Aktor xyzwh 58 141 2010 11 130 end -durationcanvas 130321 classinstance_ref 130065 // :PlatnoscGotowka - xyzwh 291 144 2010 11 190 +durationcanvas 130321 classinstance_ref 130065 // :IPlatnoscGotowkaStrategy + xyzwh 313 144 2010 11 190 end durationcanvas 130577 classinstance_ref 128145 // :Kasa xyzwh 591 156 2010 11 149 diff --git a/models/135042.diagram b/models/135042.diagram index acd76cb..5a0f8c1 100644 --- a/models/135042.diagram +++ b/models/135042.diagram @@ -1,7 +1,7 @@ format 224 -classinstance 134914 class_ref 128172 // Automat - drawing_mode actor name "" xyz 49.5 18.5 2000 life_line_z 2000 +classinstance 134914 class_ref 141058 // System + drawing_mode actor name "" xyz 51.5 17.5 2000 life_line_z 2000 classinstance 135810 class_ref 134673 // AutomatController name "" xyz 376.56 5.6 2000 life_line_z 2000 classinstance 141442 class_ref 128812 // Zakup @@ -15,7 +15,7 @@ durationcanvas 141570 classinstance_ref 141442 // :Zakup xyzwh 738 311 2020 11 25 end end -durationcanvas 142466 classinstance_ref 134914 // :Automat +durationcanvas 142466 classinstance_ref 134914 // :System xyzwh 67 96 2010 11 42 end msg 141698 synchronous diff --git a/models/models.prj b/models/models.prj index bd748e3..1b07f0d 100644 --- a/models/models.prj +++ b/models/models.prj @@ -69,7 +69,7 @@ format 224 size A2 end - class 128044 "Klient" + class 128044 "Aktor" visibility package stereotype "actor" cpp_decl "" java_decl "" @@ -1298,6 +1298,18 @@ ${members}}; classrelation_ref 141996 // zawiera end end + + class 141058 "System" + visibility package stereotype "actor" + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end end classview 134572 "design" @@ -1558,7 +1570,7 @@ ${members}}; classinstance 128273 "" stereotype "<>" - type class_ref 128044 // Klient + type class_ref 128044 // Aktor attributes end relations