design patterns

models/141186.diagram

@@ -2,154 +2,145 @@ format 224
 
 classcanvas 128044 class_ref 141996 // NaprawaAutomatuKontroler
   classdiagramsettings member_max_width 0 end
-  xyzwh 1163.39 908.29 2000 208 137
+  xyzwh 1164.39 1132.09 2000 208 137
 end
 classcanvas 128138 class_ref 128522 // RaportSprzedazy
   classdiagramsettings member_max_width 0 end
-  xyz 788.97 932.29 2000
+  xyz 787.57 933.29 2000
 end
 classcanvas 128172 class_ref 128300 // SystemOperacyjny
   classdiagramsettings member_max_width 0 end
-  xyz 1563.22 929.37 2000
+  xyz 1573.82 1140.37 2000
 end
 classcanvas 128266 class_ref 135050 // genrowanieRaportuSprzedazy
   classdiagramsettings member_max_width 0 end
-  xyz 30.56 957.68 2000
+  xyz 50.36 957.08 2000
 end
-classcanvas 128269 class_ref 141197 // <<interface>>ISprzedazStrategiaPlatnosci
+classcanvas 128269 class_ref 141197 // IPlatnoscStrategy
-  classdiagramsettings member_max_width 0 end
+  classdiagramsettings member_max_width 0 class_drawing_mode class end
-  xyzwh 1708.06 186.31 2000 384 57
+  color yellow
+  xyzwh 1343.86 55.41 2000 380 113
 end
 classcanvas 128300 class_ref 135084 // ModulLogowania
   classdiagramsettings member_max_width 0 end
-  xyz 1513.39 1215.21 2000
+  xyz 1498.39 1413.31 2000
 end
 classcanvas 128386 class_ref 164994 // ZakupProduktu
   classdiagramsettings member_max_width 0 end
-  xyz 6.57 102.04 2000
+  xyz 32.07 102.94 2000
 end
 classcanvas 128394 class_ref 135178 // ManagerRaportow
   classdiagramsettings member_max_width 0 end
-  xyz 414.17 879.03 2000
+  xyz 414.97 878.33 2000
 end
 classcanvas 128397 class_ref 141325 // SprzedazFactory
   classdiagramsettings member_max_width 0 end
-  xyzwh 524.08 353.3 2000 309 57
+  xyzwh 525.08 263.4 2000 309 113
 end
 classcanvas 128525 class_ref 164226 // ManagerPlatnosciGotowkowej
   classdiagramsettings member_max_width 0 end
-  xyz 1997.06 319.23 2000
+  xyz 1297.96 273.73 2000
 end
 classcanvas 128653 class_ref 178434 // ManagerPlatnosciKarta
   classdiagramsettings member_max_width 0 end
-  xyz 1684.97 337.82 2000
+  xyzwh 1560.67 277.22 2000 222 93
 end
 classcanvas 129037 class_ref 171906 // Sprzedaz
   classdiagramsettings member_max_width 0 end
-  xyz 587.38 533.81 2000
+  xyz 588.18 422.91 2000
 end
 classcanvas 129068 class_ref 142124 // ManagerDiagnozy
   classdiagramsettings member_max_width 0 end
-  xyz 1869.72 923.78 2000
+  xyz 1881.62 1135.38 2000
 end
 classcanvas 129293 class_ref 165122 // ManagerProduktow
   classdiagramsettings member_max_width 0 end
-  xyz 703.21 1383.86 2000
+  xyz 703.11 1384.16 2000
 end
 classcanvas 129324 class_ref 135212 // RaportDiagnozy
   classdiagramsettings member_max_width 0 end
-  xyz 2228.74 959.28 2000
+  xyz 2235.74 1171.48 2000
 end
 classcanvas 129421 class_ref 147853 // DodawanieProduktow
   classdiagramsettings member_max_width 0 end
-  xyz 46.92 1457.1 2000
+  xyz 46.62 1457.5 2000
 end
 classcanvas 129708 class_ref 142252 // ManagerNaprawy
   classdiagramsettings member_max_width 0 end
-  xyz 1403.54 691.78 2000
+  xyz 1416.74 902.68 2000
 end
 classcanvas 129805 class_ref 128013 // RaportProduktow
   classdiagramsettings member_max_width 0 end
