click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r991922 [1/2] - in /click/trunk/tools/uml: 128002.diagram 129154.diagram 129282 129410.diagram 130562.diagram 131202 131330 131714 131714.diagram 132866.diagram 132994.diagram 133122.diagram 2.session README.txt
Date Thu, 02 Sep 2010 12:59:18 GMT
Author: sabob
Date: Thu Sep  2 12:59:17 2010
New Revision: 991922

URL: http://svn.apache.org/viewvc?rev=991922&view=rev
Log:
added Ajax and Page Action diagrams

Modified:
    click/trunk/tools/uml/128002.diagram
    click/trunk/tools/uml/129154.diagram
    click/trunk/tools/uml/129282
    click/trunk/tools/uml/129410.diagram
    click/trunk/tools/uml/130562.diagram
    click/trunk/tools/uml/131202
    click/trunk/tools/uml/131330
    click/trunk/tools/uml/131714
    click/trunk/tools/uml/131714.diagram
    click/trunk/tools/uml/132866.diagram
    click/trunk/tools/uml/132994.diagram
    click/trunk/tools/uml/133122.diagram
    click/trunk/tools/uml/2.session
    click/trunk/tools/uml/README.txt

Modified: click/trunk/tools/uml/128002.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/128002.diagram?rev=991922&r1=991921&r2=991922&view=diff
==============================================================================
--- click/trunk/tools/uml/128002.diagram (original)
+++ click/trunk/tools/uml/128002.diagram Thu Sep  2 12:59:17 2010
@@ -1,32 +1,32 @@
-format 66
+format 74
 
 classinstance 128002 class_ref 128002 // ClickServlet
- write_horizontally no  name ""   xyz 89.2321 6 2000 life_line_z 2000
+ write_horizontally no  name ""   xyz 88.8321 7.2 2000 life_line_z 2000
 classinstance 128898 class_ref 129538 // Browser
-  drawing_mode actor  name ""   xyz 16.8902 5.9 2005 life_line_z 2000
+  drawing_mode actor  name ""   xyz 20.8902 6.5 2005 life_line_z 2000
 classinstance 129666 class_ref 129666 // Page
- color orange write_horizontally yes  name ""   mortal  xyz 259.4 91.6436 2000 life_line_z 2000
+ color orange write_horizontally yes  name ""   mortal  xyz 258.6 92.0436 2000 life_line_z 2000
 classinstance 129794 class_ref 129794 // Control
-  name ""   mortal  xyz 406.172 91.9274 2000 life_line_z 2000
+  drawing_mode class  name ""   mortal  xyz 406.172 92.1274 2000 life_line_z 2000
 durationcanvas 129026 classinstance_ref 128898 // :Browser
-  xyzwh 33 53.4 2010 11 480
+  xyzwh 36 53.4 2010 11 480
 end
 durationcanvas 129154 classinstance_ref 128002 // :ClickServlet
-  xyzwh 119 56.6 2010 11 485
+  xyzwh 118 56.6 2010 11 485
   overlappingdurationcanvas 135682
-    xyzwh 125 70 2020 11 401
+    xyzwh 124 70 2020 11 401
     overlappingdurationcanvas 135810
-      xyzwh 131 345.2 2030 11 114
+      xyzwh 130 344 2030 11 114
     end
   end
 end
 durationcanvas 129922 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 141.4 2010 11 24
+  xyzwh 277 141.4 2010 11 24
 end
 durationcanvas 130178 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 171.4 2010 11 24
+  xyzwh 276 171.4 2010 11 24
 end
 durationcanvas 131202 classinstance_ref 129794 // :Control
   xyzwh 425 201.4 2010 11 24
@@ -36,125 +36,125 @@ durationcanvas 132482 classinstance_ref 
 end
 durationcanvas 132994 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 259 2010 11 24
+  xyzwh 277 259 2010 11 24
 end
 durationcanvas 133250 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 291.4 2010 11 24
+  xyzwh 276 291.4 2010 11 24
 end
 durationcanvas 133506 classinstance_ref 129794 // :Control
   xyzwh 425 319 2010 11 24
 end
 durationcanvas 134018 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 369 2010 11 24
+  xyzwh 276 369 2010 11 24
 end
 durationcanvas 134274 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 401.4 2010 11 24
+  xyzwh 277 401.4 2010 11 24
 end
 durationcanvas 134530 classinstance_ref 129794 // :Control
   xyzwh 425 436.4 2010 11 24
 end
 durationcanvas 135938 classinstance_ref 129794 // :Control
-  xyzwh 425 470.2 2010 11 24
+  xyzwh 425 469 2010 11 24
 end
 durationcanvas 136194 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 496.4 2010 11 24
+  xyzwh 276 496.4 2010 11 24
 end
 msg 129282 synchronous
   from durationcanvas_ref 129026
   to durationcanvas_ref 129154
   yz 58 3010 explicitmsg "doGet"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 58 48
 reflexivemsg 129538 synchronous
   to durationcanvas_ref 135682
   yz 70 3005 explicitmsg "handleRequest"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 161 67
 msg 130050 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 129922
   yz 151 3010 explicitmsg "onSecurityCheck : boolean"
