[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6797 - in trunk/gnue-packages: base/org doc
|
From: |
kilo |
|
Subject: |
r6797 - in trunk/gnue-packages: base/org doc |
|
Date: |
Fri, 10 Dec 2004 02:01:45 -0600 (CST) |
Author: kilo
Date: 2004-12-10 02:01:44 -0600 (Fri, 10 Dec 2004)
New Revision: 6797
Modified:
trunk/gnue-packages/base/org/org.gcd
trunk/gnue-packages/doc/org.dia
trunk/gnue-packages/doc/org.png
Log:
Packages:
Reverted overshoot in ORG module.
Modified: trunk/gnue-packages/base/org/org.gcd
===================================================================
--- trunk/gnue-packages/base/org/org.gcd 2004-12-10 00:19:41 UTC (rev
6796)
+++ trunk/gnue-packages/base/org/org.gcd 2004-12-10 08:01:44 UTC (rev
6797)
@@ -29,8 +29,10 @@
<property name="shortName" type="string(35)" nullable="False"
comment=""/>
<property name="longName" type="string(70)"
comment=""/>
<property name="keywords" type="string"
comment="Free form keywords for lookup"/>
+ <property name="address" type="LOC_Address"
comment=""/>
</class>
+<!--Needs further work to replace the single address field...
<class name="OrgAd" comment="Org-Address m:n link">
<property name="org" type="ORG_Org"/>
<property name="addr" type="LOC_Address"/>
@@ -42,5 +44,6 @@
<class name="LinkType" comment="Org-Address link types (main addr, postal
addr, etc">
<property name="name" type="string(35)"/>
</class>
+-->
</module>
Modified: trunk/gnue-packages/doc/org.dia
===================================================================
--- trunk/gnue-packages/doc/org.dia 2004-12-10 00:19:41 UTC (rev 6796)
+++ trunk/gnue-packages/doc/org.dia 2004-12-10 08:01:44 UTC (rev 6797)
@@ -13,16 +13,16 @@
<dia:string>#A4#</dia:string>
</dia:attribute>
<dia:attribute name="tmargin">
- <dia:real val="2.8222000598907471"/>
+ <dia:real val="2.8222"/>
</dia:attribute>
<dia:attribute name="bmargin">
- <dia:real val="2.8222000598907471"/>
+ <dia:real val="2.8222"/>
</dia:attribute>
<dia:attribute name="lmargin">
- <dia:real val="2.8222000598907471"/>
+ <dia:real val="2.8222"/>
</dia:attribute>
<dia:attribute name="rmargin">
- <dia:real val="2.8222000598907471"/>
+ <dia:real val="2.8222"/>
</dia:attribute>
<dia:attribute name="is_portrait">
<dia:boolean val="true"/>
@@ -69,16 +69,16 @@
<dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.95,0.95;36.05,12"/>
+ <dia:rectangle val="15.95,0.95;27.05,10.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="20"/>
+ <dia:real val="11"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="9.9500000000000011"/>
+ <dia:real val="8"/>
</dia:attribute>
<dia:attribute name="line_colour">
<dia:color val="#000000"/>
@@ -95,19 +95,19 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O1">
<dia:attribute name="obj_pos">
- <dia:point val="17,2.95"/>
+ <dia:point val="17,3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.95,2.9;24.25,7.4"/>
+ <dia:rectangle val="16.95,2.95;25.35,8.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="17,2.95"/>
+ <dia:point val="17,3"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="7.1999999999999993"/>
+ <dia:real val="8.3"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="4.4000000000000004"/>
+ <dia:real val="5.2"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#Org#</dia:string>
@@ -136,12 +136,335 @@
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="wrap_operations">
+ <dia:attribute name="line_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_color">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="text_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="normal_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font">
+ <dia:font family="monospace" style="88" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font">
+ <dia:font family="monospace" style="8" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font">
+ <dia:font family="sans" style="80" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font">
+ <dia:font family="sans" style="88" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font">
+ <dia:font family="sans" style="8" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="attributes">
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#shortName#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</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>#longName#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(70)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</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>#keywords#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>#Free form keywords for lookup#</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>#address#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#LOC_Address#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</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:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="wrap_after_char">
- <dia:int val="40"/>
+ <dia:attribute name="templates"/>
+ </dia:object>
+ <dia:object type="UML - SmallPackage" version="0" id="O2">
+ <dia:attribute name="obj_pos">
+ <dia:point val="29,5"/>
</dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="28.95,4.05;31.55,6.45"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="29,5"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="2.5"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="1.4"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#7f7f7f"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#LOC#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="29.3,5.95"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Association" version="0" id="O3">
+ <dia:attribute name="obj_pos">
+ <dia:point val="25.3,7.3"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="25.25,5.65;29.05,8.9"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="25.3,7.3"/>
+ <dia:point val="28,7.3"/>
+ <dia:point val="28,5.7"/>
+ <dia:point val="29,5.7"/>
+ </dia:attribute>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="autorouting">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="ends">
+ <dia:composite>
+ <dia:attribute name="role">
+ <dia:string>#address#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multiplicity">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="arrow">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="aggregate">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite>
+ <dia:attribute name="role">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multiplicity">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="arrow">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="aggregate">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O1" connection="15"/>
+ <dia:connection handle="1" to="O2" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ </dia:group>
+ <dia:group>
+ <dia:object type="UML - LargePackage" version="0" id="O4">
+ <dia:attribute name="obj_pos">
+ <dia:point val="18,24"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="17.95,22.95;38.05,34"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="18,24"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="20"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="9.95"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#ORG#</dia:string>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Class" version="0" id="O5">
+ <dia:attribute name="obj_pos">
+ <dia:point val="19,24.95"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="18.95,24.9;27.35,29.4"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="19,24.95"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="8.3"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="4.4"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#Org#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>#Defines a business organization (seller, buyer,
employer, etc)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_attributes">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_operations">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="visible_attributes">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_operations">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_comments">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -170,13 +493,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -264,18 +587,18 @@
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O2">
+ <dia:object type="UML - Class" version="0" id="O6">
<dia:attribute name="obj_pos">
- <dia:point val="28,3.95"/>
+ <dia:point val="30,25.95"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.95,3.9;34.35,10"/>
+ <dia:rectangle val="29.95,25.9;37.3,32"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="28,3.95"/>
+ <dia:point val="30,25.95"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.2999999999999998"/>
+ <dia:real val="7.25"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="6"/>
@@ -307,12 +630,6 @@
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="wrap_operations">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="wrap_after_char">
- <dia:int val="40"/>
- </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -341,13 +658,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -481,21 +798,21 @@
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O3">
+ <dia:object type="UML - Class" version="0" id="O7">
<dia:attribute name="obj_pos">
- <dia:point val="19,8.95"/>
+ <dia:point val="21,30.95"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="18.95,8.9;24.75,11.4"/>
+ <dia:rectangle val="20.95,30.9;27.6,33.4"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="19,8.95"/>
+ <dia:point val="21,30.95"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="5.6999999999999993"/>
+ <dia:real val="6.55"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="2.3999999999999999"/>
+ <dia:real val="2.4"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#LinkType#</dia:string>
@@ -524,12 +841,6 @@
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="wrap_operations">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="wrap_after_char">
- <dia:int val="40"/>
- </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -558,13 +869,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -606,18 +917,18 @@
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="0" id="O4">
+ <dia:object type="UML - Association" version="0" id="O8">
<dia:attribute name="obj_pos">
- <dia:point val="24.2,3.65"/>
+ <dia:point val="27.3,25.65"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24.15,3.6;28.9,6.45"/>
+ <dia:rectangle val="27.25,25.6;31.05,29.45"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="24.2,3.65"/>
- <dia:point val="26.1,3.65"/>
- <dia:point val="26.1,5.85"/>
- <dia:point val="28,5.85"/>
+ <dia:point val="27.3,25.65"/>
+ <dia:point val="28.1,25.65"/>
+ <dia:point val="28.1,27.85"/>
+ <dia:point val="30,27.85"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -664,22 +975,22 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O1" connection="4"/>
+ <dia:connection handle="0" to="O5" connection="4"/>
</dia:connections>
- <dia:childnode parent="O0"/>
+ <dia:childnode parent="O4"/>
</dia:object>
- <dia:object type="UML - Association" version="0" id="O5">
+ <dia:object type="UML - Association" version="0" id="O9">
<dia:attribute name="obj_pos">
- <dia:point val="24.7,9.65"/>
+ <dia:point val="27.55,31.65"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24.65,6.45;29.2,11.25"/>
+ <dia:rectangle val="27.5,29.4;31.4,33.25"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="24.7,9.65"/>
- <dia:point val="26.35,9.65"/>
- <dia:point val="26.35,7.45"/>
- <dia:point val="28,7.45"/>
+ <dia:point val="27.55,31.65"/>
+ <dia:point val="28.775,31.65"/>
+ <dia:point val="28.775,29.45"/>
+ <dia:point val="30,29.45"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -723,26 +1034,26 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O3" connection="4"/>
- <dia:connection handle="1" to="O2" connection="12"/>
+ <dia:connection handle="0" to="O7" connection="4"/>
+ <dia:connection handle="1" to="O6" connection="12"/>
</dia:connections>
- <dia:childnode parent="O0"/>
+ <dia:childnode parent="O4"/>
</dia:object>
- <dia:object type="UML - SmallPackage" version="0" id="O6">
+ <dia:object type="UML - SmallPackage" version="0" id="O10">
<dia:attribute name="obj_pos">
- <dia:point val="37,6.95"/>
+ <dia:point val="39,28.95"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="36.95,6;39.55,8.4"/>
+ <dia:rectangle val="38.95,28;41.55,30.4"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="37,6.95"/>
+ <dia:point val="39,28.95"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="2.5"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="1.3999999999999999"/>
+ <dia:real val="1.4"/>
</dia:attribute>
<dia:attribute name="line_colour">
<dia:color val="#7f7f7f"/>
@@ -762,10 +1073,10 @@
<dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="37.3,7.75"/>
+ <dia:point val="39.3,29.9"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#7f7f7f"/>
@@ -776,18 +1087,18 @@
</dia:composite>
</dia:attribute>
</dia:object>
- <dia:object type="UML - Association" version="0" id="O7">
+ <dia:object type="UML - Association" version="0" id="O11">
<dia:attribute name="obj_pos">
- <dia:point val="34.3,6.65"/>
+ <dia:point val="37.25,28.65"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="34.25,5.65;37.05,9.25"/>
+ <dia:rectangle val="37.2,28.6;39.05,31.25"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="34.3,6.65"/>
- <dia:point val="35.65,6.65"/>
- <dia:point val="35.65,7.65"/>
- <dia:point val="37,7.65"/>
+ <dia:point val="37.25,28.65"/>
+ <dia:point val="38.125,28.65"/>
+ <dia:point val="38.125,29.65"/>
+ <dia:point val="39,29.65"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -831,21 +1142,21 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O2" connection="11"/>
- <dia:connection handle="1" to="O6" connection="3"/>
+ <dia:connection handle="0" to="O6" connection="11"/>
+ <dia:connection handle="1" to="O10" connection="3"/>
</dia:connections>
</dia:object>
</dia:group>
<dia:group>
- <dia:object type="UML - LargePackage" version="0" id="O8">
+ <dia:object type="UML - LargePackage" version="0" id="O12">
<dia:attribute name="obj_pos">
- <dia:point val="6,9"/>
+ <dia:point val="8,31"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="5.95,7.95;14.05,14.05"/>
+ <dia:rectangle val="7.95,29.95;16.05,36.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="6,9"/>
+ <dia:point val="8,31"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="8"/>
@@ -866,21 +1177,21 @@
<dia:string>#TAX#</dia:string>
</dia:attribute>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O9">
+ <dia:object type="UML - Class" version="0" id="O13">
<dia:attribute name="obj_pos">
- <dia:point val="7,10"/>
+ <dia:point val="9,32"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="6.95,9.95;13.05,12.85"/>
+ <dia:rectangle val="8.95,31.95;15.95,34.85"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="7,10"/>
+ <dia:point val="9,32"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6"/>
+ <dia:real val="6.9"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="2.7999999999999998"/>
+ <dia:real val="2.8"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#Org#</dia:string>
@@ -909,12 +1220,237 @@
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="wrap_operations">
+ <dia:attribute name="line_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_color">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="text_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="normal_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font">
+ <dia:font family="monospace" style="88" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font">
+ <dia:font family="monospace" style="8" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font">
+ <dia:font family="sans" style="80" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font">
+ <dia:font family="sans" style="88" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font">
+ <dia:font family="sans" style="8" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="attributes">
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#taxId#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</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:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="wrap_after_char">
- <dia:int val="40"/>
+ <dia:attribute name="templates"/>
+ <dia:childnode parent="O12"/>
+ </dia:object>
+ </dia:group>
+ <dia:object type="UML - Generalization" version="0" id="O14">
+ <dia:attribute name="obj_pos">
+ <dia:point val="23.15,29.35"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="12.4,29.3;24,32.05"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="23.15,29.35"/>
+ <dia:point val="23.15,30.675"/>
+ <dia:point val="12.45,30.675"/>
+ <dia:point val="12.45,32"/>
+ </dia:attribute>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="orth_autoroute">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O5" connection="6"/>
+ <dia:connection handle="1" to="O13" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="UML - Note" version="0" id="O15">
+ <dia:attribute name="obj_pos">
+ <dia:point val="8,23"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="7.95,22.95;12.1,24.75"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="8,23"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="4.05"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="1.7"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#PROPOSED:#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="8.35,24.3"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:group>
+ <dia:object type="UML - LargePackage" version="0" id="O16">
+ <dia:attribute name="obj_pos">
+ <dia:point val="14,12"/>
</dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="13.95,10.95;23.05,17.05"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="14,12"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="9"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="5"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#TAX#</dia:string>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Class" version="0" id="O17">
+ <dia:attribute name="obj_pos">
+ <dia:point val="15,13"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="14.95,12.95;21.95,15.85"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="15,13"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="6.9"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2.8"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#Org#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>#extends Org with tax-related things#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_attributes">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_operations">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="visible_attributes">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_operations">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_comments">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -943,13 +1479,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -990,21 +1526,21 @@
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="templates"/>
- <dia:childnode parent="O8"/>
+ <dia:childnode parent="O16"/>
</dia:object>
</dia:group>
- <dia:object type="UML - Generalization" version="0" id="O10">
+ <dia:object type="UML - Generalization" version="0" id="O18">
<dia:attribute name="obj_pos">
- <dia:point val="20.6,7.35"/>
+ <dia:point val="21.15,8.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="9.95,7.3;21.45,10.05"/>
+ <dia:rectangle val="18.4,8.15;22,13.05"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="20.6,7.35"/>
- <dia:point val="20.6,8.675"/>
- <dia:point val="10,8.675"/>
- <dia:point val="10,10"/>
+ <dia:point val="21.15,8.2"/>
+ <dia:point val="21.15,10.6"/>
+ <dia:point val="18.45,10.6"/>
+ <dia:point val="18.45,13"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
@@ -1025,7 +1561,7 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O1" connection="6"/>
- <dia:connection handle="1" to="O9" connection="1"/>
+ <dia:connection handle="1" to="O17" connection="1"/>
</dia:connections>
</dia:object>
</dia:layer>
Modified: trunk/gnue-packages/doc/org.png
===================================================================
(Binary files differ)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6797 - in trunk/gnue-packages: base/org doc,
kilo <=