-  xyz 1094.24 1438.6 2000
+  xyz 1094.84 1439.3 2000
 end
 classcanvas 130061 class_ref 134669 // ManagerAutomatu
   classdiagramsettings member_max_width 0 end
-  xyzwh 363.61 1652.35 2000 209 97
+  xyzwh 363.71 1652.35 2000 209 97
 end
 classcanvas 130317 class_ref 128394 // AutomatKontroler
   classdiagramsettings member_max_width 0 end
-  xyz 388.03 1419.11 2000
+  xyz 388.33 1419.21 2000
 end
 classcanvas 130434 class_ref 178562 // ManagerPlatnosci
   classdiagramsettings member_max_width 0 end
-  xyz 896.03 55.05 2000
+  xyz 901.53 57.85 2000
-end
-classcanvas 130562 class_ref 178434 // ManagerPlatnosciKarta
-  classdiagramsettings member_max_width 0 end
-  xyzwh 1267.71 81.45 2000 229 83
-end
-classcanvas 130690 class_ref 164226 // ManagerPlatnosciGotowkowej
-  classdiagramsettings member_max_width 0 end
-  xyz 1129.79 248.27 2000
 end
 classcanvas 130818 class_ref 185218 // ManagerSprzedazy
   classdiagramsettings member_max_width 0 end
-  xyz 600.18 58.16 2000
+  xyz 601.58 58.06 2000
 end
 classcanvas 131884 class_ref 148780 // RaportZakonczeniaNaprawy
   classdiagramsettings member_max_width 0 end
-  xyz 1432.78 557.63 2000
+  xyz 1443.98 721.43 2000
 end
 classcanvas 135426 class_ref 136462 // KatalogProduktow
   classdiagramsettings member_max_width 0 end
-  xyz 268 88 2000
+  xyz 239 58.1 2000
+end
+classcanvas 137986 class_ref 198274 // ObliczanieReszty
+  classdiagramsettings member_max_width 0 end
+  xyz 1349.3 471.7 2005
+end
+classcanvas 138626 class_ref 198402 // ZwrotReszty
+  classdiagramsettings member_max_width 0 end
+  xyz 1365.7 613.6 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
+  from ref 128044 z 2001 label "PrzesylaDane" italic max_width 255 xyz 1315.5 1382 2001 to ref 128300
   no_role_a no_role_b
-  multiplicity_a_pos 1510 1232 3000 multiplicity_b_pos 1304 1063 3000
+  multiplicity_a_pos 1489 1434 3000 multiplicity_b_pos 1313 1287 3000
 end
 relationcanvas 128778 relation_ref 128138 // wykorzystuje
-  from ref 128266 z 2001 label "wykorzystuje" italic max_width 255 xyz 292 962 2001 to ref 128394
+  from ref 128266 z 2001 label "wykorzystuje" italic max_width 255 xyz 302.5 962 2001 to ref 128394
   no_role_a no_role_b
-  multiplicity_a_pos 391 991 3000 multiplicity_b_pos 267 989 3000
+  multiplicity_a_pos 398 990 3000 multiplicity_b_pos 288 988 3000
-end
-relationcanvas 128781 relation_ref 128013 // <realization>
-  from ref 128653 z 2001 to ref 128269
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
 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
   multiplicity_a_pos 767 995 3000 multiplicity_b_pos 609 993 3000
 end
-relationcanvas 128909 relation_ref 128141 // <realization>
-  from ref 128525 z 2001 to ref 128269
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
 relationcanvas 128940 relation_ref 128300 // Komunikuje
-  from ref 128044 z 2001 label "Komunikuje" italic max_width 255 xyz 1422 959 2001 to ref 128172
+  from ref 128044 z 2001 label "Komunikuje" italic max_width 255 xyz 1432.5 1172 2001 to ref 128172
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 129196 relation_ref 128428 // Komunikuje
-  from ref 128172 z 2001 label "Komunikuje" italic max_width 255 xyz 1751 953 2001 to ref 129068
+  from ref 128172 z 2001 label "Komunikuje" italic max_width 255 xyz 1764 1164 2001 to ref 129068
   no_role_a no_role_b
