From 69340389232abe54e0872e16a219de6c6d8b8e30 Mon Sep 17 00:00:00 2001
From: shaaqu <pawel.lukaszewicz99@gmail.com>
Date: Wed, 16 Dec 2020 11:40:47 +0100
Subject: [PATCH] association names

---
 models/128002.diagram | 80 ++++++++++++++++++++++++-------------------
 models/models.prj     | 54 +++++++++++++++++++----------
 2 files changed, 80 insertions(+), 54 deletions(-)

diff --git a/models/128002.diagram b/models/128002.diagram
index 9c2fb35..8496bb7 100644
--- a/models/128002.diagram
+++ b/models/128002.diagram
@@ -2,71 +2,71 @@ format 223
 
 classcanvas 128130 class_ref 128002 // Bankomat
   classdiagramsettings member_max_width 0 end
-  xyzwh 885.02 437.37 2000 125 115
+  xyzwh 885.15 437.63 2000 125 115
 end
 classcanvas 128258 class_ref 128130 // Got�wka
   classdiagramsettings member_max_width 0 end
-  xyzwh 1180.27 435.36 2005 105 111
+  xyzwh 1180.55 435.46 2005 105 111
 end
 classcanvas 128386 class_ref 128258 // Karta
   classdiagramsettings member_max_width 0 end
-  xyzwh 318.12 24.28 2005 109 109
+  xyzwh 318 24.9 2005 109 109
 end
 classcanvas 128514 class_ref 128386 // BLIK
   classdiagramsettings member_max_width 0 end
-  xyzwh 324.37 784.07 2000 95 128
+  xyzwh 324.64 784.46 2000 95 128
 end
 classcanvas 128642 class_ref 128514 // Wyplata
   classdiagramsettings member_max_width 0 end
-  xyzwh 62.43 791.04 2000 108 113
+  xyzwh 61.98 791.43 2000 108 113
 end
 classcanvas 128770 class_ref 128642 // Wplata
   classdiagramsettings member_max_width 0 end
-  xyzwh 324.19 1009.69 2000 95 57
+  xyzwh 540.1 824.37 2000 95 57
 end
 classcanvas 128898 class_ref 128770 // Klient
   classdiagramsettings member_max_width 0 end
-  xyzwh 604.68 245.62 2000 96 111
+  xyzwh 604.76 245.62 2000 96 111
 end
 classcanvas 129026 class_ref 128898 // Konwojent
   classdiagramsettings member_max_width 0 end
-  xyzwh 1142.96 215.67 2000 172 77
+  xyzwh 1143.08 215.54 2000 172 77
 end
 classcanvas 129154 class_ref 129026 // Serwisant
   classdiagramsettings member_max_width 0 end
-  xyzwh 852.99 216.48 2000 190 101
+  xyzwh 853.12 216.62 2000 190 101
 end
 classcanvas 129282 class_ref 129154 // Bank
   classdiagramsettings member_max_width 0 end
-  xyzwh 65.61 233.27 2000 109 115
+  xyzwh 65.63 234.47 2000 109 114
 end
 classcanvas 129410 class_ref 129282 // Konto
   classdiagramsettings member_max_width 0 end
-  xyzwh 313.41 238.06 2000 110 105
+  xyzwh 313.34 238.16 2000 110 105
 end
 classcanvas 129538 class_ref 129410 // Przelew
   classdiagramsettings member_max_width 0 end
-  xyzwh 573.93 637.85 2000 83 80
+  xyzwh 110.99 541.68 2000 83 80
 end
 classcanvas 129666 class_ref 129538 // System_Transakcji
   classdiagramsettings member_max_width 0 end
-  xyzwh 274.61 425.34 2000 195 113
+  xyzwh 274.79 425.32 2000 195 113
 end
 classcanvas 129794 class_ref 129666 // Potwierdzenie
   classdiagramsettings member_max_width 0 end
-  xyzwh 43.1 988.58 2000 147 101
+  xyzwh 293.23 941.64 2000 147 100
 end
 classcanvas 129922 class_ref 129794 // PIN
   classdiagramsettings member_max_width 0 end
-  xyzwh 587.16 40.88 2000 102 76
+  xyzwh 587.39 40.5 2000 102 76
 end
 classcanvas 130050 class_ref 129922 // Transakcja
   classdiagramsettings member_max_width 0 end
-  xyzwh 312.97 620.42 2000 118 104
+  xyzwh 313.91 619.57 2000 118 104
 end
 classcanvas 130178 class_ref 130050 // Ekran_Bankomatu
   classdiagramsettings member_max_width 0 end
-  xyzwh 860.86 643.9 2005 174 99
+  xyzwh 860.99 643.58 2005 174 99
 end
 relationcanvas 128762 relation_ref 128122 // <association>
   from ref 130178 z 2006 to ref 128130
