From a9838b7532d1c37839263e3cb8e6fac57958d195 Mon Sep 17 00:00:00 2001 From: fabian Date: Wed, 12 Jan 2022 10:55:51 +0100 Subject: [PATCH] reworked case7 diagrams --- models/12.session | 13 ++- models/128012_12.d | 256 ------------------------------------------ models/128027_12.d | 3 - models/134683.diagram | 26 +++-- models/134811.diagram | 12 +- models/134939.diagram | 35 ++++-- models/135067.diagram | 27 +++-- models/models.prj | 72 +++++++++++- 8 files changed, 147 insertions(+), 297 deletions(-) delete mode 100644 models/128012_12.d delete mode 100644 models/128027_12.d diff --git a/models/12.session b/models/12.session index b5cdc9f..0598e4c 100644 --- a/models/12.session +++ b/models/12.session @@ -1,12 +1,13 @@ -window_sizes 2560 1475 332 2218 1324 78 - +window_sizes 2560 1475 455 2099 1274 136 +cleanlooks_style diagrams - active classdiagram_ref 128012 // domain-model - 2207 1263 200 B-Landscape 336 0 + active sequencediagram_ref 134939 // 7-8-akceptacjaDostawy + 2099 1274 200 A4 0 0 end show_stereotypes -selected class_ref 128027 // menu +selected sequencediagram_ref 134939 // 7-8-akceptacjaDostawy open - classview_ref 128027 // design + classview_ref 128012 // domain + class_ref 141068 // DostawaController end end diff --git a/models/128012_12.d b/models/128012_12.d deleted file mode 100644 index 817ca70..0000000 --- a/models/128012_12.d +++ /dev/null @@ -1,256 +0,0 @@ -format 224 - -classcanvas 128008 class_ref 128008 // Menu - classdiagramsettings member_max_width 0 end - xyz 969.44 555.48 2000 -end -classcanvas 128136 class_ref 128136 // Potrawa - classdiagramsettings member_max_width 0 end - xyzwh 745.4 421.76 2000 118 77 -end -classcanvas 128264 class_ref 128264 // Zamowienie - classdiagramsettings member_max_width 0 end - xyz 731.44 225.04 2000 -end -classcanvas 128392 class_ref 128392 // Platnosc - classdiagramsettings member_max_width 0 end - xyzwh 738.74 98.48 2000 125 77 -end -classcanvas 128520 class_ref 128520 // Kelner - classdiagramsettings member_max_width 0 end - xyz 368.66 288.62 2000 -end -classcanvas 128904 class_ref 128904 // Produkt - classdiagramsettings member_max_width 0 end - xyzwh 758 585.22 2000 93 57 -end -classcanvas 129032 class_ref 129032 // Spizarnia - classdiagramsettings member_max_width 0 end - xyz 289.32 590.38 2000 -end -classcanvas 129160 class_ref 129160 // Kuchnia - classdiagramsettings member_max_width 0 end - xyz 530 227.66 2000 -end -classcanvas 129672 class_ref 135688 // Klient - classdiagramsettings member_max_width 0 end - xyz 473.92 399.24 2000 -end -classcanvas 129800 class_ref 135816 // Kucharz - classdiagramsettings member_max_width 0 end - xyz 360.48 227.48 2000 -end -classcanvas 129928 class_ref 135944 // Kasa - classdiagramsettings member_max_width 0 end - xyz 518.1 102.82 2000 -end -classcanvas 130056 class_ref 136072 // Kasjer - classdiagramsettings member_max_width 0 end - xyz 370.96 112.76 2000 -end -classcanvas 130312 class_ref 136328 // PracownikSpizarni - classdiagramsettings member_max_width 0 end - xyz 243.42 461.02 2000 -end -classcanvas 130444 class_ref 128012 // Miara - classdiagramsettings member_max_width 0 end - xyz 532.1 534.2 2000 -end -classcanvas 130572 class_ref 134540 // Dostawa - classdiagramsettings member_max_width 0 end - xyz 420 700 2000 -end -classcanvas 134408 class_ref 142856 // PlatnoscKarta - classdiagramsettings member_max_width 0 end - xyz 917.2 86.82 2000 -end -classcanvas 134536 class_ref 142984 // PlatnoscGotowka - classdiagramsettings member_max_width 0 end - xyz 902.2 145.84 2000 -end -classcanvas 136584 class_ref 143240 // PotrawaNiestandardowa - classdiagramsettings member_max_width 0 end - xyz 889.26 405.78 2000 -end -classcanvas 136712 class_ref 143368 // PotrawaStandardowa - classdiagramsettings member_max_width 0 end - xyz 904.28 465.3 2000 -end -classcanvas 137352 class_ref 143496 // Pracownik - classdiagramsettings member_max_width 0 end - xyzwh 78.56 231.32 2005 203 107 -end -classcanvas 140808 class_ref 143624 // IloscProduktu - classdiagramsettings member_max_width 0 end - xyz 463.32 579.28 2000 -end -classcanvas 142600 class_ref 143752 // Data - classdiagramsettings member_max_width 0 end - xyz 112.56 530.56 2000 -end -classcanvas 142728 class_ref 143880 // Wartosc - classdiagramsettings member_max_width 0 end - xyz 98.02 575.34 2000 -end -classcanvas 142856 class_ref 144008 // NumerKonta - classdiagramsettings member_max_width 0 end - xyz 62.22 339.88 2000 -end -classcanvas 142984 class_ref 144136 // NumerTelefonu - classdiagramsettings member_max_width 0 end - xyz 55.1 384.52 2000 -end -classcanvas 143112 class_ref 144264 // StanZamowienia - classdiagramsettings member_max_width 0 end - xyz 830.7 257.22 2000 -end -relationcanvas 130440 relation_ref 128264 // Obsluguje - decenter_begin 379 - decenter_end 282 - from ref 130312 z 2001 label "Obsluguje" italic max_width 255 xyz 313 536 2001 to ref 129032 - no_role_a no_role_b - multiplicity_a_pos 295 574 3000 multiplicity_b_pos 266 507 3000 -end -relationcanvas 130700 relation_ref 128012 // < Sklada sie z - from ref 130572 z 2001 label "< Sklada sie z" italic max_width 255 xyz 516 667 2001 to ref 140808 - no_role_a no_role_b - multiplicity_a_pos 500 652 3000 multiplicity_b_pos 497 684 3000 -end -relationcanvas 130824 relation_ref 128648 // < Jest dodatkiem - decenter_begin 317 - decenter_end 231 - from ref 128136 z 2001 label "< Jest dodatkiem" italic max_width 255 xyz 715 530 2001 to ref 128904 - no_role_a no_role_b - multiplicity_a_pos 771 568 3000 multiplicity_b_pos 773 505 3000 -end -relationcanvas 130828 relation_ref 128140 // < Aktualizuje stan - geometry VHr - decenter_end 158 - from ref 130572 z 2001 label "< Aktualizuje stan" italic max_width 255 xyz 306 711 2001 to point 296 719 - line 130956 z 2001 to ref 129032 - no_role_a no_role_b - multiplicity_a_pos 282 632 3000 multiplicity_b_pos 405 728 3000 -end -relationcanvas 130952 relation_ref 128776 // < Jest skladnikiem - decenter_begin 736 - decenter_end 671 - from ref 128904 z 2001 label "< Jest skladnikiem" italic max_width 255 xyz 812 533 2001 to ref 128136 - no_role_a no_role_b - multiplicity_a_pos 815 505 3000 multiplicity_b_pos 803 568 3000 -end -relationcanvas 131592 relation_ref 129032 // Zawiera - decenter_begin 546 - from ref 128264 z 2001 label "Zawiera" italic max_width 255 xyz 803 362 2001 to ref 128136 - no_role_a no_role_b - multiplicity_a_pos 774 404 3000 multiplicity_b_pos 773 316 3000 -end -relationcanvas 131720 relation_ref 129160 // Zarzadza - decenter_begin 785 - decenter_end 319 - from ref 128264 z 2001 label "Zarzadza" italic max_width 255 xyz 550 287 2001 to ref 128520 - no_role_a no_role_b - multiplicity_a_pos 426 307 3000 multiplicity_b_pos 716 295 3000 -end -relationcanvas 131848 relation_ref 129288 // Obsluguje - decenter_begin 759 - from ref 128520 z 2001 label "Obsluguje" italic max_width 255 xyz 376 366 2001 to ref 129672 - no_role_a no_role_b - multiplicity_a_pos 455 380 3000 multiplicity_b_pos 395 333 3000 -end -relationcanvas 131976 relation_ref 129416 // Przygotowuje - decenter_begin 518 - decenter_end 108 - from ref 129160 z 2001 label "Przygotowuje" italic max_width 255 xyz 620 230 2001 to ref 128264 - no_role_a no_role_b - multiplicity_a_pos 716 240 3000 multiplicity_b_pos 594 254 3000 -end -relationcanvas 132104 relation_ref 129544 // Obsluguje - from ref 129800 z 2001 label "Obsluguje" italic max_width 255 xyz 441 229 2001 to ref 129160 - no_role_a no_role_b - multiplicity_a_pos 513 253 3000 multiplicity_b_pos 426 253 3000 -end -relationcanvas 132232 relation_ref 129672 // Oplaca - decenter_begin 504 - from ref 128264 z 2001 label "Oplaca" italic max_width 255 xyz 800 201 2001 to ref 128392 - no_role_a no_role_b - multiplicity_a_pos 770 181 3000 multiplicity_b_pos 759 206 3000 -end -relationcanvas 132360 relation_ref 129800 // Przyjmuje - from ref 128392 z 2001 label "Przyjmuje" italic max_width 255 xyz 628 117 2001 to ref 129928 - no_role_a no_role_b - multiplicity_a_pos 590 133 3000 multiplicity_b_pos 723 140 3000 -end -relationcanvas 132488 relation_ref 129928 // Obsluguje - from ref 129928 z 2001 label "Obsluguje" italic max_width 255 xyz 434 116 2001 to ref 130056 - no_role_a no_role_b - multiplicity_a_pos 426 136 3000 multiplicity_b_pos 501 133 3000 -end -relationcanvas 134792 relation_ref 137096 // - from ref 134408 z 2001 to ref 128392 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 134920 relation_ref 137224 // - from ref 134536 z 2001 to ref 128392 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 136840 relation_ref 137352 // - decenter_begin 532 - from ref 136584 z 2001 to ref 128136 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 136968 relation_ref 137480 // - decenter_begin 425 - from ref 136712 z 2001 to ref 128136 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 137224 relation_ref 137736 // Jest zawarta w - decenter_begin 344 - decenter_end 342 - from ref 128008 z 2001 label "Jest zawarta w" italic max_width 255 xyz 975 524 2001 to ref 136712 - no_role_a no_role_b - multiplicity_a_pos 938 510 3000 multiplicity_b_pos 964 536 3000 -end -relationcanvas 137480 relation_ref 137864 // - geometry VHr - from ref 130056 z 2006 to point 176 127 - line 130060 z 2006 to ref 137352 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 137608 relation_ref 137992 // - decenter_begin 493 - decenter_end 172 - from ref 129800 z 2006 to ref 137352 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 137736 relation_ref 138120 // - decenter_begin 333 - decenter_end 703 - from ref 128520 z 2006 to ref 137352 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 138888 relation_ref 138248 // - geometry VHr - decenter_end 722 - from ref 130312 z 2006 to point 222 474 - line 130316 z 2006 to ref 137352 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 140936 relation_ref 138376 // Przechowuje - from ref 129032 z 2001 label "Przechowuje" italic max_width 255 xyz 371 597 2001 to ref 140808 - no_role_a no_role_b - multiplicity_a_pos 453 619 3000 multiplicity_b_pos 359 617 3000 -end -relationcanvas 141064 relation_ref 138504 // Zapisuje informacje o licznosci - from ref 140808 z 2001 label "Zapisuje informacje o licznosci" italic max_width 255 xyz 549 598 2001 to ref 128904 - no_role_a no_role_b - multiplicity_a_pos 747 621 3000 multiplicity_b_pos 560 620 3000 -end -end diff --git a/models/128027_12.d b/models/128027_12.d deleted file mode 100644 index e8dd282..0000000 --- a/models/128027_12.d +++ /dev/null @@ -1,3 +0,0 @@ -format 224 - -end diff --git a/models/134683.diagram b/models/134683.diagram index d0e29de..c269eab 100644 --- a/models/134683.diagram +++ b/models/134683.diagram @@ -1,17 +1,27 @@ format 224 +classinstance 128012 class_ref 141068 // DostawaController + name "" xyz 394 127 2000 classinstance 128027 class_ref 129563 // PracownikSpizarni - name "" xyz 77 121 2000 + name "" xyz 77.06 121.2 2000 classinstance 128155 class_ref 144283 // Dostawa - name "" xyz 361 125 2000 -linkcanvas 128923 - from ref 128027 z 2001 to ref 128155 -dirscanvas 129051 z 1000 linkcanvas_ref 128923 + name "" xyz 425.1 236.44 2000 +linkcanvas 128140 + from ref 128027 z 2001 to ref 128012 +dirscanvas 128268 z 1000 linkcanvas_ref 128140 - forward_label "1 stworzDostawe()" xyz 233 109 3000 + forward_label "1 createDostawa()" xyz 268 116 3000 +linkcanvas 128396 + from ref 128012 z 2001 to ref 128155 +dirscanvas 128524 z 1000 linkcanvas_ref 128396 + + forward_label "2 createDostawa() <<>>" xyz 479 191 3000 msgs - explicitmsg "stworzDostawe()" - forward ranks 1 "1" dirscanvas_ref 129051 + msg operation_ref 128012 // "createDostawa()" + forward ranks 1 "1" dirscanvas_ref 128268 + no_msg + explicitmsg "createDostawa() <<>>" + forward ranks 2 "2" dirscanvas_ref 128524 no_msg msgsend end diff --git a/models/134811.diagram b/models/134811.diagram index 09f9dfa..f84a5dc 100644 --- a/models/134811.diagram +++ b/models/134811.diagram @@ -13,22 +13,22 @@ komunikuje sie z systemem poprzez interfejs powinien byc pustym pudelkiem" xyzwh 69 52 2000 235 75 durationcanvas 128539 classinstance_ref 128283 // :PracownikSpizarni - xyzwh 108 239 2010 11 50 + xyzwh 122 239 2010 11 50 end durationcanvas 128667 classinstance_ref 128027 // :Spizarnia - xyzwh 319 239 2010 11 50 + xyzwh 326 239 2010 11 50 end durationcanvas 129051 classinstance_ref 128283 // :PracownikSpizarni - xyzwh 108 366 2010 11 40 + xyzwh 122 366 2010 11 40 end durationcanvas 129179 classinstance_ref 128155 // :Dostawa - xyzwh 518 370 2010 11 112 + xyzwh 526 370 2010 11 112 overlappingdurationcanvas 129819 - xyzwh 524 440 2020 11 34 + xyzwh 532 440 2020 11 34 end end durationcanvas 129435 classinstance_ref 128411 // newProdukt:IloscProduktu - xyzwh 755 376 2010 11 45 + xyzwh 777 376 2010 11 45 end msg 128795 synchronous from durationcanvas_ref 128539 diff --git a/models/134939.diagram b/models/134939.diagram index 2b9f689..6843ac5 100644 --- a/models/134939.diagram +++ b/models/134939.diagram @@ -1,21 +1,42 @@ format 224 +classinstance 128012 class_ref 141068 // DostawaController + name "" xyz 511 45 2000 life_line_z 2000 classinstance 128027 class_ref 129563 // PracownikSpizarni - name "" xyz 22 4 2000 life_line_z 2000 + name "" xyz 49 41 2000 life_line_z 2000 classinstance 128155 class_ref 144283 // Dostawa - name "" xyz 251 4 2000 life_line_z 2000 + name "" xyz 286 50 2000 life_line_z 2000 continuation 128667 "X" - xyzwh 274 91 2005 33 30 + xyzwh 301 191 2005 40 32 durationcanvas 128283 classinstance_ref 128027 // :PracownikSpizarni - xyzwh 63 65 2010 11 40 + xyzwh 104 127 2010 11 40 end durationcanvas 128411 classinstance_ref 128155 // :Dostawa - xyzwh 272 65 2010 11 25 + xyzwh 315 127 2010 11 63 +end +durationcanvas 128652 classinstance_ref 128012 // :DostawaController + xyzwh 571 132 2010 11 25 +end +durationcanvas 128908 classinstance_ref 128012 // :DostawaController + xyzwh 571 171 2010 11 25 end msg 128539 synchronous from durationcanvas_ref 128283 to durationcanvas_ref 128411 - yz 65 2015 explicitmsg "zaakceptujDostawe()" + yz 127 2015 msg operation_ref 128140 // "accept()" + stereotype "<>" xyz 176 143 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 126 52 + label_xy 153 114 +msg 128780 synchronous + from durationcanvas_ref 128411 + to durationcanvas_ref 128652 + yz 130 2015 msg operation_ref 128524 // "mergeDostawaIntoSpizarnia(in : Dostawa)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 359 117 +msg 129036 synchronous + from durationcanvas_ref 128411 + to durationcanvas_ref 128908 + yz 169 2015 msg operation_ref 128268 // "removeDostawa(in : Dostawa)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 395 156 end diff --git a/models/135067.diagram b/models/135067.diagram index bbc6c92..f47b837 100644 --- a/models/135067.diagram +++ b/models/135067.diagram @@ -1,22 +1,33 @@ format 224 +classinstance 128012 class_ref 141068 // DostawaController + name "" xyz 441 60 2000 life_line_z 2000 classinstance 128027 class_ref 129563 // PracownikSpizarni - name "" xyz 17.5 4 2000 life_line_z 2000 + name "" xyz 42.5 62 2000 life_line_z 2000 classinstance 128155 class_ref 144283 // Dostawa - name "" xyz 231.5 4 2000 life_line_z 2000 + name "" xyz 256.5 62 2000 life_line_z 2000 continuation 128667 "X" - xyzwh 256 94 2005 33 30 + xyzwh 274 152 2005 40 32 +durationcanvas 128140 classinstance_ref 128012 // :DostawaController + xyzwh 501 129 2010 11 25 +end durationcanvas 128283 classinstance_ref 128155 // :Dostawa - xyzwh 252 67 2010 11 25 + xyzwh 285 125 2010 11 25 end durationcanvas 128411 classinstance_ref 128027 // :PracownikSpizarni - xyzwh 58 67 2010 11 40 + xyzwh 97 125 2010 11 40 end +msg 128268 synchronous + from durationcanvas_ref 128283 + to durationcanvas_ref 128140 + yz 129 2015 msg operation_ref 128268 // "removeDostawa(in : Dostawa)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 343 113 msg 128539 synchronous from durationcanvas_ref 128411 to durationcanvas_ref 128283 - yz 67 2015 explicitmsg "anulujDostawe()" - stereotype "<>" xyz 141 78 3000 + yz 125 2015 msg operation_ref 128396 // "cancel()" + stereotype "<>" xyz 166 136 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 121 54 + label_xy 146 112 end diff --git a/models/models.prj b/models/models.prj index dd6bd74..40337ee 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 38 - modified_by 27 "Dell" + revision 39 + modified_by 12 "fabian" @@ -36,7 +36,7 @@ format 224 class_color yellow duration_color transparent continuation_color gray note_color blue fragment_color transparent subject_color transparent usecase_color yellow package_color transparent component_color green artifact_color green deploymentnode_color gray state_color yellow stateaction_color transparent activity_color transparent activityregion_color transparent activitypartition_color transparent activityaction_color transparent parameterpin_color white generalization_color black dpi 72 - font_size 7 + font_size 5 diagram_format A4 image_root_dir "" @@ -2723,6 +2723,28 @@ format 224 a role_name "" multiplicity "1" private classrelation_ref 130843 // (aktualizuje) b multiplicity "1" parent class_ref 128795 // Spizarnia + end + + operation 128140 "accept" + stereotype "destroy" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 128396 "cancel" + stereotype "destroy" + public explicit_return_type "" + nparams 0 + + + + + end end @@ -2730,5 +2752,49 @@ format 224 classdiagramsettings draw_all_relations no show_members_full_definition yes show_members_visibility no member_max_width 0 show_parameter_name yes end size D-Landscape end + + class 141068 "DostawaController" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + operation 128012 "createDostawa" + stereotype "create" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 128268 "removeDostawa" + public explicit_return_type "" + nparams 1 + param in name "" type class_ref 134540 // Dostawa + + + + + + end + + operation 128524 "mergeDostawaIntoSpizarnia" + public explicit_return_type "" + nparams 1 + param in name "" type class_ref 134540 // Dostawa + + + + + + end + end end end