-  multiplicity_a_pos 1841 988 3000 multiplicity_b_pos 1737 985 3000
+  multiplicity_a_pos 1854 1199 3000 multiplicity_b_pos 1749 1197 3000
 end
 relationcanvas 129452 relation_ref 128556 // Stworz
-  from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 2122 958 2001 to ref 129324
+  from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 2136 1169 2001 to ref 129324
   no_role_a no_role_b
-  multiplicity_a_pos 2181 989 3000 multiplicity_b_pos 2061 989 3000
+  multiplicity_a_pos 2195 1202 3000 multiplicity_b_pos 2074 1202 3000
 end
 relationcanvas 129836 relation_ref 128684 // Wykorzystuje
   decenter_end 286
-  from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1477 823 2001 to ref 129708
+  from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1486.5 1039.5 2001 to ref 129708
   no_role_a no_role_b
-  multiplicity_a_pos 1451 782 3000 multiplicity_b_pos 1356 903 3000
+  multiplicity_a_pos 1464 977 3000 multiplicity_b_pos 1364 1114 3000
 end
 relationcanvas 129933 relation_ref 135053 // tworzy
   from ref 129293 z 2001 label "tworzy" italic max_width 255 xyz 987 1463 2001 to ref 129805
@@ -157,15 +148,15 @@ relationcanvas 129933 relation_ref 135053 // tworzy
   multiplicity_a_pos 1071 1492 3000 multiplicity_b_pos 937 1489 3000
 end
 relationcanvas 130092 relation_ref 128812 // Naprawia i ZwracaRaport
-  from ref 129708 z 2001 label "Naprawia i ZwracaRaport" italic max_width 255 xyz 1679 838 2001 to ref 128172
+  from ref 129708 z 2001 label "Naprawia i ZwracaRaport" italic max_width 255 xyz 1692 1049 2001 to ref 128172
   no_role_a no_role_b
-  multiplicity_a_pos 1590 901 3000 multiplicity_b_pos 1533 795 3000
+  multiplicity_a_pos 1604 1112 3000 multiplicity_b_pos 1547 1007 3000
 end
 relationcanvas 130348 relation_ref 135340 // ZwracaInformacje
   decenter_begin 680
-  from ref 128300 z 2001 label "ZwracaInformacje" italic max_width 255 xyz 1454 1109 2001 to ref 128044
+  from ref 128300 z 2001 label "ZwracaInformacje" italic max_width 255 xyz 1455 1357.5 2001 to ref 128044
   no_role_a no_role_b
-  multiplicity_a_pos 1394 1061 3000 multiplicity_b_pos 1636 1232 3000
+  multiplicity_a_pos 1397 1274 3000 multiplicity_b_pos 1609 1432 3000
 end
 relationcanvas 130573 relation_ref 135309 // wykorzystuje
   from ref 130317 z 2001 label "wykorzystuje" italic max_width 255 xyz 578 1459 2001 to ref 129293
@@ -183,74 +174,112 @@ relationcanvas 130829 relation_ref 135565 // wykorzystuje
   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 2001 to ref 129037
+  from ref 128397 z 2001 label "tworzy" italic max_width 255 xyz 657 389.5 2001 to ref 129037
   no_role_a no_role_b
-  multiplicity_a_pos 657 512 3000 multiplicity_b_pos 655 418 3000
+  multiplicity_a_pos 662 402 3000 multiplicity_b_pos 660 380 3000
 end
 relationcanvas 131469 relation_ref 135949 // wykorzystuje
-  from ref 130818 z 2001 label "wykorzystuje" italic max_width 255 xyz 636 249 2001 to ref 128397
+  from ref 130818 z 2001 label "wykorzystuje" italic max_width 255 xyz 637 213 2001 to ref 128397
   no_role_a no_role_b
