uml hadMembers
authorLuc Moreau <l.moreau@ecs.soton.ac.uk>
Wed, 11 Jul 2012 00:04:22 +0100
changeset 3934 1b79a1fc94af
parent 3933 70370692b272
child 3935 8de392e5da51
uml hadMembers
model/uml/Component-Dictionary.svg
model/uml/component6.svg
--- a/model/uml/Component-Dictionary.svg	Tue Jul 10 23:58:54 2012 +0100
+++ b/model/uml/Component-Dictionary.svg	Wed Jul 11 00:04:22 2012 +0100
@@ -30,70 +30,70 @@
       ><path d="M0 0 L0 37 L80 37 L80 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath9"
-      ><path d="M-7 -7 L91 -7 L91 75 L-7 75 L-7 -7 Z"
+      ><path d="M-7 -7 L104 -7 L104 75 L-7 75 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath10"
-      ><path d="M0 0 L0 61 L80 61 L80 0 Z"
+      ><path d="M0 0 L0 61 L93 61 L93 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath11"
-      ><path d="M-7 -7 L131 -7 L131 51 L-7 51 L-7 -7 Z"
+      ><path d="M0 0 L93 0 L93 14 L0 14 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath12"
-      ><path d="M0 0 L0 23 L120 23 L120 0 Z"
+      ><path d="M-7 -7 L131 -7 L131 51 L-7 51 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath13"
-      ><path d="M0 0 L120 0 L120 28 L0 28 L0 0 Z"
+      ><path d="M0 0 L0 23 L120 23 L120 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath14"
-      ><path d="M-7 -7 L51 -7 L51 31 L-7 31 L-7 -7 Z"
+      ><path d="M0 0 L120 0 L120 28 L0 28 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath15"
-      ><path d="M0 0 L233 0 L233 104 L0 104 L0 0 Z"
+      ><path d="M-7 -7 L51 -7 L51 31 L-7 31 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath16"
-      ><path d="M0 0 L193 0 L193 104 L0 104 L0 0 Z"
+      ><path d="M0 0 L233 0 L233 104 L0 104 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath17"
+      ><path d="M0 0 L193 0 L193 104 L0 104 L0 0 Z"
+      /></clipPath
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath18"
       ><path d="M0 0 L144 0 L144 273 L0 273 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath18"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath19"
       ><path d="M0 0 L143 0 L143 273 L0 273 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath19"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath20"
       ><path d="M0 0 L174 0 L174 194 L0 194 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath20"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath21"
       ><path d="M0 0 L274 0 L274 194 L0 194 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath21"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath22"
       ><path d="M0 0 L273 0 L273 104 L0 104 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath22"
-      ><path d="M0 0 L164 0 L164 204 L0 204 L0 0 Z"
-      /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath23"
-      ><path d="M0 0 L394 0 L394 374 L0 374 L0 0 Z"
+      ><path d="M0 0 L164 0 L164 204 L0 204 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath24"
+      ><path d="M0 0 L394 0 L394 374 L0 374 L0 0 Z"
+      /></clipPath
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath25"
       ><path d="M0 0 L433 0 L433 454 L0 454 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath25"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath26"
       ><path d="M0 0 L604 0 L604 324 L0 324 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath26"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath27"
       ><path d="M0 0 L104 0 L104 133 L0 133 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath27"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath28"
       ><path d="M0 0 L153 0 L153 104 L0 104 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath28"
-      ><path d="M0 0 L324 0 L324 144 L0 144 L0 0 Z"
-      /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath29"
       ><path d="M-40 -20 L80 -20 L80 40 L-40 40 L-40 -20 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath30"
-      ><path d="M-76 -14 L152 -14 L152 28 L-76 28 L-76 -14 Z"
+      ><path d="M-90 -14 L180 -14 L180 28 L-90 28 L-90 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath31"
       ><path d="M-66 -14 L132 -14 L132 28 L-66 28 L-66 -14 Z"
@@ -207,11 +207,11 @@
       >Removal</text
     ></g
     ><g font-size="11" transform="translate(382,292)" fill-opacity="1" fill="silver" text-rendering="geometricPrecision" font-family="sans-serif" stroke="silver" font-weight="bold" stroke-opacity="1"
