--- a/model/uml/component6.svg Wed May 30 10:10:01 2012 +0100
+++ b/model/uml/component6.svg Wed May 30 10:52:55 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="792" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="356" xmlns="http://www.w3.org/2000/svg" font-family="'Dialog'" 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="896" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="356" xmlns="http://www.w3.org/2000/svg" font-family="'Dialog'" 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"
@@ -30,53 +30,65 @@
><path d="M0 0 L0 37 L80 37 L80 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath9"
- ><path d="M0 0 L203 0 L203 104 L0 104 L0 0 Z"
+ ><path d="M-7 -7 L131 -7 L131 51 L-7 51 L-7 -7 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath10"
- ><path d="M0 0 L193 0 L193 104 L0 104 L0 0 Z"
+ ><path d="M0 0 L0 37 L120 37 L120 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath11"
- ><path d="M0 0 L144 0 L144 203 L0 203 L0 0 Z"
+ ><path d="M0 0 L120 0 L120 14 L0 14 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath12"
- ><path d="M0 0 L143 0 L143 203 L0 203 L0 0 Z"
+ ><path d="M0 0 L203 0 L203 104 L0 104 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath13"
- ><path d="M0 0 L174 0 L174 194 L0 194 L0 0 Z"
+ ><path d="M0 0 L193 0 L193 104 L0 104 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath14"
- ><path d="M0 0 L244 0 L244 134 L0 134 L0 0 Z"
+ ><path d="M0 0 L144 0 L144 203 L0 203 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath15"
- ><path d="M0 0 L273 0 L273 104 L0 104 L0 0 Z"
+ ><path d="M0 0 L143 0 L143 203 L0 203 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath16"
- ><path d="M0 0 L164 0 L164 204 L0 204 L0 0 Z"
+ ><path d="M0 0 L174 0 L174 194 L0 194 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath17"
- ><path d="M0 0 L364 0 L364 304 L0 304 L0 0 Z"
+ ><path d="M0 0 L244 0 L244 134 L0 134 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath18"
- ><path d="M0 0 L433 0 L433 384 L0 384 L0 0 Z"
+ ><path d="M0 0 L273 0 L273 104 L0 104 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath19"
- ><path d="M0 0 L594 0 L594 254 L0 254 L0 0 Z"
+ ><path d="M0 0 L164 0 L164 204 L0 204 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath20"
- ><path d="M0 0 L104 0 L104 133 L0 133 L0 0 Z"
+ ><path d="M0 0 L364 0 L364 304 L0 304 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath21"
- ><path d="M-77 -14 L154 -14 L154 28 L-77 28 L-77 -14 Z"
+ ><path d="M0 0 L433 0 L433 384 L0 384 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath22"
+ ><path d="M0 0 L594 0 L594 254 L0 254 L0 0 Z"
+ /></clipPath
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath23"
+ ><path d="M0 0 L104 0 L104 133 L0 133 L0 0 Z"
+ /></clipPath
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath24"
+ ><path d="M0 0 L153 0 L153 104 L0 104 L0 0 Z"
+ /></clipPath
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath25"
+ ><path d="M-77 -14 L154 -14 L154 28 L-77 28 L-77 -14 Z"
+ /></clipPath
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath26"
><path d="M-66 -14 L132 -14 L132 28 L-66 28 L-66 -14 Z"
/></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath23"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath27"
><path d="M-67 -14 L134 -14 L134 28 L-67 28 L-67 -14 Z"
/></clipPath
></defs
><g fill="white" text-rendering="geometricPrecision" fill-opacity="1" stroke-opacity="1" stroke="white"
- ><rect x="0" width="792" height="356" y="0" stroke="none"
+ ><rect x="0" width="896" height="356" y="0" stroke="none"
/></g
><g font-size="11" transform="translate(232,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"
@@ -196,75 +208,91 @@
><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
>MemberOf</text
></g
+ ><g font-size="11" transform="translate(772,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(#clipPath9)" stroke="none"
+ /></g
+ ><g font-size="11" stroke-linecap="butt" transform="translate(772,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(#clipPath9)"
+ /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath9)" x2="120" y1="14"
+ /></g
+ ><g font-size="11" transform="translate(772,2)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
+ ><text x="13" xml:space="preserve" y="11" clip-path="url(#clipPath11)" stroke="none"
+ >EmptyDictionary</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(#clipPath9)" x2="149" y1="50"
- /><polygon fill="white" clip-path="url(#clipPath9)" points=" 50 50 62 56 62 44" stroke="none"
- /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath9)"
+ ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath12)" x2="149" y1="50"
+ /><polygon fill="white" clip-path="url(#clipPath12)" points=" 50 50 62 56 62 44" stroke="none"
+ /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath12)"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(472,-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(#clipPath10)" x2="139" y1="50"
- /><polygon fill="white" clip-path="url(#clipPath10)" points=" 50 50 62 56 62 44" stroke="none"
- /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath10)"
+ ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath13)" x2="139" y1="50"
+ /><polygon fill="white" clip-path="url(#clipPath13)" points=" 50 50 62 56 62 44" stroke="none"
+ /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath13)"
/></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(#clipPath11)" x2="90" y1="149"
- /><line y2="50" fill="none" x1="90" clip-path="url(#clipPath11)" x2="50" y1="50"
+ ><line y2="50" fill="none" x1="90" clip-path="url(#clipPath14)" x2="90" y1="149"
+ /><line y2="50" fill="none" x1="90" clip-path="url(#clipPath14)" 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(#clipPath12)" x2="50" y1="149"
- /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath12)" x2="89" y1="50"
+ ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath15)" x2="50" y1="149"
+ /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath15)" x2="89" y1="50"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(532,-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(#clipPath13)" x2="120" y1="60"
- /><line y2="140" fill="none" x1="120" clip-path="url(#clipPath13)" x2="50" y1="140"
- /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath13)" x2="50" y1="140"
- /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath13)" x2="79" y1="50"
- /><line y2="44" fill="none" x1="79" clip-path="url(#clipPath13)" x2="67" y1="50"
- /><line y2="56" fill="none" x1="79" clip-path="url(#clipPath13)" x2="67" y1="50"
+ ><line y2="140" fill="none" x1="120" clip-path="url(#clipPath16)" x2="120" y1="60"
+ /><line y2="140" fill="none" x1="120" clip-path="url(#clipPath16)" x2="50" y1="140"
+ /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath16)" x2="50" y1="140"
+ /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath16)" x2="79" y1="50"
+ /><line y2="44" fill="none" x1="79" clip-path="url(#clipPath16)" x2="67" y1="50"
+ /><line y2="56" fill="none" x1="79" clip-path="url(#clipPath16)" 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="80" fill="none" x1="190" clip-path="url(#clipPath14)" x2="190" y1="50"
- /><line y2="80" fill="none" x1="190" clip-path="url(#clipPath14)" x2="50" y1="80"
+ ><line y2="80" fill="none" x1="190" clip-path="url(#clipPath17)" x2="190" y1="50"
+ /><line y2="80" fill="none" x1="190" clip-path="url(#clipPath17)" x2="50" y1="80"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(162,92)" 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(#clipPath15)" x2="50" y1="50"
+ ><line y2="50" fill="none" x1="219" clip-path="url(#clipPath18)" x2="50" y1="50"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(632,-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(#clipPath16)" x2="50" y1="70"
- /><line y2="150" fill="none" x1="50" clip-path="url(#clipPath16)" x2="110" y1="150"
- /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath16)" x2="110" y1="150"
- /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath16)" x2="90" y1="50"
- /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath16)" x2="44" y1="70"
- /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath16)" x2="56" y1="70"
+ ><line y2="150" fill="none" x1="50" clip-path="url(#clipPath19)" x2="50" y1="70"
+ /><line y2="150" fill="none" x1="50" clip-path="url(#clipPath19)" x2="110" y1="150"
+ /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath19)" x2="110" y1="150"
+ /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath19)" x2="90" y1="50"
+ /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath19)" x2="44" y1="70"
+ /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath19)" 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="250" fill="none" x1="310" clip-path="url(#clipPath17)" x2="310" y1="50"
- /><line y2="250" fill="none" x1="310" clip-path="url(#clipPath17)" x2="50" y1="250"
+ ><line y2="250" fill="none" x1="310" clip-path="url(#clipPath20)" x2="310" y1="50"
+ /><line y2="250" fill="none" x1="310" clip-path="url(#clipPath20)" x2="50" y1="250"
/></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="330" fill="none" x1="379" clip-path="url(#clipPath18)" x2="50" y1="330"
- /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath18)" x2="50" y1="330"
+ ><line y2="330" fill="none" x1="379" clip-path="url(#clipPath21)" x2="50" y1="330"
+ /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath21)" x2="50" y1="330"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(122,-8)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
- ><line y2="200" fill="none" x1="50" clip-path="url(#clipPath19)" x2="50" y1="170"
- /><line y2="200" fill="none" x1="50" clip-path="url(#clipPath19)" x2="540" y1="200"
- /><line y2="50" fill="none" x1="540" clip-path="url(#clipPath19)" x2="540" y1="200"
- /><line y2="62" fill="none" x1="540" clip-path="url(#clipPath19)" x2="534" y1="50"
- /><line y2="62" fill="none" x1="540" clip-path="url(#clipPath19)" x2="546" y1="50"
+ ><line y2="200" fill="none" x1="50" clip-path="url(#clipPath22)" x2="50" y1="170"
+ /><line y2="200" fill="none" x1="50" clip-path="url(#clipPath22)" x2="540" y1="200"
+ /><line y2="50" fill="none" x1="540" clip-path="url(#clipPath22)" x2="540" y1="200"
+ /><line y2="62" fill="none" x1="540" clip-path="url(#clipPath22)" x2="534" y1="50"
+ /><line y2="62" fill="none" x1="540" clip-path="url(#clipPath22)" x2="546" y1="50"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(372,142)" 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(#clipPath20)" x2="50" y1="50"
+ ><line y2="79" fill="none" x1="50" clip-path="url(#clipPath23)" x2="50" y1="50"
+ /></g
+ ><g font-size="11" stroke-linecap="butt" transform="translate(672,-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(#clipPath24)" x2="99" y1="50"
+ /><polygon fill="white" clip-path="url(#clipPath24)" points=" 50 50 62 56 62 44" stroke="none"
+ /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath24)"
/></g
><g font-size="11" transform="translate(202,192)" 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(#clipPath21)" stroke="none"
+ ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath25)" stroke="none"
>MemberOf</text
></g
><g font-size="11" transform="translate(722,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(#clipPath22)" stroke="none"
+ ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath26)" stroke="none"
>Removal</text
></g
><g font-size="11" transform="translate(532,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(#clipPath23)" stroke="none"
+ ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath27)" stroke="none"
>Insertion</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)"