-  multiplicity_a_pos 654 328 3000 multiplicity_b_pos 652 193 3000
+  multiplicity_a_pos 658 242 3000 multiplicity_b_pos 657 193 3000
-end
-relationcanvas 131586 relation_ref 170754 // aktywuje
-  decenter_begin 319
-  decenter_end 194
-  from ref 130434 z 2001 label "aktywuje" italic max_width 255 xyz 1135 76 2001 to ref 130562
-  no_role_a no_role_b
-  multiplicity_a_pos 1242 106 3000 multiplicity_b_pos 1074 106 3000
-end
-relationcanvas 131714 relation_ref 170882 // aktywuje
-  decenter_begin 625
-  decenter_end 187
-  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
 end
 relationcanvas 132012 relation_ref 135468 // Tworzy
-  from ref 129708 z 2001 label "Tworzy" italic max_width 255 xyz 1511 623 2001 to ref 131884
+  from ref 129708 z 2001 label "Tworzy" italic max_width 255 xyz 1523 814 2001 to ref 131884
   no_role_a no_role_b
-  multiplicity_a_pos 1511 609 3000 multiplicity_b_pos 1510 663 3000
+  multiplicity_a_pos 1513 767 3000 multiplicity_b_pos 1512 882 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 76 2001 to ref 130434
+  from ref 130818 z 2001 label "wykorzystuje" italic max_width 255 xyz 787 78 2001 to ref 130434
   no_role_a no_role_b
-  multiplicity_a_pos 872 106 3000 multiplicity_b_pos 768 108 3000
+  multiplicity_a_pos 886 109 3000 multiplicity_b_pos 759 108 3000
-end
-relationcanvas 134530 relation_ref 185474 // zwraca informacje
-  decenter_begin 671
-  decenter_end 647
-  from ref 130562 z 2001 label "zwraca informacje" italic max_width 255 xyz 1103 118 2001 to ref 130434
-  no_role_a no_role_b
-  multiplicity_a_pos 1074 147 3000 multiplicity_b_pos 1242 146 3000
-end
-relationcanvas 134786 relation_ref 185602 // zwraca informacje
-  decenter_begin 544
-  decenter_end 284
-  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_begin 629
-  decenter_end 680
+  decenter_end 611
-  from ref 130434 z 2001 label "zwraca informacje" italic max_width 255 xyz 762 124 2001 to ref 130818
+  from ref 130434 z 2001 label "zwraca informacje" italic max_width 255 xyz 765 114.5 2001 to ref 130818
   no_role_a no_role_b
-  multiplicity_a_pos 768 154 3000 multiplicity_b_pos 872 154 3000
+  multiplicity_a_pos 759 145 3000 multiplicity_b_pos 886 146 3000
 end
 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
+  from ref 128386 z 2001 label "wykorzystuje" italic max_width 255 xyz 151.5 105.5 2001 to ref 135426
   no_role_a no_role_b
-  multiplicity_a_pos 249 131 3000 multiplicity_b_pos 134 131 3000
+  multiplicity_a_pos 220 132 3000 multiplicity_b_pos 160 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
+  from ref 135426 z 2001 label "ustawia produkt" italic max_width 255 xyz 439 106 2001 to ref 130818
   no_role_a no_role_b
