commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

r6197 - trunk/gnue-packages/base/item


From: kilo
Subject: r6197 - trunk/gnue-packages/base/item
Date: Tue, 24 Aug 2004 07:39:50 -0500 (CDT)

Author: kilo
Date: 2004-08-24 07:39:49 -0500 (Tue, 24 Aug 2004)
New Revision: 6197

Modified:
   trunk/gnue-packages/base/item/item.dia
   trunk/gnue-packages/base/item/item.gcd
   trunk/gnue-packages/base/item/item.png
Log:
Moved item type info to ITEM module from CDICT

Modified: trunk/gnue-packages/base/item/item.dia
===================================================================
--- trunk/gnue-packages/base/item/item.dia      2004-08-17 07:53:36 UTC (rev 
6196)
+++ trunk/gnue-packages/base/item/item.dia      2004-08-24 12:39:49 UTC (rev 
6197)
@@ -69,16 +69,16 @@
           <dia:point val="16,2"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="15.95,0.95;40.05,13.05"/>
+          <dia:rectangle val="15.95,0.95;41.05,15.05"/>
         </dia:attribute>
         <dia:attribute name="elem_corner">
           <dia:point val="16,2"/>
         </dia:attribute>
         <dia:attribute name="elem_width">
-          <dia:real val="24"/>
+          <dia:real val="25"/>
         </dia:attribute>
         <dia:attribute name="elem_height">
-          <dia:real val="11"/>
+          <dia:real val="13"/>
         </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,3"/>
+          <dia:point val="25,3"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="16.95,2.95;25.35,8.25"/>
+          <dia:rectangle val="24.95,2.95;33.35,7.45"/>
         </dia:attribute>
         <dia:attribute name="elem_corner">
-          <dia:point val="17,3"/>
+          <dia:point val="25,3"/>
         </dia:attribute>
         <dia:attribute name="elem_width">
           <dia:real val="8.3"/>
         </dia:attribute>
         <dia:attribute name="elem_height">
-          <dia:real val="5.2"/>
+          <dia:real val="4.4"/>
         </dia:attribute>
         <dia:attribute name="name">
           <dia:string>#Item#</dia:string>
@@ -184,29 +184,6 @@
         <dia:attribute name="attributes">
           <dia:composite type="umlattribute">
             <dia:attribute name="name">
-              <dia:string>#type#</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>#Code 007#</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>#shortName#</dia:string>
             </dia:attribute>
             <dia:attribute name="type">
@@ -283,13 +260,13 @@
       </dia:object>
       <dia:object type="UML - Class" version="0" id="O2">
         <dia:attribute name="obj_pos">
-          <dia:point val="29,5"/>
+          <dia:point val="17,8"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="28.95,4.95;39.1,11.85"/>
+          <dia:rectangle val="16.95,7.95;27.1,14.85"/>
         </dia:attribute>
         <dia:attribute name="elem_corner">
-          <dia:point val="29,5"/>
+          <dia:point val="17,8"/>
         </dia:attribute>
         <dia:attribute name="elem_width">
           <dia:real val="10.05"/>
@@ -515,29 +492,224 @@
         </dia:attribute>
         <dia:attribute name="templates"/>
       </dia:object>
-      <dia:object type="UML - Association" version="0" id="O3">
+      <dia:object type="UML - Class" version="0" id="O3">
         <dia:attribute name="obj_pos">
-          <dia:point val="25.3,3.7"/>
+          <dia:point val="33,8"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="25.25,3.65;30.4,7.3"/>
+          <dia:rectangle val="32.95,7.95;39.95,11.65"/>
         </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="33,8"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="6.9"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="3.6"/>
+        </dia:attribute>
+        <dia:attribute name="name">
+          <dia:string>#ItemType#</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="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>#code#</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>#value#</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:attribute>
+        <dia:attribute name="operations"/>
+        <dia:attribute name="template">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="templates"/>
+      </dia:object>
+      <dia:object type="UML - Association" version="0" id="O4">
+        <dia:attribute name="obj_pos">
+          <dia:point val="25,3.7"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="21.975,3.65;25.35,8.8"/>
+        </dia:attribute>
         <dia:attribute name="orth_points">
