From 62ab9dbc811091c38ae2b7e9d6d6be23d2e88bae Mon Sep 17 00:00:00 2001 From: Mateusz Date: Wed, 3 Feb 2021 11:46:17 +0100 Subject: [PATCH] singleton, observer, factory --- models/134693.diagram | 36 +++--- models/141221_38.d | 128 ++++++++++++++++++++ models/147749_38.d | 122 +++++++++++++++++++ models/154405.diagram | 157 +++++++++++++++---------- models/38.session | 15 ++- models/models.prj | 267 ++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 630 insertions(+), 95 deletions(-) create mode 100644 models/141221_38.d create mode 100644 models/147749_38.d diff --git a/models/134693.diagram b/models/134693.diagram index fabd393..92b6cca 100644 --- a/models/134693.diagram +++ b/models/134693.diagram @@ -1,60 +1,60 @@ format 224 classinstance 128165 class_ref 134565 // ZmianaStatusuController - name "" xyz 223.4 3.62 2000 life_line_z 2000 + name "" xyz 223.4 4 2000 life_line_z 2000 classinstancecanvas 128293 classinstance_ref 134693 // - xyz 15.58 3.8 2005 life_line_z 2000 + xyz 15.58 4 2005 life_line_z 2000 end classinstancecanvas 128933 classinstance_ref 141221 // - xyz 497.66 3.62 2000 life_line_z 2000 + xyz 497.66 4 2000 life_line_z 2000 end classinstancecanvas 129573 classinstance_ref 141349 // zamowienie - xyz 670.1 3.62 2005 life_line_z 2000 + xyz 670.1 4 2005 life_line_z 2000 end classinstancecanvas 129957 classinstance_ref 141477 // - xyz 1073.28 3.6 2000 life_line_z 2000 + xyz 1073.28 4 2000 life_line_z 2000 end classinstancecanvas 130341 classinstance_ref 142117 // - xyz 866.88 3.62 2000 life_line_z 2000 + xyz 866.88 4 2000 life_line_z 2000 end classinstancecanvas 135461 classinstance_ref 155941 // - xyz 1247.6 3.6 2005 life_line_z 2000 + xyz 1247.6 4 2005 life_line_z 2000 end classinstancecanvas 135973 classinstance_ref 156197 // - xyz 1454.58 3.6 2000 life_line_z 2000 + xyz 1454.58 4 2000 life_line_z 2000 end classinstancecanvas 136613 classinstance_ref 164133 // - xyz 1658.74 3.6 2005 life_line_z 2000 + xyz 1658.74 4 2005 life_line_z 2000 end durationcanvas 128549 classinstance_ref 128293 // :Kucharz - xyzwh 37 79.8 2010 11 294 + xyzwh 37 79 2010 11 294 end durationcanvas 128677 classinstance_ref 128165 // :ZmianaStatusuController - xyzwh 301 86 2010 11 269 + xyzwh 296 86 2010 11 269 end durationcanvas 131493 classinstance_ref 128933 // :SystemZamowien - xyzwh 551 101.2 2010 11 197 + xyzwh 551 101 2010 11 197 end durationcanvas 132005 classinstance_ref 129573 // zamowienie:Zamowienie xyzwh 740 110 2010 11 122 end durationcanvas 132261 classinstance_ref 130341 // :Status - xyzwh 887 108.6 2010 11 99 + xyzwh 887 108 2010 11 99 overlappingdurationcanvas 137893 - xyzwh 893 171.4 2020 11 25 + xyzwh 893 171 2020 11 25 end end durationcanvas 134053 classinstance_ref 129957 // :StosStanowStatusu - xyzwh 1133 131.8 2010 11 30 + xyzwh 1133 131 2010 11 30 end durationcanvas 135717 classinstance_ref 135461 // :HistoriaZmianZamowien - xyzwh 1318 267.2 2010 11 56 + xyzwh 1318 267 2010 11 56 end durationcanvas 136101 classinstance_ref 135973 // :StosZmienianychZamowien - xyzwh 1535 287.2 2010 11 45 + xyzwh 1535 287 2010 11 45 end durationcanvas 137637 classinstance_ref 136613 // :ZamowieniaKopiaZapasowa - xyzwh 1740 214.4 2010 11 29 + xyzwh 1740 214 2010 11 29 end msg 128805 synchronous from durationcanvas_ref 128549 diff --git a/models/141221_38.d b/models/141221_38.d new file mode 100644 index 0000000..addeb09 --- /dev/null +++ b/models/141221_38.d @@ -0,0 +1,128 @@ +format 224 + +classinstancecanvas 128037 classinstance_ref 141605 // + xyz 27.5 4 2005 life_line_z 2000 +end +classinstancecanvas 128165 classinstance_ref 141733 // + xyz 236.7 4.28 2000 life_line_z 2000 +end +classinstancecanvas 128677 classinstance_ref 141861 // + xyz 547.94 4.28 2000 life_line_z 2000 +end +classinstancecanvas 129445 classinstance_ref 155173 // + xyz 999.1 4 2000 life_line_z 2000 +end +classinstancecanvas 129829 classinstance_ref 155301 // ostatnioZmienione + xyz 1184.88 4.38 2000 life_line_z 2000 +end +classinstancecanvas 130469 classinstance_ref 148645 // + xyz 1389.26 4 2000 life_line_z 2000 +end +classinstancecanvas 130597 classinstance_ref 155429 // + xyz 1557.68 4.28 2005 life_line_z 2000 +end +classinstancecanvas 132645 classinstance_ref 155813 // + xyz 771.38 4.28 2000 life_line_z 2000 +end +classinstancecanvas 135973 classinstance_ref 164005 // + xyz 1739.96 4 2010 life_line_z 2000 +end +durationcanvas 128293 classinstance_ref 128037 // :Kucharz + xyzwh 49 74 2010 11 359 +end +durationcanvas 128421 classinstance_ref 128165 // :ZmianaStatusuController + xyzwh 309 77 2010 11 332 +end +durationcanvas 128805 classinstance_ref 128677 // :SystemZamowien + xyzwh 601 90 2010 11 304 +end +durationcanvas 131749 classinstance_ref 130469 // :Status + xyzwh 1410 175 2010 11 123 + overlappingdurationcanvas 134437 + xyzwh 1416 262 2020 11 24 + end +end +durationcanvas 132005 classinstance_ref 130597 // :StosStanowStatusu + xyzwh 1617 175 2010 11 69 +end +durationcanvas 132773 classinstance_ref 132645 // :HistoriaZmianZamowien + xyzwh 842 100 2010 11 281 +end +durationcanvas 133029 classinstance_ref 129445 // :StosZmienianychZamowien + xyzwh 1080 108 2010 11 49 +end +durationcanvas 133797 classinstance_ref 129829 // ostatnioZmienione:Zamowienie + xyzwh 1273 156 2010 11 196 +end +durationcanvas 137253 classinstance_ref 135973 // :ZamowieniaKopiaZapasowa + xyzwh 1821 320 2010 11 33 +end +msg 128549 synchronous + from durationcanvas_ref 128293 + to durationcanvas_ref 128421 + yz 81 2015 msg operation_ref 135333 // "cofniecieOstatniejModyfikacjiStatusu() : void" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 69 63 +msg 128933 synchronous + from durationcanvas_ref 128421 + to durationcanvas_ref 128805 + yz 98 2015 msg operation_ref 135461 // "cofnijOstatniaZmianeStatusuZamowienia() : Zamowienie" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 334 85 +msg 132133 synchronous + from durationcanvas_ref 131749 + to durationcanvas_ref 132005 + yz 203 2025 msg operation_ref 150437 // "pop() : StanStatusu" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 1505 185 +reflexivemsg 132517 synchronous + to durationcanvas_ref 134437 + yz 262 3010 msg operation_ref 150693 // "ustawStan(in stan : StanStatusu) : void" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "poprzedni: +StanStatusu" + label_xy 1424 245 +msg 132901 synchronous + from durationcanvas_ref 128805 + to durationcanvas_ref 132773 + yz 112 2015 msg operation_ref 150821 // "cofnijOstatniaZmiane() : Zamowienie" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 655 93 +msg 133157 synchronous + from durationcanvas_ref 132773 + to durationcanvas_ref 133029 + yz 117 2015 explicitmsg "pop()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 954 97 +msg 133925 synchronous + from durationcanvas_ref 132773 + to durationcanvas_ref 133797 + yz 183 2015 explicitmsg "[ostatnioZmienione != null] cofnijOstaniaZmianeStatusu()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 907 167 +msg 134181 synchronous + from durationcanvas_ref 133797 + to durationcanvas_ref 131749 + yz 194 2030 msg operation_ref 150565 // "cofnijStan() : void" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 1304 172 +msg 135717 return + from durationcanvas_ref 133029 + to durationcanvas_ref 132773 + yz 142 3005 explicitmsg "ostatnioZmienione: Zamowienie" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 875 130 +msg 135845 return + from durationcanvas_ref 132005 + to durationcanvas_ref 131749 + yz 232 2030 explicitmsg "poprzedni: Status" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 1474 216 +msg 137381 synchronous + from durationcanvas_ref 133797 + to durationcanvas_ref 137253 + yz 330 2015 msg operation_ref 159013 // "cofnietoZmianeStatusuZamowienia(in ostatnioZmienione : Zamowienie) : void" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "zamowienie: Zamowienie" + label_xy 1385 308 +end diff --git a/models/147749_38.d b/models/147749_38.d new file mode 100644 index 0000000..6bdea49 --- /dev/null +++ b/models/147749_38.d @@ -0,0 +1,122 @@ +format 224 + +classinstancecanvas 128037 classinstance_ref 162725 // + xyz 7.5 4 2005 life_line_z 2000 +end +classinstancecanvas 128165 classinstance_ref 162853 // + xyz 100 4 2000 life_line_z 2000 +end +classinstancecanvas 130469 classinstance_ref 163365 // + xyz 283.5 4 2005 life_line_z 2000 +end +classinstancecanvas 131109 classinstance_ref 163493 // + xyz 668.5 4 2005 life_line_z 2000 +end +classinstancecanvas 131493 classinstance_ref 163621 // + xyz 490.2 4 2010 life_line_z 2000 +end +classinstancecanvas 132645 classinstance_ref 163749 // + xyz 849.4 4 2010 life_line_z 2000 +end +classinstancecanvas 133029 classinstance_ref 163877 // + xyz 1060.5 4 2015 life_line_z 2000 +end +durationcanvas 128293 classinstance_ref 128037 // :Kucharz + xyzwh 29 69 2010 11 471 +end +durationcanvas 128421 classinstance_ref 128165 // :RestartController + xyzwh 151 73 2010 11 457 +end +durationcanvas 130597 classinstance_ref 130469 // :Restarter + xyzwh 312 81 2010 11 437 +end +durationcanvas 131237 classinstance_ref 131109 // :SystemZamowien + xyzwh 722 414 2010 11 65 +end +durationcanvas 131621 classinstance_ref 131493 // :ZamowieniaKopiaZapasowa + xyzwh 572 137 2010 11 166 +end +durationcanvas 132773 classinstance_ref 132645 // :HistoriaZmianZamowien + xyzwh 920 426 2010 11 39 +end +durationcanvas 133157 classinstance_ref 133029 // :StosZmienianychZamowien + xyzwh 1141 436 2010 11 37 +end +msg 128549 synchronous + from durationcanvas_ref 128293 + to durationcanvas_ref 128421 + yz 77 2015 msg operation_ref 157733 // "restartSystemu() : void" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 44 62 +msg 130725 synchronous + from durationcanvas_ref 128421 + to durationcanvas_ref 130597 + yz 85 2015 msg operation_ref 158501 // "create() : Restarter" + stereotype "<>" xyz 203 89 3000 + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 215 68 +msg 130981 synchronous + from durationcanvas_ref 128421 + to durationcanvas_ref 130597 + yz 126 3005 msg operation_ref 158629 // "restartSystemu() : SystemZamowien" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 189 110 +msg 131365 synchronous + from durationcanvas_ref 130597 + to durationcanvas_ref 131237 + yz 417 2015 msg operation_ref 157861 // "create(in zamowienia : Zamowienie [*], in historiaZmianZamowien : Zamowienie [*]) : SystemZamowien" + stereotype "<>" xyz 452 427 3000 + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "zamowienia: Zamowienie[*], +zmienianeZamowienia: Zamowienie[*]" + label_xy 393 377 +msg 131749 synchronous + from durationcanvas_ref 130597 + to durationcanvas_ref 131621 + yz 137 2015 msg operation_ref 158117 // "create() : ZamowieniaKopiaZapasowa" + stereotype "<>" xyz 388 143 3000 + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 401 123 +msg 132005 synchronous + from durationcanvas_ref 130597 + to durationcanvas_ref 131621 + yz 180 2025 msg operation_ref 158245 // "podajZapisaneZamowienia() : Zamowienie [*]" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 345 164 +msg 132133 return + from durationcanvas_ref 131621 + to durationcanvas_ref 130597 + yz 212 2015 explicitmsg "zamowienia: Zamowienie[*]" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 373 195 +msg 132389 synchronous + from durationcanvas_ref 130597 + to durationcanvas_ref 131621 + yz 247 2025 msg operation_ref 158373 // "podajZapisanaHistorieZmianZamowien() : Zamowienie [*]" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 337 233 +msg 132517 return + from durationcanvas_ref 131621 + to durationcanvas_ref 130597 + yz 285 2015 explicitmsg "zmienianeZamowienia: : Zamowienie[*]" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 333 269 +msg 132901 synchronous + from durationcanvas_ref 131237 + to durationcanvas_ref 132773 + yz 430 2020 msg operation_ref 158757 // "create(in historiaZmianZamowien : Zamowienia [*]) : HistoriaZmianZamowien" + stereotype "<>" xyz 791 438 3000 + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "zmienianeZamowienia: +Zamowienie[*]" + label_xy 745 394 +msg 133285 synchronous + from durationcanvas_ref 132773 + to durationcanvas_ref 133157 + yz 438 2025 msg operation_ref 158885 // "create(in zmienianeZamowienia : Zamowienie [*]) : StosZmienianychZamowien" + stereotype "<>" xyz 1002 442 3000 + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "zmienianeZamowienia: +Zamowienie [*]" + label_xy 954 402 +end diff --git a/models/154405.diagram b/models/154405.diagram index 19fab03..29a8c6b 100644 --- a/models/154405.diagram +++ b/models/154405.diagram @@ -2,146 +2,177 @@ format 224 classcanvas 128037 class_ref 134565 // ZmianaStatusuController classdiagramsettings member_max_width 0 end - xyz 208.9 146.2 2000 + xyz 37.9 766.2 2000 +end +classcanvas 128038 class_ref 134694 // StatusListener + classdiagramsettings member_max_width 0 end + xyz 1216 666 2000 end classcanvas 128165 class_ref 141093 // StosStanowStatusu classdiagramsettings member_max_width 0 end - xyz 1404.8 654.2 2000 + xyz 1690.8 657.2 2000 end classcanvas 128293 class_ref 147621 // StanStatusu classdiagramsettings member_max_width 0 end - xyz 1262.7 460.3 2000 + xyz 1548.7 463.3 2000 end +note 128294 "Observer" + xyzwh 1122 682 2000 75 35 classcanvas 128421 class_ref 154149 // StosZmienianychZamowien classdiagramsettings member_max_width 0 end - xyz 957 880.6 2000 + xyz 1243 883.6 2000 end classcanvas 128549 class_ref 154277 // HistoriaZmianZamowien classdiagramsettings member_max_width 0 end - xyz 687.7 701 2000 + xyz 554.7 761 2000 +end +classcanvas 128550 class_ref 134822 // SystemZamowienFactory + classdiagramsettings member_max_width 0 end + xyzwh 987 57 2000 191 121 end classcanvas 129061 class_ref 135032 // Zamowienie classdiagramsettings member_max_width 0 end - xyz 590.2 363.1 2000 + xyz 871.2 366.1 2000 end classcanvas 129189 class_ref 136824 // SystemZamowien classdiagramsettings member_max_width 0 end - xyz 257.7 405 2006 + xyz 510.7 410 2006 end +note 129190 "Factory" + xyzwh 1040 15 2005 71 35 classcanvas 129445 class_ref 146936 // Status classdiagramsettings member_max_width 0 end - xyz 907.1 378.8 2005 + xyz 1198.1 389.8 2005 end classcanvas 129573 class_ref 139512 // Raport classdiagramsettings member_max_width 0 end - xyzwh 1730.3 462.4 2000 86 66 + xyzwh 2016.3 465.4 2000 86 66 end classcanvas 129701 class_ref 136952 // SystemRachunkowy classdiagramsettings member_max_width 0 end - xyz 1536.1 383 3005 + xyz 1822.1 386 3005 end classcanvas 130085 class_ref 138488 // HistoriaZamowien classdiagramsettings member_max_width 0 end - xyz 204.3 806.7 3005 + xyz 126.3 191.7 3005 end classcanvas 130341 class_ref 160805 // RestartController classdiagramsettings member_max_width 0 end - xyz 1591.3 31.4 2000 + xyz 1877.3 34.4 2000 end classcanvas 130469 class_ref 160933 // ZamowieniaKopiaZapasowa classdiagramsettings member_max_width 0 end - xyz 860.9 199.2 2000 + xyz 1147.9 202.2 2000 end classcanvas 130597 class_ref 161061 // Restarter classdiagramsettings member_max_width 0 end - xyzwh 1345.2 101.2 2000 119 71 + xyzwh 1631.2 104.2 2000 119 71 end classcanvas 130725 class_ref 128119 // ZamowienieController classdiagramsettings member_max_width 0 end - xyz 574.8 45.7 2000 + xyz 557.8 63.7 2000 end classcanvas 130853 class_ref 128067 // RestartManager classdiagramsettings member_max_width 0 end - xyz 1504.6 254.9 2000 + xyz 1790.6 257.9 2000 end classcanvas 130981 class_ref 128195 // Restart classdiagramsettings member_max_width 0 end - xyz 1283.3 354.8 2000 + xyz 1569.3 357.8 2000 end note 133541 "Singleton" - xyzwh 919 140.3 2000 96 36 -relationcanvas 131365 relation_ref 135077 // ma > - from ref 129061 z 2006 label "ma >" italic max_width 255 xyz 840.5 465 2006 to ref 129445 + xyzwh 1226 159.3 2000 79 35 +relationcanvas 128166 relation_ref 147238 // < slucha + from ref 129061 z 2001 label "< slucha" italic max_width 255 xyz 1141.5 601 3000 to ref 128038 no_role_a no_role_b - multiplicity_a_pos 883 494 3000 multiplicity_b_pos 823 494 3000 + multiplicity_a_pos 1208 680 3000 multiplicity_b_pos 1101 583 3000 +end +relationcanvas 128422 relation_ref 147366 // + from ref 128549 z 2001 to ref 128038 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 128806 relation_ref 147622 // < buduje + from ref 128550 z 2007 label "< buduje" italic max_width 255 xyz 854.5 257.5 3000 to ref 129189 + no_role_a no_role_b + multiplicity_a_pos 758 376 3000 multiplicity_b_pos 976 177 3000 +end +relationcanvas 129062 relation_ref 147750 // + from ref 128550 z 2001 to ref 130469 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 130342 relation_ref 148006 // + from ref 128037 z 2001 to ref 128549 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 130982 relation_ref 148262 // + from ref 128037 z 2007 to ref 129189 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 131110 relation_ref 148390 // + from ref 130725 z 2007 to ref 129189 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 131238 relation_ref 148518 // + from ref 130597 z 2001 to ref 128550 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 131365 relation_ref 135077 // ma > + from ref 129061 z 2006 label "ma >" italic max_width 255 xyz 1126 471 2006 to ref 129445 + no_role_a no_role_b + multiplicity_a_pos 1180 500 3000 multiplicity_b_pos 1101 498 3000 end relationcanvas 131493 relation_ref 135205 // ma > - from ref 129189 z 2007 label "ma >" italic max_width 255 xyz 536 469 2007 to ref 129061 + from ref 129189 z 2007 label "ma >" italic max_width 255 xyz 803 485.5 2007 to ref 129061 no_role_a no_role_b - multiplicity_a_pos 569 495 3000 multiplicity_b_pos 529 498 3000 + multiplicity_a_pos 855 506 3000 multiplicity_b_pos 774 517 3000 end relationcanvas 131621 relation_ref 135333 // ma > - from ref 129445 z 2006 label "ma >" italic max_width 255 xyz 1176 467.5 2006 to ref 128293 + from ref 129445 z 2006 label "ma >" italic max_width 255 xyz 1464.5 473 2006 to ref 128293 no_role_a no_role_b - multiplicity_a_pos 1238 497 3000 multiplicity_b_pos 1137 495 3000 -end -relationcanvas 131749 relation_ref 135461 // delegujeZadania > - decenter_begin 273 - from ref 128037 z 2007 label "delegujeZadania >" italic max_width 255 xyz 259 303 2007 to ref 129189 - no_role_a no_role_b - multiplicity_a_pos 321 379 3000 multiplicity_b_pos 257 243 3000 -end -relationcanvas 131877 relation_ref 135589 // ma > - from ref 129189 z 2007 label "ma >" italic max_width 255 xyz 597 622 2007 to ref 128549 - no_role_a no_role_b - multiplicity_a_pos 653 687 3000 multiplicity_b_pos 529 594 3000 + multiplicity_a_pos 1530 501 3000 multiplicity_b_pos 1424 502 3000 end relationcanvas 132005 relation_ref 135717 // ma > - decenter_begin 143 - from ref 129189 z 3006 label "ma >" italic max_width 255 xyz 277.5 674 3006 to ref 130085 + decenter_begin 273 + from ref 129189 z 3006 label "ma >" italic max_width 255 xyz 396 382.5 3006 to ref 130085 no_role_a no_role_b - multiplicity_a_pos 278 782 3000 multiplicity_b_pos 267 594 3000 + multiplicity_a_pos 333 348 3000 multiplicity_b_pos 492 487 3000 end relationcanvas 132261 relation_ref 135973 // uzywa > - from ref 128549 z 2001 label "uzywa >" italic max_width 255 xyz 888 815 2001 to ref 128421 - role_a_pos 946 865 3000 no_role_b - no_multiplicity_a multiplicity_b_pos 858 805 3000 -end -relationcanvas 132389 relation_ref 136101 // < delegujeZadania - decenter_end 578 - from ref 130725 z 2007 label "< delegujeZadania" italic max_width 255 xyz 440 294 2007 to ref 129189 - no_role_a no_role_b - multiplicity_a_pos 392 379 3000 multiplicity_b_pos 552 234 3000 + from ref 128549 z 2001 label "uzywa >" italic max_width 255 xyz 963 863 2001 to ref 128421 + role_a_pos 1225 894 3000 no_role_b + no_multiplicity_a multiplicity_b_pos 748 859 3000 end relationcanvas 132645 relation_ref 136357 // < delegujeZadania - from ref 130341 z 2001 label "< delegujeZadania" italic max_width 255 xyz 1469.5 79 2001 to ref 130597 + from ref 130341 z 2001 label "< delegujeZadania" italic max_width 255 xyz 1755 82 2001 to ref 130597 no_role_a no_role_b - multiplicity_a_pos 1476 120 3000 multiplicity_b_pos 1563 82 3000 -end -relationcanvas 132773 relation_ref 136485 // < pobieraDaneOd - from ref 130597 z 2001 label "< pobieraDaneOd" italic max_width 255 xyz 1128.5 159 2001 to ref 130469 - no_role_a no_role_b - multiplicity_a_pos 1119 233 3000 multiplicity_b_pos 1324 158 3000 + multiplicity_a_pos 1759 123 3000 multiplicity_b_pos 1859 82 3000 end relationcanvas 132901 relation_ref 136613 // - decenter_end 268 - from ref 129061 z 2001 to ref 130469 + decenter_end 497 + from ref 129061 z 2001 to point 1079 302 + line 129318 z 2001 to ref 130469 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 133669 relation_ref 137125 // uzywa > - from ref 130853 z 3006 label "uzywa >" italic max_width 255 xyz 1556 327 3006 to ref 129701 + from ref 130853 z 3006 label "uzywa >" italic max_width 255 xyz 1842 330 3006 to ref 129701 no_role_a no_role_b - multiplicity_a_pos 1572 360 3000 multiplicity_b_pos 1549 314 3000 + multiplicity_a_pos 1858 363 3000 multiplicity_b_pos 1835 317 3000 end relationcanvas 133925 relation_ref 137253 // < delegujeZadania - from ref 130853 z 2001 label "< delegujeZadania" italic max_width 255 xyz 1367 315 2001 to ref 130981 + from ref 130853 z 2001 label "< delegujeZadania" italic max_width 255 xyz 1653 318 2001 to ref 130981 no_role_a no_role_b - multiplicity_a_pos 1353 370 3000 multiplicity_b_pos 1478 308 3000 + multiplicity_a_pos 1639 373 3000 multiplicity_b_pos 1764 311 3000 end relationcanvas 134053 relation_ref 143781 // uzywa > - from ref 129445 z 2006 label "uzywa >" italic max_width 255 xyz 1258 577 3000 to ref 128165 + from ref 129445 z 2006 label "uzywa >" italic max_width 255 xyz 1546.5 583.5 2006 to ref 128165 no_role_a no_role_b - multiplicity_a_pos 1378 669 3000 multiplicity_b_pos 1137 548 3000 + multiplicity_a_pos 1672 673 3000 multiplicity_b_pos 1424 555 3000 end end diff --git a/models/38.session b/models/38.session index d498156..d33d437 100644 --- a/models/38.session +++ b/models/38.session @@ -1,13 +1,17 @@ window_sizes 1920 1017 450 1465 864 104 diagrams - sequencediagram_ref 128038 // 1-1-zmianaStatusuZamowieniaNaWtrakcieRealizacji - 1172 691 100 A1 0 565 - active sequencediagram_ref 128166 // 1-2-cofniecieOstatniejModyfikacjiStatusu - 1172 691 100 A1 0 0 + active sequencediagram_ref 128038 // 1-1-zmianaStatusuZamowieniaNaWtrakcieRealizacji + 1403 808 100 A1 0 558 + sequencediagram_ref 128166 // 1-2-cofniecieOstatniejModyfikacjiStatusu + 1172 691 100 A1 0 682 + classdiagram_ref 154405 // design-model + 1443 831 100 A0 0 0 + statediagram_ref 154277 // PrzebiegZamowienia + 1360 795 100 A2 1128 220 end show_stereotypes -selected operation_ref 129603 // zmianaStatusu +selected statediagram_ref 154277 // PrzebiegZamowienia open class_ref 135032 // Zamowienie class_ref 136824 // SystemZamowien @@ -16,5 +20,6 @@ open class_ref 141093 // StosStanowStatusu class_ref 154149 // StosZmienianychZamowien class_ref 154277 // HistoriaZmianZamowien + state_ref 128037 // PrzebiegZamowienia end end diff --git a/models/models.prj b/models/models.prj index 5d21188..f1da67f 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 25 - modified_by 37 "Michal" + revision 26 + modified_by 38 "Mateusz" @@ -374,6 +374,13 @@ format 224 classrelation_ref 137253 // b parent class_ref 160933 // ZamowieniaKopiaZapasowa end + + classrelation 153638 // (< slucha) + relation 147238 ---> name "< slucha" + a role_name "" multiplicity "*" private + classrelation_ref 153638 // (< slucha) + b multiplicity "1" parent class_ref 134694 // StatusListener + end end class 135160 "Potrawa" @@ -746,12 +753,17 @@ format 224 end class 136824 "SystemZamowien" - visibility package - cpp_decl "" + visibility package stereotype "singleton" + cpp_decl "${comment}${template}class ${name}${inherit} { +${members}}; +${inlines} +" java_decl "" php_decl "" python_2_2 python_decl "" - idl_decl "" + idl_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} { +${members}}; +" explicit_switch_type "" mysql_decl "" @@ -871,6 +883,27 @@ format 224 + end + + attribute 128550 "instance" + private type class_ref 136824 // SystemZamowien + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 136230 "getInstance" + public return_type class_ref 136824 // SystemZamowien + nparams 0 + + + + + end end @@ -1962,6 +1995,34 @@ format 224 classrelation_ref 136101 // (delegujeZadania >) b multiplicity "1" parent class_ref 136824 // SystemZamowien end + + classrelation 154278 // + relation 147878 ---> + a role_name "" private + classrelation_ref 154278 // + b parent class_ref 154277 // HistoriaZmianZamowien + end + + classrelation 154406 // + relation 148006 -_-> + a public + classrelation_ref 154406 // + b parent class_ref 154277 // HistoriaZmianZamowien + end + + classrelation 154534 // + relation 148134 -_-> + a public + classrelation_ref 154534 // + b parent class_ref 136824 // SystemZamowien + end + + classrelation 154662 // + relation 148262 -_-> + a public + classrelation_ref 154662 // + b parent class_ref 136824 // SystemZamowien + end end classinstance 134693 "" @@ -2196,12 +2257,17 @@ ${items}}; end class 154277 "HistoriaZmianZamowien" - visibility package - cpp_decl "" + visibility package stereotype "singleton" + cpp_decl "${comment}${template}class ${name}${inherit} { +${members}}; +${inlines} +" java_decl "" php_decl "" python_2_2 python_decl "" - idl_decl "" + idl_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} { +${members}}; +" explicit_switch_type "" mysql_decl "" @@ -2243,6 +2309,46 @@ ${items}}; a role_name "1" private classrelation_ref 136613 // 1 (uzywa >) b multiplicity "1" parent class_ref 154149 // StosZmienianychZamowien + end + + operation 135718 "onStatusUpdate" + public explicit_return_type "void" + nparams 2 + param in name "source" type class_ref 135032 // Zamowienie + param in name "value" type class_ref 146936 // Status + + + + + + end + + classrelation 153766 // + relation 147366 -_-|> + a public + classrelation_ref 153766 // + b parent class_ref 134694 // StatusListener + end + + attribute 128422 "instance" + private type class_ref 154277 // HistoriaZmianZamowien + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 136102 "getInstance" + public return_type class_ref 154277 // HistoriaZmianZamowien + nparams 0 + + + + + end end @@ -2360,7 +2466,7 @@ ${members}}; operation 158117 "create" stereotype "create" - public return_type class_ref 160933 // ZamowieniaKopiaZapasowa + private return_type class_ref 160933 // ZamowieniaKopiaZapasowa nparams 0 @@ -2411,6 +2517,27 @@ ${members}}; + end + + operation 135462 "getInstance" + public return_type class_ref 160933 // ZamowieniaKopiaZapasowa + nparams 0 + + + + + + end + + attribute 128294 "instance" + private type class_ref 160933 // ZamowieniaKopiaZapasowa + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn end end @@ -2467,6 +2594,13 @@ ${members}}; classrelation_ref 137125 // (< pobieraDaneOd) b multiplicity "1" parent class_ref 160933 // ZamowieniaKopiaZapasowa end + + classrelation 154918 // + relation 148518 -_-> + a public + classrelation_ref 154918 // + b parent class_ref 134822 // SystemZamowienFactory + end end classinstance 163365 "" @@ -2768,6 +2902,13 @@ ${members}}; + end + + classrelation 154790 // + relation 148390 -_-> + a public + classrelation_ref 154790 // + b parent class_ref 136824 // SystemZamowien end end @@ -3199,5 +3340,113 @@ ${members}}; relations end end + + class 134694 "StatusListener" + visibility package stereotype "interface" + cpp_decl "" + java_decl "${comment}${@}${visibility}${static}interface ${name}${extends} { +${members}} +" + php_decl "${comment}interface ${name}${extends} { +${members}} +" + python_2_2 python_decl "" + idl_decl "${comment}${abstract}${local}interface ${name}${inherit} { +${members}}; +" + explicit_switch_type "" + mysql_decl "" + + operation 135590 "onStatusUpdate" + public explicit_return_type "void" + nparams 2 + param in name "source" type class_ref 135032 // Zamowienie + param in name "value" type class_ref 146936 // Status + + + + + + end + end + + class 134822 "SystemZamowienFactory" + visibility package stereotype "singleton" + cpp_decl "${comment}${template}class ${name}${inherit} { +${members}}; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} { +${members}}; +" + explicit_switch_type "" + mysql_decl "" + + classrelation 153894 // + relation 147494 ---> + a role_name "" private + classrelation_ref 153894 // + b parent class_ref 136824 // SystemZamowien + end + + classrelation 154022 // (< buduje) + relation 147622 ---> name "< buduje" + a role_name "" multiplicity "1" private + classrelation_ref 154022 // (< buduje) + b multiplicity "1" parent class_ref 136824 // SystemZamowien + end + + classrelation 154150 // + relation 147750 -_-> + a public + classrelation_ref 154150 // + b parent class_ref 160933 // ZamowieniaKopiaZapasowa + end + + operation 135846 "zbudujSystemZamowien" + public return_type class_ref 136824 // SystemZamowien + nparams 0 + + + + + + end + + attribute 128038 "systemZamowien" + private type class_ref 136824 // SystemZamowien + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 135974 "getInstance" + public return_type class_ref 134822 // SystemZamowienFactory + nparams 0 + + + + + + end + + attribute 128166 "instance" + private type class_ref 134822 // SystemZamowienFactory + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end end end