[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6704 - trunk/gnue-packages/base/person
|
From: |
kilo |
|
Subject: |
r6704 - trunk/gnue-packages/base/person |
|
Date: |
Thu, 18 Nov 2004 17:18:30 -0600 (CST) |
Author: kilo
Date: 2004-11-18 17:18:29 -0600 (Thu, 18 Nov 2004)
New Revision: 6704
Modified:
trunk/gnue-packages/base/person/person.dia
trunk/gnue-packages/base/person/person.gcd
trunk/gnue-packages/base/person/person.png
Log:
Updated Person package
Modified: trunk/gnue-packages/base/person/person.dia
===================================================================
--- trunk/gnue-packages/base/person/person.dia 2004-11-18 15:23:35 UTC (rev
6703)
+++ trunk/gnue-packages/base/person/person.dia 2004-11-18 23:18:29 UTC (rev
6704)
@@ -13,16 +13,16 @@
<dia:string>#A4#</dia:string>
</dia:attribute>
<dia:attribute name="tmargin">
- <dia:real val="2.8222"/>
+ <dia:real val="2.8222000598907471"/>
</dia:attribute>
<dia:attribute name="bmargin">
- <dia:real val="2.8222"/>
+ <dia:real val="2.8222000598907471"/>
</dia:attribute>
<dia:attribute name="lmargin">
- <dia:real val="2.8222"/>
+ <dia:real val="2.8222000598907471"/>
</dia:attribute>
<dia:attribute name="rmargin">
- <dia:real val="2.8222"/>
+ <dia:real val="2.8222000598907471"/>
</dia:attribute>
<dia:attribute name="is_portrait">
<dia:boolean val="true"/>
@@ -66,19 +66,19 @@
<dia:group>
<dia:object type="UML - LargePackage" version="0" id="O0">
<dia:attribute name="obj_pos">
- <dia:point val="16.5,2.35"/>
+ <dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.45,1.3;49.05,20.05"/>
+ <dia:rectangle val="15.95,0.95;44.05,19.7"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="16.5,2.35"/>
+ <dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="32.5"/>
+ <dia:real val="28"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="17.65"/>
+ <dia:real val="17.649999999999999"/>
</dia:attribute>
<dia:attribute name="line_colour">
<dia:color val="#000000"/>
@@ -98,25 +98,25 @@
<dia:point val="17,10"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.95,9.95;34.45,19.05"/>
+ <dia:rectangle val="16.95,9.95;23.35,17.65"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="17,10"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="17.4"/>
+ <dia:real val="6.2999999999999998"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="9"/>
+ <dia:real val="7.5999999999999996"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>#Person#</dia:string>
+ <dia:string>#Name#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>#Typedef of a person#</dia:string>
+ <dia:string>#Typedef of a person name#</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -136,6 +136,12 @@
<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>
@@ -164,13 +170,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -184,7 +190,7 @@
<dia:attribute name="attributes">
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#nameFirst#</dia:string>
+ <dia:string>#first#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#string(35)#</dia:string>
@@ -207,7 +213,7 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#nameMiddle#</dia:string>
+ <dia:string>#middle#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#string(35)#</dia:string>
@@ -230,7 +236,7 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#nameLast#</dia:string>
+ <dia:string>#last#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#string(35)#</dia:string>
@@ -253,7 +259,7 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#nameNick#</dia:string>
+ <dia:string>#nick#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#string(35)#</dia:string>
@@ -262,7 +268,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>##</dia:string>
+ <dia:string>#nickname#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@@ -276,7 +282,7 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#workTitle#</dia:string>
+ <dia:string>#title#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#string(35)#</dia:string>
@@ -285,7 +291,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>##</dia:string>
+ <dia:string>#work title#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@@ -299,7 +305,7 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#fullName#</dia:string>
+ <dia:string>#full#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#string#</dia:string>
@@ -311,7 +317,7 @@
<dia:string>#Computed:#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
- <dia:enum val="0"/>
+ <dia:enum val="3"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -322,7 +328,7 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#politeName#</dia:string>
+ <dia:string>#polite#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#string#</dia:string>
@@ -334,7 +340,7 @@
<dia:string>#Computed:#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
- <dia:enum val="0"/>
+ <dia:enum val="3"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -344,104 +350,7 @@
</dia:attribute>
</dia:composite>
</dia:attribute>
- <dia:attribute name="operations">
- <dia:composite type="umloperation">
- <dia:attribute name="name">
- <dia:string>#getAddress#</dia:string>
- </dia:attribute>
- <dia:attribute name="stereotype">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#LOC_Address#</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Get an address by address type#</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 type="umlparameter">
- <dia:attribute name="name">
- <dia:string>#addressType#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#CDICT_Code#</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="kind">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:composite>
- <dia:composite type="umloperation">
- <dia:attribute name="name">
- <dia:string>#getComm#</dia:string>
- </dia:attribute>
- <dia:attribute name="stereotype">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#COMM_Comm#</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Get a comm way by comm type#</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 type="umlparameter">
- <dia:attribute name="name">
- <dia:string>#commType#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#CDICT_Code#</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="kind">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
+ <dia:attribute name="operations"/>
<dia:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
@@ -449,28 +358,28 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O2">
<dia:attribute name="obj_pos">
- <dia:point val="17,3"/>
+ <dia:point val="28,10"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.95,2.95;25.7,6.65"/>
+ <dia:rectangle val="27.95,9.95;34.05,13.65"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="17,3"/>
+ <dia:point val="28,10"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="8.65"/>
+ <dia:real val="6"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="3.6"/>
+ <dia:real val="3.6000000000000001"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>#Employee#</dia:string>
+ <dia:string>#Prefix#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>##</dia:string>
+ <dia:string>#Stores valid name prefixes#</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -490,6 +399,12 @@
<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>
@@ -518,13 +433,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -541,13 +456,13 @@
<dia:string>#code#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(8)#</dia:string>
+ <dia:string>#string(3)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>#Employee designation#</dia:string>
+ <dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@@ -561,10 +476,10 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#department#</dia:string>
+ <dia:string>#value#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CDICT_Code#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -591,28 +506,28 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O3">
<dia:attribute name="obj_pos">
- <dia:point val="41,12"/>
+ <dia:point val="28,15"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="40.95,11.95;47.95,15.65"/>
+ <dia:rectangle val="27.95,14.95;34.05,18.65"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="41,12"/>
+ <dia:point val="28,15"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.9"/>
+ <dia:real val="6"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="3.6"/>
+ <dia:real val="3.6000000000000001"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>#Prefix#</dia:string>
+ <dia:string>#Suffix#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>#Stores valid name prefixes#</dia:string>
+ <dia:string>#Stores valid name suffixes#</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -632,6 +547,12 @@
<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>
@@ -660,13 +581,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -731,30 +652,153 @@
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O4">
+ <dia:object type="UML - Association" version="0" id="O4">
<dia:attribute name="obj_pos">
- <dia:point val="39,16"/>
+ <dia:point val="23.3,11.9"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.95,15.95;45.95,19.65"/>
+ <dia:rectangle val="23.25,10;29.2,12.8"/>
</dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="23.3,11.9"/>
+ <dia:point val="24.5,11.9"/>
+ <dia:point val="24.5,10.7"/>
+ <dia:point val="28,10.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>#prefix#</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>##</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>#0..1#</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="9"/>
+ <dia:connection handle="1" to="O2" connection="3"/>
+ </dia:connections>
+ <dia:childnode parent="O0"/>
+ </dia:object>
+ <dia:object type="UML - Association" version="0" id="O5">
+ <dia:attribute name="obj_pos">
+ <dia:point val="23.3,14.3"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="23.25,13.6;29.2,16.6"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="23.3,14.3"/>
+ <dia:point val="25.65,14.3"/>
+ <dia:point val="25.65,15.7"/>
+ <dia:point val="28,15.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="name">
+ <dia:string>#suffix#</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>##</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>#0..1#</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="O3" connection="3"/>
+ </dia:connections>
+ <dia:childnode parent="O0"/>
+ </dia:object>
+ <dia:object type="UML - Class" version="0" id="O6">
+ <dia:attribute name="obj_pos">
+ <dia:point val="37,10"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="36.95,9.95;43.65,16.05"/>
+ </dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="39,16"/>
+ <dia:point val="37,10"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.9"/>
+ <dia:real val="6.5999999999999996"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="3.6"/>
+ <dia:real val="6"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>#Suffix#</dia:string>
+ <dia:string>#Birthdata#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>#Stores valid name suffixes#</dia:string>
+ <dia:string>#Constant personal data determined at birth#</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -774,6 +818,12 @@
<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>
@@ -802,13 +852,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.8"/>
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -822,17 +872,40 @@
<dia:attribute name="attributes">
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#code#</dia:string>
+ <dia:string>#name#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(3)#</dia:string>
+ <dia:string>#PERSON_Name#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
+ <dia:string>#Original name (at time of birth)#</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>#date#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#datetime#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>#Date of birth#</dia:string>
+ </dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
</dia:attribute>
@@ -845,17 +918,40 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#value#</dia:string>
+ <dia:string>#place#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(35)#</dia:string>
+ <dia:string>#string(70)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
+ <dia:string>#Place of birth#</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>#sex#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(1)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>#F or M#</dia:string>
+ </dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
</dia:attribute>
@@ -866,33 +962,157 @@
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#mother#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#PERSON_Name#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>#Original name of person's mother#</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="templates"/>
+ <dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="0" id="O5">
+ <dia:object type="UML - Class" version="0" id="O7">
<dia:attribute name="obj_pos">
- <dia:point val="25.7,10"/>
+ <dia:point val="30,4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.575,5.85;25.75,11.6"/>
+ <dia:rectangle val="29.95,3.95;33.15,6.25"/>
</dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="30,4"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.1000000000000001"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2.1999999999999997"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#Person#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </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="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="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>
+ <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.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font_height">
+ <dia:real val="0.80000000000000004"/>
+ </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:attribute name="operations"/>
+ <dia:attribute name="template">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="templates"/>
+ <dia:childnode parent="O0"/>
+ </dia:object>
+ <dia:object type="UML - Association" version="0" id="O8">
+ <dia:attribute name="obj_pos">
+ <dia:point val="30,4.7"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="19.4,4;30.05,11"/>
+ </dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="25.7,10"/>
- <dia:point val="25.7,8.3"/>
- <dia:point val="21.325,8.3"/>
- <dia:point val="21.325,6.6"/>
+ <dia:point val="30,4.7"/>
+ <dia:point val="20.15,4.7"/>
+ <dia:point val="20.15,10"/>
</dia:attribute>
<dia:attribute name="orth_orient">
- <dia:enum val="1"/>
<dia:enum val="0"/>
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>#person#</dia:string>
+ <dia:string>#name#</dia:string>
</dia:attribute>
<dia:attribute name="direction">
<dia:enum val="0"/>
@@ -928,34 +1148,31 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O1" connection="1"/>
- <dia:connection handle="1" to="O2" connection="6"/>
+ <dia:connection handle="0" to="O7" connection="3"/>
+ <dia:connection handle="1" to="O1" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="0" id="O6">
+ <dia:object type="UML - Association" version="0" id="O9">
<dia:attribute name="obj_pos">
- <dia:point val="34.4,11.9"/>
+ <dia:point val="31.55,6.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="34.35,11.85;42.4,14.3"/>
+ <dia:rectangle val="31.5,6.15;41.05,11"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="34.4,11.9"/>
- <dia:point val="35.7,11.9"/>
- <dia:point val="35.7,12.7"/>
- <dia:point val="41,12.7"/>
+ <dia:point val="31.55,6.2"/>
+ <dia:point val="31.55,8.1"/>
+ <dia:point val="40.3,8.1"/>
+ <dia:point val="40.3,10"/>
</dia:attribute>
<dia:attribute name="orth_orient">
+ <dia:enum val="1"/>
<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>#namePrefix#</dia:string>
+ <dia:string>#birth#</dia:string>
</dia:attribute>
<dia:attribute name="direction">
<dia:enum val="0"/>
@@ -966,7 +1183,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="multiplicity">
- <dia:string>#*#</dia:string>
+ <dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="arrow">
<dia:boolean val="false"/>
@@ -980,34 +1197,82 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="multiplicity">
- <dia:string>#0..1#</dia:string>
+ <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:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O1" connection="9"/>
- <dia:connection handle="1" to="O3" connection="3"/>
+ <dia:connection handle="0" to="O7" connection="6"/>
+ <dia:connection handle="1" to="O6" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="0" id="O7">
+ <dia:object type="UML - SmallPackage" version="0" id="O10">
<dia:attribute name="obj_pos">
- <dia:point val="34.4,14.3"/>
+ <dia:point val="48,4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="34.35,14.25;40.4,18.3"/>
+ <dia:rectangle val="47.95,3.05;51.95,5.45"/>
</dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="48,4"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.8999999999999999"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="1.3999999999999999"/>
+ </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="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#LOC_Country#</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.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="48.3,4.8"/>
+ </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="O11">
+ <dia:attribute name="obj_pos">
+ <dia:point val="33.1,4.7"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="33.1,4;48.0707,6.3"/>
+ </dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="34.4,14.3"/>
- <dia:point val="36.7,14.3"/>
- <dia:point val="36.7,16.7"/>
- <dia:point val="39,16.7"/>
+ <dia:point val="33.1,4.7"/>
+ <dia:point val="33.1,4.7"/>
+ <dia:point val="48,4.7"/>
+ <dia:point val="48,4.7"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -1015,7 +1280,7 @@
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>#nameSuffix#</dia:string>
+ <dia:string>#citizen#</dia:string>
</dia:attribute>
<dia:attribute name="direction">
<dia:enum val="0"/>
@@ -1026,7 +1291,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="multiplicity">
- <dia:string>#*#</dia:string>
+ <dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="arrow">
<dia:boolean val="false"/>
@@ -1040,21 +1305,20 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="multiplicity">
- <dia:string>#0..1#</dia:string>
+ <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:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O1" connection="15"/>
- <dia:connection handle="1" to="O4" connection="3"/>
+ <dia:connection handle="0" to="O7" connection="4"/>
+ <dia:connection handle="1" to="O10" connection="3"/>
</dia:connections>
- <dia:childnode parent="O0"/>
</dia:object>
</dia:group>
</dia:layer>
Modified: trunk/gnue-packages/base/person/person.gcd
===================================================================
--- trunk/gnue-packages/base/person/person.gcd 2004-11-18 15:23:35 UTC (rev
6703)
+++ trunk/gnue-packages/base/person/person.gcd 2004-11-18 23:18:29 UTC (rev
6704)
@@ -23,31 +23,43 @@
$Id$ -->
-<module name="PERSON" comment="A person with names, physical address(es) and
communication way(s)">
- <class name="Person" comment="Typedef of a person">
- <property name="namePrefix" type="PERSON_Prefix"
comment="Mr., Mrs., Dr., etc." />
- <property name="nameFirst" type="string(35)"
comment="" />
- <property name="nameMiddle" type="string(35)"
comment="" />
- <property name="nameLast" type="string(35)" nullable="False"
comment="" />
- <property name="nameSuffix" type="PERSON_Suffix"
comment="Jr., Sr., III., etc." />
- <property name="nameNick" type="string(35)"
comment="" />
- <property name="workTitle" type="string(35)"
comment="" />
-
- <property name="fullName" type="string"
comment="Full name per local requirements">
+<module name="PERSON" comment="A person with name">
+
+ <class name="Person" comment="">
+ <property name="name" type="PERSON_Name" comment="" />
+ <property name="birth" type="PERSON_BirthData" comment="" />
+ <property name="citizen" type="LOC_Country"
comment="Citizenship" />
+ <!-- addresses? -->
+ <!-- comm channels? -->
+ </class>
+
+ <!-- ***********************************************************************
+ Details of a person's name
+ ************************************************************************ -->
+ <class name="Name" comment="Typedef of a person name">
+ <property name="prefix" type="PERSON_Prefix" comment="Mr., Mrs., Dr.,
etc." />
+ <property name="first" type="string(35)" comment="first name" />
+ <property name="middle" type="string(35)" comment="middle name" />
+ <property name="last" type="string(35)" comment="last name" />
+ <property name="suffix" type="PERSON_Suffix" comment="Jr., Sr., III.,
etc." />
+ <property name="nick" type="string(35)" comment="nickname" />
+ <property name="title" type="string(35)" comment="work title" />
+
+ <property name="full" type="string" comment="Full name per
local requirements">
name = ''
- if self.namePrefix : name += self.namePrefix.value + ' '
- if self.nameFirst: name += self.nameFirst + ' '
- if self.nameMiddle: name += self.nameMiddle + ' '
- name += self.nameLast
- if self.nameSuffix: name += ' ' + self.nameSuffix.value
+ if self.prefix : name += self.prefix.value + ' '
+ if self.first: name += self.first + ' '
+ if self.middle: name += self.middle + ' '
+ name += self.last
+ if self.suffix: name += ' ' + self.suffix.value
return name
</property>
-
- <property name="politeName" type="string"
comment="Polite name per local requirements">
+
+ <property name="polite" type="string" comment="Polite name per
local requirements">
name = ''
- if self.namePrefix : name += self.namePrefix.value + ' '
- name += self.nameLast
+ if self.prefix : name += self.prefix.value + ' '
+ name += self.last
return name
</property>
</class>
@@ -62,4 +74,16 @@
<property name="value" type="string(35)"
comment="" />
</class>
+
+ <!-- ***********************************************************************
+ Details of a person's data of birth. This info can not change
+ ************************************************************************ -->
+ <class name="BirthData" comment="Constant personal data determinded at
birth">
+ <property name="name" type="PERSON_Name" comment="Original name" />
+ <property name="date" type="datetime" comment="Date of birth" />
+ <property name="place" type="string(70") comment="Place of birth" />
+ <property name="sex" type="string(1)" comment="F or M" />
+ <property name="mother" type="PERSON_Name" comment="Original name of
person's mother" />
+ </class>
+
</module>
Modified: trunk/gnue-packages/base/person/person.png
===================================================================
(Binary files differ)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6704 - trunk/gnue-packages/base/person,
kilo <=