-  multiplicity_a_pos 581 131 3000 multiplicity_b_pos 420 131 3000
+  multiplicity_a_pos 583 132 3000 multiplicity_b_pos 391 132 3000
+end
+relationcanvas 136578 relation_ref 198914 // ustawia strategie
+  decenter_begin 252
+  decenter_end 298
+  from ref 130434 z 2001 label "ustawia strategie" italic max_width 255 xyz 1143.5 71 3000 to ref 128269
+  no_role_a no_role_b
+  multiplicity_a_pos 1324 99 3000 multiplicity_b_pos 1074 99 3000
+end
+relationcanvas 137346 relation_ref 199170 // uruchamia strategie
+  decenter_begin 97
+  decenter_end 363
+  from ref 128269 z 2001 label "uruchamia strategie" italic max_width 255 xyz 1315.5 202 3000 to ref 128525
+  no_role_a no_role_b
+  multiplicity_a_pos 1360 252 3000 multiplicity_b_pos 1361 172 3000
+end
+relationcanvas 137474 relation_ref 199298 // uruchamia strategie
+  decenter_begin 699
+  decenter_end 228
+  from ref 128269 z 2001 label "uruchamia strategie" italic max_width 255 xyz 1540.5 186 3000 to ref 128653
+  no_role_a no_role_b
+  multiplicity_a_pos 1591 255 3000 multiplicity_b_pos 1590 172 3000
+end
+relationcanvas 137730 relation_ref 199554 // zwraca informacje
+  decenter_begin 642
+  decenter_end 549
+  from ref 128269 z 2001 label "zwraca informacje" italic max_width 255 xyz 1143.5 109.5 3000 to ref 130434
+  no_role_a no_role_b
+  multiplicity_a_pos 1074 135 3000 multiplicity_b_pos 1324 134 3000
+end
+relationcanvas 138114 relation_ref 199682 // oblicza reszte
+  decenter_begin 402
+  decenter_end 300
+  from ref 128525 z 2006 label "oblicza reszte" italic max_width 255 xyz 1345 408.5 3000 to ref 137986
+  no_role_a no_role_b
+  multiplicity_a_pos 1371 449 3000 multiplicity_b_pos 1369 390 3000
+end
+relationcanvas 138754 relation_ref 199938 // zwraca reszte
+  decenter_begin 326
+  decenter_end 252
+  from ref 137986 z 2006 label "zwraca reszte" italic max_width 255 xyz 1347 552 3000 to ref 138626
+  no_role_a no_role_b
+  multiplicity_a_pos 1370 591 3000 multiplicity_b_pos 1370 533 3000
+end
+relationcanvas 138882 relation_ref 200066 // zwraca informacje
+  decenter_begin 744
+  decenter_end 670
+  from ref 137986 z 2006 label "zwraca informacje" italic max_width 255 xyz 1391 429 3000 to ref 128525
+  no_role_a no_role_b
+  multiplicity_a_pos 1430 390 3000 multiplicity_b_pos 1430 449 3000
+end
+relationcanvas 139010 relation_ref 200194 // zwraca informacje
+  decenter_begin 862
+  decenter_end 393
+  from ref 128525 z 2001 label "zwraca informacje" italic max_width 255 xyz 1430 228.5 3000 to ref 128269
+  no_role_a no_role_b
+  multiplicity_a_pos 1474 172 3000 multiplicity_b_pos 1474 252 3000
+end
+relationcanvas 139266 relation_ref 200450 // zwraca informacje
+  decenter_begin 695
+  decenter_end 976
+  from ref 128653 z 2001 label "zwraca informacje" italic max_width 255 xyz 1659.5 222.5 3000 to ref 128269
+  no_role_a no_role_b
+  multiplicity_a_pos 1695 172 3000 multiplicity_b_pos 1696 255 3000
+end
+relationcanvas 140034 relation_ref 200578 // zwrot informacji
+  decenter_begin 870
+  decenter_end 795
+  from ref 138626 z 2006 label "zwrot informacji" italic max_width 255 xyz 1403.5 571.5 3000 to ref 137986
+  no_role_a no_role_b
+  multiplicity_a_pos 1431 533 3000 multiplicity_b_pos 1433 591 3000
 end
-line 131597 -_-_ decenter_begin 929 decenter_end 151
-  from ref 130434 z 2001 to ref 128269
 end

models/154754.diagram

@@ -11,11 +11,11 @@ classinstance 128642 class_ref 171906 // Sprzedaz
 classinstance 130562 class_ref 191746 // Klient
   name ""   xyz 19 13 2000 life_line_z 2000
 classinstance 131842 class_ref 128394 // AutomatKontroler
-  name ""   xyz 175 14 2000 life_line_z 2000
+  name ""   xyz 177 19 2000 life_line_z 2000
 note 134658 "zwracanie wartosci z diagramu 2-2"
-  xyzwh 534 308 2000 201 69
+  xyzwh 530 325 2000 201 69
 note 134786 "zwracanie wartosci z diagramu 2-1"
-  xyzwh 842 359 2000 165 67
+  xyzwh 850 373 2000 165 67
 durationcanvas 129794 classinstance_ref 128386 // :ManagerPlatnosci
   xyzwh 782 279 2010 11 79
 end
@@ -29,10 +29,10 @@ durationcanvas 130690 classinstance_ref 130562 // :Klient
   xyzwh 35 92 2010 11 45
 end
 durationcanvas 131970 classinstance_ref 131842 // :AutomatKontroler
