From 28b32e77434694101a4707e71d85e602c1c65972 Mon Sep 17 00:00:00 2001 From: Jakub Adamski Date: Tue, 2 Feb 2021 22:14:42 +0100 Subject: [PATCH] zmiana kuba --- models/128013.diagram | 36 +++++++++---------------- models/128141.diagram | 63 +++++++++++++++++++++---------------------- models/128269.diagram | 40 +++++++++++++-------------- models/13.session | 2 +- models/models.prj | 16 +++++++++-- 5 files changed, 77 insertions(+), 80 deletions(-) diff --git a/models/128013.diagram b/models/128013.diagram index 63f79c1..5bc6092 100644 --- a/models/128013.diagram +++ b/models/128013.diagram @@ -6,53 +6,41 @@ classinstance 133005 class_ref 165122 // ManagerProduktow name "" xyz 705 34 2000 life_line_z 2000 classinstance 133901 class_ref 128010 // Zaopatrzeniowiec name "" xyz 96 17 2000 life_line_z 2000 -durationcanvas 134029 classinstance_ref 133901 // :Zaopatrzeniowiec - xyzwh 151 116 2010 11 40 -end -durationcanvas 134157 classinstance_ref 132109 // :AutomatKontroler - xyzwh 444 116 2010 11 25 -end durationcanvas 135565 classinstance_ref 133901 // :Zaopatrzeniowiec - xyzwh 151 223 2010 11 40 + xyzwh 151 133 2010 11 40 end durationcanvas 135693 classinstance_ref 132109 // :AutomatKontroler - xyzwh 444 223 2010 11 88 + xyzwh 444 133 2010 11 88 end durationcanvas 136205 classinstance_ref 133005 // :ManagerProduktow - xyzwh 769 237 2010 11 134 + xyzwh 770 147 2010 11 134 overlappingdurationcanvas 136717 - xyzwh 775 338 2020 11 25 + xyzwh 776 248 2020 11 25 end end -msg 134285 synchronous - from durationcanvas_ref 134029 - to durationcanvas_ref 134157 - yz 116 2015 explicitmsg "rozpocznijDodawanieProduktow()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 197 97 msg 135821 synchronous from durationcanvas_ref 135565 to durationcanvas_ref 135693 - yz 223 2015 explicitmsg "logowanie()" + yz 133 2015 explicitmsg "startDodajProdukty()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "haslo: String" - label_xy 224 206 + label_xy 192 116 msg 136333 synchronous from durationcanvas_ref 135693 to durationcanvas_ref 136205 - yz 237 2015 explicitmsg "sprawdzHaslo()" + yz 147 2015 explicitmsg "sprawdzHaslo()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "haslo: String" - label_xy 520 220 + label_xy 518 130 reflexivemsg 136845 synchronous to durationcanvas_ref 136717 - yz 338 2025 explicitmsg "gotowoscOtrzymaniaTowarow()" + yz 248 2025 explicitmsg "gotowoscOtrzymaniaTowarow()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 803 316 + label_xy 801 226 msg 136973 return from durationcanvas_ref 136205 to durationcanvas_ref 135693 - yz 291 2025 explicitmsg "logowanie(status: Boolean)" + yz 201 2025 explicitmsg "logowanie(status: Boolean)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 528 274 + label_xy 526 184 end diff --git a/models/128141.diagram b/models/128141.diagram index e88292e..216bad7 100644 --- a/models/128141.diagram +++ b/models/128141.diagram @@ -5,40 +5,40 @@ classinstance 130061 class_ref 128010 // Zaopatrzeniowiec classinstance 130189 class_ref 128394 // AutomatKontroler name "" xyz 255 43 2000 life_line_z 2000 classinstance 131085 class_ref 165122 // ManagerProduktow - name "" xyz 500 46 2000 life_line_z 2000 + name "" xyz 494 45 2000 life_line_z 2000 classinstance 131981 class_ref 128013 // RaportProduktow - name "" xyz 761 49 2000 life_line_z 2000 + name "" xyz 803 50 2000 life_line_z 2000 classinstance 132877 class_ref 128141 // DzialZaopatrzeniowy - name "" xyz 1029 47 2000 life_line_z 2000 + name "" xyz 970 42 2000 life_line_z 2000 durationcanvas 130317 classinstance_ref 130061 // :Zaopatrzeniowiec xyzwh 75 144 2010 11 40 end durationcanvas 130445 classinstance_ref 130189 // :AutomatKontroler xyzwh 314 144 2010 11 53 end -durationcanvas 130701 classinstance_ref 130061 // :Zaopatrzeniowiec - xyzwh 75 243 2010 11 40 -end durationcanvas 130829 classinstance_ref 130189 // :AutomatKontroler - xyzwh 314 244 2010 11 133 + xyzwh 314 242 2010 11 62 end durationcanvas 131213 classinstance_ref 131085 // :ManagerProduktow - xyzwh 564 255 2010 11 65 + xyzwh 559 253 2010 11 67 overlappingdurationcanvas 131725 - xyzwh 570 288 2020 11 25 + xyzwh 565 288 2020 11 25 end end durationcanvas 132109 classinstance_ref 131085 // :ManagerProduktow - xyzwh 564 361 2010 11 40 + xyzwh 559 361 2010 11 40 end durationcanvas 132237 classinstance_ref 131981 // :RaportProduktow - xyzwh 820 362 2010 11 60 -end -durationcanvas 133005 classinstance_ref 132877 // :DzialZaopatrzeniowy - xyzwh 1099 390 2010 11 25 + xyzwh 862 362 2010 11 60 end durationcanvas 133261 classinstance_ref 131085 // :ManagerProduktow - xyzwh 564 172 2010 11 25 + xyzwh 559 172 2010 11 25 +end +durationcanvas 133517 classinstance_ref 131085 // :ManagerProduktow + xyzwh 559 475 2010 11 40 +end +durationcanvas 133645 classinstance_ref 132877 // :DzialZaopatrzeniowy + xyzwh 1036 475 2010 11 25 end msg 130573 synchronous from durationcanvas_ref 130317 @@ -47,36 +47,26 @@ msg 130573 synchronous show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "produkt: Produkt" label_xy 97 125 -msg 130957 synchronous - from durationcanvas_ref 130701 - to durationcanvas_ref 130829 - yz 244 2015 explicitmsg "uzupelnionoTowar()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 122 225 msg 131341 synchronous from durationcanvas_ref 130829 to durationcanvas_ref 131213 - yz 255 2015 explicitmsg "sprawdzProdukty()" + yz 253 2015 explicitmsg "sprawdzProdukty()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 350 238 + label_xy 350 236 reflexivemsg 131853 synchronous to durationcanvas_ref 131725 yz 288 2025 explicitmsg "gotowoscDoZamkniecia()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 587 266 + label_xy 581 266 msg 132365 synchronous from durationcanvas_ref 132109 to durationcanvas_ref 132237 - yz 362 2015 explicitmsg "<> RaportProduktow" + yz 362 2015 explicitmsg "<> RaportProduktow()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 613 344 -msg 133133 synchronous - from durationcanvas_ref 132237 - to durationcanvas_ref 133005 - yz 390 2015 explicitmsg "wyslijRaport()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "raport: RaportProduktow" - label_xy 847 370 + args "produkt: Produkt +data: Data +ilosc: Int" + label_xy 567 333 msg 133389 synchronous from durationcanvas_ref 130445 to durationcanvas_ref 133261 @@ -84,4 +74,11 @@ msg 133389 synchronous show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "produkt: Produkt" label_xy 344 155 +msg 133773 synchronous + from durationcanvas_ref 133517 + to durationcanvas_ref 133645 + yz 481 2015 explicitmsg "wyslijRaport()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "raport: RaportProduktow" + label_xy 676 464 end diff --git a/models/128269.diagram b/models/128269.diagram index a7375f5..0702867 100644 --- a/models/128269.diagram +++ b/models/128269.diagram @@ -4,21 +4,21 @@ classinstance 129677 class_ref 128010 // Zaopatrzeniowiec name "" xyz 44 28 2000 life_line_z 2000 classinstance 129805 class_ref 128394 // AutomatKontroler name "" xyz 282 41 2000 life_line_z 2000 -classinstance 130317 class_ref 128266 // Automat - name "" xyz 566 39 2000 life_line_z 2000 +classinstance 131213 class_ref 134669 // ManagerAutomatu + name "" xyz 585 41 2000 life_line_z 2000 durationcanvas 129933 classinstance_ref 129677 // :Zaopatrzeniowiec xyzwh 99 150 2010 11 40 end durationcanvas 130061 classinstance_ref 129805 // :AutomatKontroler xyzwh 341 149 2010 11 60 end -durationcanvas 130445 classinstance_ref 130317 // :Automat - xyzwh 595 174 2010 11 184 - overlappingdurationcanvas 130701 - xyzwh 601 322 2020 11 25 +durationcanvas 131341 classinstance_ref 131213 // :ManagerAutomatu + xyzwh 646 167 2010 11 238 + overlappingdurationcanvas 131597 + xyzwh 652 227 2020 11 25 end - overlappingdurationcanvas 130957 - xyzwh 601 209 2020 11 25 + overlappingdurationcanvas 131853 + xyzwh 652 330 2020 11 25 end end msg 130189 synchronous @@ -27,20 +27,20 @@ msg 130189 synchronous yz 150 2015 explicitmsg "zamknijAutomat()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 140 133 -msg 130573 synchronous +msg 131469 synchronous from durationcanvas_ref 130061 - to durationcanvas_ref 130445 - yz 178 2020 explicitmsg "zamknijAutomat()" + to durationcanvas_ref 131341 + yz 167 3005 explicitmsg "zamknijAutomat()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 390 160 -reflexivemsg 130829 synchronous - to durationcanvas_ref 130701 - yz 322 2025 explicitmsg "gotowoscNaZamowienie()" + label_xy 449 150 +reflexivemsg 131725 synchronous + to durationcanvas_ref 131597 + yz 227 2025 explicitmsg "sprawdzZamkniecie()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 636 303 -reflexivemsg 131085 synchronous - to durationcanvas_ref 130957 - yz 209 2025 explicitmsg "sprawdzZamkniecie()" + label_xy 686 207 +reflexivemsg 131981 synchronous + to durationcanvas_ref 131853 + yz 330 2025 explicitmsg "gotowoscNaZamowienie()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 630 189 + label_xy 686 310 end diff --git a/models/13.session b/models/13.session index 59aea99..fc11eeb 100644 --- a/models/13.session +++ b/models/13.session @@ -1,7 +1,7 @@ window_sizes 1920 1017 450 1465 860 104 show_stereotypes -selected sequencediagram_ref 128010 // 9-1-wybranieOpcjiGenerujRaport +selected class_ref 134669 // ManagerAutomatu open classview_ref 128014 // domain classview_ref 128002 // design diff --git a/models/models.prj b/models/models.prj index 2040443..f5d46ff 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 35 - modified_by 10 "Mikołaj" + revision 36 + modified_by 13 "Kuba" @@ -3062,5 +3062,17 @@ format 224 mysql_decl "" end + + class 134669 "ManagerAutomatu" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end end end