-    ><rect x="0" width="80" height="64" y="0" clip-path="url(#clipPath9)" stroke="none"
+    ><rect x="0" width="93" height="64" y="0" clip-path="url(#clipPath9)" stroke="none"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(382,292)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" font-weight="bold" stroke-opacity="1" stroke-miterlimit="0"
-    ><rect fill="none" x="0" width="80" height="64" y="0" clip-path="url(#clipPath9)"
-      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath9)" x2="80" y1="14"
+    ><rect fill="none" x="0" width="93" height="64" y="0" clip-path="url(#clipPath9)"
+      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath9)" x2="93" y1="14"
     /></g
     ><g font-size="11" transform="translate(382,306)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath10)" stroke="none"
@@ -222,28 +222,28 @@
       > attributes</text
     ></g
     ><g font-size="11" transform="translate(382,292)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
-    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
-      >MemberOf</text
+    ><text x="8" xml:space="preserve" y="11" clip-path="url(#clipPath11)" stroke="none"
+      >HadMembers</text
     ></g
     ><g font-size="11" transform="translate(802,2)" fill-opacity="1" fill="rgb(179,214,249)" text-rendering="geometricPrecision" font-family="sans-serif" stroke="rgb(179,214,249)" font-weight="bold" stroke-opacity="1"
-    ><rect x="0" width="120" height="40" y="0" clip-path="url(#clipPath11)" stroke="none"
+    ><rect x="0" width="120" height="40" y="0" clip-path="url(#clipPath12)" stroke="none"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(802,2)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" font-weight="bold" stroke-opacity="1" stroke-miterlimit="0"
-    ><rect fill="none" x="0" width="120" height="40" y="0" clip-path="url(#clipPath11)"
-      /><line y2="28" fill="none" x1="0" clip-path="url(#clipPath11)" x2="120" y1="28"
+    ><rect fill="none" x="0" width="120" height="40" y="0" clip-path="url(#clipPath12)"
+      /><line y2="28" fill="none" x1="0" clip-path="url(#clipPath12)" x2="120" y1="28"
     /></g
     ><g font-size="11" transform="translate(802,2)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="16" xml:space="preserve" y="11" clip-path="url(#clipPath13)" stroke="none"
+    ><text x="16" xml:space="preserve" y="11" clip-path="url(#clipPath14)" stroke="none"
       >&lt;&lt;prov:type&gt;&gt;</text
-      ><text x="13" xml:space="preserve" y="25" font-weight="bold" clip-path="url(#clipPath13)" stroke="none"
+      ><text x="13" xml:space="preserve" y="25" font-weight="bold" clip-path="url(#clipPath14)" stroke="none"
       >EmptyDictionary</text
     ></g
     ><g font-size="11" transform="translate(382,112)" fill-opacity="1" fill="silver" text-rendering="geometricPrecision" font-family="sans-serif" stroke="silver" font-weight="bold" stroke-opacity="1"
-    ><rect x="0" width="80" height="64" y="0" clip-path="url(#clipPath9)" stroke="none"
+    ><rect x="0" width="93" height="64" y="0" clip-path="url(#clipPath9)" stroke="none"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(382,112)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" font-weight="bold" stroke-opacity="1" stroke-miterlimit="0"
-    ><rect fill="none" x="0" width="80" height="64" y="0" clip-path="url(#clipPath9)"
-      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath9)" x2="80" y1="14"
+    ><rect fill="none" x="0" width="93" height="64" y="0" clip-path="url(#clipPath9)"
+      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath9)" x2="93" y1="14"
     /></g
     ><g font-size="11" transform="translate(382,126)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath10)" stroke="none"
@@ -254,102 +254,83 @@
       > attributes</text
     ></g
     ><g font-size="11" transform="translate(382,112)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
-    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
-      >MemberOf</text
+    ><text x="8" xml:space="preserve" y="11" clip-path="url(#clipPath11)" stroke="none"
+      >HadMembers</text
     ></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(262,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath15)" x2="179" y1="50"
-      /><polygon fill="white" clip-path="url(#clipPath15)" points=" 50 50 62 56 62 44" stroke="none"
-      /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath15)"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(502,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath16)" x2="139" y1="50"
+    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath16)" x2="179" y1="50"
       /><polygon fill="white" clip-path="url(#clipPath16)" points=" 50 50 62 56 62 44" stroke="none"
       /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath16)"
     /></g
