From f6cb4e8ef7a15ed46946cd2392f0f0e371221c28 Mon Sep 17 00:00:00 2001 From: Michael-Czekanski Date: Mon, 1 Feb 2021 23:08:44 +0100 Subject: [PATCH] class dgrm v2 --- models/154405.diagram | 114 ++++++++++++++++++------------------------ models/37.session | 39 ++------------- models/models.prj | 60 +++++++++++++--------- 3 files changed, 90 insertions(+), 123 deletions(-) diff --git a/models/154405.diagram b/models/154405.diagram index 2e85fac..19fab03 100644 --- a/models/154405.diagram +++ b/models/154405.diagram @@ -2,63 +2,63 @@ format 224 classcanvas 128037 class_ref 134565 // ZmianaStatusuController classdiagramsettings member_max_width 0 end - xyz 208.1 146.2 2000 + xyz 208.9 146.2 2000 end classcanvas 128165 class_ref 141093 // StosStanowStatusu classdiagramsettings member_max_width 0 end - xyz 1364.4 571.8 2000 + xyz 1404.8 654.2 2000 end classcanvas 128293 class_ref 147621 // StanStatusu classdiagramsettings member_max_width 0 end - xyz 1265.9 461.1 2000 + xyz 1262.7 460.3 2000 end classcanvas 128421 class_ref 154149 // StosZmienianychZamowien classdiagramsettings member_max_width 0 end - xyz 956.6 879.6 2000 + xyz 957 880.6 2000 end classcanvas 128549 class_ref 154277 // HistoriaZmianZamowien classdiagramsettings member_max_width 0 end - xyz 687.5 701 2000 + xyz 687.7 701 2000 end classcanvas 129061 class_ref 135032 // Zamowienie classdiagramsettings member_max_width 0 end - xyz 590.2 362.3 2000 + xyz 590.2 363.1 2000 end classcanvas 129189 class_ref 136824 // SystemZamowien classdiagramsettings member_max_width 0 end - xyz 256.7 405.8 2006 + xyz 257.7 405 2006 end classcanvas 129445 class_ref 146936 // Status classdiagramsettings member_max_width 0 end - xyz 906.9 380.6 2005 + xyz 907.1 378.8 2005 end classcanvas 129573 class_ref 139512 // Raport classdiagramsettings member_max_width 0 end - xyzwh 1744.7 507 2000 87 67 + xyzwh 1730.3 462.4 2000 86 66 end classcanvas 129701 class_ref 136952 // SystemRachunkowy classdiagramsettings member_max_width 0 end - xyz 1535.3 383.8 3005 + xyz 1536.1 383 3005 end classcanvas 130085 class_ref 138488 // HistoriaZamowien classdiagramsettings member_max_width 0 end - xyz 217.1 999.1 3005 + xyz 204.3 806.7 3005 end classcanvas 130341 class_ref 160805 // RestartController classdiagramsettings member_max_width 0 end - xyz 1591.3 31.8 2000 + xyz 1591.3 31.4 2000 end classcanvas 130469 class_ref 160933 // ZamowieniaKopiaZapasowa classdiagramsettings member_max_width 0 end - xyz 860.9 199.4 2000 + xyz 860.9 199.2 2000 end classcanvas 130597 class_ref 161061 // Restarter classdiagramsettings member_max_width 0 end - xyzwh 1345 102.2 2000 119 71 + xyzwh 1345.2 101.2 2000 119 71 end classcanvas 130725 class_ref 128119 // ZamowienieController classdiagramsettings member_max_width 0 end - xyz 575.6 44.7 2000 + xyz 574.8 45.7 2000 end classcanvas 130853 class_ref 128067 // RestartManager classdiagramsettings member_max_width 0 end @@ -66,71 +66,62 @@ classcanvas 130853 class_ref 128067 // RestartManager end classcanvas 130981 class_ref 128195 // Restart classdiagramsettings member_max_width 0 end - xyz 1283.5 354.8 2000 + xyz 1283.3 354.8 2000 end -note 133413 "jaka strza ka, gdy dana instancja nie jest atrybutem klasy, a jest jedynie przez nia tworzona?" - xyzwh 1659 131.5 2000 244 93 -note 133541 "jaka strzalka w przypadku Singletona?" - xyzwh 704 282.3 2000 133 64 -note 133797 "jaka strza ka, gdy dana instancja nie jest atrybutem klasy, a jest jedynie przez nia tworzona?" - xyzwh 1702.1 332.3 2000 224 96 +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 466.5 3000 to ref 129445 + from ref 129061 z 2006 label "ma >" italic max_width 255 xyz 840.5 465 2006 to ref 129445 no_role_a no_role_b - multiplicity_a_pos 883 493 3000 multiplicity_b_pos 824 493 3000 + multiplicity_a_pos 883 494 3000 multiplicity_b_pos 823 494 3000 end relationcanvas 131493 relation_ref 135205 // ma > - from ref 129189 z 2007 label "ma >" italic max_width 255 xyz 536 469 3000 to ref 129061 + from ref 129189 z 2007 label "ma >" italic max_width 255 xyz 536 469 2007 to ref 129061 no_role_a no_role_b - multiplicity_a_pos 568 494 3000 multiplicity_b_pos 528 497 3000 + multiplicity_a_pos 569 495 3000 multiplicity_b_pos 529 498 3000 end relationcanvas 131621 relation_ref 135333 // ma > - from ref 129445 z 2006 label "ma >" italic max_width 255 xyz 1176 467.5 3000 to ref 128293 + from ref 129445 z 2006 label "ma >" italic max_width 255 xyz 1176 467.5 2006 to ref 128293 no_role_a no_role_b - multiplicity_a_pos 1241 494 3000 multiplicity_b_pos 1137 494 3000 + 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 3000 to ref 129189 + 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 323 386 3000 multiplicity_b_pos 257 240 3000 + 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.5 3000 to ref 128549 + 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 691 719 3000 multiplicity_b_pos 528 593 3000 + multiplicity_a_pos 653 687 3000 multiplicity_b_pos 529 594 3000 end relationcanvas 132005 relation_ref 135717 // ma > - decenter_begin 144 - from ref 129189 z 3006 label "ma >" italic max_width 255 xyz 285 770.5 3000 to ref 130085 + decenter_begin 143 + from ref 129189 z 3006 label "ma >" italic max_width 255 xyz 277.5 674 3006 to ref 130085 no_role_a no_role_b - multiplicity_a_pos 290 977 3000 multiplicity_b_pos 268 586 3000 -end -relationcanvas 132133 relation_ref 135845 // uzywa > - from ref 128293 z 2001 label "uzywa >" italic max_width 255 xyz 1353 523 3000 to ref 128165 - no_role_a no_role_b - multiplicity_a_pos 1374 549 3000 multiplicity_b_pos 1337 519 3000 + multiplicity_a_pos 278 782 3000 multiplicity_b_pos 267 594 3000 end relationcanvas 132261 relation_ref 135973 // uzywa > - from ref 128549 z 2001 label "uzywa >" italic max_width 255 xyz 888 816.5 3000 to ref 128421 - role_a_pos 964 867 3000 no_role_b - no_multiplicity_a multiplicity_b_pos 856 803 3000 + 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 441 294 3000 to ref 129189 + 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 388 386 3000 multiplicity_b_pos 557 226 3000 + multiplicity_a_pos 392 379 3000 multiplicity_b_pos 552 234 3000 end relationcanvas 132645 relation_ref 136357 // < delegujeZadania - from ref 130341 z 2001 label "< delegujeZadania" italic max_width 255 xyz 1469 79.5 3000 to ref 130597 + from ref 130341 z 2001 label "< delegujeZadania" italic max_width 255 xyz 1469.5 79 2001 to ref 130597 no_role_a no_role_b - multiplicity_a_pos 1476 120 3000 multiplicity_b_pos 1566 80 3000 + 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 156 3000 to ref 130469 + 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 1118 226 3000 multiplicity_b_pos 1321 157 3000 + multiplicity_a_pos 1119 233 3000 multiplicity_b_pos 1324 158 3000 end relationcanvas 132901 relation_ref 136613 // decenter_end 268 @@ -138,24 +129,19 @@ relationcanvas 132901 relation_ref 136613 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 133157 relation_ref 136869 // < tworzy - from ref 130341 z 2001 label "< tworzy" italic max_width 255 xyz 1579 150 3000 to ref 130853 +relationcanvas 133669 relation_ref 137125 // uzywa > + from ref 130853 z 3006 label "uzywa >" italic max_width 255 xyz 1556 327 3006 to ref 129701 no_role_a no_role_b - multiplicity_a_pos 1548 232 3000 multiplicity_b_pos 1614 90 3000 -end -relationcanvas 133285 relation_ref 136997 // tworzy > - from ref 129701 z 3006 label "tworzy >" italic max_width 255 xyz 1670 453 3000 to ref 129573 - no_role_a no_role_b - multiplicity_a_pos 1724 526 3000 multiplicity_b_pos 1656 452 3000 -end -relationcanvas 133669 relation_ref 137125 // tworzy > - from ref 130853 z 3006 label "tworzy >" italic max_width 255 xyz 1557 327 3000 to ref 129701 - no_role_a no_role_b - multiplicity_a_pos 1570 360 3000 multiplicity_b_pos 1548 313 3000 + multiplicity_a_pos 1572 360 3000 multiplicity_b_pos 1549 314 3000 end relationcanvas 133925 relation_ref 137253 // < delegujeZadania - from ref 130853 z 2001 label "< delegujeZadania" italic max_width 255 xyz 1367.5 316 3000 to ref 130981 + from ref 130853 z 2001 label "< delegujeZadania" italic max_width 255 xyz 1367 315 2001 to ref 130981 no_role_a no_role_b - multiplicity_a_pos 1354 369 3000 multiplicity_b_pos 1481 303 3000 + multiplicity_a_pos 1353 370 3000 multiplicity_b_pos 1478 308 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 + no_role_a no_role_b + multiplicity_a_pos 1378 669 3000 multiplicity_b_pos 1137 548 3000 end end diff --git a/models/37.session b/models/37.session index e6072e0..7f50747 100644 --- a/models/37.session +++ b/models/37.session @@ -1,39 +1,6 @@ -window_sizes 1920 1017 450 1465 864 104 +window_sizes 1800 910 450 1345 758 104 -diagrams - sequencediagram_ref 141221 // 2-3-cofniecieOstatniejModyfikacjiStatusu - 1076 605 100 A1 0 0 - sequencediagram_ref 128166 // 1-2-cofniecieOstatniejModyfikacjiStatusu - 1076 605 100 A1 0 0 - sequencediagram_ref 134693 // 2-1-zmianaStatusuZamowieniaNaUkonczone - 1076 605 90 A1 0 0 - sequencediagram_ref 147749 // 2-2-restartSystemu - 1076 605 100 A0 0 0 - statediagram_ref 154277 // ZlozenieZamowienia - 1076 605 80 A2 0 0 - active classdiagram_ref 154405 // design-model - 1465 864 69 A0 0 70 - sequencediagram_ref 128707 // 4-6-wprowadzenieNowejDarmowejPotrawy - 114 98 100 A1 0 0 - sequencediagram_ref 128579 // 4-5-zmianaStatusuZamowieniaNaWTrakcieRealizacji - 114 98 100 A1 0 0 - sequencediagram_ref 128451 // 4-4-zadanieWyswietleniaWszystkichZamowien - 114 98 100 A4 0 0 - sequencediagram_ref 128323 // 4-3-stworzenieZamowienia - 114 98 100 A1 0 0 - sequencediagram_ref 128195 // 4-2-restartSystemu - 114 98 100 A1 0 0 - sequencediagram_ref 128067 // 4-1-zmianaStatusuZamowieniaNaUkonczone - 114 98 100 A1 0 0 - classdiagram_ref 128042 // domain-model - 114 98 69 A1 0 0 -end show_stereotypes -selected classdiagram_ref 154405 // design-model -open - class_ref 136824 // SystemZamowien - class_ref 138488 // HistoriaZamowien - class_ref 128119 // ZamowienieController - state_ref 128037 // ZlozenieZamowienia -end +selected +package_ref 129 // models end diff --git a/models/models.prj b/models/models.prj index 55ae123..adf845f 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 224 "models" - revision 24 + revision 25 modified_by 37 "Michal" @@ -1879,6 +1879,13 @@ format 224 classrelation_ref 135973 // (ma >) b multiplicity "1" parent class_ref 147621 // StanStatusu end + + classrelation 144421 // (uzywa >) + relation 143781 ---> name "uzywa >" + a role_name "" multiplicity "1" private + classrelation_ref 144421 // (uzywa >) + b multiplicity "1" parent class_ref 141093 // StosStanowStatusu + end end end @@ -2067,25 +2074,26 @@ format 224 end class 147621 "StanStatusu" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" + visibility package stereotype "enum" + cpp_decl "${comment}enum ${name} { +${items}}; +" + java_decl "${comment}${@}${visibility}${static}${final}${abstract}enum ${name}${implements} { +${items}; +${members}} +" + php_decl "${comment}${visibility}final class ${name} { +${items}} +" + python_2_2 python_decl "class ${name}: +${docstring}${members} +" + idl_decl "${comment}enum ${name} { +${items}}; +" explicit_switch_type "" mysql_decl "" - operation 143397 "zmienNaUkonczone" - public explicit_return_type "void" - nparams 0 - - - - - - end - classrelation 136485 // (uzywa >) relation 135845 ---> name "uzywa >" a role_name "" multiplicity "1" private @@ -2335,12 +2343,18 @@ format 224 end class 160933 "ZamowieniaKopiaZapasowa" - visibility package - cpp_decl "" + visibility package stereotype "singleton" + + constraint "1"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 "" @@ -2867,10 +2881,10 @@ format 224 b parent class_ref 160805 // RestartController end - classrelation 137765 // (tworzy >) - relation 137125 ---> name "tworzy >" + classrelation 137765 // (uzywa >) + relation 137125 ---> name "uzywa >" a role_name "" multiplicity "1" private - classrelation_ref 137765 // (tworzy >) + classrelation_ref 137765 // (uzywa >) b multiplicity "1" parent class_ref 136952 // SystemRachunkowy end