-  show_full_operations_definition yes drawing_language uml
+  show_full_operations_definition yes drawing_language uml show_context_mode default
   label_xy 143 138
 msg 130306 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 130178
   yz 182 3010 explicitmsg "onInit"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 191 172
 msg 131330 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 131202
   yz 210 3010 explicitmsg "onInit"
-  show_full_operations_definition yes drawing_language uml
+  show_full_operations_definition yes drawing_language uml show_context_mode default
   label_xy 349 197
 msg 132610 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 132482
   yz 242 3010 explicitmsg "onProcess : boolean"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 314 231
 msg 133122 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 132994
   yz 266 3010 explicitmsg "onPost"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 187 255
 msg 133378 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 133250
   yz 298 3010 explicitmsg "onRender"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 181 287
 msg 133634 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 133506
   yz 328 3010 explicitmsg "onRender"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 334 317
 reflexivemsg 133890 synchronous
   to durationcanvas_ref 135810
-  yz 345 3005 explicitmsg "renderTemplate"
-  show_full_operations_definition default drawing_language default
+  yz 344 3005 explicitmsg "renderTemplate"
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 167 343
 msg 134146 synchronous
   from durationcanvas_ref 135810
   to durationcanvas_ref 134018
   yz 378 3010 explicitmsg "getModel : Map"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 166 366
 msg 134402 synchronous
   from durationcanvas_ref 135810
   to durationcanvas_ref 134274
   yz 412 3010 explicitmsg "getTemplate : String"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 152 400
 msg 134658 synchronous
   from durationcanvas_ref 135810
   to durationcanvas_ref 134530
   yz 445 3010 explicitmsg "toString : String"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 318 433
 msg 136066 synchronous
   from durationcanvas_ref 129154
   to durationcanvas_ref 135938
   yz 478 2015 explicitmsg "onDestroy"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 334 467
 msg 136322 synchronous
   from durationcanvas_ref 129154
   to durationcanvas_ref 136194
   yz 505 2015 explicitmsg "onDestroy"
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 175 493
 msg 136450 return
   from durationcanvas_ref 129154
   to durationcanvas_ref 129026
   yz 518 2020 unspecifiedmsg
-  show_full_operations_definition default drawing_language default
+  show_full_operations_definition default drawing_language default show_context_mode default
 preferred_whz 0 0 1.2
 end

Modified: click/trunk/tools/uml/129154.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/129154.diagram?rev=991922&r1=991921&r2=991922&view=diff
==============================================================================
--- click/trunk/tools/uml/129154.diagram (original)
+++ click/trunk/tools/uml/129154.diagram Thu Sep  2 12:59:17 2010
@@ -1,67 +1,44 @@
-format 66
+format 74
 
 classcanvas 128002 class_ref 129666 // Page
-  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition yes show_members_visibility yes show_members_stereotype default show_members_multiplicity default show_members_initialization yes show_attribute_modifiers default member_max_width 0 show_parameter_dir no show_parameter_name no package_name_in_tab default class_drawing_mode class drawing_language uml show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 3 8 2000
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition yes show_members_visibility yes show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization yes show_attribute_modifiers default member_max_width 0 show_parameter_dir no show_parameter_name no package_name_in_tab default class_drawing_mode class drawing_language uml show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 4 4 2000
 end
 classcanvas 128130 class_ref 130946 // Context
-  draw_all_relations default hide_attributes default hide_operations yes show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 292 9 2000
-end
-classcanvas 128386 class_ref 132098 // List
-  draw_all_relations default hide_attributes yes hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 254 159 2000
-end
-classcanvas 128514 class_ref 132226 // Map
-  draw_all_relations default hide_attributes yes hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 253 281 2000
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 281 4 2000
 end
 classcanvas 128642 class_ref 129794 // Control
-  draw_all_relations default hide_attributes yes hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir no show_parameter_name no package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 426 135 2000
+  draw_all_relations default hide_attributes yes hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir no show_parameter_name no package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 429 149 2000
 end
 classcanvas 129410 class_ref 132354 // Object
-  draw_all_relations default hide_attributes yes hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 425 396 2000
-end
-relationcanvas 128258 relation_ref 128002 // #context
-  decenter_begin 187
-  from ref 128002 z 2001 label "#context" italic xyz 206 50 2001 to ref 128130
-  no_role_a no_role_b
-  multiplicity_a_pos 275 74 3000 multiplicity_b_pos 175 74 3000
-end
-relationcanvas 128770 relation_ref 129154 // #controls
-  decenter_begin 523
-  decenter_end 344
-  from ref 128002 z 2001 label "#controls" italic xyz 187 161 2001 to ref 128386
-  no_role_a no_role_b
-  multiplicity_a_pos 237 183 3000 multiplicity_b_pos 175 183 3000
+  draw_all_relations default hide_attributes yes hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 360 466 2000
 end