+    ><g font-size="11" stroke-linecap="butt" transform="translate(502,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath17)" x2="139" y1="50"
+      /><polygon fill="white" clip-path="url(#clipPath17)" points=" 50 50 62 56 62 44" stroke="none"
+      /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath17)"
+    /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(62,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="90" clip-path="url(#clipPath17)" x2="90" y1="219"
-      /><line y2="50" fill="none" x1="90" clip-path="url(#clipPath17)" x2="50" y1="50"
+    ><line y2="50" fill="none" x1="90" clip-path="url(#clipPath18)" x2="90" y1="219"
+      /><line y2="50" fill="none" x1="90" clip-path="url(#clipPath18)" x2="50" y1="50"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(142,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath18)" x2="50" y1="219"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath18)" x2="89" y1="50"
+    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath19)" x2="50" y1="219"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath19)" x2="89" y1="50"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(562,-18)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="140" fill="none" x1="120" clip-path="url(#clipPath19)" x2="120" y1="60"
-      /><line y2="140" fill="none" x1="120" clip-path="url(#clipPath19)" x2="50" y1="140"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath19)" x2="50" y1="140"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath19)" x2="79" y1="50"
-      /><line y2="44" fill="none" x1="79" clip-path="url(#clipPath19)" x2="67" y1="50"
-      /><line y2="56" fill="none" x1="79" clip-path="url(#clipPath19)" x2="67" y1="50"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(412,72)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
-    ><line y2="140" fill="none" x1="220" clip-path="url(#clipPath20)" x2="220" y1="50"
-      /><line y2="140" fill="none" x1="220" clip-path="url(#clipPath20)" x2="50" y1="140"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(162,162)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="219" clip-path="url(#clipPath21)" x2="50" y1="50"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(662,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="150" fill="none" x1="50" clip-path="url(#clipPath22)" x2="50" y1="70"
-      /><line y2="150" fill="none" x1="50" clip-path="url(#clipPath22)" x2="110" y1="150"
-      /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath22)" x2="110" y1="150"
-      /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath22)" x2="90" y1="50"
-      /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath22)" x2="44" y1="70"
-      /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath22)" x2="56" y1="70"
+    ><line y2="140" fill="none" x1="120" clip-path="url(#clipPath20)" x2="120" y1="60"
+      /><line y2="140" fill="none" x1="120" clip-path="url(#clipPath20)" x2="50" y1="140"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath20)" x2="50" y1="140"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath20)" x2="79" y1="50"
+      /><line y2="44" fill="none" x1="79" clip-path="url(#clipPath20)" x2="67" y1="50"
+      /><line y2="56" fill="none" x1="79" clip-path="url(#clipPath20)" x2="67" y1="50"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(412,72)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
-    ><line y2="320" fill="none" x1="340" clip-path="url(#clipPath23)" x2="340" y1="50"
-      /><line y2="320" fill="none" x1="340" clip-path="url(#clipPath23)" x2="50" y1="320"
+    ><line y2="140" fill="none" x1="220" clip-path="url(#clipPath21)" x2="220" y1="50"
+      /><line y2="140" fill="none" x1="220" clip-path="url(#clipPath21)" x2="50" y1="140"
+    /></g
+    ><g font-size="11" stroke-linecap="butt" transform="translate(162,162)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><line y2="50" fill="none" x1="219" clip-path="url(#clipPath22)" x2="50" y1="50"
+    /></g
+    ><g font-size="11" stroke-linecap="butt" transform="translate(662,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><line y2="150" fill="none" x1="50" clip-path="url(#clipPath23)" x2="50" y1="70"
+      /><line y2="150" fill="none" x1="50" clip-path="url(#clipPath23)" x2="110" y1="150"
+      /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath23)" x2="110" y1="150"
+      /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath23)" x2="90" y1="50"
+      /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath23)" x2="44" y1="70"
+      /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath23)" x2="56" y1="70"
+    /></g
+    ><g font-size="11" stroke-linecap="butt" transform="translate(412,72)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
+    ><line y2="320" fill="none" x1="340" clip-path="url(#clipPath24)" x2="340" y1="50"
+      /><line y2="320" fill="none" x1="340" clip-path="url(#clipPath24)" x2="50" y1="320"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(2,-8)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="400" fill="none" x1="379" clip-path="url(#clipPath24)" x2="50" y1="400"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath24)" x2="50" y1="400"
+    ><line y2="400" fill="none" x1="379" clip-path="url(#clipPath25)" x2="50" y1="400"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath25)" x2="50" y1="400"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(142,-8)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="270" fill="none" x1="50" clip-path="url(#clipPath25)" x2="50" y1="240"
-      /><line y2="270" fill="none" x1="50" clip-path="url(#clipPath25)" x2="550" y1="270"
-      /><line y2="74" fill="none" x1="550" clip-path="url(#clipPath25)" x2="550" y1="270"
-      /><line y2="252" fill="none" x1="50" clip-path="url(#clipPath25)" x2="44" y1="240"
-      /><line y2="252" fill="none" x1="50" clip-path="url(#clipPath25)" x2="56" y1="240"
-      /><polygon fill="none" points=" 550 50 544 62 550 74 556 62" clip-path="url(#clipPath25)"
+    ><line y2="270" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="240"
+      /><line y2="270" fill="none" x1="50" clip-path="url(#clipPath26)" x2="550" y1="270"
+      /><line y2="74" fill="none" x1="550" clip-path="url(#clipPath26)" x2="550" y1="270"
+      /><line y2="252" fill="none" x1="50" clip-path="url(#clipPath26)" x2="44" y1="240"
+      /><line y2="252" fill="none" x1="50" clip-path="url(#clipPath26)" x2="56" y1="240"
+      /><polygon fill="none" points=" 550 50 544 62 550 74 556 62" clip-path="url(#clipPath26)"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(362,212)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
-    ><line y2="70" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="50"
-      /><line y2="79" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="70"
+    ><line y2="70" fill="none" x1="50" clip-path="url(#clipPath27)" x2="50" y1="50"
+      /><line y2="79" fill="none" x1="50" clip-path="url(#clipPath27)" x2="50" y1="70"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(702,-38)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath27)" x2="99" y1="50"
-      /><polygon fill="white" clip-path="url(#clipPath27)" points=" 50 50 62 56 62 44" stroke="none"
-      /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath27)"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(222,-8)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="90" fill="none" x1="270" clip-path="url(#clipPath28)" x2="270" y1="74"
-      /><line y2="90" fill="none" x1="270" clip-path="url(#clipPath28)" x2="50" y1="90"
-      /><line y2="60" fill="none" x1="50" clip-path="url(#clipPath28)" x2="50" y1="90"
-      /><polygon fill="none" points=" 270 50 264 62 270 74 276 62" clip-path="url(#clipPath28)"
-      /><line y2="72" fill="none" x1="50" clip-path="url(#clipPath28)" x2="44" y1="60"
-      /><line y2="72" fill="none" x1="50" clip-path="url(#clipPath28)" x2="56" y1="60"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(372,32)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
-    ><line y2="79" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="50"
+    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath28)" x2="99" y1="50"
+      /><polygon fill="white" clip-path="url(#clipPath28)" points=" 50 50 62 56 62 44" stroke="none"
+      /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath28)"
     /></g
     ><g font-size="11" transform="translate(712,42)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
       >0..1</text
     ></g
