From adc15f2f13af01a4a75a6f67563fee7d5b9bd01f Mon Sep 17 00:00:00 2001
From: pontus_pih <pontus_pih>
Date: Tue, 9 Jan 2007 16:12:53 +0000
Subject: [PATCH] merged changes from patches

---
 diagrams/model.dia | 310 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 203 insertions(+), 107 deletions(-)

diff --git a/diagrams/model.dia b/diagrams/model.dia
index bfdca3b..27c8ffa 100644
--- a/diagrams/model.dia
+++ b/diagrams/model.dia
@@ -468,12 +468,12 @@
         <dia:point val="0,-26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.25,-26.05;0.2,-8.45"/>
+        <dia:rectangle val="-6.25,-26.05;0.2,-8.7"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="0,-26"/>
-        <dia:point val="0,-10.05"/>
-        <dia:point val="-5.5,-10.05"/>
+        <dia:point val="0,-10.3"/>
+        <dia:point val="-5.5,-10.3"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -710,13 +710,13 @@
         <dia:point val="30.775,40.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.925,40.35;126.825,44.05"/>
+        <dia:rectangle val="29.925,40.35;114.5,44.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30.775,40.4"/>
         <dia:point val="30.775,43"/>
-        <dia:point val="126.775,43"/>
-        <dia:point val="126.775,44"/>
+        <dia:point val="114.45,43"/>
+        <dia:point val="114.45,44"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -748,7 +748,7 @@
         <dia:point val="73.75,55.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="73.7,55.65;90.75,59.95"/>
+        <dia:rectangle val="73.7,55.65;90.75,59.15"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="73.75,55.7"/>
@@ -757,7 +757,7 @@
         <dia:real val="16.949999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.2000000000000002"/>
+        <dia:real val="3.3999999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#pk#</dia:string>
@@ -917,36 +917,6 @@
             </dia:composite>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#_read_options#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="2"/>
-          </dia:attribute>
-          <dia:attribute name="query">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -1062,13 +1032,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="103,57"/>
+        <dia:point val="103.5,63.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="102.95,56.95;114.05,59.85"/>
+        <dia:rectangle val="103.45,63.15;114.55,66.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="103,57"/>
+        <dia:point val="103.5,63.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11"/>
@@ -1200,13 +1170,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="95,57"/>
+        <dia:point val="95.5,63.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="94.95,56.95;97.8,59.25"/>
+        <dia:rectangle val="95.45,63.15;98.3,65.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="95,57"/>
+        <dia:point val="95.5,63.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="2.75"/>
@@ -1383,16 +1353,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="1" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="126.775,53.8437"/>
+        <dia:point val="114.45,59.4498"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="108.45,53.7937;127.625,57.05"/>
+        <dia:rectangle val="108.95,59.3998;115.3,63.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="126.775,53.8437"/>
-        <dia:point val="126.775,56"/>
-        <dia:point val="108.5,56"/>
-        <dia:point val="108.5,57"/>
+        <dia:point val="114.45,59.4498"/>
+        <dia:point val="114.45,61"/>
+        <dia:point val="109,61"/>
+        <dia:point val="109,63.2"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1415,22 +1385,22 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O98" connection="28"/>
+        <dia:connection handle="0" to="O98" connection="32"/>
         <dia:connection handle="1" to="O11" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Generalization" version="1" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="126.775,53.8"/>
+        <dia:point val="114.45,59.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="96.325,53.75;127.625,57.05"/>
+        <dia:rectangle val="96.825,59.35;115.3,63.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="126.775,53.8"/>
-        <dia:point val="126.775,56"/>
-        <dia:point val="96.375,56"/>
-        <dia:point val="96.375,57"/>
+        <dia:point val="114.45,59.4"/>
+        <dia:point val="114.45,61"/>
+        <dia:point val="96.875,61"/>
+        <dia:point val="96.875,63.2"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1462,7 +1432,7 @@
         <dia:point val="4,70"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.95,69.95;46.9,83.05"/>
+        <dia:rectangle val="3.95,69.95;46.9,84.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="4,70"/>
@@ -1471,7 +1441,7 @@
         <dia:real val="42.850000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="13"/>
+        <dia:real val="14.6"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#init_option#</dia:string>
@@ -1742,6 +1712,52 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#sd#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#scalar boolean#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>#0#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#corr#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#scalar boolean#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>#0#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="operations">
         <dia:composite type="umloperation">
@@ -2333,13 +2349,13 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="1" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="25.425,83"/>
+        <dia:point val="25.425,84.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.825,82.95;26.275,85.05"/>
+        <dia:rectangle val="14.825,83.3;26.275,85.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="25.425,83"/>
+        <dia:point val="25.425,84.6"/>
         <dia:point val="25.425,84"/>
         <dia:point val="14.875,84"/>
         <dia:point val="14.875,85"/>
@@ -2374,7 +2390,7 @@
         <dia:point val="-34,-94"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-34.05,-94.05;-5.45,58.85"/>
+        <dia:rectangle val="-34.05,-94.05;-5.45,58.6"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-34,-94"/>
@@ -2383,7 +2399,7 @@
         <dia:real val="28.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="152.79999999999981"/>
+        <dia:real val="152.54999999999978"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#model#</dia:string>
@@ -3133,7 +3149,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="inheritance_type">
-            <dia:enum val="1"/>
+            <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="query">
             <dia:boolean val="false"/>
@@ -9137,12 +9153,12 @@
         <dia:point val="109,-35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.25,-45.3;109.2,-33.4"/>
