changeset 28:6ad68d5cb049

[uml] IHttpHandler splitted into IHeaderHandler and IBodyHandler
author Zoltan K
date Sun, 21 Mar 2010 15:19:01 +0100
parents 27de48562b2c
children e53daed19d97
files src/examples/Buffer/Buffer.cpp uml/StreamIt_api.dia
diffstat 2 files changed, 293 insertions(+), 91 deletions(-) [+]
line wrap: on
line diff
--- a/src/examples/Buffer/Buffer.cpp	Sun Mar 21 14:35:03 2010 +0100
+++ b/src/examples/Buffer/Buffer.cpp	Sun Mar 21 15:19:01 2010 +0100
@@ -34,15 +34,15 @@
                                     std::ios_base::seekdir way,
                                     std::ios_base::openmode which = std::ios_base::in | std::ios_base::out)
 {
-    if (off == 0)
+    if (off != 0)
     {
     }
-    if (which == std::ios_base::in | std::ios_base::out)
+
+    if ((which == std::ios_base::in | std::ios_base::out)
+        || (which == std::ios_base::in))
         return (this->gptr() - this->eback());
-    else if (which == std::ios_base::in)
+    else
         return (this->pptr() - this->pbase());
-    else
-        return (this->gptr() - this->eback());
 }
 
 
--- a/uml/StreamIt_api.dia	Sun Mar 21 14:35:03 2010 +0100
+++ b/uml/StreamIt_api.dia	Sun Mar 21 15:19:01 2010 +0100
@@ -65,22 +65,22 @@
   <dia:layer name="Background" visible="true" active="true">
     <dia:object type="UML - LargePackage" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.85,-10.1"/>
+        <dia:point val="2.85,-12.8438"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.8,-11.95;80.4,47.0094"/>
+        <dia:rectangle val="2.8,-14.6938;80.4,47.0094"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.85,-10.1"/>
+        <dia:point val="2.85,-12.8438"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="77.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="57.059364149004011"/>
+        <dia:real val="59.803114149004017"/>
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.10000000149011612"/>
@@ -103,22 +103,22 @@
     </dia:object>
     <dia:object type="UML - LargePackage" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.9,-6.66248"/>
+        <dia:point val="3.9,-9.24375"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.85,-8.51248;78.5,44.6969"/>
+        <dia:rectangle val="3.85,-11.0938;78.5,44.6969"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3.9,-6.66248"/>
+        <dia:point val="3.9,-9.24375"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="74.549999999999983"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="51.309364234685688"/>
+        <dia:real val="53.890634234685692"/>
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.10000000149011612"/>
@@ -142,13 +142,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="44.925,-3.6375"/>
+        <dia:point val="51.525,-2.6375"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.875,-3.6875;70.5,2.0125"/>
+        <dia:rectangle val="51.475,-2.6875;77.1,3.0125"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="44.925,-3.6375"/>
+        <dia:point val="51.525,-2.6375"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="25.524999999999999"/>
@@ -2147,22 +2147,22 @@
     </dia:object>
     <dia:object type="UML - LargePackage" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="5,-3.57186"/>
+        <dia:point val="5.2,-5.44375"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.95,-5.42186;43.597,17.3375"/>
+        <dia:rectangle val="5.15,-7.29375;50.075,16.6062"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="5,-3.57186"/>
+        <dia:point val="5.2,-5.44375"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="38.546974811174358"/>
+        <dia:real val="44.825000000000003"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="20.859374924795702"/>
+        <dia:real val="21.999999999999993"/>
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.10000000149011612"/>
@@ -2185,13 +2185,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.575,-1.2375"/>
+        <dia:point val="14.875,-2.6375"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.525,-1.2875;24.52,2.0125"/>
+        <dia:rectangle val="14.825,-2.6875;25.82,0.6125"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.575,-1.2375"/>
+        <dia:point val="14.875,-2.6375"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.895"/>
@@ -2357,13 +2357,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.84385,6.50626"/>
+        <dia:point val="6.49385,3.60626"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.79385,6.45626;24.8739,9.75626"/>
+        <dia:rectangle val="6.44385,3.55626;25.5238,6.85626"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="5.84385,6.50626"/>
+        <dia:point val="6.49385,3.60626"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="18.98"/>
@@ -2534,22 +2534,22 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.4064,11.3188"/>
+        <dia:point val="27.7064,7.5688"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.3564,11.2688;38.9814,14.5688"/>
+        <dia:rectangle val="27.6564,7.5188;48.6614,10.0188"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.4064,11.3188"/>
+        <dia:point val="27.7064,7.5688"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="25.524999999999999"/>
+        <dia:real val="20.905000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="2.3999999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#IHttpHandler#</dia:string>
+        <dia:string>#IHeaderHandler#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -2683,40 +2683,6 @@
                 <dia:enum val="0"/>
               </dia:attribute>
             </dia:composite>