-    ><g font-size="11" transform="translate(186,242)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
-      >1..*</text
-    ></g
     ><g font-size="11" transform="translate(122,22)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="16" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
       >1</text
     ></g
-    ><g font-size="11" transform="translate(272,52)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
-      >1..*</text
-    ></g
     ><g font-size="11" transform="translate(612,32)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
       >0..1</text
@@ -366,13 +347,9 @@
     ><text x="16" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
       >1</text
     ></g
-    ><g font-size="11" transform="translate(349,68)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath30)" stroke="none"
-      >MemberOf</text
-    ></g
     ><g font-size="11" transform="translate(277,272)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath30)" stroke="none"
-      >MemberOf</text
+      >HadMembers</text
     ></g
     ><g font-size="11" transform="translate(752,132)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath31)" stroke="none"
--- a/model/uml/component6.svg	Tue Jul 10 23:58:54 2012 +0100
+++ b/model/uml/component6.svg	Wed Jul 11 00:04:22 2012 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
           'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
-<svg fill-opacity="0" xmlns:xlink="http://www.w3.org/1999/xlink" color-rendering="auto" color-interpolation="auto" stroke="rgb(0,0,0)" text-rendering="auto" stroke-linecap="square" width="546" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="180" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" stroke-dashoffset="0" image-rendering="auto"
+<svg fill-opacity="0" xmlns:xlink="http://www.w3.org/1999/xlink" color-rendering="auto" color-interpolation="auto" stroke="rgb(0,0,0)" text-rendering="auto" stroke-linecap="square" width="546" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="186" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" stroke-dashoffset="0" image-rendering="auto"
 ><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
   /><g
   ><defs id="defs1"