-relationcanvas 129026 relation_ref 129282 // #model
-  decenter_begin 898
-  decenter_end 344
-  from ref 128002 z 2001 label "#model" italic xyz 191 286 2001 to ref 128514
+relationcanvas 130050 relation_ref 142210 // #controls
+  decenter_begin 575
+  decenter_end 179
+  from ref 128002 z 2001 label "#controls" italic xyz 172.5 182 2001 to ref 128642
   no_role_a no_role_b
-  multiplicity_a_pos 236 305 3000 multiplicity_b_pos 175 305 3000
+  multiplicity_a_pos 402 210 3000 multiplicity_b_pos 176 210 3000
 end
-relationcanvas 129154 relation_ref 129410 // <aggregation>
-  decenter_begin 453
-  decenter_end 312
-  from ref 128386 z 2001 to ref 128642
+relationcanvas 130690 relation_ref 149506 // <association>
+  decenter_begin 857
+  from ref 128002 z 2001 to ref 128642
   no_role_a no_role_b
-  multiplicity_a_pos 399 218 3000 multiplicity_b_pos 340 191 3000
+  multiplicity_a_pos 402 308 3000 multiplicity_b_pos 173 312 3000
 end
-relationcanvas 129282 relation_ref 129538 // <aggregation>
-  decenter_begin 163
-  decenter_end 559
-  from ref 128514 z 2001 to ref 128642
+relationcanvas 131074 relation_ref 149762 // #model
+  decenter_begin 850
+  from ref 128002 z 2001 label "#model" italic xyz 170 277.5 2001 to ref 129410
   no_role_a no_role_b
-  multiplicity_a_pos 399 275 3000 multiplicity_b_pos 339 294 3000
+  multiplicity_a_pos 343 458 3000 multiplicity_b_pos 203 305 3000
 end
-relationcanvas 129538 relation_ref 129666 // <aggregation>
-  decenter_begin 818
-  from ref 128514 z 2001 to ref 129410
+relationcanvas 131202 relation_ref 149890 // <unidirectional association>
+  decenter_begin 197
+  from ref 128002 z 2001 to ref 128130
   no_role_a no_role_b
-  multiplicity_a_pos 415 407 3000 multiplicity_b_pos 339 337 3000
+  no_multiplicity_a no_multiplicity_b
 end
 end

Modified: click/trunk/tools/uml/129282
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/129282?rev=991922&r1=991921&r2=991922&view=diff
==============================================================================
--- click/trunk/tools/uml/129282 (original)
+++ click/trunk/tools/uml/129282 Thu Sep  2 12:59:17 2010
@@ -1,16 +1,16 @@
-format 66
+format 74
 "diagrams" // diagrams
-  revision 9
-  modified_by 2 "bob"
+  revision 26
+  modified_by 2 "bschellink"
   // class settings
   //class diagram settings
-  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   //use case diagram settings
   package_name_in_tab default show_context default auto_label_position default draw_all_relations default class_drawing_mode default shadow default show_stereotype_properties default
   //sequence diagram settings
-  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
   //collaboration diagram settings
-  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
   //object diagram settings
    write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
   //component diagram settings
@@ -28,13 +28,13 @@ format 66
   
   classview 129154 "pages"
     //class diagram settings
-    draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
     //collaboration diagram settings
-    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
     //object diagram settings
      write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
     //sequence diagram settings
-    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
     //state diagram settings
     package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
     show_activities default region_horizontally default drawing_language default show_stereotype_properties default
@@ -43,12 +43,12 @@ format 66
     package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
     show_infonote default drawing_language default show_stereotype_properties default
     sequencediagram 128002 "post-sequence-diagram"
-      show_full_operations_definition no write_horizontally no class_drawing_mode default drawing_language uml draw_all_relations default shadow default show_stereotype_properties default
+      show_full_operations_definition no write_horizontally no class_drawing_mode default drawing_language uml draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
       overlapping_bars size A4
     end
 
     classdiagram 129154 "click-class-diagram"
-      draw_all_relations default hide_attributes default hide_operations default show_members_full_definition yes show_members_visibility yes show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language uml show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+      draw_all_relations no hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition yes show_members_visibility yes show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language uml show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
       size A4
     end
 
@@ -60,7 +60,7 @@ format 66
 	size A4
       end
 
-      activitynode 128002 initial "HTTP Request"
+      activitynode 128002 initial_node "HTTP Request"
 	flow 128002 "<flow>"
 	  on activityaction_ref 128130 // activity action ClickServlet.handleRequest()
 	end
@@ -141,6 +141,10 @@ format 66
 	flow 136450 "<flow>"
 	  on activitynode_ref 130050 // join
 	end
+
+	flow 142978 "<flow>"
+	  on activitynode_ref 130050 // join
+	end
       end
 
       activitynode 129794 join ""
@@ -253,20 +257,30 @@ format 66
     end
 
     sequencediagram 130562 "get-sequence-diagram"