-  xyzwh 234 119 2010 11 46
+  xyzwh 236 119 2010 11 46
 end
 durationcanvas 132994 classinstance_ref 131842 // :AutomatKontroler
-  xyzwh 234 257 2010 11 28
+  xyzwh 236 257 2010 11 28
 end
 durationcanvas 134018 classinstance_ref 128258 // :ManagerPlatnosciGotowkowej
   xyzwh 490 122 2010 11 183
@@ -51,7 +51,7 @@ nazwaProduktu:String,
 cena:Money,
 nazwaMetodyTransakcji:String,
 statusSprzedazy:Boolean"
-  label_xy 1166 362
+  label_xy 1155 355
 msg 131458 return
   from durationcanvas_ref 134018
   to durationcanvas_ref 129794
@@ -76,14 +76,14 @@ msg 133122 return
   to durationcanvas_ref 132994
   yz 257 3005 explicitmsg "reszta:Money"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  label_xy 333 234
+  label_xy 335 234
 msg 134146 synchronous
   from durationcanvas_ref 131970
   to durationcanvas_ref 134018
   yz 135 2015 explicitmsg "wprowadzonaKwota()"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
   args "wartosc:Money"
-  label_xy 263 112
+  label_xy 265 112
 reflexivemsg 134402 synchronous
   to durationcanvas_ref 134274
   yz 183 2025 explicitmsg "obliczReszte()"

models/2.session

@@ -1,14 +1,19 @@
-window_sizes 1920 1017 450 1465 859 105
+window_sizes 1920 1017 370 1545 859 105
 
 diagrams
   active  classdiagram_ref 141186 // design-model
-    1172 687 100 A1 0 0
+    1545 859 90 A1 0 59
+  collaborationdiagram_ref 154626 // 2-1-wprowadzenieNumeruProduktu
+    1316 687 100 A4 0 0
+  collaborationdiagram_ref 147970 // 2-2-wybranieFormyPlatnosci
+    1316 687 100 A2 0 0
+  sequencediagram_ref 154882 // 2-4-zaprzestanieWprowadzaniaMonet
+    1316 687 100 A2 0 0
 end
 show_stereotypes
-selected sequencediagram_ref 154882 // 2-4-zaprzestanieWprowadzaniaMonet
+selected class_ref 178434 // ManagerPlatnosciKarta
 open
   class_ref 191746 // Klient
-  class_ref 136462 // KatalogProduktow
+  classinstance_ref 128654 // 
-  class_ref 165122 // ManagerProduktow
 end
 end

models/models.prj

@@ -1,6 +1,6 @@
 format 224
 "models"
-  revision 42
+  revision 43
   modified_by 2 "48516"
 
 
@@ -2334,7 +2334,7 @@ format 224
       
     end
 
-    class 136462 "KatalogProduktow"
+    class 198274 "ObliczanieReszty"
       visibility package 
       cpp_decl ""
       java_decl ""
@@ -2344,6 +2344,217 @@ format 224
       explicit_switch_type ""
       mysql_decl ""
       
