changeset 16:8cafa15f8aca

class diagram update
author Zoltan K
date Sun, 21 Mar 2010 00:03:33 +0100
parents ceb2499994ce
children 2035bdfd2ca8
files src/include/handler/INetworkHandler.hpp uml/StreamIt_api.dia
diffstat 2 files changed, 95 insertions(+), 98 deletions(-) [+]
line wrap: on
line diff
--- a/src/include/handler/INetworkHandler.hpp	Sat Mar 20 23:28:26 2010 +0100
+++ b/src/include/handler/INetworkHandler.hpp	Sun Mar 21 00:03:33 2010 +0100
@@ -21,7 +21,7 @@
 
     virtual ~INetworkHandler(void){}
 
-    virtual int     operator()(IEndPoint & endpoint, std::ios & stream) = 0;
+    virtual int     operator()(network::IEndPoint & endpoint, std::ios & stream) = 0;
 
 };
 
--- a/uml/StreamIt_api.dia	Sat Mar 20 23:28:26 2010 +0100
+++ b/uml/StreamIt_api.dia	Sun Mar 21 00:03:33 2010 +0100
@@ -68,7 +68,7 @@
         <dia:point val="2.85,-10.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.8,-11.95;77.625,47.0094"/>
+        <dia:rectangle val="2.8,-11.95;80.4,47.0094"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -77,7 +77,7 @@
         <dia:point val="2.85,-10.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="74.725000000000023"/>
+        <dia:real val="77.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="57.059364149004011"/>
@@ -106,7 +106,7 @@
         <dia:point val="3.9,-6.66248"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.85,-8.51248;75.825,44.6969"/>
+        <dia:rectangle val="3.85,-8.51248;78.5,44.6969"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -115,7 +115,7 @@
         <dia:point val="3.9,-6.66248"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="71.875000000000014"/>
+        <dia:real val="74.549999999999983"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="51.309364234685688"/>
@@ -145,13 +145,13 @@
         <dia:point val="44.925,-3.6375"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.875,-3.6875;67.035,2.0125"/>
+        <dia:rectangle val="44.875,-3.6875;70.5,2.0125"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="44.925,-3.6375"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="22.059999999999999"/>
+        <dia:real val="25.524999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>
@@ -343,7 +343,7 @@
             <dia:string>#const#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#const std::vector&lt;IHander *&gt; &amp;#</dia:string>
+            <dia:string>#const std::vector&lt;handler::IHander *&gt; &amp;#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -373,7 +373,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#bool#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -425,7 +425,7 @@
         <dia:point val="5.05,19.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5,17.8;53.625,43.075"/>
+        <dia:rectangle val="5,17.8;57.65,43.075"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -434,7 +434,7 @@
         <dia:point val="5.05,19.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="48.52500000000002"/>
+        <dia:real val="52.549999999999997"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="23.374999999999993"/>
@@ -464,16 +464,16 @@
         <dia:point val="6.35,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.3,20.95;27.69,30.85"/>
+        <dia:rectangle val="6.3,20.95;31.925,29.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="6.35,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="21.289999999999999"/>
+        <dia:real val="25.524999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="9.8000000000000007"/>
+        <dia:real val="8.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#IHeader#</dia:string>
@@ -672,7 +672,7 @@
             <dia:string>#const#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#const Value &amp;#</dia:string>
+            <dia:string>#bool#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -710,17 +710,34 @@
                 <dia:enum val="1"/>
               </dia:attribute>
             </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#value#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#Value &amp;#</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="3"/>
+              </dia:attribute>
+            </dia:composite>
           </dia:attribute>
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#getValue#</dia:string>
+            <dia:string>#setValue#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Value &amp;#</dia:string>
+            <dia:string>#void#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -743,7 +760,7 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#key#</dia:string>
+                <dia:string>#k#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
                 <dia:string>#const Key &amp;#</dia:string>
@@ -758,6 +775,23 @@
                 <dia:enum val="1"/>
               </dia:attribute>
             </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#value#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#const Value &amp;#</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="1"/>
+              </dia:attribute>
+            </dia:composite>
           </dia:attribute>
         </dia:composite>
         <dia:composite type="umloperation">
@@ -856,66 +890,6 @@
             </dia:composite>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#getHeaders#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>#const#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#const Map &amp;#</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="true"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="0"/>
-          </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:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#getHeaders#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Map &amp;#</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="true"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="0"/>
-          </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"/>
@@ -1791,13 +1765,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.9,21.025"/>
+        <dia:point val="33.35,21.025"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.85,20.975;51.78,29.875"/>
+        <dia:rectangle val="33.3,20.975;56.23,29.875"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="28.9,21.025"/>
+        <dia:point val="33.35,21.025"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="22.830000000000002"/>
@@ -2796,22 +2770,22 @@
     </dia:object>
     <dia:object type="UML - LargePackage" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="56.9126,19.3625"/>
+        <dia:point val="61.3126,19.4125"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="56.8626,17.5125;72.322,29.85"/>
+        <dia:rectangle val="61.2626,17.5625;76.722,30.5"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="56.9126,19.3625"/>
+        <dia:point val="61.3126,19.4125"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="15.359374771127484"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="10.437499844469134"/>
+        <dia:real val="11.037500000000001"/>
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.10000000149011612"/>
@@ -2835,19 +2809,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="58.1001,20.7375"/>
+        <dia:point val="62.5001,20.7875"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="58.0501,20.6875;70.9701,28.1875"/>
+        <dia:rectangle val="62.4501,20.7375;75.3701,29.0375"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="58.1001,20.7375"/>
+        <dia:point val="62.5001,20.7875"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.82"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="7.4000000000000004"/>
+        <dia:real val="8.2000000000000011"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#IEndPoint#</dia:string>
@@ -3006,6 +2980,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#IAddress#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#typedef#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>#std::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:composite type="umloperation">
@@ -3467,7 +3464,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#CloseConnection#</dia:string>
+            <dia:string>#OnConnectionClosed#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>
@@ -3501,16 +3498,16 @@
         <dia:point val="44.922,3.07189"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.872,3.02189;61.257,5.52189"/>
+        <dia:rectangle val="44.872,3.02189;66.647,6.52189"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="44.922,3.07189"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="16.285"/>
+        <dia:real val="21.675000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.3999999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#IConfig#</dia:string>
@@ -3531,7 +3528,7 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="visible_attributes">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
         <dia:boolean val="true"/>
@@ -3664,16 +3661,16 @@
     </dia:object>
     <dia:object type="UML - Note" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="44.975,6.9"/>
+        <dia:point val="44.975,7.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.925,6.85;58.63,9.45"/>
+        <dia:rectangle val="44.925,7.55;58.63,10.15"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="44.975,6.9"/>
+        <dia:point val="44.975,7.6"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.605"/>
@@ -3703,7 +3700,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="45.325,8.145"/>
+            <dia:point val="45.325,8.845"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>