-      show_full_operations_definition no write_horizontally no class_drawing_mode default drawing_language uml draw_all_relations default shadow default show_stereotype_properties default
+      show_full_operations_definition no write_horizontally no class_drawing_mode default drawing_language uml draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+      overlapping_bars size A4
+    end
+
+    sequencediagram 140930 "page-action-sequence-diagram"
+      show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
       overlapping_bars size A4
     end
+
+    classdiagram 154242 "page-action-class-diagram"
+      draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+      size A4
+    end
   end
 
   classview 130306 "controls"
     //class diagram settings
-    draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
     //collaboration diagram settings
-    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
     //object diagram settings
      write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
     //sequence diagram settings
-    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
     //state diagram settings
     package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
     show_activities default region_horizontally default drawing_language default show_stereotype_properties default
@@ -275,35 +289,35 @@ format 66
     package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
     show_infonote default drawing_language default show_stereotype_properties default
     sequencediagram 131714 "control-post-sequence-diagram"
-      show_full_operations_definition no write_horizontally no class_drawing_mode default drawing_language uml draw_all_relations default shadow default show_stereotype_properties default
+      show_full_operations_definition no write_horizontally no class_drawing_mode default drawing_language uml draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
       overlapping_bars size A4
     end
 
     classdiagram 132866 "container-package-class-diagram"
-      draw_all_relations no hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+      draw_all_relations no hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
       size A4
     end
 
     classdiagram 132994 "control-class-diagram"
-      draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+      draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
       size A4
     end
 
     classdiagram 133122 "control-package-class-diagram"
-      draw_all_relations default hide_attributes yes hide_operations yes show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+      draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
       size A4
     end
   end
 
   classview 132994 "services"
     //class diagram settings
-    draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
     //collaboration diagram settings
-    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
     //object diagram settings
      write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
     //sequence diagram settings
-    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
     //state diagram settings
     package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
     show_activities default region_horizontally default drawing_language default show_stereotype_properties default
@@ -312,8 +326,40 @@ format 66
     package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
     show_infonote default drawing_language default show_stereotype_properties default
     classdiagram 134274 "service-package"
-      draw_all_relations default hide_attributes yes hide_operations yes show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+      draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
       size A4
     end
   end
+
+  classview 139650 "ajax"
+    //class diagram settings
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+    //collaboration diagram settings
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
+    //object diagram settings
+     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+    //sequence diagram settings
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+    //state diagram settings
+    package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+    show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+    //class settings
+    //activity diagram settings
+    package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+    show_infonote default drawing_language default show_stereotype_properties default
+    classdiagram 147458 "ajax-class-diagram"
+      draw_all_relations no hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition yes show_members_visibility yes show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language uml show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+      size A4
+    end
+
+    sequencediagram 160770 "ajax-request-sequence-diagram"
+      show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+      overlapping_bars size A4
+    end
+
+    sequencediagram 147586 "detailed-ajax-request-sequence-diagram"
+      show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+      overlapping_bars size A4
+    end
+  end
 end

Modified: click/trunk/tools/uml/129410.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/129410.diagram?rev=991922&r1=991921&r2=991922&view=diff
==============================================================================
--- click/trunk/tools/uml/129410.diagram (original)
+++ click/trunk/tools/uml/129410.diagram Thu Sep  2 12:59:17 2010
@@ -1,20 +1,20 @@
-format 66
+format 74
 
-activitynodecanvas 128002 activitynode_ref 128002 // initial
-  xyz 199 5.3 2000
+activitynodecanvas 128002 activitynode_ref 128002 // initial_node
+  xyz 199.2 4.1 2000
 end
 textcanvas 129538 "HTTP Request"
-  font bold  xyzwh 220 7 2000 118 18
+  font bold  xyzwh 219.6 4.6 2000 118 18
 activityactioncanvas 129922 activityaction_ref 128130 // activity action ClickServlet.handleRequest()
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 128 46.3 2007 159 41
+  xyzwh 129 46.3 2007 159 41
 end
 activitynodecanvas 130306 activitynode_ref 129154 // activity_final
-  xyz 185.5 862.8 2000
+  xyz 185.5 863 2000
 end
 textcanvas 130434 "HTTP Response"
-  font bold  xyzwh 216 867 2000 111 17
+  font bold  xyzwh 216.2 867 2000 111 17
 activityactioncanvas 130562 activityaction_ref 129282 // activity action new Page
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
@@ -26,15 +26,15 @@ end
 activityactioncanvas 132482 activityaction_ref 129410 // activity action Page.onInit()
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 161.9 172.5 2000 95 41
+  xyzwh 164.3 172.5 2000 95 41
 end
 textcanvas 133634 "Page.onSecurityCheck()"
-  font bold  xyzwh 26 155 2006 146 15
+  font bold  xyzwh 25.6 155.4 2006 146 15
 activitynodecanvas 133762 activitynode_ref 129410 // decision
-  xyz 197 233.8 2000
+  xyz 198 233.8 2000
 end
 textcanvas 133890 "Is Forward ?"