+      operation 142082 "obliczReszte"
+	public explicit_return_type ""
+	nparams 2
+	  param in name "doZaplacenia" explicit_type "Money"
+	  param in name "wprowadzonaKwota" explicit_type "Money"
+	
+	
+	
+	
+	
+      end
+
+      classrelation 210306 // (zwraca reszte)
+	relation 199938 ---> name "zwraca reszte"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 210306 // (zwraca reszte)
+	  b multiplicity "1" parent class_ref 198402 // ZwrotReszty
+      end
+
+      classrelation 210434 // (zwraca informacje)
+	relation 200066 ---> name "zwraca informacje"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 210434 // (zwraca informacje)
+	  b multiplicity "1" parent class_ref 164226 // ManagerPlatnosciGotowkowej
+      end
+    end
+
+    class 198402 "ZwrotReszty"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      mysql_decl ""
+      
+      operation 142210 "zwrocReszte"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "monety" explicit_type "Money"
+	
+	
+	
+	
+	
+      end
+
+      classrelation 210946 // (zwrot informacji)
+	relation 200578 ---> name "zwrot informacji"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 210946 // (zwrot informacji)
+	  b multiplicity "1" parent class_ref 198274 // ObliczanieReszty
+      end
+    end
+
+    class 141325 "SprzedazFactory"
+      visibility package stereotype "singleton"
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      mysql_decl ""
+      
+      operation 128141 "utworzSprzedaz"
+	public explicit_return_type ""
+	nparams 5
+	  param in name "czasWykonaniaTransakcji" explicit_type "DateTime"
+	  param in name "nazwaProduktu" explicit_type "String"
+	  param in name "cena" explicit_type "Money"
+	  param in name "nazwaMetodyTransakcji" explicit_type "String"
+	  param in name "statusSprzedazy" explicit_type "Boolean"
+	
+	
+	
+	
+	
+      end
+
+      classrelation 135693 // <unidirectional association>
+	relation 135693 --->
+	  a role_name "" private
+	    classrelation_ref 135693 // <unidirectional association>
+	  b parent class_ref 171906 // Sprzedaz
+      end
+
+      classrelation 135821 // (tworzy)
+	relation 135821 ---> name "tworzy"
+	  a role_name "" multiplicity "*" private
+	    classrelation_ref 135821 // (tworzy)
+	  b multiplicity "1" parent class_ref 171906 // Sprzedaz
+      end
+
+      operation 142338 "getInstance"
+	class_operation public explicit_return_type ""
+	nparams 0
+	nexceptions 1
+	  explicit_exception "SprzedazFactory"
+	
+	
+	
+	
+	
+      end
+
+      attribute 186114 "instance"
+	class_attribute private explicit_type "SprzedazFactory"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+	mysql_decl ""
+	MysqlColumn
+      end
+    end
+
+    class 141197 "IPlatnoscStrategy"
+      visibility package stereotype "interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}${static}interface ${name}${extends} {
+${members}}
+"
+      php_decl "${comment}interface ${name}${extends} {
+${members}}
+"
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      mysql_decl ""
+      
+      operation 128013 "zrealizujPlatnosc"
+	public explicit_return_type ""
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 141954 "ustawStrategie"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "strategia" explicit_type "IPlatnoscStrategy"
+	
+	
+	
+	
+	
+      end
+
+      attribute 185858 "strategiaPlatnosci"
+	private explicit_type "IStrategiaPlatnosci"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+	mysql_decl ""
+	MysqlColumn
+      end
+
+      classrelation 209410 // <unidirectional association>
+	relation 199042 --->
+	  a role_name "" private
+	    classrelation_ref 209410 // <unidirectional association>
+	  b parent class_ref 141197 // IPlatnoscStrategy
+      end
+
+      classrelation 209538 // (uruchamia strategie)
+	relation 199170 ---> name "uruchamia strategie"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 209538 // (uruchamia strategie)
+	  b multiplicity "1" parent class_ref 164226 // ManagerPlatnosciGotowkowej
+      end
+
+      classrelation 209666 // (uruchamia strategie)
+	relation 199298 ---> name "uruchamia strategie"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 209666 // (uruchamia strategie)
+	  b multiplicity "1" parent class_ref 178434 // ManagerPlatnosciKarta
+      end
+
+      classrelation 209922 // (zwraca informacje)
+	relation 199554 ---> name "zwraca informacje"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 209922 // (zwraca informacje)
+	  b multiplicity "1" parent class_ref 178562 // ManagerPlatnosci
+      end
+    end
+
+    class 136462 "KatalogProduktow"
+      visibility package stereotype "singleton"
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      mysql_decl ""
+      
       attribute 179330 "produkty"
 	private explicit_type "Map<Int, Produkt>"
 	cpp_decl ""
@@ -2371,6 +2582,27 @@ format 224
 	  a role_name "" multiplicity "1" private
 	    classrelation_ref 202754 // (ustawia produkt)
 	  b multiplicity "1" parent class_ref 185218 // ManagerSprzedazy
+      end
+
+      attribute 186242 "instance"
+	class_attribute private explicit_type "KatalogProduktow"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+	mysql_decl ""
+	MysqlColumn
+      end
+
+      operation 142466 "getInstance"
+	class_operation public explicit_return_type ""
+	nparams 0
+	
+	
+	
+	
+	
       end
     end
 
