s452684/Projekt_APO-Automat_spozywczy
s452684/Projekt_APO-Automat_spozywczy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix adapter

Browse Source
This commit is contained in:
Konrad 2022-01-12 10:29:05 +01:00
parent b1d12b951c
commit f5f86f1aec
3 changed files with 86 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
models/134597.diagram
View File

@ -2,23 +2,23 @@ format 224
classcanvas 128008 class_ref 128008 // Coin
classdiagramsettings member_max_width 0 end
xyzwh 1606.19 768.28 2000 82 39
xyzwh 1605.99 768.88 2000 82 39
end
classcanvas 128136 class_ref 128136 // Price
classdiagramsettings member_max_width 0 end
xyzwh 542.5 249.47 2000 117 65
xyzwh 542.5 249.27 2000 117 65
end
classcanvas 128154 class_ref 128154 // Product
classdiagramsettings member_max_width 0 end
xyzwh 354.088 517.446 2000 109 42
xyzwh 354.488 517.046 2000 109 42
end
classcanvas 128282 class_ref 128282 // Meal
classdiagramsettings member_max_width 0 end
xyzwh 758.632 503.546 2000 105 49
xyzwh 758.632 503.146 2000 105 49
end
classcanvas 128410 class_ref 128410 // Order
classdiagramsettings member_max_width 0 end
xyzwh 971.203 394.126 2000 141 186
xyzwh 971.003 393.926 2000 141 186
end
classcanvas 129178 class_ref 128666 // CardPayment
classdiagramsettings member_max_width 0 end
@ -26,83 +26,83 @@ classcanvas 129178 class_ref 128666 // CardPayment
end
classcanvas 129434 class_ref 128922 // Automat
classdiagramsettings member_max_width 0 end
xyzwh 730.836 534.331 2000 169 345
xyzwh 730.036 534.131 2000 169 345
end
classcanvas 129562 class_ref 129050 // Worker
classdiagramsettings member_max_width 0 end
xyzwh 728.289 832.922 2000 161 91
xyzwh 728.689 832.522 2000 161 91
end
classcanvas 129690 class_ref 129178 // Shelf
classdiagramsettings member_max_width 0 end
xyzwh 535.585 683.451 2000 125 90
xyzwh 535.185 683.051 2000 125 90
end
classcanvas 129800 class_ref 128026 // Ware
classdiagramsettings member_max_width 0 end
xyzwh 537.95 394.19 2000 127 49
xyzwh 537.95 394.59 2000 127 49
end
classcanvas 129818 class_ref 135706 // Payment
classdiagramsettings member_max_width 0 end
xyzwh 1250.46 389.562 2000 100 49
xyzwh 1249.66 389.962 2000 100 49
end
classcanvas 129946 class_ref 135834 // CashPayment
classdiagramsettings member_max_width 0 end
xyzwh 1388.42 257.832 2000 145 59
xyzwh 1388.42 257.632 2000 145 59
end
classcanvas 130074 class_ref 135962 // CoinCollector
classcanvas 130074 class_ref 135962 // CoinCollectorAdapter
classdiagramsettings member_max_width 0 end
xyzwh 1200.01 643.607 2000 141 65
xyzwh 1201.01 643.607 2000 140 65
end
classcanvas 131080 class_ref 128264 // PhoneNumber
classdiagramsettings member_max_width 0 end
xyzwh 207.69 902.55 2000 124 65
xyzwh 207.89 902.75 2000 124 65
end
classcanvas 131464 class_ref 128794 // Warehouse
classdiagramsettings member_max_width 0 end
xyzwh 91.99 394.44 2000 127 49
xyzwh 91.19 394.84 2000 127 49
end
classcanvas 131848 class_ref 128392 // ProductType
classdiagramsettings member_max_width 0 end
xyzwh 88.45 512.03 2000 118 49
xyzwh 88.25 512.83 2000 118 49
end
classcanvas 132104 class_ref 128520 // Date
classdiagramsettings member_max_width 0 end
xyzwh 992.33 240.02 2000 92 49
xyzwh 991.93 240.22 2000 92 49
end
classcanvas 132360 class_ref 128648 // Address
classdiagramsettings member_max_width 0 end
xyzwh 84.34 756.26 2000 91 81
xyzwh 84.54 756.06 2000 91 81
end
classcanvas 133000 class_ref 128776 // Money
classdiagramsettings member_max_width 0 end
xyzwh 1442.7 797.64 2000 80 49
xyzwh 1443.3 797.44 2000 80 49
end
classcanvas 133128 class_ref 128904 // Cash
classdiagramsettings member_max_width 0 end
xyzwh 1610.57 843.37 2000 79 39
xyzwh 1610.77 843.97 2000 79 39
end
classcanvas 133768 class_ref 135432 // Currency
classdiagramsettings member_max_width 0 end
xyzwh 1441.57 919.7 2000 87 39
xyzwh 1441.77 919.1 2000 87 39
end
classcanvas 134024 class_ref 135560 // ZipCode
classdiagramsettings member_max_width 0 end
xyzwh 89.04 901.07 2000 80 65
xyzwh 89.44 901.47 2000 80 65
end
classcanvas 135432 class_ref 135688 // Card
classdiagramsettings member_max_width 0 end
xyzwh 1598.68 358.62 2000 93 107
xyzwh 1598.88 358.42 2000 93 107
end
classcanvas 136840 class_ref 135816 // CashCollector
classcanvas 136840 class_ref 135816 // CashCollectorAdapter
classdiagramsettings member_max_width 0 end
xyzwh 1198.07 733.64 2000 146 65
xyzwh 1198.07 733.64 2000 145 65
end
classcanvas 136968 class_ref 135944 // Collector
classcanvas 136968 class_ref 135944 // CollectorAdapter
classdiagramsettings member_max_width 0 end
xyz 1002.88 676.91 2000
end
classcanvas 138504 class_ref 136072 // Culture
classdiagramsettings member_max_width 0 end
xyzwh 376.67 904.06 2000 139 59
xyzwh 376.67 904.46 2000 139 59
end
relationcanvas 128197 relation_ref 128197 // Posiada ^
from ref 129690 z 2001 label "Posiada ^" italic max_width 255 xyz 598 548 2001 to ref 129800
@ -181,9 +181,9 @@ relationcanvas 136200 relation_ref 139528 // <generalisation>
no_multiplicity_a no_multiplicity_b
end
relationcanvas 137096 relation_ref 139656 // Posiada
from ref 129434 z 2001 label "Posiada" italic max_width 255 xyz 900 639 2001 to ref 136968
from ref 129434 z 2001 label "Posiada" italic max_width 255 xyz 900 643 2001 to ref 136968
no_role_a no_role_b
multiplicity_a_pos 978 708 3000 multiplicity_b_pos 910 710 3000
multiplicity_a_pos 978 713 3000 multiplicity_b_pos 912 713 3000
end
relationcanvas 137224 relation_ref 139784 // <generalisation>
from ref 130074 z 2001 to ref 136968