-  font bold  xyzwh 219 227 2000 80 17
+  font bold  xyzwh 218.6 227 2000 80 17
 activityactioncanvas 134146 activityaction_ref 129538 // activity action process Controls
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
@@ -45,7 +45,7 @@ activitynodecanvas 134658 activitynode_r
 end
 textcanvas 134914 "Continue
 processing ?"
-  font bold  xyzwh 401 349 2000 75 36
+  font bold  xyzwh 401.6 345.6 2000 75 36
 activitynodecanvas 135042 activitynode_ref 129794 // join
   horizontal  xyzwh 200.2 384.2 2000 65 15
 end
@@ -58,11 +58,11 @@ activityactioncanvas 136194 activityacti
   xyzwh 271.1 462.2 2000 101 41
 end
 textcanvas 136322 "Is Post ?"
-  font bold  xyzwh 169 410 2000 60 18
+  font bold  xyzwh 168.6 409.6 2000 60 18
 activityactioncanvas 136962 activityaction_ref 129794 // activity action Page.onPost()
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 89.6 461.3 2000 99 41
+  xyzwh 90.8 461.3 2000 99 41
 end
 activityactioncanvas 137346 activityaction_ref 129922 // activity action Page.onRender()
   show_infonote default drawing_language default show_stereotype_properties default
@@ -70,18 +70,18 @@ activityactioncanvas 137346 activityacti
   xyzwh 146.9 519.3 2000 159 41
 end
 activitynodecanvas 138882 activitynode_ref 130050 // join
-  horizontal  xyzwh 4.8 577.2 2000 402 15
+  horizontal  xyzwh 4.8 577.2 2000 403 15
 end
 activitynodecanvas 142210 activitynode_ref 131202 // decision
   xyz 138.1 613.4 2005
 end
 textcanvas 142466 "Do Redirect ?"
-  font bold  xyzwh 162 604 2000 93 16
+  font bold  xyzwh 162.6 603 2000 93 16
 activitynodecanvas 142594 activitynode_ref 131330 // decision
-  xyz 255.5 658.5 2000
+  xyz 255.5 659.9 2000
 end
 textcanvas 142722 "Do Forward ?"
-  font bold  xyzwh 276 650 2005 88 16
+  font bold  xyzwh 274.6 648 2005 88 16
 activityactioncanvas 143490 activityaction_ref 131074 // activity action redirect request
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
@@ -98,19 +98,19 @@ activityactioncanvas 144130 activityacti
   xyzwh 289.6 708.1 2000 137 41
 end
 activitynodecanvas 145026 activitynode_ref 131458 // join
-  horizontal  xyzwh 3.2 767.4 2000 396 15
+  horizontal  xyzwh 2.2 767.4 2000 397 15
 end
 activityactioncanvas 145538 activityaction_ref 131458 // activity action Page.onDestroy()
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 138.6 801.2 2005 119 41
+  xyzwh 138.6 802.4 2005 119 41
 end
 textcanvas 146690 "Servlet Container"
-  font bold  xyzwh 17 6 2000 125 25
+  font bold  xyzwh 17.8 6.6 2000 125 25
 activityactioncanvas 147714 activityaction_ref 132610 // activity action dispatch Control event listeners
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 301 289 2005 171 40
+  xyzwh 301 289 2005 171 41
 end
 flowcanvas 130178 flow_ref 128002 // <flow>
   
@@ -120,7 +120,7 @@ end
 flowcanvas 130946 flow_ref 129282 // <flow>
   geometry VHr
   
-  from ref 130562 z 2001 to point 12 125
+  from ref 130562 z 2001 to point 11 125
   line 131202 z 2001 to ref 130818
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
@@ -132,7 +132,7 @@ end
 flowcanvas 132610 flow_ref 129538 // true
   decenter_end 449
   
-  from ref 130818 z 2001 label "true" xyz 74 198 2001 to ref 132482
+  from ref 130818 z 2001 label "true" xyz 76 197 2001 to ref 132482
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 134018 flow_ref 129666 // <flow>
@@ -147,15 +147,15 @@ flowcanvas 134274 flow_ref 129794 // no
 end
 flowcanvas 135170 flow_ref 130178 // yes
   decenter_begin 518
-  decenter_end 151
+  decenter_end 177
   
-  from ref 133762 z 2001 label "yes" xyz 214 307 2001 to ref 135042
+  from ref 133762 z 2001 label "yes" xyz 215 307 2001 to ref 135042
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 135298 flow_ref 130306 // yes
   decenter_end 851
   
-  from ref 134658 z 2001 label "yes" xyz 323 365 2001 to point 253 361
+  from ref 134658 z 2001 label "yes" xyz 323 364 2001 to point 254.2 361.6
   line 135810 z 2001 to ref 135042
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
@@ -167,20 +167,20 @@ end
 flowcanvas 136450 flow_ref 130562 // no
   geometry HV
   
-  from ref 135938 z 2001 label "no" xyz 256 439 2001 to point 319 432
+  from ref 135938 z 2001 label "no" xyz 256 439 2001 to point 319 431
   line 136834 z 2001 to ref 136194
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 137090 flow_ref 130690 // yes
   geometry VHr
   