@@ -2594,11 +2826,18 @@ format 224
 	
 	
 	
+      end
+
+      classrelation 209282 // (ustawia strategie)
+	relation 198914 ---> name "ustawia strategie"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 209282 // (ustawia strategie)
+	  b multiplicity "1" parent class_ref 141197 // IPlatnoscStrategy
       end
     end
 
     class 178434 "ManagerPlatnosciKarta"
-      visibility protected 
+      visibility protected stereotype "implementationClass"
       cpp_decl ""
       java_decl ""
       php_decl ""
@@ -2663,12 +2902,19 @@ format 224
 	relation 128013 -_-|>
 	  a public
 	    classrelation_ref 128013 // <realization>
-	  b parent class_ref 141197 // <<interface>>ISprzedazStrategiaPlatnosci
+	  b parent class_ref 141197 // IPlatnoscStrategy
+      end
+
+      classrelation 210818 // (zwraca informacje)
+	relation 200450 ---> name "zwraca informacje"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 210818 // (zwraca informacje)
+	  b multiplicity "1" parent class_ref 141197 // IPlatnoscStrategy
       end
     end
 
     class 164226 "ManagerPlatnosciGotowkowej"
-      visibility package 
+      visibility package stereotype "implementationClass"
       cpp_decl ""
       java_decl ""
       php_decl ""
@@ -2738,36 +2984,35 @@ format 224
 	
 	
 	
-      end
-
-      operation 128770 "wprowadzonaKwota"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "wartosc" explicit_type "Money"
-	
-	
-	
-	
-	
-      end
-
-      operation 128898 "obliczReszte"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "cena" explicit_type "Money"
-	  param in name "wprowadzonaKwota" explicit_type "Money"
-	
-	
-	
-	
-	
       end
 
       classrelation 128141 // <realization>
 	relation 128141 -_-|>
 	  a public
 	    classrelation_ref 128141 // <realization>
-	  b parent class_ref 141197 // <<interface>>ISprzedazStrategiaPlatnosci
+	  b parent class_ref 141197 // IPlatnoscStrategy
+      end
+
+      classrelation 209794 // <unidirectional association>
+	relation 199426 --->
+	  a role_name "" private
+	    classrelation_ref 209794 // <unidirectional association>
+	  b parent class_ref 141197 // IPlatnoscStrategy
+      end
+
+      classrelation 210050 // (oblicza reszte)
+	relation 199682 ---> name "oblicza reszte"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 210050 // (oblicza reszte)
+	  b multiplicity "1" parent class_ref 198274 // ObliczanieReszty
+      end
+
+      classrelation 210562 // (zwraca informacje)
+	relation 200194 ---> name "zwraca informacje"
+	  a role_name "" multiplicity "1" private
+	    comment "				"
+	    classrelation_ref 210562 // (zwraca informacje)
+	  b multiplicity "1" parent class_ref 141197 // IPlatnoscStrategy
       end
     end
 
@@ -3504,62 +3749,6 @@ format 224
         end
     end
 
-    class 141197 "<<interface>>ISprzedazStrategiaPlatnosci"
-      visibility package 
-      cpp_decl ""
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      mysql_decl ""
-      
-      operation 128013 "zrealizujPlatnosc"
-	public explicit_return_type ""
-	nparams 0
-	
-	
-	
-	
-	
-      end
-    end
-
-    class 141325 "SprzedazFactory"
-      visibility package 
-      cpp_decl ""
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      mysql_decl ""
-      
-      operation 128141 "utworzSprzedaz"
-	public explicit_return_type ""
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      classrelation 135693 // <unidirectional association>
-	relation 135693 --->
-	  a role_name "" private
-	    classrelation_ref 135693 // <unidirectional association>
-	  b parent class_ref 171906 // Sprzedaz
-      end
-
-      classrelation 135821 // (tworzy)
-	relation 135821 ---> name "tworzy"
-	  a role_name "" multiplicity "*" private
-	    classrelation_ref 135821 // (tworzy)
-	  b multiplicity "1" parent class_ref 171906 // Sprzedaz
-      end
-    end
-
     class 147853 "DodawanieProduktow"
       visibility package 
       cpp_decl ""