@@ -15,13 +15,13 @@
       ><path d="M0 0 L80 0 L80 14 L0 14 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath4"
-      ><path d="M-7 -7 L91 -7 L91 75 L-7 75 L-7 -7 Z"
+      ><path d="M-7 -7 L111 -7 L111 81 L-7 81 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath5"
-      ><path d="M0 0 L0 61 L80 61 L80 0 Z"
+      ><path d="M0 0 L0 67 L100 67 L100 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath6"
-      ><path d="M-7 -7 L51 -7 L51 31 L-7 31 L-7 -7 Z"
+      ><path d="M0 0 L100 0 L100 14 L0 14 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath7"
       ><path d="M-7 -7 L121 -7 L121 51 L-7 51 L-7 -7 Z"
@@ -54,14 +54,11 @@
       ><path d="M0 0 L213 0 L213 104 L0 104 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath17"
-      ><path d="M-76 -14 L152 -14 L152 28 L-76 28 L-76 -14 Z"
-      /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath18"
-      ><path d="M-40 -20 L80 -20 L80 40 L-40 40 L-40 -20 Z"
+      ><path d="M-90 -14 L180 -14 L180 28 L-90 28 L-90 -14 Z"
       /></clipPath
     ></defs
     ><g fill="white" text-rendering="geometricPrecision" fill-opacity="1" stroke-opacity="1" stroke="white"
-    ><rect x="0" width="546" height="180" y="0" stroke="none"
+    ><rect x="0" width="546" height="186" y="0" stroke="none"
     /></g
     ><g font-size="11" transform="translate(2,2)" fill-opacity="1" fill="rgb(122,207,245)" text-rendering="geometricPrecision" font-family="sans-serif" stroke="rgb(122,207,245)" font-weight="bold" stroke-opacity="1"
     ><rect x="0" width="80" height="50" y="0" clip-path="url(#clipPath1)" stroke="none"
@@ -81,11 +78,11 @@
       >Entity</text
     ></g
     ><g font-size="11" transform="translate(122,112)" fill-opacity="1" fill="silver" text-rendering="geometricPrecision" font-family="sans-serif" stroke="silver" font-weight="bold" stroke-opacity="1"
-    ><rect x="0" width="80" height="64" y="0" clip-path="url(#clipPath4)" stroke="none"
+    ><rect x="0" width="100" height="70" y="0" clip-path="url(#clipPath4)" stroke="none"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(122,112)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" font-weight="bold" stroke-opacity="1" stroke-miterlimit="0"
-    ><rect fill="none" x="0" width="80" height="64" y="0" clip-path="url(#clipPath4)"
-      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath4)" x2="80" y1="14"
+    ><rect fill="none" x="0" width="100" height="70" y="0" clip-path="url(#clipPath4)"
+      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath4)" x2="100" y1="14"
     /></g
     ><g font-size="11" transform="translate(122,126)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath5)" stroke="none"
@@ -96,8 +93,8 @@
       > attributes</text
     ></g
     ><g font-size="11" transform="translate(122,112)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
-    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
-      >MemberOf</text
+    ><text x="12" xml:space="preserve" y="11" clip-path="url(#clipPath6)" stroke="none"
+      >HadMembers</text
     ></g
     ><g font-size="11" transform="translate(202,2)" fill-opacity="1" fill="rgb(179,214,249)" text-rendering="geometricPrecision" font-family="sans-serif" stroke="rgb(179,214,249)" font-weight="bold" stroke-opacity="1"
     ><rect x="0" width="110" height="40" y="0" clip-path="url(#clipPath7)" stroke="none"
@@ -146,13 +143,9 @@
       /><polygon fill="white" clip-path="url(#clipPath16)" points=" 50 50 62 56 62 44" stroke="none"
       /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath16)"
     /></g
-    ><g font-size="11" transform="translate(82,92)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><g font-size="11" transform="translate(72,92)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath17)" stroke="none"
-      >MemberOf</text
-    ></g
-    ><g font-size="11" transform="translate(42,52)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="14" clip-path="url(#clipPath18)" stroke="none"
-      >1..*</text
+      >HadMembers</text
     ></g
     ><g fill="rgb(120,120,120)" text-rendering="geometricPrecision" fill-opacity="1" font-size="8" stroke-opacity="1" stroke="rgb(120,120,120)"
     ></g