-  from ref 135938 z 2001 label "yes" xyz 187 437 2001 to point 136 432
+  from ref 135938 z 2001 label "yes" xyz 185 437 2001 to point 136 431
   line 137218 z 2001 to ref 136962
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 138498 flow_ref 130946 // <flow>
   decenter_begin 847
-  decenter_end 165
+  decenter_end 172
   
   from ref 136962 z 2001 to ref 137346
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
@@ -194,9 +194,9 @@ flowcanvas 138754 flow_ref 131074 // <fl
 end
 flowcanvas 139010 flow_ref 131202 // false
   decenter_begin 518
-  decenter_end 28
+  decenter_end 26
   
-  from ref 130818 z 2001 label "false" xyz 19 227 2001 to ref 138882
+  from ref 130818 z 2001 label "false" xyz 18 227 2001 to ref 138882
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 142338 flow_ref 132610 // <flow>
@@ -208,21 +208,21 @@ end
 flowcanvas 142850 flow_ref 132738 // no
   geometry HV
   
-  from ref 142210 z 2006 label "no" xyz 239 635 2006 to point 265 629
+  from ref 142210 z 2006 label "no" xyz 238 635 2006 to point 265 629
   line 143362 z 2006 to ref 142594
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 143618 flow_ref 132866 // yes
   geometry VHr
   
-  from ref 142210 z 2006 label "yes" xyz 75 636 2006 to point 62 629
+  from ref 142210 z 2006 label "yes" xyz 75 636 2006 to point 61 629
   line 143874 z 2006 to ref 143490
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 144258 flow_ref 132994 // no
   geometry HV
   
-  from ref 142594 z 2001 label "no" xyz 339 682 2001 to point 355 674
+  from ref 142594 z 2001 label "no" xyz 338 682 2001 to point 355 674
   line 144642 z 2001 to ref 144130
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
@@ -235,7 +235,7 @@ flowcanvas 144770 flow_ref 133122 // yes
 end
 flowcanvas 145410 flow_ref 133378 // <flow>
   decenter_begin 513
-  decenter_end 451
+  decenter_end 453
   
   from ref 144002 z 2001 to ref 145026
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
@@ -253,14 +253,14 @@ flowcanvas 145794 flow_ref 133634 // <fl
 end
 flowcanvas 145922 flow_ref 133762 // <flow>
   decenter_begin 500
-  decenter_end 156
+  decenter_end 158
   
   from ref 143490 z 2001 to ref 145026
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 146050 flow_ref 133890 // <flow>
-  decenter_begin 513
-  decenter_end 901
+  decenter_begin 490
+  decenter_end 888
   
   from ref 144130 z 2001 to ref 145026
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
@@ -283,9 +283,9 @@ flowcanvas 148098 flow_ref 136322 // <fl
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 148354 flow_ref 136450 // <flow>
-  decenter_end 953
+  decenter_end 952
   
-  from ref 134658 z 2007 to point 385 388
+  from ref 134658 z 2007 to point 385.4 388
   line 148482 z 2007 to ref 138882
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end

Modified: click/trunk/tools/uml/130562.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/130562.diagram?rev=991922&r1=991921&r2=991922&view=diff
==============================================================================
--- click/trunk/tools/uml/130562.diagram (original)
+++ click/trunk/tools/uml/130562.diagram Thu Sep  2 12:59:17 2010
@@ -1,160 +1,160 @@
-format 66
+format 74
 
 classinstance 128002 class_ref 128002 // ClickServlet
- write_horizontally no  name ""   xyz 89.8321 4.6 2000 life_line_z 2000
+ write_horizontally no  name ""   xyz 89.0321 5.6 2000 life_line_z 2000
 classinstance 128898 class_ref 129538 // Browser
-  drawing_mode actor  name ""   xyz 16.6902 5.7 2005 life_line_z 2000
+  drawing_mode actor  name ""   xyz 19.2902 6.5 2005 life_line_z 2000
 classinstance 129666 class_ref 129666 // Page
- color orange write_horizontally yes  name ""   mortal  xyz 259.4 95.6436 2000 life_line_z 2000
+ color orange write_horizontally yes  name ""   mortal  xyz 264.8 92.2 2000 life_line_z 2000
 classinstance 129794 class_ref 129794 // Control
-  name ""   mortal  xyz 406.172 91.7274 2000 life_line_z 2000
+  drawing_mode class  name ""   mortal  xyz 407.172 92.9274 2000 life_line_z 2000
 durationcanvas 129026 classinstance_ref 128898 // :Browser
-  xyzwh 34 53.6 2010 11 480
+  xyzwh 38 53.4 2010 11 480
 end
 durationcanvas 129154 classinstance_ref 128002 // :ClickServlet
-  xyzwh 120 55.4 2010 11 485
+  xyzwh 119 53.4 2010 11 480
   overlappingdurationcanvas 135682
-    xyzwh 126 70 2020 11 401
+    xyzwh 125 70 2020 11 401
     overlappingdurationcanvas 135810
