diff --git a/models/141221.diagram b/models/141221.diagram index f2e5eb5..e4bd569 100644 --- a/models/141221.diagram +++ b/models/141221.diagram @@ -24,40 +24,40 @@ end classinstancecanvas 132645 classinstance_ref 155813 // xyz 771.2 4 2000 life_line_z 2000 end -note 135333 "Tu jest niedobrze, bo HistoriaZmianZamowien widzi SystemZamowien, ale chcialbym jakis komunikat do Controllera, aby np. CofnijButton sie wylaczyl jesli nie ma juz zapisanych zmian do cofania" - xyzwh 582 188 2000 237 109 +note 135333 "Tu jest nieprawidlowosc bo HistoriaZmianZamowien widzi SystemZamowien, ale chcialbym jakis komunikat do Controllera, aby np. CofnijButton sie wylaczyl jesli nie ma juz zapisanych zmian do cofania" + xyzwh 582 189 2000 237 119 durationcanvas 128293 classinstance_ref 128037 // :Kucharz - xyzwh 45 74 2010 11 41 + xyzwh 49 74 2010 11 41 end durationcanvas 128421 classinstance_ref 128165 // :ZmianaStatusuController - xyzwh 297 74 2010 11 26 + xyzwh 309 74 2010 11 26 end durationcanvas 128805 classinstance_ref 128677 // :SystemZamowien - xyzwh 565 84 2010 11 45 + xyzwh 574 84 2010 11 45 end durationcanvas 131749 classinstance_ref 130469 // :Status - xyzwh 1585 167 2010 11 135 + xyzwh 1587 167 2010 11 135 overlappingdurationcanvas 134437 - xyzwh 1591 240 2020 11 25 + xyzwh 1593 240 2020 11 25 end end durationcanvas 132005 classinstance_ref 130597 // :StosStanowStatusu - xyzwh 1835 183 2010 11 47 + xyzwh 1845 183 2010 11 47 end durationcanvas 132773 classinstance_ref 132645 // :HistoriaZmianZamowien - xyzwh 831 98 2010 11 92 + xyzwh 842 98 2010 11 92 end durationcanvas 133029 classinstance_ref 129445 // :StosZmienianychZamowien - xyzwh 1200 114 2010 11 25 + xyzwh 1212 114 2010 11 25 end durationcanvas 133797 classinstance_ref 129829 // ostatnioZmienione:Zamowienie - xyzwh 1450 155 2010 11 59 + xyzwh 1464 155 2010 11 59 end durationcanvas 134821 classinstance_ref 128677 // :SystemZamowien - xyzwh 565 176 2010 11 30 + xyzwh 574 176 2010 11 30 end durationcanvas 135077 classinstance_ref 128165 // :ZmianaStatusuController - xyzwh 297 195 2010 11 25 + xyzwh 309 195 2010 11 25 end msg 128549 synchronous from durationcanvas_ref 128293 diff --git a/models/147749.diagram b/models/147749.diagram index 47ef324..1f8c973 100644 --- a/models/147749.diagram +++ b/models/147749.diagram @@ -1,122 +1,137 @@ format 223 classinstancecanvas 128037 classinstance_ref 162725 // - xyz 7.5 3.9 2005 life_line_z 2000 + xyz 7.5 4.1 2005 life_line_z 2000 end classinstancecanvas 128165 classinstance_ref 162853 // - xyz 100.8 4.1 2000 life_line_z 2000 + xyz 100.2 3.9 2000 life_line_z 2000 end classinstancecanvas 130469 classinstance_ref 163365 // - xyz 283.1 4.1 2005 life_line_z 2000 + xyz 283.9 3.9 2005 life_line_z 2000 end classinstancecanvas 131109 classinstance_ref 163493 // - xyz 668.1 4.1 2005 life_line_z 2000 + xyz 668.9 3.9 2005 life_line_z 2000 end classinstancecanvas 131493 classinstance_ref 163621 // - xyz 489.8 4.1 2010 life_line_z 2000 + xyz 489.2 3.9 2010 life_line_z 2000 end classinstancecanvas 132645 classinstance_ref 163749 // - xyz 852.2 4.1 2010 life_line_z 2000 + xyz 849.4 3.2 2010 life_line_z 2000 end classinstancecanvas 133029 classinstance_ref 163877 // - xyz 1061.1 2.6 2015 life_line_z 2000 + xyz 1060.9 3 2015 life_line_z 2000 end +note 134053 "Czy tutaj powinno by wi cej komunikatów ilustruj cych powstawanie Zamowien w ZamowienieKopiaZapasowa. +Czy mozna zalozyc ze ZamowienieKopiaZapasowa to jest baza danych, ktora nam to po prostu zwroci?" + xyzwh 589.4 52.2 2000 124 306 durationcanvas 128293 classinstance_ref 128037 // :Kucharz - xyzwh 29 75.1 2010 11 310 + xyzwh 29 69.2 2010 11 471 end durationcanvas 128421 classinstance_ref 128165 // :RestartController - xyzwh 151 74.5 2010 11 307 + xyzwh 151 74.7 2010 11 442 end durationcanvas 130597 classinstance_ref 130469 // :Restarter - xyzwh 312 81.6 2010 11 367 + xyzwh 312 83.3 2010 11 437 end durationcanvas 131237 classinstance_ref 131109 // :SystemZamowien - xyzwh 722 411.7 2010 11 37 + xyzwh 722 415.2 2010 11 85 end durationcanvas 131621 classinstance_ref 131493 // :ZamowieniaKopiaZapasowa - xyzwh 571 137.1 2010 11 165 + xyzwh 571 137.7 2010 11 165 end durationcanvas 132773 classinstance_ref 132645 // :HistoriaZmianZamowien - xyzwh 923 426.1 2010 11 27 + xyzwh 920 426.5 2010 11 39 end durationcanvas 133157 classinstance_ref 133029 // :StosZmienianychZamowien - xyzwh 1142 436.7 2010 11 26 + xyzwh 1141 437.8 2010 11 35 end msg 128549 synchronous from durationcanvas_ref 128293 to durationcanvas_ref 128421 - yz 76 2015 msg operation_ref 157733 // "restartSystemu() : void" + 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 45 61 + label_xy 45 62 msg 130725 synchronous from durationcanvas_ref 128421 to durationcanvas_ref 130597 - yz 83 2015 msg operation_ref 158501 // "create() : Restarter" - stereotype "<>" xyz 203 88 3000 + yz 87 2015 msg operation_ref 158501 // "create() : Restarter" + stereotype "<>" xyz 203 92 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 215 67 + label_xy 215 70 msg 130981 synchronous from durationcanvas_ref 128421 to durationcanvas_ref 130597 - yz 125 3005 msg operation_ref 158629 // "restartSystemu() : void" + yz 129 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 109 + label_xy 189 113 msg 131365 synchronous from durationcanvas_ref 130597 to durationcanvas_ref 131237 - yz 416 2015 msg operation_ref 157861 // "create(in zamowienia : Zamowienie [*], in historiaZmianZamowien : Zamowienie [*]) : SystemZamowien" - stereotype "<>" xyz 452 425 3000 + yz 421 2015 msg operation_ref 157861 // "create(in zamowienia : Zamowienie [*], in historiaZmianZamowien : Zamowienie [*]) : SystemZamowien" + stereotype "<>" xyz 452 430 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 376 + label_xy 393 381 msg 131749 synchronous from durationcanvas_ref 130597 to durationcanvas_ref 131621 - yz 139 2015 msg operation_ref 158117 // "create() : ZamowieniaKopiaZapasowa" - stereotype "<>" xyz 388 144 3000 + yz 140 2015 msg operation_ref 158117 // "create() : ZamowieniaKopiaZapasowa" + stereotype "<>" xyz 388 146 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 402 123 + label_xy 402 125 msg 132005 synchronous from durationcanvas_ref 130597 to durationcanvas_ref 131621 - yz 181 2025 msg operation_ref 158245 // "podajZapisaneZamowienia() : Zamowienie [*]" + yz 183 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 165 + label_xy 345 167 msg 132133 return from durationcanvas_ref 131621 to durationcanvas_ref 130597 - yz 213 2015 explicitmsg "zamowienia: Zamowienie[*]" + yz 215 2015 explicitmsg "zamowienia: Zamowienie[*]" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 373 197 + label_xy 373 198 msg 132389 synchronous from durationcanvas_ref 130597 to durationcanvas_ref 131621 - yz 249 2025 msg operation_ref 158373 // "podajZapisanaHistorieZmianZamowien() : Zamowienie [*]" + yz 250 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 + label_xy 337 235 msg 132517 return from durationcanvas_ref 131621 to durationcanvas_ref 130597 - yz 286 2015 explicitmsg "zmienianeZamowienia: : Zamowienie[*]" + yz 288 2015 explicitmsg "zmienianeZamowienia: : Zamowienie[*]" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 333 270 + label_xy 333 272 msg 132901 synchronous from durationcanvas_ref 131237 to durationcanvas_ref 132773 - yz 428 2020 msg operation_ref 158757 // "create(in historiaZmianZamowien : Zamowienia [*]) : HistoriaZmianZamowien" - stereotype "<>" xyz 791 436 3000 + yz 431 2020 msg operation_ref 158757 // "create(in historiaZmianZamowien : Zamowienia [*]) : HistoriaZmianZamowien" + stereotype "<>" xyz 791 439 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "zmienianeZamowienia: Zamowienie[*]" - label_xy 746 391 + label_xy 745 395 msg 133285 synchronous from durationcanvas_ref 132773 to durationcanvas_ref 133157 - yz 437 2025 msg operation_ref 158885 // "create(in zmienianeZamowienia : Zamowienie [*]) : StosZmienianychZamowien" - stereotype "<>" xyz 1005 441 3000 + 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 957 402 + label_xy 954 402 +msg 133797 return + from durationcanvas_ref 131237 + to durationcanvas_ref 130597 + yz 488 2015 explicitmsg "systemZamowien: SystemZamowien" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 416 473 +msg 133925 return + from durationcanvas_ref 130597 + to durationcanvas_ref 128421 + yz 494 2015 explicitmsg "systemZamowien: SystemZamowien" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 137 475 end diff --git a/models/models.prj b/models/models.prj index fdee49f..447584d 100644 --- a/models/models.prj +++ b/models/models.prj @@ -2007,7 +2007,7 @@ format 223 end operation 158629 "restartSystemu" - public explicit_return_type "void" + public return_type class_ref 136824 // SystemZamowien nparams 0