62
models/154498.diagram
View File

@ -2,102 +2,102 @@ format 224
classcanvas 139650 class_ref 128922 // Automat
classdiagramsettings member_max_width 0 end
xyz 497.624 64.3054 2000
xyz 497.324 64.6854 2000
end
classcanvas 139778 class_ref 142600 // AutomatController
classdiagramsettings member_max_width 0 end
xyz 36.9278 3.6996 2000
xyz 36.6478 3.6396 2000
end
classcanvas 140034 class_ref 128410 // Order
classdiagramsettings member_max_width 0 end
xyz 1010.36 -0.754523 2000
xyz 1010.06 -0.954523 2000
end
classcanvas 140162 class_ref 135834 // CashPayment
classdiagramsettings member_max_width 0 end
xyz 1433.34 621.5 2000
xyz 1433.4 621.6 2000
end
classcanvas 140674 class_ref 129178 // Shelf
classdiagramsettings member_max_width 0 end
xyz 1034.29 132.829 2000
xyz 1034.21 132.649 2000
end
classcanvas 140930 class_ref 128666 // CardPayment
classdiagramsettings member_max_width 0 end
xyz 1553.78 444.695 2000
xyz 1553.66 444.835 2000
end
classcanvas 141058 class_ref 136072 // Culture
classdiagramsettings member_max_width 0 end
xyz 1389.87 104.262 2000
xyz 1389.09 104.002 2000
end
classcanvas 141186 class_ref 134853 // I18nService
classdiagramsettings member_max_width 0 end
xyz 1010.07 213.136 2000
xyz 1010.43 213.236 2000
end
classcanvas 141570 class_ref 141765 // CollectorFactory
classdiagramsettings member_max_width 0 end
xyz 989.274 300.643 2000
xyz 989.394 300.363 2000
end
classcanvas 141698 class_ref 135962 // CoinCollector
classcanvas 141698 class_ref 135962 // CoinCollectorAdapter
classdiagramsettings member_max_width 0 end
xyz 1411.2 221.576 2000
xyz 1408.26 221.976 2000
end
classcanvas 141826 class_ref 135816 // CashCollector
classcanvas 141826 class_ref 135816 // CashCollectorAdapter
classdiagramsettings member_max_width 0 end
xyz 1438.08 359.278 2000
xyz 1433.82 359.958 2000
end
classcanvas 141954 class_ref 135944 // Collector
classcanvas 141954 class_ref 135944 // CollectorAdapter
classdiagramsettings member_max_width 0 end
xyz 1240.93 295.772 2000
xyz 1238.25 295.852 2000
end
classcanvas 142210 class_ref 141637 // PaymentSelectorController
classdiagramsettings member_max_width 0 end
xyz 38.6202 247.156 2000
xyz 38.4402 247.776 2000
end
classcanvas 143362 class_ref 149122 // PaymentService
classdiagramsettings member_max_width 0 end
xyz 991.3 494.832 2000
xyz 991.28 494.872 2000
end
classcanvas 143746 class_ref 149250 // PaymentStrategy
classdiagramsettings member_max_width 0 end
xyz 1224.35 489.367 2000
xyz 1224.41 489.507 2000
end
classcanvas 145282 class_ref 135109 // MealPrepearer
classdiagramsettings member_max_width 0 end
xyz 489.725 464.866 2000
xyz 489.065 464.506 2000
end
classcanvas 145410 class_ref 129050 // Worker
classdiagramsettings member_max_width 0 end
xyz 706.769 442.198 2000
xyz 706.869 442.058 2000
end
classcanvas 145794 class_ref 135298 // Terminal
classdiagramsettings member_max_width 0 end
xyz 79.42 880.738 2000
xyz 79.24 880.098 2000
end
classcanvas 145922 class_ref 128770 // TransactionController
classdiagramsettings member_max_width 0 end
xyz 42.6447 321.243 2000
xyz 42.0247 321.023 2000
end
classcanvas 146562 class_ref 135688 // Card
classdiagramsettings member_max_width 0 end
xyz 1573.34 873.548 2000
xyz 1573.14 873.828 2000
end
classcanvas 147202 class_ref 142466 // Transaction
classdiagramsettings member_max_width 0 end
xyz 540.462 721.6 2000
xyz 540.282 721.7 2000
end
classcanvas 147330 class_ref 135938 // TransactionConfirmation
classdiagramsettings member_max_width 0 end
xyz 904.57 720.812 2000
xyz 904.21 720.132 2000
end
classcanvas 147714 class_ref 135554 // AuthorizationSystem
classdiagramsettings member_max_width 0 end
xyz 1736.98 438.599 2000
xyz 1736.98 438.959 2000
end
note 149506 "2 odmienne rodzaje platnosci charakteryzujace sie odmienna implementacja"
xyzwh 1212 426 2006 119 58
xyzwh 1212.38 426.12 2006 119 58
note 149634 "Adapter-wspolny interfejs dla kolektorow pieniedzy"
xyzwh 1222 238 2006 106 55
xyzwh 1221.72 238.7 2006 106 55
note 149762 "Klasa odpowiedzialna za budowanie odpowiednich kolektorow. Wyrecza automat z tej odpowiedzialnosci"
xyzwh 984 351 2006 153 76
xyzwh 984.8 350.64 2006 153 76
relationcanvas 139906 relation_ref 128258 // <unidirectional association>
decenter_end 266
from ref 139778 z 2001 to ref 139650
@ -133,7 +133,7 @@ relationcanvas 142338 relation_ref 128898 // ma
multiplicity_a_pos 975 321 3000 multiplicity_b_pos 639 267 3000
end
relationcanvas 142466 relation_ref 129026 // tworzy
from ref 141570 z 2001 label "tworzy" italic max_width 255 xyz 1166 304 2001 to ref 141954
from ref 141570 z 2001 label "tworzy" italic max_width 255 xyz 1166 307 2001 to ref 141954
no_role_a no_role_b
no_multiplicity_a no_multiplicity_b
end
@ -178,7 +178,7 @@ relationcanvas 146434 relation_ref 131330 // kontroluje
end
relationcanvas 146946 relation_ref 131458 // uzywa
decenter_begin 592
from ref 140930 z 2001 to point 1602 494
from ref 140930 z 2001 to point 1602.34 494.1
line 149890 z 2001 label "uzywa" italic max_width 255 xyz 1591.5 673.5 2001 to ref 146562
no_role_a no_role_b
multiplicity_a_pos 1590 861 3000 multiplicity_b_pos 1584 485 3000