@@ -96,7 +96,7 @@ relationcanvas 132866 relation_ref 129026 //
   decenter_end 537
   from ref 129282 z 2001 to ref 129410
   no_role_a role_b_pos 184 266 3000
-  multiplicity_a_pos 292 304 3000 multiplicity_b_pos 185 303 3000
+  multiplicity_a_pos 293 304 3000 multiplicity_b_pos 185 303 3000
 end
 relationcanvas 132994 relation_ref 129154 // <association>
   from ref 129922 z 2006 to ref 128386
@@ -104,16 +104,18 @@ relationcanvas 132994 relation_ref 129154 // <association>
   multiplicity_a_pos 439 86 3000 multiplicity_b_pos 563 86 3000
 end
 relationcanvas 133122 relation_ref 129282 // <association>
-  from ref 129794 z 2001 to ref 128642
-  no_role_a no_role_b
-  multiplicity_a_pos 92 913 3000 multiplicity_b_pos 92 958 3000
+  from ref 129794 z 2001 to point 112 988
+  line 138754 z 2001 to ref 128642
+  no_role_a role_b_pos 216 962 3000
+  multiplicity_a_pos 90 912 3000 multiplicity_b_pos 269 999 3000
 end
 relationcanvas 133250 relation_ref 129410 // <association>
   decenter_begin 456
   decenter_end 430
-  from ref 129794 z 2001 to ref 128770
-  role_a_pos 246 1005 3000 no_role_b
-  multiplicity_a_pos 300 1042 3000 multiplicity_b_pos 202 1042 3000
+  from ref 129794 z 2001 to point 583 984
+  line 138626 z 2001 to ref 128770
+  no_role_a role_b_pos 451 960 3000
+  multiplicity_a_pos 558 889 3000 multiplicity_b_pos 452 996 3000
 end
 relationcanvas 133506 relation_ref 129666 // <association>
   from ref 128130 z 2001 to ref 129154
@@ -128,24 +130,24 @@ end
 relationcanvas 134530 relation_ref 130690 // <association>
   from ref 128514 z 2001 to ref 128642
   no_role_a no_role_b
-  multiplicity_a_pos 181 857 3000 multiplicity_b_pos 300 857 3000
+  multiplicity_a_pos 181 860 3000 multiplicity_b_pos 300 856 3000
 end
 relationcanvas 134658 relation_ref 130818 // <association>
   from ref 128514 z 2001 to ref 128770
-  no_role_a no_role_b
-  multiplicity_a_pos 348 980 3000 multiplicity_b_pos 348 920 3000
+  role_a_pos 463 822 3000 no_role_b
+  multiplicity_a_pos 516 858 3000 multiplicity_b_pos 430 856 3000
 end
 relationcanvas 134914 relation_ref 131074 // 
   from ref 129666 z 2001 to ref 129410
-  role_a_pos 380 352 3000 no_role_b
-  multiplicity_a_pos 348 352 3000 multiplicity_b_pos 349 396 3000
+  role_a_pos 380 351 3000 no_role_b
+  multiplicity_a_pos 348 351 3000 multiplicity_b_pos 349 396 3000
 end
 relationcanvas 135042 relation_ref 131202 // <association>
   geometry HV unfixed
   decenter_end 458
   from ref 129666 z 2001 to point 112 463
   line 130170 z 2001 to ref 129282
-  no_role_a no_role_b
+  no_role_a role_b_pos 196 453 3000
   multiplicity_a_pos 91 356 3000 multiplicity_b_pos 249 490 3000
 end
 relationcanvas 136706 relation_ref 131330 // <association>
@@ -155,23 +157,31 @@ relationcanvas 136706 relation_ref 131330 // <association>
   multiplicity_a_pos 348 591 3000 multiplicity_b_pos 350 546 3000
 end
 relationcanvas 137218 relation_ref 131586 // <association>
-  decenter_end 532
+  decenter_end 85
   from ref 129538 z 2001 to ref 130050
   no_role_a no_role_b
-  multiplicity_a_pos 442 684 3000 multiplicity_b_pos 549 684 3000
+  multiplicity_a_pos 288 639 3000 multiplicity_b_pos 204 608 3000
 end
 relationcanvas 137346 relation_ref 131714 // <association>
   geometry HV unfixed
   decenter_begin 532
-  from ref 130050 z 2001 to point 113 673
+  from ref 130050 z 2001 to point 112 672
   line 128634 z 2001 to ref 128642
   no_role_a no_role_b
