Binary file model/uml/component6.png has changed
--- a/model/uml/component6.svg Thu Jul 12 11:14:47 2012 +0100
+++ b/model/uml/component6.svg Thu Jul 12 11:19:31 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="186" 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="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="110" 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"
@@ -15,50 +15,38 @@
><path d="M0 0 L80 0 L80 14 L0 14 L0 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath4"
- ><path d="M-7 -7 L111 -7 L111 81 L-7 81 L-7 -7 Z"
+ ><path d="M-7 -7 L121 -7 L121 51 L-7 51 L-7 -7 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath5"
- ><path d="M0 0 L0 67 L100 67 L100 0 Z"
+ ><path d="M0 0 L0 23 L110 23 L110 0 Z"
/></clipPath
><clipPath clipPathUnits="userSpaceOnUse" id="clipPath6"
- ><path d="M0 0 L100 0 L100 14 L0 14 L0 0 Z"
+ ><path d="M0 0 L110 0 L110 28 L0 28 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"
- /></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath8"
- ><path d="M0 0 L0 23 L110 23 L110 0 Z"
- /></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath9"
- ><path d="M0 0 L110 0 L110 28 L0 28 L0 0 Z"
- /></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath10"
><path d="M-7 -7 L131 -7 L131 51 L-7 51 L-7 -7 Z"
/></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath11"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath8"
><path d="M0 0 L0 23 L120 23 L120 0 Z"
/></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath12"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath9"
><path d="M0 0 L120 0 L120 28 L0 28 L0 0 Z"
/></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath13"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath10"
><path d="M0 0 L314 0 L314 144 L0 144 L0 0 Z"
/></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath14"
- ><path d="M0 0 L104 0 L104 133 L0 133 L0 0 Z"
- /></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath15"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath11"
><path d="M0 0 L223 0 L223 104 L0 104 L0 0 Z"
/></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath16"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath12"
><path d="M0 0 L213 0 L213 104 L0 104 L0 0 Z"
/></clipPath
- ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath17"
- ><path d="M-90 -14 L180 -14 L180 28 L-90 28 L-90 -14 Z"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath13"
+ ><path d="M-85 -14 L170 -14 L170 28 L-85 28 L-85 -14 Z"
/></clipPath
></defs
><g fill="white" text-rendering="geometricPrecision" fill-opacity="1" stroke-opacity="1" stroke="white"
- ><rect x="0" width="546" height="186" y="0" stroke="none"
+ ><rect x="0" width="546" height="110" 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"
@@ -77,75 +65,53 @@
><text x="23" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
>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="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="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"
- > id</text
- ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath5)" stroke="none"
- > complete</text
- ><text x="2" xml:space="preserve" y="41" clip-path="url(#clipPath5)" stroke="none"
- > 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="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"
+ ><rect x="0" width="110" height="40" y="0" clip-path="url(#clipPath4)" stroke="none"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(202,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="110" height="40" y="0" clip-path="url(#clipPath7)"
- /><line y2="28" fill="none" x1="0" clip-path="url(#clipPath7)" x2="110" y1="28"
+ ><rect fill="none" x="0" width="110" height="40" y="0" clip-path="url(#clipPath4)"
+ /><line y2="28" fill="none" x1="0" clip-path="url(#clipPath4)" x2="110" y1="28"
/></g
><g font-size="11" transform="translate(202,2)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
- ><text x="11" xml:space="preserve" y="11" clip-path="url(#clipPath9)" stroke="none"
+ ><text x="11" xml:space="preserve" y="11" clip-path="url(#clipPath6)" stroke="none"
><<prov:type>></text
- ><text x="26" xml:space="preserve" y="25" font-weight="bold" clip-path="url(#clipPath9)" stroke="none"
+ ><text x="26" xml:space="preserve" y="25" font-weight="bold" clip-path="url(#clipPath6)" stroke="none"
>Collection</text
></g
><g font-size="11" transform="translate(422,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(#clipPath10)" stroke="none"
+ ><rect x="0" width="120" height="40" y="0" clip-path="url(#clipPath7)" stroke="none"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(422,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(#clipPath10)"
- /><line y2="28" fill="none" x1="0" clip-path="url(#clipPath10)" x2="120" y1="28"
+ ><rect fill="none" x="0" width="120" height="40" y="0" clip-path="url(#clipPath7)"
+ /><line y2="28" fill="none" x1="0" clip-path="url(#clipPath7)" x2="120" y1="28"
/></g
><g font-size="11" transform="translate(422,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(#clipPath12)" stroke="none"
+ ><text x="16" xml:space="preserve" y="11" clip-path="url(#clipPath9)" stroke="none"
><<prov:type>></text
- ><text x="13" xml:space="preserve" y="25" font-weight="bold" clip-path="url(#clipPath12)" stroke="none"
+ ><text x="13" xml:space="preserve" y="25" font-weight="bold" clip-path="url(#clipPath9)" stroke="none"
>EmptyCollection</text
></g
><g font-size="11" stroke-linecap="butt" transform="translate(-8,-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="260" clip-path="url(#clipPath13)" x2="260" y1="74"
- /><line y2="90" fill="none" x1="260" clip-path="url(#clipPath13)" x2="50" y1="90"
- /><line y2="60" fill="none" x1="50" clip-path="url(#clipPath13)" x2="50" y1="90"
- /><polygon fill="none" points=" 260 50 254 62 260 74 266 62" clip-path="url(#clipPath13)"
- /><line y2="72" fill="none" x1="50" clip-path="url(#clipPath13)" x2="44" y1="60"
- /><line y2="72" fill="none" x1="50" clip-path="url(#clipPath13)" x2="56" y1="60"
- /></g
- ><g font-size="11" stroke-linecap="butt" transform="translate(112,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(#clipPath14)" x2="50" y1="50"
+ ><line y2="90" fill="none" x1="260" clip-path="url(#clipPath10)" x2="260" y1="74"
+ /><line y2="90" fill="none" x1="260" clip-path="url(#clipPath10)" x2="50" y1="90"
+ /><line y2="60" fill="none" x1="50" clip-path="url(#clipPath10)" x2="50" y1="90"
+ /><polygon fill="none" points=" 260 50 254 62 260 74 266 62" clip-path="url(#clipPath10)"
+ /><line y2="72" fill="none" x1="50" clip-path="url(#clipPath10)" x2="44" y1="60"
+ /><line y2="72" fill="none" x1="50" clip-path="url(#clipPath10)" x2="56" y1="60"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(32,-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(#clipPath15)" x2="169" 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)"
+ ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath11)" x2="169" y1="50"
+ /><polygon fill="white" clip-path="url(#clipPath11)" points=" 50 50 62 56 62 44" stroke="none"
+ /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath11)"
/></g
><g font-size="11" stroke-linecap="butt" transform="translate(262,-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(#clipPath16)" x2="159" 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)"
+ ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath12)" x2="159" 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" 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"
- >HadMembers</text
+ ><g font-size="11" transform="translate(102,92)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+ ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath13)" stroke="none"
+ >HadMember</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