-          <dia:point val="25.3,3.7"/>
-          <dia:point val="26.65,3.7"/>
-          <dia:point val="26.65,5.7"/>
-          <dia:point val="29,5.7"/>
+          <dia:point val="25,3.7"/>
+          <dia:point val="22.025,3.7"/>
+          <dia:point val="22.025,8"/>
         </dia:attribute>
         <dia:attribute name="orth_orient">
           <dia:enum val="0"/>
           <dia:enum val="1"/>
+        </dia:attribute>
+        <dia:attribute name="name">
+          <dia:string>#price#</dia:string>
+        </dia:attribute>
+        <dia:attribute name="direction">
           <dia:enum val="0"/>
         </dia:attribute>
-        <dia:attribute name="autorouting">
-          <dia:boolean val="false"/>
+        <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="3"/>
+          <dia:connection handle="1" to="O2" connection="1"/>
+        </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="33.3,3.7"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="33.25,3.65;37.85,8.8"/>
+        </dia:attribute>
+        <dia:attribute name="orth_points">
+          <dia:point val="33.3,3.7"/>
+          <dia:point val="36.45,3.7"/>
+          <dia:point val="36.45,8"/>
+        </dia:attribute>
+        <dia:attribute name="orth_orient">
+          <dia:enum val="0"/>
+          <dia:enum val="1"/>
+        </dia:attribute>
         <dia:attribute name="name">
-          <dia:string>#price#</dia:string>
+          <dia:string>#type#</dia:string>
         </dia:attribute>
         <dia:attribute name="direction">
           <dia:enum val="0"/>
@@ -574,8 +746,9 @@
         </dia:attribute>
         <dia:connections>
           <dia:connection handle="0" to="O1" connection="4"/>
-          <dia:connection handle="1" to="O2" connection="3"/>
+          <dia:connection handle="1" to="O3" connection="1"/>
         </dia:connections>
+        <dia:childnode parent="O0"/>
       </dia:object>
     </dia:group>
   </dia:layer>

Modified: trunk/gnue-packages/base/item/item.gcd
===================================================================
--- trunk/gnue-packages/base/item/item.gcd      2004-08-17 07:53:36 UTC (rev 
6196)
+++ trunk/gnue-packages/base/item/item.gcd      2004-08-24 12:39:49 UTC (rev 
6197)
@@ -2,12 +2,11 @@
 
 <module name="ITEM">
   <class name="Item"        comment="Atomic item info">
-    <property name="type"           type="CDICT_Code"   nullable="False"    
comment="Code 007" />
-    <property name="shortName"      type="string(35)"                       
comment="" />
-    <property name="longName"       type="string(70)"                       
comment="" />
-    <property name="keywords"       type="string"                           
comment="Free form keywords for lookup" />
-
-    <property name="price"          type="ITEM_Price"                       
comment="" />
+    <property name="type"           type="ITEM_ItemType"    nullable="False"   
 comment="" />
+    <property name="shortName"      type="string(35)"                          
 comment="" />
+    <property name="longName"       type="string(70)"                          
 comment="" />
+    <property name="keywords"       type="string"                              
 comment="Free form keywords for lookup" />
+    <property name="price"          type="ITEM_Price"                          
 comment="" />
   </class>
 
   <class name="Price"       comment="Item price information">
@@ -18,4 +17,10 @@
     <property name="maxAmount"      type="CORE_Amount"                      
comment="" />
     <property name="vat"            type="TAX_Vat"                          
comment="" />
   </class>
+
+  <class name="ItemType">
+    <property name="code"           type="string(35)"                       
comment="" />
+    <property name="value"          type="string(70)"                       
comment="" />
+  </class>
+
 </module>

Modified: trunk/gnue-packages/base/item/item.png
===================================================================
(Binary files differ)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]