diff --git a/models/141186.diagram b/models/141186.diagram index c2f8b23..4b86d12 100644 --- a/models/141186.diagram +++ b/models/141186.diagram @@ -36,10 +36,6 @@ classcanvas 128397 class_ref 141325 // SprzedazFactory classdiagramsettings member_max_width 0 end xyzwh 524.08 353.3 2000 309 57 end -classcanvas 128514 class_ref 165122 // ManagerProduktow - classdiagramsettings member_max_width 0 end - xyz 225.01 30.55 2000 -end classcanvas 128525 class_ref 164226 // ManagerPlatnosciGotowkowej classdiagramsettings member_max_width 0 end xyz 1997.06 319.23 2000 @@ -104,6 +100,10 @@ classcanvas 131884 class_ref 148780 // RaportZakonczeniaNaprawy classdiagramsettings member_max_width 0 end xyz 1432.78 557.63 2000 end +classcanvas 135426 class_ref 136462 // KatalogProduktow + classdiagramsettings member_max_width 0 end + xyz 268 88 2000 +end relationcanvas 128428 relation_ref 128044 // PrzesylaDane decenter_begin 601 from ref 128044 z 2001 label "PrzesylaDane" italic max_width 255 xyz 1364 1111 2001 to ref 128300 @@ -120,12 +120,6 @@ relationcanvas 128781 relation_ref 128013 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 128898 relation_ref 163458 // wykorzytuje - decenter_end 490 - from ref 128386 z 2001 label "wykorzytuje" italic max_width 255 xyz 133.5 102 2001 to ref 128514 - no_role_a no_role_b - multiplicity_a_pos 200 133 3000 multiplicity_b_pos 139 133 3000 -end relationcanvas 128906 relation_ref 128266 // tworzy from ref 128394 z 2001 label "tworzy" italic max_width 255 xyz 670 968 2001 to ref 128138 no_role_a no_role_b @@ -158,7 +152,7 @@ relationcanvas 129836 relation_ref 128684 // Wykorzystuje multiplicity_a_pos 1451 782 3000 multiplicity_b_pos 1356 903 3000 end relationcanvas 129933 relation_ref 135053 // tworzy - from ref 129293 z 2001 label "tworzy" italic max_width 255 xyz 987.5 1463 3000 to ref 129805 + from ref 129293 z 2001 label "tworzy" italic max_width 255 xyz 987 1463 2001 to ref 129805 no_role_a no_role_b multiplicity_a_pos 1071 1492 3000 multiplicity_b_pos 937 1489 3000 end @@ -174,27 +168,27 @@ relationcanvas 130348 relation_ref 135340 // ZwracaInformacje multiplicity_a_pos 1394 1061 3000 multiplicity_b_pos 1636 1232 3000 end relationcanvas 130573 relation_ref 135309 // wykorzystuje - from ref 130317 z 2001 label "wykorzystuje" italic max_width 255 xyz 578 1459 3000 to ref 129293 + from ref 130317 z 2001 label "wykorzystuje" italic max_width 255 xyz 578 1459 2001 to ref 129293 no_role_a no_role_b multiplicity_a_pos 678 1486 3000 multiplicity_b_pos 547 1486 3000 end relationcanvas 130701 relation_ref 135437 // wykorzystuje - from ref 130317 z 2001 label "wykorzystuje" italic max_width 255 xyz 423.5 1573.5 3000 to ref 130061 + from ref 130317 z 2001 label "wykorzystuje" italic max_width 255 xyz 423 1573 2001 to ref 130061 no_role_a no_role_b multiplicity_a_pos 440 1630 3000 multiplicity_b_pos 441 1541 3000 end relationcanvas 130829 relation_ref 135565 // wykorzystuje - from ref 129421 z 2001 label "wykorzystuje" italic max_width 255 xyz 260 1457.5 3000 to ref 130317 + from ref 129421 z 2001 label "wykorzystuje" italic max_width 255 xyz 260 1457 2001 to ref 130317 no_role_a no_role_b multiplicity_a_pos 364 1486 3000 multiplicity_b_pos 227 1486 3000 end relationcanvas 131213 relation_ref 135821 // tworzy - from ref 128397 z 2001 label "tworzy" italic max_width 255 xyz 658 454 3000 to ref 129037 + from ref 128397 z 2001 label "tworzy" italic max_width 255 xyz 658 454 2001 to ref 129037 no_role_a no_role_b multiplicity_a_pos 657 512 3000 multiplicity_b_pos 655 418 3000 end relationcanvas 131469 relation_ref 135949 // wykorzystuje - from ref 130818 z 2001 label "wykorzystuje" italic max_width 255 xyz 636 249.5 3000 to ref 128397 + from ref 130818 z 2001 label "wykorzystuje" italic max_width 255 xyz 636 249 2001 to ref 128397 no_role_a no_role_b multiplicity_a_pos 654 328 3000 multiplicity_b_pos 652 193 3000 end @@ -208,7 +202,7 @@ end relationcanvas 131714 relation_ref 170882 // aktywuje decenter_begin 625 decenter_end 187 - from ref 130434 z 2001 to point 998 270.08 + from ref 130434 z 2001 to point 998 270 line 135298 z 2001 label "aktywuje" italic max_width 255 xyz 1034 254 2001 to ref 130690 no_role_a no_role_b multiplicity_a_pos 1104 283 3000 multiplicity_b_pos 975 189 3000 @@ -218,15 +212,10 @@ relationcanvas 132012 relation_ref 135468 // Tworzy no_role_a no_role_b multiplicity_a_pos 1511 609 3000 multiplicity_b_pos 1510 663 3000 end -relationcanvas 133890 relation_ref 178690 // ustawiaProdukt - from ref 128514 z 2001 label "ustawiaProdukt" italic max_width 255 xyz 471 105.5 2001 to ref 130818 - no_role_a no_role_b - multiplicity_a_pos 572 133 3000 multiplicity_b_pos 459 133 3000 -end relationcanvas 134018 relation_ref 178818 // wykorzystuje decenter_begin 305 decenter_end 317 - from ref 130818 z 2001 label "wykorzystuje" italic max_width 255 xyz 784.5 76.5 2001 to ref 130434 + from ref 130818 z 2001 label "wykorzystuje" italic max_width 255 xyz 784 76 2001 to ref 130434 no_role_a no_role_b multiplicity_a_pos 872 106 3000 multiplicity_b_pos 768 108 3000 end @@ -240,18 +229,28 @@ end relationcanvas 134786 relation_ref 185602 // zwraca informacje decenter_begin 544 decenter_end 284 - from ref 130690 z 2001 to point 941.39 315.85 - line 135042 z 2001 label "zwraca informacje" italic max_width 255 xyz 885.5 230 2001 to ref 130434 + from ref 130690 z 2001 to point 941 315 + line 135042 z 2001 label "zwraca informacje" italic max_width 255 xyz 885 230 2001 to ref 130434 no_role_a no_role_b multiplicity_a_pos 920 189 3000 multiplicity_b_pos 1104 328 3000 end relationcanvas 135170 relation_ref 185730 // zwraca informacje decenter_begin 703 decenter_end 680 - from ref 130434 z 2001 label "zwraca informacje" italic max_width 255 xyz 762.5 124.5 2001 to ref 130818 + from ref 130434 z 2001 label "zwraca informacje" italic max_width 255 xyz 762 124 2001 to ref 130818 no_role_a no_role_b multiplicity_a_pos 768 154 3000 multiplicity_b_pos 872 154 3000 end -line 131597 -_-_ decenter_begin 929 decenter_end 152 +relationcanvas 135554 relation_ref 192258 // wykorzystuje + from ref 128386 z 2001 label "wykorzystuje" italic max_width 255 xyz 153.5 106 3000 to ref 135426 + no_role_a no_role_b + multiplicity_a_pos 249 131 3000 multiplicity_b_pos 134 131 3000 +end +relationcanvas 135682 relation_ref 192386 // ustawia produkt + from ref 135426 z 2001 label "ustawia produkt" italic max_width 255 xyz 453.5 106 3000 to ref 130818 + no_role_a no_role_b + multiplicity_a_pos 581 131 3000 multiplicity_b_pos 420 131 3000 +end +line 131597 -_-_ decenter_begin 929 decenter_end 151 from ref 130434 z 2001 to ref 128269 end diff --git a/models/154626.diagram b/models/154626.diagram index db7d42a..06e50de 100644 --- a/models/154626.diagram +++ b/models/154626.diagram @@ -1,7 +1,5 @@ format 224 -classinstance 128258 class_ref 165122 // ManagerProduktow - name "" xyz 361 258 2000 classinstance 128386 class_ref 178562 // ManagerPlatnosci name "" xyz 364 540 2000 classinstance 128514 class_ref 185218 // ManagerSprzedazy @@ -9,41 +7,43 @@ classinstance 128514 class_ref 185218 // ManagerSprzedazy classinstance 130050 class_ref 191746 // Klient name "" xyz 68 113 2000 classinstance 130434 class_ref 128394 // AutomatKontroler - name "" xyz 369 119 2000 -linkcanvas 129154 decenter_end 500 - from ref 128258 z 2001 to ref 128514 -dirscanvas 129922 z 1000 linkcanvas_ref 129154 - - forward_label "3 ustawProdukt(nazwa:String, cena:Money)" xyz 449 332 3000 + name "" xyz 365 118 2000 +classinstance 131842 class_ref 136462 // KatalogProduktow + name "" xyz 363 258 2000 linkcanvas 130562 from ref 130050 z 2001 to ref 130434 dirscanvas 130690 z 1000 linkcanvas_ref 130562 - forward_label "1 wybranoProdukt(produktId:Int)" xyz 138 100 3000 -linkcanvas 130818 - from ref 130434 z 2001 to ref 128258 -dirscanvas 130946 z 1000 linkcanvas_ref 130818 - - forward_label "2 cena := wybierzProdukt(produktId:Int)" xyz 450 195 3000 + forward_label "1 wybranoProdukt(produktId:Int)" xyz 136 99 3000 linkcanvas 131586 from ref 128514 z 2001 to ref 128386 dirscanvas 131714 z 1000 linkcanvas_ref 131586 forward_label "4 powodzeniePlatnosci := przyjmijPlatnosc(cena:Money)" xyz 446 473 3000 +linkcanvas 132738 + from ref 131842 z 2001 to ref 128514 +dirscanvas 133250 z 1000 linkcanvas_ref 132738 + + forward_label "3 ustawProdukt(nazwa:String, cena:Money)" xyz 448 332 3000 +linkcanvas 132866 + from ref 130434 z 2001 to ref 131842 +dirscanvas 132994 z 1000 linkcanvas_ref 132866 + + forward_label "2 cena := wybierzProdukt(produktId:Int)" xyz 447 194 3000 msgs explicitmsg "wybranoProdukt(produktId:Int)" forward ranks 1 "1" dirscanvas_ref 130690 msgs explicitmsg "cena := wybierzProdukt(produktId:Int)" - forward ranks 2 "1.1" dirscanvas_ref 130946 - no_msg - msgsend - explicitmsg "ustawProdukt(nazwa:String, cena:Money)" - forward ranks 3 "2" dirscanvas_ref 129922 - msgs - explicitmsg "powodzeniePlatnosci := przyjmijPlatnosc(cena:Money)" - forward ranks 4 "2.1" dirscanvas_ref 131714 - no_msg + forward ranks 2 "1.1" dirscanvas_ref 132994 + msgs + explicitmsg "ustawProdukt(nazwa:String, cena:Money)" + forward ranks 3 "1.1.1" dirscanvas_ref 133250 + no_msg + msgsend msgsend + explicitmsg "powodzeniePlatnosci := przyjmijPlatnosc(cena:Money)" + forward ranks 4 "2" dirscanvas_ref 131714 + no_msg msgsend end diff --git a/models/2.session b/models/2.session index aa7d346..7d0a63d 100644 --- a/models/2.session +++ b/models/2.session @@ -1,14 +1,14 @@ -window_sizes 1258 979 450 803 821 105 +window_sizes 1920 1017 450 1465 859 105 diagrams - classdiagram_ref 141186 // design-model + active classdiagram_ref 141186 // design-model 1172 687 100 A1 0 0 - active sequencediagram_ref 154754 // 2-3-wprowadzanieMonet - 803 821 100 A2 0 426 end show_stereotypes -selected sequencediagram_ref 154754 // 2-3-wprowadzanieMonet +selected sequencediagram_ref 154882 // 2-4-zaprzestanieWprowadzaniaMonet open - classview_ref 128002 // design + class_ref 191746 // Klient + class_ref 136462 // KatalogProduktow + class_ref 165122 // ManagerProduktow end end diff --git a/models/models.prj b/models/models.prj index 623112b..10a7cef 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 41 - modified_by 13 "Kuba" + revision 42 + modified_by 2 "48516" @@ -2334,6 +2334,46 @@ format 224 end + class 136462 "KatalogProduktow" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 179330 "produkty" + private explicit_type "Map" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 135426 "wybierzProdukt" + public explicit_return_type "" + nparams 1 + param in name "produktId" explicit_type "Int" + + + + + + end + + classrelation 202754 // (ustawia produkt) + relation 192386 ---> name "ustawia produkt" + a role_name "" multiplicity "1" private + classrelation_ref 202754 // (ustawia produkt) + b multiplicity "1" parent class_ref 185218 // ManagerSprzedazy + end + end + class 164994 "ZakupProduktu" visibility package cpp_decl "" @@ -2350,6 +2390,13 @@ format 224 classrelation_ref 173186 // (wykorzytuje) b multiplicity "*" parent class_ref 165122 // ManagerProduktow end + + classrelation 202626 // (wykorzystuje) + relation 192258 ---> name "wykorzystuje" + a role_name "" multiplicity "1" private + classrelation_ref 202626 // (wykorzystuje) + b multiplicity "*" parent class_ref 136462 // KatalogProduktow + end end class 165122 "ManagerProduktow" @@ -3393,18 +3440,6 @@ format 224 end end - class 136462 "KatalogProduktow" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - end - classinstance 128142 "" type class_ref 136462 // KatalogProduktow attributes