+        <dia:rectangle val="-6.25,-45.55;109.2,-33.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="109,-35"/>
-        <dia:point val="109,-44.55"/>
-        <dia:point val="-5.5,-44.55"/>
+        <dia:point val="109,-44.8"/>
+        <dia:point val="-5.5,-44.8"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -9310,12 +9326,12 @@
         <dia:point val="89,-35.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.25,-42.5;89.2,-34.2"/>
+        <dia:rectangle val="-6.25,-42.75;89.2,-34.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="89,-35.8"/>
-        <dia:point val="89,-41.75"/>
-        <dia:point val="-5.5,-41.75"/>
+        <dia:point val="89,-42"/>
+        <dia:point val="-5.5,-42"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -9373,13 +9389,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="99,57"/>
+        <dia:point val="99.5,63.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="98.95,56.95;101.8,59.25"/>
+        <dia:rectangle val="99.45,63.15;102.3,65.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="99,57"/>
+        <dia:point val="99.5,63.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="2.75"/>
@@ -9480,16 +9496,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="1" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="126.775,53.8"/>
+        <dia:point val="114.45,59.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="100.325,53.75;127.625,57.05"/>
+        <dia:rectangle val="100.825,59.35;115.3,63.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="126.775,53.8"/>
-        <dia:point val="126.775,56"/>
-        <dia:point val="100.375,56"/>
-        <dia:point val="100.375,57"/>
+        <dia:point val="114.45,59.4"/>
+        <dia:point val="114.45,61"/>
+        <dia:point val="100.875,61"/>
+        <dia:point val="100.875,63.2"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -14008,15 +14024,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O89">
       <dia:attribute name="obj_pos">
-        <dia:point val="95,57"/>
+        <dia:point val="95.5,63.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.6,1.5;111.05,58.6"/>
+        <dia:rectangle val="24.6,1.5;111.05,64.8"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="95,57"/>
-        <dia:point val="95,56"/>
-        <dia:point val="111,56"/>
+        <dia:point val="95.5,63.2"/>
+        <dia:point val="95.5,61"/>
+        <dia:point val="111,61"/>
         <dia:point val="111,2.25"/>
         <dia:point val="25.35,2.25"/>
       </dia:attribute>
@@ -14078,15 +14094,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O90">
       <dia:attribute name="obj_pos">
-        <dia:point val="99,57"/>
+        <dia:point val="99.5,63.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.6,1.5;111.05,58.6"/>
+        <dia:rectangle val="24.6,1.5;111.05,64.8"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="99,57"/>
-        <dia:point val="99,56"/>
-        <dia:point val="111,56"/>
+        <dia:point val="99.5,63.2"/>
+        <dia:point val="99.5,61"/>
+        <dia:point val="111,61"/>
         <dia:point val="111,2.25"/>
         <dia:point val="25.35,2.25"/>
       </dia:attribute>
@@ -14148,15 +14164,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O91">
       <dia:attribute name="obj_pos">
-        <dia:point val="103,57"/>
+        <dia:point val="103.5,63.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.6,1.5;111.05,58.6"/>
+        <dia:rectangle val="24.6,1.5;111.05,64.8"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="103,57"/>
-        <dia:point val="103,56"/>
-        <dia:point val="111,56"/>
+        <dia:point val="103.5,63.2"/>
+        <dia:point val="103.5,61"/>
+        <dia:point val="111,61"/>
         <dia:point val="111,2.25"/>
         <dia:point val="25.35,2.25"/>
       </dia:attribute>
@@ -14689,19 +14705,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O98">
       <dia:attribute name="obj_pos">
-        <dia:point val="98,44"/>
+        <dia:point val="103,44"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="97.95,43.95;155.6,53.85"/>
+        <dia:rectangle val="102.95,43.95;125.95,59.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="98,44"/>
+        <dia:point val="103,44"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="57.549999999999997"/>
+        <dia:real val="22.899999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="9.8000000000000007"/>
+        <dia:real val="15.4"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#init_record#</dia:string>
@@ -14731,7 +14747,7 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="wrap_after_char">
         <dia:int val="40"/>
@@ -14880,6 +14896,52 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#sd#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#scalar boolean#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>#0#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#corr#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#scalar boolean#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>#0#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="operations">
         <dia:composite type="umloperation">
@@ -15009,6 +15071,40 @@
                 <dia:enum val="1"/>
               </dia:attribute>
             </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#sd#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#scalar boolean#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>#0#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#corr#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#scalar boolean#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>#0#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
           </dia:attribute>
         </dia:composite>
         <dia:composite type="umloperation">
@@ -16090,13 +16186,13 @@
         <dia:point val="30,-22.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.25,-35.35;30.05,-20.9"/>
+        <dia:rectangle val="-6.25,-35.6;30.05,-20.9"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30,-22.5"/>
         <dia:point val="26.7329,-22.5"/>
-        <dia:point val="26.7329,-34.6"/>
-        <dia:point val="-5.5,-34.6"/>
+        <dia:point val="26.7329,-34.85"/>
+        <dia:point val="-5.5,-34.85"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -17029,13 +17125,13 @@
         <dia:point val="54,-20.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.25,-38.75;54.05,-19.1"/>
+        <dia:rectangle val="-6.25,-39;54.05,-19.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="54,-20.7"/>
         <dia:point val="52,-20.7"/>
-        <dia:point val="52,-38"/>
-        <dia:point val="-5.5,-38"/>
+        <dia:point val="52,-38.25"/>
+        <dia:point val="-5.5,-38.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
-- 
2.11.4.GIT