-      xyzwh 132 345.2 2030 11 114
+      xyzwh 131 345.2 2030 11 114
     end
   end
 end
 durationcanvas 129922 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 141.6 2010 11 24
+  xyzwh 282 141.4 2010 11 24
 end
 durationcanvas 130178 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 171.6 2010 11 24
+  xyzwh 283 171.4 2010 11 24
 end
 durationcanvas 131202 classinstance_ref 129794 // :Control
-  xyzwh 424 201.6 2010 11 24
+  xyzwh 426 201.4 2010 11 24
 end
 durationcanvas 132482 classinstance_ref 129794 // :Control
-  xyzwh 425 230.2 2010 11 24
+  xyzwh 426 230.2 2010 11 24
 end
 durationcanvas 132994 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 259 2010 11 24
+  xyzwh 282 259 2010 11 24
 end
 durationcanvas 133250 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 290.2 2010 11 24
+  xyzwh 283 290.2 2010 11 24
 end
 durationcanvas 133506 classinstance_ref 129794 // :Control
   xyzwh 425 319 2010 11 24
 end
 durationcanvas 134018 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 369 2010 11 24
+  xyzwh 283 369 2010 11 24
 end
 durationcanvas 134274 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 401.6 2010 11 24
+  xyzwh 283 401.4 2010 11 24
 end
 durationcanvas 134530 classinstance_ref 129794 // :Control
-  xyzwh 425 434 2010 11 24
+  xyzwh 426 434 2010 11 24
 end
 durationcanvas 135938 classinstance_ref 129794 // :Control
-  xyzwh 425 470.2 2010 11 24
+  xyzwh 426 470.2 2010 11 24
 end
 durationcanvas 136194 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 278 494 2010 11 24
+  xyzwh 283 494 2010 11 24
 end
 msg 129282 synchronous
   from durationcanvas_ref 129026
   to durationcanvas_ref 129154
-  yz 58 3010 explicitmsg "doGet"
-  show_full_operations_definition default drawing_language default
-  label_xy 58 48
+  yz 57 3010 explicitmsg "doGet"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 58 47
 reflexivemsg 129538 synchronous
   to durationcanvas_ref 135682
-  yz 70 3005 explicitmsg "handleRequest"
-  show_full_operations_definition default drawing_language default
+  yz 69 3005 explicitmsg "handleRequest"
+  show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 161 67
 msg 130050 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 129922
-  yz 151 3010 explicitmsg "onSecurityCheck : boolean"
-  show_full_operations_definition yes drawing_language uml
-  label_xy 143 138
+  yz 147 3010 explicitmsg "onSecurityCheck : boolean"
+  show_full_operations_definition yes drawing_language uml show_context_mode default
+  label_xy 143 134
 msg 130306 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 130178
-  yz 182 3010 explicitmsg "onInit"
-  show_full_operations_definition default drawing_language default
-  label_xy 191 172
+  yz 176 3010 explicitmsg "onInit"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 191 167
 msg 131330 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 131202
-  yz 210 3010 explicitmsg "onInit"
-  show_full_operations_definition yes drawing_language uml
-  label_xy 349 197
+  yz 206 3010 explicitmsg "onInit"
+  show_full_operations_definition yes drawing_language uml show_context_mode default
+  label_xy 349 193
 msg 132610 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 132482
-  yz 242 3010 explicitmsg "onProcess : boolean"
-  show_full_operations_definition default drawing_language default
-  label_xy 314 231
+  yz 235 3010 explicitmsg "onProcess : boolean"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 314 224
 msg 133122 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 132994
-  yz 266 3010 explicitmsg "onGet"
-  show_full_operations_definition default drawing_language default
-  label_xy 189 255
+  yz 265 3010 explicitmsg "onGet"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 189 254
 msg 133378 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 133250
-  yz 299 3010 explicitmsg "onRender"
-  show_full_operations_definition default drawing_language default
-  label_xy 181 288
+  yz 296 3010 explicitmsg "onRender"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 181 285
 msg 133634 synchronous
   from durationcanvas_ref 135682
   to durationcanvas_ref 133506
-  yz 328 3010 explicitmsg "onRender"
-  show_full_operations_definition default drawing_language default
-  label_xy 334 317
+  yz 325 3010 explicitmsg "onRender"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 334 314
 reflexivemsg 133890 synchronous
   to durationcanvas_ref 135810
-  yz 345 3005 explicitmsg "renderTemplate"
-  show_full_operations_definition default drawing_language default
-  label_xy 167 341
+  yz 343 3005 explicitmsg "renderTemplate"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 167 337
 msg 134146 synchronous
   from durationcanvas_ref 135810
   to durationcanvas_ref 134018
-  yz 378 3010 explicitmsg "getModel : Map"
-  show_full_operations_definition default drawing_language default
-  label_xy 166 366
+  yz 375 3010 explicitmsg "getModel : Map"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 166 362
 msg 134402 synchronous
   from durationcanvas_ref 135810
   to durationcanvas_ref 134274