-            <dia:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#is#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#std::istream &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:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#os#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#std::ostream#</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="2"/>
-              </dia:attribute>
-            </dia:composite>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
@@ -2728,19 +2694,19 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="1" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="19.0225,2.0129"/>
+        <dia:point val="20.3225,0.612786"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.2838,1.9629;19.8725,6.50586"/>
+        <dia:rectangle val="15.9338,0.562786;21.1725,3.60914"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="19.0225,2.0129"/>
-        <dia:point val="19.0225,4.23438"/>
-        <dia:point val="15.3338,4.23438"/>
-        <dia:point val="15.3338,6.45586"/>
+        <dia:point val="20.3225,0.612786"/>
+        <dia:point val="20.3225,2.15625"/>
+        <dia:point val="15.9838,2.15625"/>
+        <dia:point val="15.9838,3.55914"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2748,7 +2714,7 @@
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="text_colour">
         <dia:color val="#000000"/>
@@ -3134,19 +3100,19 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="1" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="19.0225,2.01268"/>
+        <dia:point val="20.3225,0.611026"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.1725,1.96268;26.2189,11.3193"/>
+        <dia:rectangle val="19.4725,0.561026;38.2089,7.57485"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="19.0225,2.01268"/>
-        <dia:point val="19.0225,4.25939"/>
-        <dia:point val="26.1689,4.25939"/>
-        <dia:point val="26.1689,11.2693"/>
+        <dia:point val="20.3225,0.611026"/>
+        <dia:point val="20.3225,2.16875"/>
+        <dia:point val="38.1589,2.16875"/>
+        <dia:point val="38.1589,7.52485"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3176,13 +3142,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.3595,-1.72498"/>
+        <dia:point val="39.1595,-4.12498"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.3095,-1.77498;41.7645,7.92502"/>
+        <dia:rectangle val="39.1095,-4.17498;48.5645,5.52502"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="32.3595,-1.72498"/>
+        <dia:point val="39.1595,-4.12498"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9.3550000000000004"/>
@@ -3491,17 +3457,17 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="templates"/>
-      <dia:childnode parent="O1"/>
+      <dia:childnode parent="O8"/>
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="44.922,3.07189"/>
+        <dia:point val="51.522,4.07189"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.872,3.02189;66.647,6.52189"/>
+        <dia:rectangle val="51.472,4.02189;73.247,7.52189"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="44.922,3.07189"/>
+        <dia:point val="51.522,4.07189"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="21.675000000000001"/>
@@ -3661,16 +3627,16 @@
     </dia:object>
     <dia:object type="UML - Note" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="44.975,7.6"/>
+        <dia:point val="51.575,8.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.925,7.55;58.63,10.15"/>
+        <dia:rectangle val="51.525,8.55;65.23,11.15"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="44.975,7.6"/>
+        <dia:point val="51.575,8.6"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.605"/>
@@ -3700,7 +3666,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="45.325,8.845"/>
+            <dia:point val="51.925,9.845"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -3712,5 +3678,241 @@
       </dia:attribute>
       <dia:childnode parent="O1"/>
     </dia:object>
+    <dia:object type="UML - Class" version="0" id="O19">
+      <dia:attribute name="obj_pos">
+        <dia:point val="14.475,12.1837"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="14.425,12.1337;40.05,15.4337"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="14.475,12.1837"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="25.524999999999999"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#IBodyHandler#</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="true"/>
+      </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="false"/>
+      </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="true"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="comment_line_length">
+        <dia:int val="17"/>
+      </dia:attribute>
+      <dia:attribute name="comment_tagging">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_width">
+        <dia:real val="0.10000000000000001"/>
+      </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-BoldOblique"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
+      </dia:attribute>
+      <dia:attribute name="normal_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="0.69999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="attributes"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#operator()#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>#ftor#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</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 type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#transaction#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#ITransaction &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="0"/>
+              </dia:attribute>
+            </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#is#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#std::istream &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:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#os#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#std::ostream#</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="2"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+      <dia:childnode parent="O8"/>
+    </dia:object>
+    <dia:object type="UML - Generalization" version="1" id="O20">
+      <dia:attribute name="obj_pos">
+        <dia:point val="20.3225,0.611026"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="19.4725,0.561026;27.2875,12.1862"/>
+      </dia:attribute>
+      <dia:attribute name="meta">
+        <dia:composite type="dict"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="20.3225,0.611026"/>
+        <dia:point val="20.3225,2.16875"/>
+        <dia:point val="27.2375,2.16875"/>
+        <dia:point val="27.2375,12.1362"/>
+      </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="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </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="O9" connection="12"/>
+        <dia:connection handle="1" to="O19" connection="10"/>
+      </dia:connections>
+      <dia:childnode parent="O8"/>
+    </dia:object>
   </dia:layer>
 </dia:diagram>