ItEr32S03RequirimentosItEr31S03: Refactoring data model of CalendarException

Removed the concept of interval in favour of just using CalendarExceptionDates
This commit is contained in:
Jose Maria Casanova Crespo 2009-10-27 21:07:35 +01:00
parent 65ff3e51cf
commit 34918690b7

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<XMI verified="false" xmi.version="1.2" timestamp="2009-10-27T14:26:44" xmlns:UML="http://schema.omg.org/spec/UML/1.3" >
<XMI verified="false" xmi.version="1.2" timestamp="2009-10-27T21:07:11" xmlns:UML="http://schema.omg.org/spec/UML/1.3" >
<XMI.header>
<XMI.documentation>
<XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
@ -567,14 +567,6 @@
<UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="qdnbcS4KQ3SN" type="aaComrF6S2Lu" name="" aggregation="none" />
</UML:Association.connection>
</UML:Association>
<UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="LMhwNWi8VTxj" name="CalendarExceptionDay" >
<UML:GeneralizableElement.generalization>
<UML:Generalization xmi.idref="pb6HwGdUgAtX" />
</UML:GeneralizableElement.generalization>
<UML:Classifier.feature>
<UML:Attribute visibility="private" isSpecification="false" xmi.id="3yqbve6SO01R" type="VyGIwPHyTZLs" name="date" />
</UML:Classifier.feature>
</UML:Class>
<UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="jkgXjYzFGWEM" name="" >
<UML:Association.connection>
<UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="HzJhMcEhwteJ" type="ntefL6x2Ab2r" name="" aggregation="composite" />
@ -1028,7 +1020,8 @@
</UML:Association>
<UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="0WqNRLCOXQXR" name="CalendarException" >
<UML:Classifier.feature>
<UML:Attribute visibility="private" isSpecification="false" xmi.id="rqY20BdCRSZu" type="CMWvZcLLrUfe" name="hours" />
<UML:Attribute visibility="private" isSpecification="false" xmi.id="rqY20BdCRSZu" type="dCHs9h07Z9Vb" name="hours" />
<UML:Attribute visibility="private" isSpecification="false" xmi.id="OQFU8xBPdMAL" type="VyGIwPHyTZLs" name="date" />
<UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="FfqvP3FJhzmB" name="isDayInException" >
<UML:BehavioralFeature.parameter>
<UML:Parameter kind="return" xmi.id="4AKXM6H4ks03" type="qdTUeCLBaJts" />
@ -1037,11 +1030,6 @@
</UML:Operation>
</UML:Classifier.feature>
</UML:Class>
<UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Lx31p4AKKJS0" name="CalendarExceptionInterval" >
<UML:GeneralizableElement.generalization>
<UML:Generalization xmi.idref="XMEBU7he2Yo3" />
</UML:GeneralizableElement.generalization>
</UML:Class>
<UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="LMhwNWi8VTxj" xmi.id="pb6HwGdUgAtX" parent="0WqNRLCOXQXR" name="" />
<UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="Lx31p4AKKJS0" xmi.id="XMEBU7he2Yo3" parent="0WqNRLCOXQXR" name="" />
<UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="bxb1FZ7c3xzw" name="" >
@ -1158,8 +1146,8 @@
<startpoint startx="773" starty="173" />
<endpoint endx="819" endy="173" />
</linepath>
<floatingtext width="61" x="796" y="186" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="mBesDy6qfnH7" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="requires" pretext="" />
<floatingtext width="31" x="758" y="174" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="GIkgstwfIkHG" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="61" x="796" y="186" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="LimzeZFyXnYf" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="requires" pretext="" />
<floatingtext width="31" x="758" y="174" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="IWP0DlqzykWN" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
</assocwidget>
<assocwidget indexa="2" indexb="1" widgetaid="8A8KfC0gS3t4" linecolor="none" totalcounta="3" xmi.id="ECeqpWy8psFU" widgetbid="9JJu7hjphMwH" totalcountb="4" type="500" linewidth="none" >
<linepath>
@ -1186,8 +1174,8 @@
<endpoint endx="413" endy="188" />
<point x="282" y="188" />
</linepath>
<floatingtext width="31" x="239" y="398" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="KeLkVp9Hyl7B" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="32" x="299" y="211" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="jC1NzGUEWCuO" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..1" pretext="" />
<floatingtext width="31" x="239" y="398" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="aJcfKcAfIufu" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="32" x="299" y="211" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="UstzfRevv1t6" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..1" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="oRwdH97rBGn9" linecolor="none" totalcounta="2" xmi.id="0fgpKmKdgy1V" widgetbid="aDjWeslUEANx" totalcountb="2" type="512" linewidth="none" >
<linepath>
@ -1195,9 +1183,9 @@
<endpoint endx="636" endy="244" />
<point x="607" y="608" />
</linepath>
<floatingtext width="90" x="615" y="636" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="5o2MXHartvbO" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="descompose" pretext="" />
<floatingtext width="34" x="535" y="578" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="iiegTjpBtoYr" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..N" pretext="" />
<floatingtext width="31" x="676" y="248" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="305ZCxwGjwcG" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="90" x="615" y="636" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="mh3lSZ60sjdA" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="descompose" pretext="" />
<floatingtext width="34" x="535" y="578" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="JoocgRWAHP7u" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..N" pretext="" />
<floatingtext width="31" x="676" y="248" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="ojpikhoXOqGq" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="j6nQ2fUEmIW5" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="rVN4DbRR2AJv" totalcountb="2" type="513" documentation="" linewidth="none" >
<linepath>
@ -1224,17 +1212,17 @@
<startpoint startx="548" starty="200" />
<endpoint endx="636" endy="200" />
</linepath>
<floatingtext width="31" x="526" y="200" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="nK1g6XV9XYhj" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="74" x="550" y="198" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="709" linecolor="none" xmi.id="DC577gTqO5Uq" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="contains" pretext="+" />
<floatingtext width="31" x="526" y="200" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="dV3utAofscNc" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="74" x="550" y="198" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="709" linecolor="none" xmi.id="PMoG3SQNECzu" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="contains" pretext="+" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="rVN4DbRR2AJv" linecolor="none" totalcounta="2" xmi.id="1DEsmgrxxgMG" widgetbid="9JJu7hjphMwH" totalcountb="3" type="512" linewidth="none" >
<linepath>
<startpoint startx="489" starty="383" />
<endpoint endx="353" endy="383" />
</linepath>
<floatingtext width="45" x="408" y="363" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="VbxDXZTklZrr" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="origin" pretext="" />
<floatingtext width="31" x="457" y="358" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="DJfaO9QBRPqW" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="32" x="363" y="386" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="wLfTuKANv8aS" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
<floatingtext width="45" x="408" y="363" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="HA9f0PUPkIdn" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="origin" pretext="" />
<floatingtext width="31" x="457" y="358" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="i4AwE7psbqkU" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="32" x="363" y="386" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="yX7q9VTQda3d" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="2" widgetaid="rVN4DbRR2AJv" linecolor="none" totalcounta="2" xmi.id="F6WCnsRVBR2k" widgetbid="9JJu7hjphMwH" totalcountb="3" type="512" linewidth="none" >
<linepath>
@ -1242,9 +1230,9 @@
<endpoint endx="353" endy="428" />
<point x="546" y="428" />
</linepath>
<floatingtext width="81" x="441" y="432" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="h4DRb2GoLtOk" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="destination" pretext="" />
<floatingtext width="31" x="560" y="416" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="2mtSBjy75bYz" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="32" x="366" y="426" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="wjMrpxKUzVva" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
<floatingtext width="81" x="441" y="432" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="yX0ioeTWgcRu" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="destination" pretext="" />
<floatingtext width="31" x="560" y="416" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="jEkI4Vm22sr9" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="32" x="366" y="426" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="NKZ0sabq6bWu" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="9JJu7hjphMwH" linecolor="none" totalcounta="3" xmi.id="lyv5tS6Uncy0" widgetbid="ntefL6x2Ab2r" totalcountb="2" type="512" linewidth="none" >
<linepath>
@ -1272,7 +1260,7 @@
</assocwidget>
</associations>
</diagram>
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Resources Allocation" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="557" canvaswidth="835" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="em0PEuZNPWBl" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Resources Allocation" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="835" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="em0PEuZNPWBl" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<widgets>
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="201" showattsigs="601" y="181" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="134" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="oRwdH97rBGn9" showscope="1" height="88" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="407" showattsigs="601" y="206" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="150" isinstance="0" usefillcolor="1" fillcolor="#92ff88" xmi.id="xC9oqvTbtqno" showscope="1" height="40" showopsigs="601" />
@ -1400,14 +1388,14 @@
<startpoint startx="159" starty="273" />
<endpoint endx="297" endy="273" />
</linepath>
<floatingtext width="31" x="259" y="264" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="r2lZ3XSTjARo" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="31" x="259" y="264" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="J1Wc31M41EvA" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="UwUp5iYgVB85" linecolor="none" totalcounta="2" xmi.id="uvVTa3RmuzlY" widgetbid="bmRPNtkrYrn4" totalcountb="2" type="512" linewidth="none" >
<linepath>
<startpoint startx="517" starty="287" />
<endpoint endx="655" endy="287" />
</linepath>
<floatingtext width="32" x="612" y="276" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="F0NCw4WmtR4N" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
<floatingtext width="32" x="612" y="276" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="ZFhX5I8wOiQG" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="BRWpZJn9t6Gg" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="UwUp5iYgVB85" totalcountb="2" type="513" documentation="" linewidth="none" >
<linepath>
@ -1441,7 +1429,7 @@
</assocwidget>
</associations>
</diagram>
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Labels" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="417" canvaswidth="691" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="9fuEBXrUUlIu" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Labels" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="824" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="9fuEBXrUUlIu" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<widgets>
<classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="135" showattsigs="601" y="108" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="135" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="tuIzeslDqJW5" showscope="1" height="152" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="410" showattsigs="601" y="167" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="68" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="J8SsPhfYKZmW" showscope="1" height="40" showopsigs="601" />
@ -1455,16 +1443,16 @@
<startpoint startx="270" starty="187" />
<endpoint endx="410" endy="187" />
</linepath>
<floatingtext width="34" x="272" y="175" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="QZHy4QLtR6SS" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="34" x="375" y="175" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="btvI1K7EKSQF" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="34" x="272" y="175" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="tQel0QVIP1uT" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="34" x="375" y="175" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="1EX2TQD0duYi" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="4cyZLGRuFuQR" linecolor="none" totalcounta="2" xmi.id="BTXE19fHMeq8" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="501" linewidth="none" >
<linepath>
<startpoint startx="605" starty="187" />
<endpoint endx="478" endy="187" />
</linepath>
<floatingtext width="34" x="589" y="172" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="Wu1NM3kkc1je" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="32" x="462" y="184" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="Q4Wp8wHjnC2o" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
<floatingtext width="34" x="589" y="172" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="AecYK3oETRxS" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="32" x="462" y="184" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="pSkERcfSqCTH" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="4M4dK9M6XlQq" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="513" documentation="" linewidth="none" >
<linepath>
@ -1474,7 +1462,7 @@
</assocwidget>
</associations>
</diagram>
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Orders" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="490" canvaswidth="942" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="C827JMNPgNXZ" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Orders" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="583" canvaswidth="942" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="C827JMNPgNXZ" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<widgets>
<classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="155" showattsigs="601" y="212" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="125" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="9m8Qj7mNVHWt" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="164" showattsigs="601" y="287" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="106" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="P0toAiR6U083" showscope="1" height="56" showopsigs="601" />
@ -1520,8 +1508,8 @@
<startpoint startx="396" starty="154" />
<endpoint endx="586" endy="154" />
</linepath>
<floatingtext width="31" x="402" y="41" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="58Nf86KW8oLE" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="74" x="398" y="99" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="709" linecolor="none" xmi.id="W72qXQ31J2Of" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="contains" pretext="+" />
<floatingtext width="31" x="402" y="41" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="b2x3RuTGKDUl" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="74" x="398" y="99" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="709" linecolor="none" xmi.id="aeIDWowhSYDl" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="contains" pretext="+" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="CzdNEBmDsnGX" linecolor="none" totalcounta="2" xmi.id="PGYCCNTyF7TI" widgetbid="pXwBgpXvFPTv" totalcountb="2" type="512" linewidth="none" >
<linepath>
@ -1529,8 +1517,8 @@
<endpoint endx="428" endy="302" />
<point x="428" y="234" />
</linepath>
<floatingtext width="15" x="500" y="212" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="kcyYmyMI3N6a" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
<floatingtext width="32" x="428" y="281" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="l8b4AzhG55vB" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
<floatingtext width="15" x="500" y="212" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="nACdKftvHB8n" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
<floatingtext width="32" x="428" y="281" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="x2UPbi8Ai5B7" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
</assocwidget>
<assocwidget indexa="2" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="3" xmi.id="Eddd1PYLJZsj" widgetbid="CzdNEBmDsnGX" totalcountb="2" type="503" linewidth="none" >
<linepath>
@ -1545,8 +1533,8 @@
<point x="808" y="147" />
<point x="807" y="234" />
</linepath>
<floatingtext width="16" x="725" y="132" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="9DhG10UmaQIM" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
<floatingtext width="15" x="687" y="212" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="OccPzhzlpYnz" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
<floatingtext width="16" x="725" y="132" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="xeNHrp1czDGI" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
<floatingtext width="15" x="687" y="212" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="q9B7IHsFKLct" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="2" widgetaid="WasJ2iNgmUNO" linecolor="none" totalcounta="2" xmi.id="810lqRZuxUkW" widgetbid="CzdNEBmDsnGX" totalcountb="3" type="500" linewidth="none" >
<linepath>
@ -1559,8 +1547,8 @@
<startpoint startx="727" starty="418" />
<endpoint endx="590" endy="418" />
</linepath>
<floatingtext width="31" x="582" y="401" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="QS81sQLH2ye0" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="71" x="616" y="394" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="710" linecolor="none" xmi.id="VVFZaBkjOQzO" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="children" pretext="+" />
<floatingtext width="31" x="582" y="401" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="02LyDZE3gP8w" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
<floatingtext width="71" x="616" y="394" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="710" linecolor="none" xmi.id="1l3hoFomtB1j" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="children" pretext="+" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="FlXADIefsqnc" linecolor="none" totalcounta="2" xmi.id="3sWbDbUnzm2a" widgetbid="CzdNEBmDsnGX" totalcountb="3" type="500" linewidth="none" >
<linepath>
@ -1575,16 +1563,16 @@
<point x="506" y="485" />
<point x="822" y="485" />
</linepath>
<floatingtext width="32" x="837" y="436" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="sxHENGaoiinb" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
<floatingtext width="61" x="742" y="444" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="710" linecolor="none" xmi.id="fejUAWRg1hFZ" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="parent" pretext="+" />
<floatingtext width="32" x="837" y="436" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="8o5zx7iv72tL" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
<floatingtext width="61" x="742" y="444" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="710" linecolor="none" xmi.id="gzB0KorJXv0L" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="parent" pretext="+" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="3" xmi.id="5PKYSxAl3acS" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="512" linewidth="none" >
<linepath>
<startpoint startx="261" starty="56" />
<endpoint endx="122" endy="56" />
</linepath>
<floatingtext width="34" x="226" y="54" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="88q96U7j6qBF" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="34" x="126" y="37" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="KdvKK8tA5AMT" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="34" x="226" y="54" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="Z5MGUTC9SM7k" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="34" x="126" y="37" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="8z3ds3y0r2zm" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="aDjWeslUEANx" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="q8B6Zo6eONeB" totalcountb="2" type="513" documentation="" linewidth="none" >
<linepath>
@ -1594,7 +1582,7 @@
</assocwidget>
</associations>
</diagram>
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Resources" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="386" canvaswidth="777" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="S6yQPUlWs49s" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Resources" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="824" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="S6yQPUlWs49s" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<widgets>
<classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="256" showattsigs="601" y="149" showattributes="1" font="Sans Serif,10,-1,0,75,0,0,0,0,0" width="78" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="QuCpOvJF0Q5L" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="193" showattsigs="601" y="254" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="63" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="EuVtTEVBubBT" showscope="1" height="32" showopsigs="601" />
@ -1681,17 +1669,15 @@
</diagram>
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Calendars" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="583" canvaswidth="1172" localid="" snapcsgrid="0" showgrid="1" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="Al723HW1jXBv" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<widgets>
<classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="412" showattsigs="601" y="257" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="143" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="pWd0kqSVARYy" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="412" showattsigs="601" y="257" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="143" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="pWd0kqSVARYy" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="255" showattsigs="601" y="147" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="496" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="ntefL6x2Ab2r" showscope="1" height="80" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="759" showattsigs="601" y="262" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="174" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="LMhwNWi8VTxj" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="75" showattsigs="601" y="159" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="110" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="djb5JvjZ9GTh" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="588" showattsigs="601" y="70" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="154" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="REhCQm4MOB01" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="818" showattsigs="601" y="155" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="253" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="0WqNRLCOXQXR" showscope="1" height="40" showopsigs="601" />
<classwidget linecolor="none" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="966" showattsigs="601" y="261" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="202" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="Lx31p4AKKJS0" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="855" showattsigs="601" y="58" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="181" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="9aZodH8figJs" showscope="1" height="72" showopsigs="601" />
<classwidget linecolor="none" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="590" showattsigs="601" y="259" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="108" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="y8PAxnHdWHgm" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="230" showattsigs="601" y="251" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="78" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="QuCpOvJF0Q5L" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="599" showattsigs="601" y="345" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="43" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="oRwdH97rBGn9" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="818" showattsigs="601" y="155" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="253" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="0WqNRLCOXQXR" showscope="1" height="64" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="855" showattsigs="601" y="58" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="181" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="9aZodH8figJs" showscope="1" height="72" showopsigs="601" />
<classwidget linecolor="none" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="590" showattsigs="601" y="259" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="108" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="y8PAxnHdWHgm" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="230" showattsigs="601" y="251" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="78" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="QuCpOvJF0Q5L" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="599" showattsigs="601" y="345" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="43" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="oRwdH97rBGn9" showscope="1" height="32" showopsigs="601" />
<notewidget width="174" x="372" noteType="0" y="22" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="96" linecolor="none" xmi.id="oUXh8daTKGG6" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="The calendar availability could only be associated to ResourceCalendars and TaskCalendars." />
</widgets>
<messages/>
@ -1709,7 +1695,7 @@
<point x="130" y="91" />
<point x="361" y="91" />
</linepath>
<floatingtext width="50" x="130" y="125" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="PxF5d2ek8StD" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="parent" pretext="" />
<floatingtext width="50" x="130" y="125" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="9ghEgZZDewR7" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="parent" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="ntefL6x2Ab2r" linecolor="none" totalcounta="2" xmi.id="3oF4IIw3C3pt" widgetbid="djb5JvjZ9GTh" totalcountb="2" type="501" linewidth="none" >
<linepath>
@ -1717,18 +1703,6 @@
<endpoint endx="185" endy="175" />
</linepath>
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="LMhwNWi8VTxj" linecolor="none" totalcounta="2" xmi.id="pb6HwGdUgAtX" widgetbid="0WqNRLCOXQXR" totalcountb="3" type="500" linewidth="none" >
<linepath>
<startpoint startx="902" starty="262" />
<endpoint endx="902" endy="195" />
</linepath>
</assocwidget>
<assocwidget indexa="1" indexb="2" widgetaid="Lx31p4AKKJS0" linecolor="none" totalcounta="2" xmi.id="XMEBU7he2Yo3" widgetbid="0WqNRLCOXQXR" totalcountb="3" type="500" linewidth="none" >
<linepath>
<startpoint startx="986" starty="261" />
<endpoint endx="986" endy="195" />
</linepath>
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="ntefL6x2Ab2r" linecolor="none" totalcounta="2" xmi.id="bxb1FZ7c3xzw" widgetbid="0WqNRLCOXQXR" totalcountb="2" type="510" linewidth="none" >
<linepath>
<startpoint startx="751" starty="175" />
@ -1758,18 +1732,18 @@
<startpoint startx="634" starty="345" />
<endpoint endx="634" endy="291" />
</linepath>
<floatingtext width="151" x="648" y="312" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="sHyCzam4rCYq" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="machineTaskCalendar" pretext="" />
<floatingtext width="16" x="636" y="323" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="rvJ3gAaXPWjP" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
<floatingtext width="29" x="638" y="293" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="9nHtkGwb9Deq" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0-1" pretext="" />
<floatingtext width="151" x="648" y="312" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="PcGpyLZ4KchC" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="machineTaskCalendar" pretext="" />
<floatingtext width="16" x="636" y="323" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="ddASf8Emmv1Q" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
<floatingtext width="29" x="638" y="293" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="UYd7U5ErhSef" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0-1" pretext="" />
</assocwidget>
<assocwidget indexa="2" indexb="1" widgetaid="oRwdH97rBGn9" linecolor="none" totalcounta="3" xmi.id="MwHQnc1Dm9HN" widgetbid="y8PAxnHdWHgm" totalcountb="3" type="512" linewidth="none" >
<linepath>
<startpoint startx="602" starty="345" />
<endpoint endx="602" endy="291" />
</linepath>
<floatingtext width="140" x="458" y="317" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="HxP4EJmUDNeQ" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="workerTaskCalendar" pretext="" />
<floatingtext width="16" x="604" y="323" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="QSnrsk87hX9t" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
<floatingtext width="29" x="567" y="296" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="eQyH7GUXgGNW" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0-1" pretext="" />
<floatingtext width="140" x="458" y="317" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="nDh6nOGO1Rqf" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="workerTaskCalendar" pretext="" />
<floatingtext width="16" x="604" y="323" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="X4RJ0QjSzMZT" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
<floatingtext width="29" x="567" y="296" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="PlJ6Dxj19Q5u" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0-1" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="QuCpOvJF0Q5L" linecolor="none" totalcounta="2" xmi.id="KnonRVuLZaF6" widgetbid="pWd0kqSVARYy" totalcountb="2" type="512" linewidth="none" >
<linepath>
@ -1785,7 +1759,7 @@
</assocwidget>
</associations>
</diagram>
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Work Reports" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="384" canvaswidth="720" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="lRwZmKnJy6yj" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Work Reports" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="824" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="lRwZmKnJy6yj" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<widgets>
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="213" showattsigs="601" y="245" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="97" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="4xsyjJuI5D3M" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="23" showattsigs="601" y="243" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="130" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="rAYL8dKCYC8F" showscope="1" height="32" showopsigs="601" />
@ -1828,16 +1802,16 @@
<startpoint startx="549" starty="149" />
<endpoint endx="451" endy="101" />
</linepath>
<floatingtext width="34" x="589" y="125" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="x0w1o6G8j9S1" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="34" x="470" y="74" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="HM9LUTmtO1z2" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="34" x="589" y="125" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="oLJok9THEuYC" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="34" x="470" y="74" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="LHcKcCl1x289" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="4cyZLGRuFuQR" linecolor="none" totalcounta="2" xmi.id="BTXE19fHMeq8" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="501" linewidth="none" >
<linepath>
<startpoint startx="318" starty="85" />
<endpoint endx="402" endy="85" />
</linepath>
<floatingtext width="34" x="335" y="51" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="1bm94fMzdH0R" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="32" x="347" y="45" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="NFZ4O05eMCxo" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
<floatingtext width="34" x="335" y="51" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="yp87GD12YIqJ" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
<floatingtext width="32" x="347" y="45" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="SJYeC7oVMQny" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
</assocwidget>
<assocwidget indexa="1" indexb="1" widgetaid="rAYL8dKCYC8F" linecolor="none" totalcounta="2" xmi.id="XNWkT3Q27j8q" widgetbid="cCjTVCxVWMoz" totalcountb="2" type="503" linewidth="none" >
<linepath>
@ -1865,7 +1839,7 @@
</assocwidget>
</associations>
</diagram>
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Cost Analysis" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="317" canvaswidth="554" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="DcCqLQWgvQ9f" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="Cost Analysis" font="Sans Serif,10,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="824" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="100" xmi.id="DcCqLQWgvQ9f" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
<widgets>
<classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="431" showattsigs="601" y="281" showattributes="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" width="119" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="HRweRDeLQktl" showscope="1" height="32" showopsigs="601" />
<classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="47" showattsigs="601" y="128" showattributes="1" font="Sans Serif,10,-1,0,75,0,0,0,0,0" width="78" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="QuCpOvJF0Q5L" showscope="1" height="32" showopsigs="601" />
@ -1920,7 +1894,7 @@
</UML:Model>
</XMI.content>
<XMI.extensions xmi.extender="umbrello" >
<docsettings viewid="Al723HW1jXBv" uniqueid="oUXh8daTKGG6" documentation="" />
<docsettings viewid="Al723HW1jXBv" uniqueid="OQFU8xBPdMAL" documentation="" />
<listview>
<listitem open="1" type="800" label="Views" >
<listitem open="1" type="801" id="Logical View" >
@ -1966,12 +1940,9 @@
</listitem>
<listitem open="1" type="813" id="0WqNRLCOXQXR" >
<listitem open="0" type="814" id="rqY20BdCRSZu" />
<listitem open="0" type="814" id="OQFU8xBPdMAL" />
<listitem open="0" type="815" id="FfqvP3FJhzmB" />
</listitem>
<listitem open="1" type="813" id="LMhwNWi8VTxj" >
<listitem open="0" type="814" id="3yqbve6SO01R" />
</listitem>
<listitem open="1" type="813" id="Lx31p4AKKJS0" />
<listitem open="1" type="813" id="9aZodH8figJs" >
<listitem open="0" type="814" id="xPvbjGGSlqDm" />
<listitem open="0" type="814" id="pDDCfbBFqNTu" />