40
models/models.prj
View File

@ -1215,7 +1215,7 @@ format 224
end
end
class 135962 "CoinCollector"
class 135962 "CoinCollectorAdapter"
visibility package
cpp_decl ""
java_decl ""
@ -1242,7 +1242,7 @@ format 224
a public
java "${type}"
classrelation_ref 144392 // <generalisation>
b parent class_ref 135944 // Collector
b parent class_ref 135944 // CollectorAdapter
end
classrelation 130178 // (implementuje)
@ -1251,14 +1251,14 @@ format 224
java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
"
classrelation_ref 130178 // (implementuje)
b multiplicity "1" parent class_ref 135944 // Collector
b multiplicity "1" parent class_ref 135944 // CollectorAdapter
end
classrelation 138882 // <dependency>
relation 138882 -_->
a public
classrelation_ref 138882 // <dependency>
b parent class_ref 135944 // Collector
b parent class_ref 135944 // CollectorAdapter
end
classrelation 139138 // <unidirectional association>
@ -1267,7 +1267,7 @@ format 224
java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
"
classrelation_ref 139138 // <unidirectional association>
b parent class_ref 135944 // Collector
b parent class_ref 135944 // CollectorAdapter
end
end
@ -1805,7 +1805,7 @@ ${members}}
end
end
class 135816 "CashCollector"
class 135816 "CashCollectorAdapter"
visibility package
cpp_decl ""
java_decl "${comment}${@}${visibility}${static}${final}${abstract}class ${name}${extends}${implements} {
@ -1822,7 +1822,7 @@ ${members}}
a public
java "${type}"
classrelation_ref 144520 // <generalisation>
b parent class_ref 135944 // Collector
b parent class_ref 135944 // CollectorAdapter
end
classrelation 130306 // (implementuje)
@ -1831,7 +1831,7 @@ ${members}}
java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
"
classrelation_ref 130306 // (implementuje)
b multiplicity "1" parent class_ref 135944 // Collector
b multiplicity "1" parent class_ref 135944 // CollectorAdapter
end
classrelation 139010 // <unidirectional association>
@ -1840,7 +1840,7 @@ ${members}}
java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
"
classrelation_ref 139010 // <unidirectional association>
b parent class_ref 135944 // Collector
b parent class_ref 135944 // CollectorAdapter
end
classrelation 139266 // <unidirectional association>
@ -1849,11 +1849,11 @@ ${members}}
java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
"
classrelation_ref 139266 // <unidirectional association>
b parent class_ref 135944 // Collector
b parent class_ref 135944 // CollectorAdapter
end
end
class 135944 "Collector"
class 135944 "CollectorAdapter"
abstract visibility package
cpp_decl ""
java_decl "${comment}${@}${visibility}${static}${final}${abstract}class ${name}${extends}${implements} {
@ -1888,7 +1888,7 @@ ${members}}
java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
"
classrelation_ref 129154 // <unidirectional association>
b parent class_ref 135962 // CoinCollector
b parent class_ref 135962 // CoinCollectorAdapter
end
classrelation 129282 // <unidirectional association>
@ -1897,7 +1897,19 @@ ${members}}
java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
"
classrelation_ref 129282 // <unidirectional association>
b parent class_ref 135816 // CashCollector
b parent class_ref 135816 // CashCollectorAdapter
end
operation 150658 "collect"
public explicit_return_type ""
nparams 0
java_def " ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
${body}}
"
end
end
@ -2866,7 +2878,7 @@ ${members}}
java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
"
classrelation_ref 129026 // (tworzy)
b parent class_ref 135944 // Collector
b parent class_ref 135944 // CollectorAdapter
end
end