-  yz 412 3010 explicitmsg "getTemplate : String"
-  show_full_operations_definition default drawing_language default
-  label_xy 152 400
+  yz 407 3010 explicitmsg "getTemplate : String"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 152 395
 msg 134658 synchronous
   from durationcanvas_ref 135810
   to durationcanvas_ref 134530
-  yz 445 3010 explicitmsg "toString : String"
-  show_full_operations_definition default drawing_language default
-  label_xy 318 433
+  yz 440 3010 explicitmsg "toString : String"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 318 428
 msg 136066 synchronous
   from durationcanvas_ref 129154
   to durationcanvas_ref 135938
-  yz 478 2015 explicitmsg "onDestroy"
-  show_full_operations_definition default drawing_language default
-  label_xy 334 467
+  yz 475 2015 explicitmsg "onDestroy"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 334 464
 msg 136322 synchronous
   from durationcanvas_ref 129154
   to durationcanvas_ref 136194
-  yz 505 2015 explicitmsg "onDestroy"
-  show_full_operations_definition default drawing_language default
-  label_xy 175 493
+  yz 499 2015 explicitmsg "onDestroy"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 175 488
 msg 136450 return
   from durationcanvas_ref 129154
   to durationcanvas_ref 129026
-  yz 518 2020 unspecifiedmsg
-  show_full_operations_definition default drawing_language default
+  yz 517 2020 unspecifiedmsg
+  show_full_operations_definition default drawing_language default show_context_mode default
 preferred_whz 0 0 1.2
 end

Modified: click/trunk/tools/uml/131202
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/131202?rev=991922&r1=991921&r2=991922&view=diff
==============================================================================
--- click/trunk/tools/uml/131202 (original)
+++ click/trunk/tools/uml/131202 Thu Sep  2 12:59:17 2010
@@ -1,16 +1,16 @@
-format 66
+format 74
 "util" // java::util
-  revision 1
-  modified_by 2 "bob"
+  revision 3
+  modified_by 2 "bschellink"
   // class settings
   //class diagram settings
-  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   //use case diagram settings
   package_name_in_tab default show_context default auto_label_position default draw_all_relations default class_drawing_mode default shadow default show_stereotype_properties default
   //sequence diagram settings
-  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
   //collaboration diagram settings
-  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
   //object diagram settings
    write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
   //component diagram settings
@@ -28,13 +28,13 @@ format 66
   
   classview 131714 "classes"
     //class diagram settings
-    draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
     //collaboration diagram settings
-    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
     //object diagram settings
      write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
     //sequence diagram settings
-    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
     //state diagram settings
     package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
     show_activities default region_horizontally default drawing_language default show_stereotype_properties default
@@ -64,7 +64,6 @@ ${members}}
 	  b role_name "" multiplicity "1" private
 	    classrelation_ref 129922 // <aggregation>
       end
-
     end
 
     class 132226 "Map"
@@ -82,10 +81,6 @@ ${members}};
 "
       explicit_switch_type ""
       
-      classrelation 129666 // (#model)
-	relation_ref 129282 // #model
-      end
-
       classrelation 130050 // <aggregation>
 	relation 129538 o---
 	  a role_name "" multiplicity "0..*" private
@@ -102,6 +97,13 @@ ${members}};
 	    classrelation_ref 130434 // <aggregation>
       end
 
+      classrelation 142978 // <aggregation>
+	relation 141954 o---
+	  a role_name "" multiplicity "0..*" private
+	    classrelation_ref 142978 // <aggregation>
+	  b role_name "" multiplicity "1" private
+	    classrelation_ref 143106 // <aggregation>
+      end
     end
   end
 end

Modified: click/trunk/tools/uml/131330
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/131330?rev=991922&r1=991921&r2=991922&view=diff
==============================================================================
--- click/trunk/tools/uml/131330 (original)
+++ click/trunk/tools/uml/131330 Thu Sep  2 12:59:17 2010
@@ -1,16 +1,16 @@
-format 66
+format 74
 "lang" // java::lang
-  revision 1
-  modified_by 2 "bob"
+  revision 3
+  modified_by 2 "bschellink"
   // class settings
   //class diagram settings
-  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   //use case diagram settings
   package_name_in_tab default show_context default auto_label_position default draw_all_relations default class_drawing_mode default shadow default show_stereotype_properties default
   //sequence diagram settings
-  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
   //collaboration diagram settings
-  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
   //object diagram settings
    write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
   //component diagram settings
@@ -28,13 +28,13 @@ format 66
   
   classview 131842 "classes"
     //class diagram settings
-    draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
     //collaboration diagram settings
-    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
     //object diagram settings
      write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
     //sequence diagram settings
-    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
     //state diagram settings
     package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
     show_activities default region_horizontally default drawing_language default show_stereotype_properties default
@@ -64,6 +64,10 @@ format 66
       classrelation 130434 // <aggregation>
 	relation_ref 129666 // <aggregation>
       end
+
+      classrelation 152066 // (#model)
+	relation_ref 149762 // #model
+      end
     end
   end
 end



Mime
View raw message