-  multiplicity_a_pos 92 763 3000 multiplicity_b_pos 288 684 3000
+  multiplicity_a_pos 91 762 3000 multiplicity_b_pos 288 684 3000
 end
 relationcanvas 137474 relation_ref 131842 // <association>
   decenter_begin 465
   from ref 130050 z 2001 to ref 128514
+  no_role_a role_b_pos 380 732 3000
+  multiplicity_a_pos 345 758 3000 multiplicity_b_pos 344 732 3000
+end
+relationcanvas 137602 relation_ref 138370 // <association>
+  decenter_begin 536
+  from ref 130050 z 2001 to point 586 674
+  line 137730 z 2001 to point 586 755
+  line 137858 z 2001 to ref 128770
   no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
+  multiplicity_a_pos 566 799 3000 multiplicity_b_pos 442 684 3000
 end
 end
diff --git a/models/models.prj b/models/models.prj
index ee7ade6..f2533b7 100644
--- a/models/models.prj
+++ b/models/models.prj
@@ -248,19 +248,19 @@ ${members}}
 	    classrelation_ref 133506 // <association>
       end
 
-      classrelation 133634 // <association>
+      classrelation 133634 // posiada (<association>)
 	relation 130818 ----
-	  a role_name "" multiplicity "1" private
+	  a role_name "posiada" multiplicity "1" private
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
-	    classrelation_ref 133634 // <association>
+	    classrelation_ref 133634 // posiada (<association>)
 	  b role_name "" multiplicity "1" private
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
 	    classrelation_ref 133762 // <association>
       end
 
-      classrelation 135810 // <association>
+      classrelation 135810 // autoryzuje (<association>)
 	relation_ref 131842 // <association>
       end
     end
@@ -289,7 +289,7 @@ ${members}}
 	    classrelation_ref 129154 // <association>
       end
 
-      classrelation 130690 // <association>
+      classrelation 130690 // posiada (<association>)
 	relation_ref 129282 // <association>
       end
 
@@ -318,7 +318,7 @@ ${members}}
 	relation_ref 128258 // <association>
       end
 
-      classrelation 130946 // <association>
+      classrelation 130946 // posiada (<association>)
 	relation_ref 129410 // <association>
       end
 
@@ -329,6 +329,10 @@ ${members}}
       classrelation 133762 // <association>
 	relation_ref 130818 // <association>
       end
+
+      classrelation 142466 // <association>
+	relation_ref 138370 // <association>
+      end
     end
 
     class 128770 "Klient"
@@ -506,7 +510,7 @@ ${members}}
 	    classrelation_ref 130178 // posiada ()
       end
 
-      classrelation 134530 // <association>
+      classrelation 134530 // posiada (<association>)
 	relation_ref 131202 // <association>
       end
     end
@@ -623,10 +627,10 @@ ${members}}
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
 	    classrelation_ref 134402 // <association>
-	  b role_name "" multiplicity "1" private
+	  b role_name "posiada" multiplicity "1" private
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
-	    classrelation_ref 134530 // <association>
+	    classrelation_ref 134530 // posiada (<association>)
       end
 
       classrelation 134658 // nadzoruje (<association>)
@@ -664,22 +668,22 @@ ${members}}
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
 	    classrelation_ref 130562 // <association>
-	  b role_name "" multiplicity "1" private
+	  b role_name "posiada" multiplicity "1" private
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
-	    classrelation_ref 130690 // <association>
+	    classrelation_ref 130690 // posiada (<association>)
       end
 
-      classrelation 130818 // posiada (<association>)
+      classrelation 130818 // <association>
 	relation 129410 ----
-	  a role_name "posiada" multiplicity "1" private
+	  a role_name "" multiplicity "1" private
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
-	    classrelation_ref 130818 // posiada (<association>)
-	  b role_name "" multiplicity "1" private
+	    classrelation_ref 130818 // <association>
+	  b role_name "posiada" multiplicity "1" private
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
-	    classrelation_ref 130946 // <association>
+	    classrelation_ref 130946 // posiada (<association>)
       end
     end
 
@@ -742,14 +746,26 @@ ${members}}
 
       classrelation 135682 // <association>
 	relation 131842 ----
-	  a role_name "" private
+	  a role_name "" multiplicity "1" private
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
 	    classrelation_ref 135682 // <association>
-	  b role_name "" private
+	  b role_name "autoryzuje" multiplicity "1" private
 	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
 "
-	    classrelation_ref 135810 // <association>
+	    classrelation_ref 135810 // autoryzuje (<association>)
+      end
+
+      classrelation 142338 // <association>
+	relation 138370 ----
+	  a role_name "" multiplicity "1" private
+	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	    classrelation_ref 142338 // <association>
+	  b role_name "" multiplicity "1" private
+	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	    classrelation_ref 142466 // <association>
       end
     end