click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r1029329 [1/2] - /click/trunk/tools/uml/
Date Sun, 31 Oct 2010 13:08:48 GMT
Author: sabob
Date: Sun Oct 31 13:08:47 2010
New Revision: 1029329

URL: http://svn.apache.org/viewvc?rev=1029329&view=rev
Log:
updated diagrams for the AjaxBehavior refactoring

Added:
    click/trunk/tools/uml/140930.diagram
    click/trunk/tools/uml/147458.diagram
    click/trunk/tools/uml/147586.diagram
    click/trunk/tools/uml/147714.diagram
    click/trunk/tools/uml/154242.diagram
    click/trunk/tools/uml/160770.diagram
Modified:
    click/trunk/tools/uml/128002.diagram
    click/trunk/tools/uml/129154.diagram
    click/trunk/tools/uml/129282
    click/trunk/tools/uml/130562.diagram
    click/trunk/tools/uml/131458
    click/trunk/tools/uml/131586
    click/trunk/tools/uml/131714
    click/trunk/tools/uml/131714.diagram
    click/trunk/tools/uml/131842
    click/trunk/tools/uml/133122
    click/trunk/tools/uml/2.session

Modified: click/trunk/tools/uml/128002.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/128002.diagram?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/128002.diagram (original)
+++ click/trunk/tools/uml/128002.diagram Sun Oct 31 13:08:47 2010
@@ -1,15 +1,15 @@
 format 74
 
 classinstance 128002 class_ref 128002 // ClickServlet
- write_horizontally no  name ""   xyz 88.8321 7.2 2000 life_line_z 2000
+ write_horizontally no  name ""   xyz 88.4321 7 2000 life_line_z 2000
 classinstance 128898 class_ref 129538 // Browser
   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 258.6 92.0436 2000 life_line_z 2000
+ color orange write_horizontally yes  name ""   mortal  xyz 259.2 91.8436 2000 life_line_z 2000
 classinstance 129794 class_ref 129794 // Control
-  drawing_mode class  name ""   mortal  xyz 406.172 92.1274 2000 life_line_z 2000
+  drawing_mode class  name ""   mortal  xyz 406.172 91.9274 2000 life_line_z 2000
 durationcanvas 129026 classinstance_ref 128898 // :Browser
-  xyzwh 36 53.4 2010 11 480
+  xyzwh 39 53.4 2010 11 480
 end
 durationcanvas 129154 classinstance_ref 128002 // :ClickServlet
   xyzwh 118 56.6 2010 11 485
@@ -22,11 +22,11 @@ durationcanvas 129154 classinstance_ref 
 end
 durationcanvas 129922 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 141.4 2010 11 24
+  xyzwh 278 141.4 2010 11 24
 end
 durationcanvas 130178 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 276 171.4 2010 11 24
+  xyzwh 278 171.4 2010 11 24
 end
 durationcanvas 131202 classinstance_ref 129794 // :Control
   xyzwh 425 201.4 2010 11 24
@@ -36,22 +36,22 @@ durationcanvas 132482 classinstance_ref 
 end
 durationcanvas 132994 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 259 2010 11 24
+  xyzwh 278 259 2010 11 24
 end
 durationcanvas 133250 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 276 291.4 2010 11 24
+  xyzwh 278 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 276 369 2010 11 24
+  xyzwh 278 369 2010 11 24
 end
 durationcanvas 134274 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 401.4 2010 11 24
+  xyzwh 278 401.4 2010 11 24
 end
 durationcanvas 134530 classinstance_ref 129794 // :Control
   xyzwh 425 436.4 2010 11 24
@@ -61,7 +61,7 @@ durationcanvas 135938 classinstance_ref 
 end
 durationcanvas 136194 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 276 496.4 2010 11 24
+  xyzwh 278 496.4 2010 11 24
 end
 msg 129282 synchronous
   from durationcanvas_ref 129026

Modified: click/trunk/tools/uml/129154.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/129154.diagram?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/129154.diagram (original)
+++ click/trunk/tools/uml/129154.diagram Sun Oct 31 13:08:47 2010
@@ -17,26 +17,26 @@ classcanvas 129410 class_ref 132354 // O
   xyz 360 466 2000
 end
 relationcanvas 130050 relation_ref 142210 // #controls
-  decenter_begin 575
+  decenter_begin 574
   decenter_end 179
-  from ref 128002 z 2001 label "#controls" italic xyz 172.5 182 2001 to ref 128642
+  from ref 128002 z 2001 label "#controls" italic xyz 172 182 2001 to ref 128642
   no_role_a no_role_b
   multiplicity_a_pos 402 210 3000 multiplicity_b_pos 176 210 3000
 end
 relationcanvas 130690 relation_ref 149506 // <association>
-  decenter_begin 857
+  decenter_begin 856
   from ref 128002 z 2001 to ref 128642
   no_role_a no_role_b
-  multiplicity_a_pos 402 308 3000 multiplicity_b_pos 173 312 3000
+  multiplicity_a_pos 402 308 3000 multiplicity_b_pos 176 308 3000
 end
 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
+  from ref 128002 z 2001 label "#model" italic xyz 170 277 2001 to ref 129410
   no_role_a no_role_b
-  multiplicity_a_pos 343 458 3000 multiplicity_b_pos 203 305 3000
+  multiplicity_a_pos 355 479 3000 multiplicity_b_pos 176 312 3000
 end
 relationcanvas 131202 relation_ref 149890 // <unidirectional association>
-  decenter_begin 197
+  decenter_begin 196
   from ref 128002 z 2001 to ref 128130
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b

Modified: click/trunk/tools/uml/129282
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/129282?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/129282 (original)
+++ click/trunk/tools/uml/129282 Sun Oct 31 13:08:47 2010
@@ -1,6 +1,6 @@
 format 74
 "diagrams" // diagrams
-  revision 26
+  revision 29
   modified_by 2 "bschellink"
   // class settings
   //class diagram settings
@@ -352,14 +352,31 @@ format 74
       size A4
     end
 
-    sequencediagram 160770 "ajax-request-sequence-diagram"
+    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
 
-    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
+  classview 146178 "behavior"
+    //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 160770 "behavior-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
   end
 end

Modified: click/trunk/tools/uml/130562.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/130562.diagram?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/130562.diagram (original)
+++ click/trunk/tools/uml/130562.diagram Sun Oct 31 13:08:47 2010
@@ -1,28 +1,28 @@
 format 74
 
 classinstance 128002 class_ref 128002 // ClickServlet
- write_horizontally no  name ""   xyz 89.0321 5.6 2000 life_line_z 2000
+ write_horizontally no  name ""   xyz 89.8321 6.2 2000 life_line_z 2000
 classinstance 128898 class_ref 129538 // Browser
-  drawing_mode actor  name ""   xyz 19.2902 6.5 2005 life_line_z 2000
+  drawing_mode actor  name ""   xyz 18.8902 6.5 2005 life_line_z 2000
 classinstance 129666 class_ref 129666 // Page
- color orange write_horizontally yes  name ""   mortal  xyz 264.8 92.2 2000 life_line_z 2000
+ color orange write_horizontally yes  name ""   mortal  xyz 264.6 92 2000 life_line_z 2000
 classinstance 129794 class_ref 129794 // Control
-  drawing_mode class  name ""   mortal  xyz 407.172 92.9274 2000 life_line_z 2000
+  drawing_mode class  name ""   mortal  xyz 407.372 92.9274 2000 life_line_z 2000
 durationcanvas 129026 classinstance_ref 128898 // :Browser
-  xyzwh 38 53.4 2010 11 480
+  xyzwh 37 53.4 2010 11 480
 end
 durationcanvas 129154 classinstance_ref 128002 // :ClickServlet
-  xyzwh 119 53.4 2010 11 480
+  xyzwh 118 53.4 2010 11 480
   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 345.2 2030 11 114
     end
   end
 end
 durationcanvas 129922 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 282 141.4 2010 11 24
+  xyzwh 283 141.4 2010 11 24
 end
 durationcanvas 130178 classinstance_ref 129666 // :Page
   color orange
@@ -36,14 +36,14 @@ durationcanvas 132482 classinstance_ref 
 end
 durationcanvas 132994 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 282 259 2010 11 24
+  xyzwh 283 259 2010 11 24
 end
 durationcanvas 133250 classinstance_ref 129666 // :Page
   color orange
   xyzwh 283 290.2 2010 11 24
 end
 durationcanvas 133506 classinstance_ref 129794 // :Control
-  xyzwh 425 319 2010 11 24
+  xyzwh 426 319 2010 11 24
 end
 durationcanvas 134018 classinstance_ref 129666 // :Page
   color orange
@@ -71,7 +71,7 @@ msg 129282 synchronous
   label_xy 58 47
 reflexivemsg 129538 synchronous
   to durationcanvas_ref 135682
-  yz 69 3005 explicitmsg "handleRequest"
+  yz 70 3005 explicitmsg "handleRequest"
   show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 161 67
 msg 130050 synchronous
@@ -118,7 +118,7 @@ msg 133634 synchronous
   label_xy 334 314
 reflexivemsg 133890 synchronous
   to durationcanvas_ref 135810
-  yz 343 3005 explicitmsg "renderTemplate"
+  yz 345 3005 explicitmsg "renderTemplate"
   show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 167 337
 msg 134146 synchronous

Modified: click/trunk/tools/uml/131458
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/131458?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/131458 (original)
+++ click/trunk/tools/uml/131458 Sun Oct 31 13:08:47 2010
@@ -1,16 +1,16 @@
-format 66
+format 74
 "org" // org
-  revision 1
-  modified_by 2 "bob"
+  revision 2
+  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
@@ -26,5 +26,5 @@ 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
   
-  package_ref 131586 // click
+  package_ref 131714 // apache
 end

Modified: click/trunk/tools/uml/131586
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/131586?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/131586 (original)
+++ click/trunk/tools/uml/131586 Sun Oct 31 13:08:47 2010
@@ -1,16 +1,16 @@
-format 66
-"click" // org::click
-  revision 1
-  modified_by 2 "bob"
+format 74
+"click" // org::apache::click
+  revision 4
+  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
@@ -26,5 +26,889 @@ 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
   
-  package_ref 131714 // apache
+  classview 128002 "classes"
+    //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 class drawing_language java draw_all_relations yes 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
+    class 130946 "Context"
+      visibility public 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      attribute 128130 "context"
+	protected explicit_type "ServletContext"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 130306 "config"
+	protected explicit_type "ServletConfig"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 130434 "request"
+	protected explicit_type "HttpServletRequest"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 130562 "response"
+	protected explicit_type "HttpServletResponse"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 130690 "session"
+	protected explicit_type "HttpSession"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 130818 "isPost"
+	protected explicit_type "boolean"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      operation 169602 "isAjaxRequest"
+	public explicit_return_type "boolean"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+    end
+
+    class 128002 "ClickServlet"
+      visibility public 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      ncouples 1
+      key "" value "
+"
+      operation 129026 "handleRequest"
+	public explicit_return_type ""
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 129154 "renderTemplate"
+	public explicit_return_type ""
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 129922 "doGet"
+	public explicit_return_type ""
+	nparams 0
+	
+	
+	
+	
+	
+      end
+    end
+
+    class 129538 "Browser"
+      visibility package stereotype "actor"
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+    end
+
+    class 129666 "Page"
+      visibility public 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 176130 "getContext"
+	public return_type class_ref 130946 // Context
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 130050 "addControl"
+	public explicit_return_type "void"
+	nparams 1
+	  param in name "control" type class_ref 129794 // Control
+	
+	
+	
+	
+	
+      end
+
+      operation 130178 "addModel"
+	public explicit_return_type ""
+	nparams 2
+	  param in name "name" explicit_type "String"
+	  param in name "object" explicit_type "Object"
+	
+	
+	
+	
+	
+      end
+
+      operation 133250 "getHeadElements"
+	public return_type class_ref 132098 // List
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 129794 "getTemplate"
+	public explicit_return_type "String"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 128002 "onSecurityCheck"
+	preserve_cpp_body_indent public explicit_return_type "boolean"
+	nparams 0
+	
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 128130 "onInit"
+	public explicit_return_type "void"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 128898 "onGet"
+	public explicit_return_type "void"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 128770 "onPost"
+	public explicit_return_type "void"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 128642 "onRender"
+	public explicit_return_type "void"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 129410 "onDestroy"
+	public explicit_return_type "void"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 129666 "getModel"
+	public return_type class_ref 132226 // Map
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      attribute 129282 "controls"
+	protected explicit_type "List"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 129410 "format"
+	protected explicit_type "Object"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 130178 "headElements"
+	protected explicit_type "List"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 129538 "headers"
+	protected explicit_type "Map"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 129666 "messages"
+	protected explicit_type "ResourceBundle"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 129794 "model"
+	protected explicit_type "Map"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 129922 "path"
+	protected explicit_type "String"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 130050 "redirect"
+	protected explicit_type "String"
+	cpp_decl ""
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      classrelation 129282 // (#controls)
+	relation 129154 *--- name "#controls"
+	  a role_name "" multiplicity "1" private
+	    classrelation_ref 129282 // (#controls)
+	  b role_name "" multiplicity "1" private
+	    classrelation_ref 129410 // #controls
+      end
+
+      classrelation 151426 // <association>
+	relation 149506 ----
+	  a role_name "" multiplicity "0..*" private
+	    classrelation_ref 151426 // <association>
+	  b role_name "" multiplicity "1" private
+	    classrelation_ref 151554 // <association>
+      end
+
+      classrelation 143490 // (#controls)
+	relation 142210 o--- name "#controls"
+	  a role_name "" multiplicity "0..*" private
+	    classrelation_ref 143490 // (#controls)
+	  b role_name "" multiplicity "1" private
+	    classrelation_ref 143618 // (#controls)
+      end
+
+      classrelation 150786 // <directional aggregation>
+	relation 149122 o-->
+	  a role_name "" private
+	    classrelation_ref 150786 // <directional aggregation>
+	  b parent class_ref 129794 // Control
+      end
+
+      classrelation 150914 // <aggregation>
+	relation 149250 o---
+	  a role_name "" private
+	    classrelation_ref 150914 // <aggregation>
+	  b role_name "" private
+	    classrelation_ref 151042 // <aggregation>
+      end
+
+      classrelation 151938 // (#model)
+	relation 149762 o--- name "#model"
+	  a role_name "" multiplicity "0..*" private
+	    classrelation_ref 151938 // (#model)
+	  b role_name "" multiplicity "1" private
+	    classrelation_ref 152066 // #model
+      end
+
+      classrelation 152194 // <unidirectional association>
+	relation 149890 --->
+	  a role_name "" private
+	    classrelation_ref 152194 // <unidirectional association>
+	  b parent class_ref 130946 // Context
+      end
+    end
+
+    class 129794 "Control"
+      abstract visibility public stereotype "interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      php_decl "${comment}${visibility}interface ${name} {
+${members}}
+"
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+      operation 131330 "getContext"
+	public return_type class_ref 130946 // Context
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 133122 "getHeadElements"
+	public return_type class_ref 132098 // List
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 132994 "getId"
+	public explicit_return_type "String"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 134530 "getMessages"
+	public return_type class_ref 132226 // Map
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 132738 "getName"
+	public explicit_return_type "String"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 132866 "setName"
+	public explicit_return_type "void"
+	nparams 1
+	  param in name "name" explicit_type "String"
+	
+	
+	
+	
+	
+      end
+
+      operation 134658 "getParent"
+	public return_type class_ref 132354 // Object
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 134786 "setParent"
+	public explicit_return_type "void"
+	nparams 1
+	  param in name "parent" type class_ref 132354 // Object
+	
+	
+	
+	
+	
+      end
+
+      operation 134914 "onDeploy"
+	public explicit_return_type "void"
+	nparams 1
+	  param in name "servletContext" explicit_type "ServletContext"
+	
+	
+	
+	
+	
+      end
+
+      operation 128258 "onInit"
+	public explicit_return_type "void"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 128386 "onProcess"
+	public explicit_return_type "boolean"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 128514 "onRender"
+	public explicit_return_type "void"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 129282 "onDestroy"
+	public explicit_return_type "void"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      classrelation 129922 // <aggregation>
+	relation_ref 129410 // <aggregation>
+      end
+
+      classrelation 130178 // <aggregation>
+	relation_ref 129538 // <aggregation>
+      end
+
+      operation 141570 "getBehaviors"
+	public explicit_return_type "Set"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 141698 "hasBehaviors"
+	public explicit_return_type "boolean"
+	nparams 0
+	
+	
+	
+	
+	
+      end
+
+      operation 141442 "isAjaxTarget"
+	public explicit_return_type "boolean"
+	nparams 1
+	  param in name "" type class_ref 130946 // Context
+	
+	
+	
+	
+	
+      end
+
+      classrelation 143106 // <aggregation>
+	relation_ref 141954 // <aggregation>
+      end
+
+      classrelation 143618 // (#controls)
+	relation_ref 142210 // #controls
+      end
+
+      classrelation 143746 // (#behaviors)
+	relation 142338 o--- name "#behaviors"
+	  a role_name "" multiplicity "0..*" private
+	    classrelation_ref 143746 // (#behaviors)
+	  b role_name "" multiplicity "1" private
+	    classrelation_ref 143874 // (#behaviors)
+      end
+
+      classrelation 151042 // <aggregation>
+	relation_ref 149250 // <aggregation>
+      end
+
+      classrelation 151554 // <association>
+	relation_ref 149506 // <association>
+      end
+    end
+
+    class 144770 "Behavior"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 162818 "preResponse"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "source" type class_ref 129794 // Control
+	
+	
+	
+	
+	
+      end
+
+      operation 162946 "preRenderHeadElements"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "source" type class_ref 129794 // Control
+	
+	
+	
+	
+	
+      end
+
+      operation 163074 "preDestroy"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "source" type class_ref 129794 // Control
+	
+	
+	
+	
+	
+      end
+
+      classrelation 143874 // (#behaviors)
+	relation_ref 142338 // #behaviors
+      end
+
+      classrelation 144002 // <aggregation>
+	relation 142466 o---
+	  a role_name "" private
+	    classrelation_ref 144002 // <aggregation>
+	  b role_name "" private
+	    classrelation_ref 144130 // <aggregation>
+      end
+
+      classrelation 165634 // <aggregation>
+	relation 163330 o---
+	  a role_name "" private
+	    classrelation_ref 165634 // <aggregation>
+	  b role_name "" private
+	    classrelation_ref 165762 // <aggregation>
+      end
+
+      classrelation 166018 // (#behaviors)
+	relation_ref 163458 // #behaviors
+      end
+    end
+
+    class 144898 "ActionResult"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 148354 "setContent"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "content" explicit_type "String"
+	
+	
+	
+	
+	
+      end
+
+      operation 148610 "setBytes"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "bytes" explicit_type "byte[]"
+	
+	
+	
+	
+	
+      end
+
+      operation 148738 "setTemplate"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "templateName" explicit_type "String"
+	
+	
+	
+	
+	
+      end
+
+      operation 148866 "setModel"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "model" type class_ref 132226 // Map
+	
+	
+	
+	
+	
+      end
+
+      operation 148482 "setContentType"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "contentType" explicit_type "String"
+	
+	
+	
+	
+	
+      end
+
+      classrelation 144130 // <aggregation>
+	relation_ref 142466 // <aggregation>
+      end
+    end
+
+    class 151426 "ControlRegistry"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 155906 "registerAjaxTarget"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "control" type class_ref 129794 // Control
+	
+	
+	
+	
+	
+      end
+
+      operation 156034 "registerInterceptor"
+	public explicit_return_type ""
+	nparams 2
+	  param in name "control" type class_ref 129794 // Control
+	  param in name "behavior" type class_ref 144770 // Behavior
+	
+	
+	
+	
+	
+      end
+    end
+
+    class 157954 "AjaxBehavior"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 162562 "onAction"
+	public return_type class_ref 144898 // ActionResult
+	nparams 1
+	  param in name "source" type class_ref 129794 // Control
+	
+	
+	
+	
+	
+      end
+
+      classrelation 158850 // <generalisation>
+	relation 156546 ---|>
+	  a public
+	    classrelation_ref 158850 // <generalisation>
+	  b parent class_ref 144770 // Behavior
+      end
+
+      classrelation 158978 // <unidirectional association>
+	relation 156674 --->
+	  a role_name "" private
+	    classrelation_ref 158978 // <unidirectional association>
+	  b parent class_ref 144898 // ActionResult
+      end
+
+      operation 182658 "isAjaxTarget"
+	public explicit_return_type "boolean"
+	nparams 1
+	  param in name "context" type class_ref 130946 // Context
+	
+	
+	
+	
+	
+      end
+    end
+
+    class 164482 "AbstractControl"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 189186 "addBehavior"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "" type class_ref 144770 // Behavior
+	
+	
+	
+	
+	
+      end
+
+      operation 189314 "removeBehavior"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "" type class_ref 144770 // Behavior
+	
+	
+	
+	
+	
+      end
+
+      classrelation 165506 // <generalisation>
+	relation 163202 ---|>
+	  a public
+	    classrelation_ref 165506 // <generalisation>
+	  b parent class_ref 129794 // Control
+      end
+
+      classrelation 165762 // <aggregation>
+	relation_ref 163330 // <aggregation>
+      end
+
+      classrelation 165890 // (#behaviors)
+	relation 163458 o--- name "#behaviors"
+	  a role_name "" multiplicity "0..*" private
+	    classrelation_ref 165890 // (#behaviors)
+	  b role_name "" multiplicity "1" private
+	    classrelation_ref 166018 // (#behaviors)
+      end
+    end
+  end
+
+  package_ref 133122 // service
+
+  package_ref 131842 // control
 end

Modified: click/trunk/tools/uml/131714
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/131714?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/131714 (original)
+++ click/trunk/tools/uml/131714 Sun Oct 31 13:08:47 2010
@@ -1,6 +1,6 @@
 format 74
 "apache" // org::click::apache
-  revision 10
+  revision 11
   modified_by 2 "bschellink"
   // class settings
   //class diagram settings
@@ -26,808 +26,5 @@ format 74
   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
   
-  classview 128002 "classes"
-    //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 class drawing_language java draw_all_relations yes 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
-    class 130946 "Context"
-      visibility public 
-      cpp_decl ""
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      attribute 128130 "context"
-	protected explicit_type "ServletContext"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 130306 "config"
-	protected explicit_type "ServletConfig"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 130434 "request"
-	protected explicit_type "HttpServletRequest"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 130562 "response"
-	protected explicit_type "HttpServletResponse"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 130690 "session"
-	protected explicit_type "HttpSession"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 130818 "isPost"
-	protected explicit_type "boolean"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      operation 169602 "isAjaxRequest"
-	public explicit_return_type "boolean"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-    end
-
-    class 128002 "ClickServlet"
-      visibility public 
-      cpp_decl ""
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      ncouples 1
-      key "" value "
-"
-      operation 129026 "handleRequest"
-	public explicit_return_type ""
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 129154 "renderTemplate"
-	public explicit_return_type ""
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 129922 "doGet"
-	public explicit_return_type ""
-	nparams 0
-	
-	
-	
-	
-	
-      end
-    end
-
-    class 129538 "Browser"
-      visibility package stereotype "actor"
-      cpp_decl ""
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-    end
-
-    class 129666 "Page"
-      visibility public 
-      cpp_decl ""
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      operation 176130 "getContext"
-	public return_type class_ref 130946 // Context
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 130050 "addControl"
-	public explicit_return_type "void"
-	nparams 1
-	  param in name "control" type class_ref 129794 // Control
-	
-	
-	
-	
-	
-      end
-
-      operation 130178 "addModel"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "name" explicit_type "String"
-	  param in name "object" explicit_type "Object"
-	
-	
-	
-	
-	
-      end
-
-      operation 133250 "getHeadElements"
-	public return_type class_ref 132098 // List
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 129794 "getTemplate"
-	public explicit_return_type "String"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 128002 "onSecurityCheck"
-	preserve_cpp_body_indent public explicit_return_type "boolean"
-	nparams 0
-	
-	preserve_java_body_indent 
-	preserve_php_body_indent 
-	preserve_python_body_indent 
-	
-      end
-
-      operation 128130 "onInit"
-	public explicit_return_type "void"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 128898 "onGet"
-	public explicit_return_type "void"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 128770 "onPost"
-	public explicit_return_type "void"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 128642 "onRender"
-	public explicit_return_type "void"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 129410 "onDestroy"
-	public explicit_return_type "void"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 129666 "getModel"
-	public return_type class_ref 132226 // Map
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      attribute 129282 "controls"
-	protected explicit_type "List"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 129410 "format"
-	protected explicit_type "Object"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 130178 "headElements"
-	protected explicit_type "List"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 129538 "headers"
-	protected explicit_type "Map"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 129666 "messages"
-	protected explicit_type "ResourceBundle"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 129794 "model"
-	protected explicit_type "Map"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 129922 "path"
-	protected explicit_type "String"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      attribute 130050 "redirect"
-	protected explicit_type "String"
-	cpp_decl ""
-	java_decl ""
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-      end
-
-      classrelation 129282 // (#controls)
-	relation 129154 *--- name "#controls"
-	  a role_name "" multiplicity "1" private
-	    classrelation_ref 129282 // (#controls)
-	  b role_name "" multiplicity "1" private
-	    classrelation_ref 129410 // #controls
-      end
-
-      classrelation 151426 // <association>
-	relation 149506 ----
-	  a role_name "" multiplicity "0..*" private
-	    classrelation_ref 151426 // <association>
-	  b role_name "" multiplicity "1" private
-	    classrelation_ref 151554 // <association>
-      end
-
-      classrelation 143490 // (#controls)
-	relation 142210 o--- name "#controls"
-	  a role_name "" multiplicity "0..*" private
-	    classrelation_ref 143490 // (#controls)
-	  b role_name "" multiplicity "1" private
-	    classrelation_ref 143618 // (#controls)
-      end
-
-      classrelation 150786 // <directional aggregation>
-	relation 149122 o-->
-	  a role_name "" private
-	    classrelation_ref 150786 // <directional aggregation>
-	  b parent class_ref 129794 // Control
-      end
-
-      classrelation 150914 // <aggregation>
-	relation 149250 o---
-	  a role_name "" private
-	    classrelation_ref 150914 // <aggregation>
-	  b role_name "" private
-	    classrelation_ref 151042 // <aggregation>
-      end
-
-      classrelation 151938 // (#model)
-	relation 149762 o--- name "#model"
-	  a role_name "" multiplicity "0..*" private
-	    classrelation_ref 151938 // (#model)
-	  b role_name "" multiplicity "1" private
-	    classrelation_ref 152066 // #model
-      end
-
-      classrelation 152194 // <unidirectional association>
-	relation 149890 --->
-	  a role_name "" private
-	    classrelation_ref 152194 // <unidirectional association>
-	  b parent class_ref 130946 // Context
-      end
-    end
-
-    class 129794 "Control"
-      abstract visibility public stereotype "interface"
-      cpp_decl ""
-      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
-${members}}
-"
-      php_decl "${comment}${visibility}interface ${name} {
-${members}}
-"
-      python_2_2 python_decl ""
-      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
-${members}};
-"
-      explicit_switch_type ""
-      
-      operation 131330 "getContext"
-	public return_type class_ref 130946 // Context
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 133122 "getHeadElements"
-	public return_type class_ref 132098 // List
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 132994 "getId"
-	public explicit_return_type "String"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 134530 "getMessages"
-	public return_type class_ref 132226 // Map
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 132738 "getName"
-	public explicit_return_type "String"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 132866 "setName"
-	public explicit_return_type "void"
-	nparams 1
-	  param in name "name" explicit_type "String"
-	
-	
-	
-	
-	
-      end
-
-      operation 134658 "getParent"
-	public return_type class_ref 132354 // Object
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 134786 "setParent"
-	public explicit_return_type "void"
-	nparams 1
-	  param in name "parent" type class_ref 132354 // Object
-	
-	
-	
-	
-	
-      end
-
-      operation 134914 "onDeploy"
-	public explicit_return_type "void"
-	nparams 1
-	  param in name "servletContext" explicit_type "ServletContext"
-	
-	
-	
-	
-	
-      end
-
-      operation 128258 "onInit"
-	public explicit_return_type "void"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 128386 "onProcess"
-	public explicit_return_type "boolean"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 128514 "onRender"
-	public explicit_return_type "void"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 129282 "onDestroy"
-	public explicit_return_type "void"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      classrelation 129922 // <aggregation>
-	relation_ref 129410 // <aggregation>
-      end
-
-      classrelation 130178 // <aggregation>
-	relation_ref 129538 // <aggregation>
-      end
-
-      operation 141570 "getBehaviors"
-	public explicit_return_type "Set"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 141698 "hasBehaviors"
-	public explicit_return_type "boolean"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      operation 141442 "isAjaxTarget"
-	public explicit_return_type "boolean"
-	nparams 0
-	
-	
-	
-	
-	
-      end
-
-      classrelation 143106 // <aggregation>
-	relation_ref 141954 // <aggregation>
-      end
-
-      classrelation 143618 // (#controls)
-	relation_ref 142210 // #controls
-      end
-
-      classrelation 143746 // (#behaviors)
-	relation 142338 o--- name "#behaviors"
-	  a role_name "" multiplicity "0..*" private
-	    classrelation_ref 143746 // (#behaviors)
-	  b role_name "" multiplicity "1" private
-	    classrelation_ref 143874 // (#behaviors)
-      end
-
-      classrelation 151042 // <aggregation>
-	relation_ref 149250 // <aggregation>
-      end
-
-      classrelation 151554 // <association>
-	relation_ref 149506 // <association>
-      end
-    end
-
-    class 144770 "Behavior"
-      visibility package 
-      cpp_decl ""
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      operation 162562 "onAction"
-	public return_type class_ref 144898 // ActionResult
-	nparams 1
-	  param in name "source" type class_ref 129794 // Control
-	
-	
-	
-	
-	
-      end
-
-      operation 162690 "isRequestTarget"
-	public explicit_return_type "boolean"
-	nparams 1
-	  param in name "context" type class_ref 130946 // Context
-	
-	
-	
-	
-	
-      end
-
-      operation 162818 "preResponse"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "source" type class_ref 129794 // Control
-	
-	
-	
-	
-	
-      end
-
-      operation 162946 "preGetHeadElements"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "source" type class_ref 129794 // Control
-	
-	
-	
-	
-	
-      end
-
-      operation 163074 "preDestroy"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "source" type class_ref 129794 // Control
-	
-	
-	
-	
-	
-      end
-
-      classrelation 143874 // (#behaviors)
-	relation_ref 142338 // #behaviors
-      end
-
-      classrelation 144002 // <aggregation>
-	relation 142466 o---
-	  a role_name "" private
-	    classrelation_ref 144002 // <aggregation>
-	  b role_name "" private
-	    classrelation_ref 144130 // <aggregation>
-      end
-
-      classrelation 144258 // <unidirectional association>
-	relation 142594 --->
-	  a role_name "" private
-	    classrelation_ref 144258 // <unidirectional association>
-	  b parent class_ref 144898 // ActionResult
-      end
-    end
-
-    class 144898 "ActionResult"
-      visibility package 
-      cpp_decl ""
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      operation 148354 "setContent"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "content" explicit_type "String"
-	
-	
-	
-	
-	
-      end
-
-      operation 148610 "setBytes"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "bytes" explicit_type "byte[]"
-	
-	
-	
-	
-	
-      end
-
-      operation 148738 "setTemplate"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "templateName" explicit_type "String"
-	
-	
-	
-	
-	
-      end
-
-      operation 148866 "setModel"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "model" type class_ref 132226 // Map
-	
-	
-	
-	
-	
-      end
-
-      operation 148482 "setContentType"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "contentType" explicit_type "String"
-	
-	
-	
-	
-	
-      end
-
-      classrelation 144130 // <aggregation>
-	relation_ref 142466 // <aggregation>
-      end
-    end
-
-    class 151426 "ControlRegistry"
-      visibility package 
-      cpp_decl ""
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      operation 155906 "registerAjaxTarget"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "control" type class_ref 129794 // Control
-	
-	
-	
-	
-	
-      end
-
-      operation 156034 "registerInterceptor"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "control" type class_ref 129794 // Control
-	  param in name "behavior" type class_ref 144770 // Behavior
-	
-	
-	
-	
-	
-      end
-    end
-  end
-
-  package_ref 131842 // control
-
-  package_ref 133122 // service
+  package_ref 131586 // click
 end

Modified: click/trunk/tools/uml/131714.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/131714.diagram?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/131714.diagram (original)
+++ click/trunk/tools/uml/131714.diagram Sun Oct 31 13:08:47 2010
@@ -1,22 +1,22 @@
 format 74
 
 classinstance 128002 class_ref 128002 // ClickServlet
- write_horizontally no  name ""   xyz 88.6321 4.6 2000 life_line_z 2000
+ write_horizontally no  name ""   xyz 88.2321 5 2000 life_line_z 2000
 classinstance 128898 class_ref 129538 // Browser
-  drawing_mode actor  name ""   xyz 19.6902 5.9 2005 life_line_z 2000
+  drawing_mode actor  name ""   xyz 20.4902 5.7 2005 life_line_z 2000
 classinstance 129666 class_ref 129666 // Page
- write_horizontally yes  name ""   mortal  xyz 258.7 97.0436 2000 life_line_z 2000
+ write_horizontally yes  name ""   mortal  xyz 259.3 96.8436 2000 life_line_z 2000
 classinstance 129794 class_ref 129794 // Control
- color orange  drawing_mode class  name ""   mortal  xyz 406.172 97.1274 2000 life_line_z 2000
+ color orange  drawing_mode class  name ""   mortal  xyz 406.172 96.9274 2000 life_line_z 2000
 durationcanvas 129026 classinstance_ref 128898 // :Browser
-  xyzwh 38 51.7 2010 11 474
+  xyzwh 38 51.4 2010 11 474
 end
 durationcanvas 129154 classinstance_ref 128002 // :ClickServlet
-  xyzwh 117 56.2 2010 11 472
+  xyzwh 118 56.2 2010 11 472
   overlappingdurationcanvas 135682
-    xyzwh 123 70 2020 11 401
+    xyzwh 124 70 2020 11 401
     overlappingdurationcanvas 135810
-      xyzwh 129 344 2030 11 114
+      xyzwh 130 344 2030 11 114
     end
   end
 end
@@ -24,7 +24,7 @@ durationcanvas 129922 classinstance_ref 
   xyzwh 277 139 2010 11 24
 end
 durationcanvas 130178 classinstance_ref 129666 // :Page
-  xyzwh 277 169 2010 11 24
+  xyzwh 278 169 2010 11 24
 end
 durationcanvas 131202 classinstance_ref 129794 // :Control
   color orange
@@ -35,20 +35,20 @@ durationcanvas 132482 classinstance_ref 
   xyzwh 425 229 2010 11 24
 end
 durationcanvas 132994 classinstance_ref 129666 // :Page
-  xyzwh 277 259 2010 11 24
+  xyzwh 278 259 2010 11 24
 end
 durationcanvas 133250 classinstance_ref 129666 // :Page
-  xyzwh 277 289 2010 11 24
+  xyzwh 278 289 2010 11 24
 end
 durationcanvas 133506 classinstance_ref 129794 // :Control
   color orange
-  xyzwh 425 313.4 2010 11 24
+  xyzwh 425 312.8 2010 11 24
 end
 durationcanvas 134018 classinstance_ref 129666 // :Page
-  xyzwh 277 376 2010 11 24
+  xyzwh 278 376.4 2010 11 24
 end
 durationcanvas 134274 classinstance_ref 129666 // :Page
-  xyzwh 276 407 2010 11 24
+  xyzwh 278 406.6 2010 11 24
 end
 durationcanvas 134530 classinstance_ref 129794 // :Control
   color orange
@@ -59,17 +59,17 @@ durationcanvas 135938 classinstance_ref 
   xyzwh 425 469 2010 11 24
 end
 durationcanvas 136194 classinstance_ref 129666 // :Page
-  xyzwh 277 494 2010 11 24
+  xyzwh 278 494 2010 11 24
 end
 msg 129282 synchronous
   from durationcanvas_ref 129026
   to durationcanvas_ref 129154
-  yz 58.9 3010 explicitmsg "doPost"
+  yz 58 3010 explicitmsg "doPost"
   show_full_operations_definition default drawing_language default show_context_mode default
-  label_xy 56 48.9
+  label_xy 56 48
 reflexivemsg 129538 synchronous
   to durationcanvas_ref 135682
-  yz 69 3005 explicitmsg "handleRequest"
+  yz 70 3005 explicitmsg "handleRequest"
   show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 161 67
 msg 130050 synchronous
@@ -116,7 +116,7 @@ msg 133634 synchronous
   label_xy 334 308
 reflexivemsg 133890 synchronous
   to durationcanvas_ref 135810
-  yz 342 3005 explicitmsg "renderTemplate"
+  yz 344 3005 explicitmsg "renderTemplate"
   show_full_operations_definition default drawing_language default show_context_mode default
   label_xy 164 339
 msg 134146 synchronous
@@ -152,7 +152,7 @@ msg 136322 synchronous
 msg 136450 return
   from durationcanvas_ref 129154
   to durationcanvas_ref 129026
-  yz 513.9 2020 unspecifiedmsg
+  yz 513 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/131842
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/131842?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/131842 (original)
+++ click/trunk/tools/uml/131842 Sun Oct 31 13:08:47 2010
@@ -1,16 +1,16 @@
-format 66
+format 74
 "control" // org::click::apache::control
-  revision 1
-  modified_by 2 "bob"
+  revision 2
+  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 131458 "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

Modified: click/trunk/tools/uml/133122
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/133122?rev=1029329&r1=1029328&r2=1029329&view=diff
==============================================================================
--- click/trunk/tools/uml/133122 (original)
+++ click/trunk/tools/uml/133122 Sun Oct 31 13:08:47 2010
@@ -1,16 +1,16 @@
-format 66
+format 74
 "service" // org::click::apache::service
-  revision 1
-  modified_by 2 "bob"
+  revision 2
+  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 133122 "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

Added: click/trunk/tools/uml/140930.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/140930.diagram?rev=1029329&view=auto
==============================================================================
--- click/trunk/tools/uml/140930.diagram (added)
+++ click/trunk/tools/uml/140930.diagram Sun Oct 31 13:08:47 2010
@@ -0,0 +1,90 @@
+format 74
+
+classinstance 132738 class_ref 128002 // ClickServlet
+ write_horizontally no  name ""   xyz 87.6321 7.5 2000 life_line_z 2000
+classinstance 132866 class_ref 129538 // Browser
+  drawing_mode actor  name ""   xyz 13.2902 5.9 2005 life_line_z 2000
+classinstance 132994 class_ref 129666 // Page
+ color orange write_horizontally yes  name ""   mortal  xyz 298.5 75.3 2000 life_line_z 2000
+classinstance 137218 class_ref 144898 // ActionResult
+  name ""   mortal  xyz 368.9 75.3 2000 life_line_z 2000
+durationcanvas 133122 classinstance_ref 132994 // :Page
+  color orange
+  xyzwh 317 123 2010 11 24
+end
+durationcanvas 134530 classinstance_ref 132994 // :Page
+  color orange
+  xyzwh 317 337 2010 11 24
+end
+durationcanvas 134658 classinstance_ref 132866 // :Browser
+  xyzwh 32 52 2010 11 319
+end
+durationcanvas 134786 classinstance_ref 132738 // :ClickServlet
+  xyzwh 117 54 2010 11 318
+  overlappingdurationcanvas 134914
+    xyzwh 123 72 2020 11 269
+    overlappingdurationcanvas 135042
+      xyzwh 129 267 2030 11 42
+    end
+  end
+end
+durationcanvas 137346 classinstance_ref 132994 // :Page
+  color orange
+  xyzwh 317 167 2010 11 72
+end
+durationcanvas 138498 classinstance_ref 137218 // :ActionResult
+  color yellow
+  xyzwh 400 287 2010 11 25
+end
+msg 135170 synchronous
+  from durationcanvas_ref 134658
+  to durationcanvas_ref 134786
+  yz 58 3010 explicitmsg "doGet"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 54 48
+reflexivemsg 135298 synchronous
+  to durationcanvas_ref 135042
+  yz 267 3005 explicitmsg "renderActionResult"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 149 250
+reflexivemsg 135426 synchronous
+  to durationcanvas_ref 134914
+  yz 72 3005 explicitmsg "handleRequest"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 159 67
+msg 135810 return
+  from durationcanvas_ref 134786
+  to durationcanvas_ref 134658
+  yz 356 2020 unspecifiedmsg
+  show_full_operations_definition default drawing_language default show_context_mode default
+msg 136322 synchronous
+  from durationcanvas_ref 134786
+  to durationcanvas_ref 134530
+  yz 342 2015 explicitmsg "onDestroy"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 173 330
+msg 136962 synchronous
+  from durationcanvas_ref 134914
+  to durationcanvas_ref 133122
+  yz 127 3010 explicitmsg "onSecurityCheck : boolean"
+  show_full_operations_definition yes drawing_language uml show_context_mode default
+  label_xy 163 115
+msg 137474 synchronous
+  from durationcanvas_ref 134914
+  to durationcanvas_ref 137346
+  yz 172 2025 explicitmsg "performPageAction : ActionResult"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 143 160
+msg 138114 return
+  from durationcanvas_ref 137346
+  to durationcanvas_ref 134914
+  yz 221 2025 explicitmsg "ActionResult"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 201 207
+msg 138626 synchronous
+  from durationcanvas_ref 135042
+  to durationcanvas_ref 138498
+  yz 294 3010 explicitmsg "render"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 345 280
+end

Added: click/trunk/tools/uml/147458.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/147458.diagram?rev=1029329&view=auto
==============================================================================
--- click/trunk/tools/uml/147458.diagram (added)
+++ click/trunk/tools/uml/147458.diagram Sun Oct 31 13:08:47 2010
@@ -0,0 +1,52 @@
+format 74
+
+classcanvas 128386 class_ref 129794 // Control
+  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
+  hidden_operations
+    operation_ref 131330 // getContext
+    operation_ref 133122 // getHeadElements
+    operation_ref 132994 // getId
+    operation_ref 134530 // getMessages
+    operation_ref 132738 // getName
+    operation_ref 132866 // setName
+    operation_ref 134658 // getParent
+    operation_ref 134786 // setParent
+    operation_ref 134914 // onDeploy
+    operation_ref 128258 // onInit
+    operation_ref 128386 // onProcess
+    operation_ref 128514 // onRender
+    operation_ref 129282 // onDestroy
+    operation_ref 141570 // getBehaviors
+    operation_ref 141698 // hasBehaviors
+  xyzwh 14.4 16.1 2000 191 85
+end
+classcanvas 129538 class_ref 144898 // ActionResult
+  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 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 345.3 305.1 2000
+end
+classcanvas 129666 class_ref 144770 // Behavior
+  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 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
+  color yellow
+  xyz 319.2 23.2 2000
+end
+classcanvas 130306 class_ref 157954 // AjaxBehavior
+  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 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 323.2 177.9 2000
+end
+relationcanvas 129922 relation_ref 142338 // #behaviors
+  decenter_begin 560
+  from ref 128386 z 2001 label "#behaviors" italic xyz 214.5 40 2001 to ref 129666
+  no_role_a no_role_b
+  multiplicity_a_pos 292 70 3000 multiplicity_b_pos 214 70 3000
+end
+relationcanvas 130562 relation_ref 156546 // <generalisation>
+  from ref 130306 z 2001 to ref 129666
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130690 relation_ref 156674 // <unidirectional association>
+  from ref 130306 z 2001 to ref 129538
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end

Added: click/trunk/tools/uml/147586.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/147586.diagram?rev=1029329&view=auto
==============================================================================
--- click/trunk/tools/uml/147586.diagram (added)
+++ click/trunk/tools/uml/147586.diagram Sun Oct 31 13:08:47 2010
@@ -0,0 +1,194 @@
+format 74
+
+classinstance 146434 class_ref 129794 // Control
+  drawing_mode class  name ""   mortal  xyz 391.542 87.9631 2000 life_line_z 2000
+classinstance 146562 class_ref 129538 // Browser
+  drawing_mode actor  name ""   xyz 3.62858 3.83015 2005 life_line_z 2000
+classinstance 146690 class_ref 129666 // Page
+ write_horizontally yes  name ""   mortal  xyz 253.281 83.7329 2000 life_line_z 2000
+classinstance 146818 class_ref 128002 // ClickServlet
+ write_horizontally no  name ""   xyz 74.8815 3.62193 2000 life_line_z 2000
+classinstance 151042 class_ref 144898 // ActionResult
+ color orange  name ""   mortal  xyz 756.496 398.989 2000 life_line_z 2000
+classinstance 151426 class_ref 151426 // ControlRegistry
+ color orange  name ""   mortal  xyz 535.795 87.3371 2000 life_line_z 2000
+classinstance 155522 class_ref 157954 // AjaxBehavior
+ color orange  name ""   mortal  xyz 692.025 93.5111 2000 life_line_z 2000
+durationcanvas 146946 classinstance_ref 146434 // :Control
+  xyzwh 410 229.03 2010 11 25
+end
+durationcanvas 147586 classinstance_ref 146690 // :Page
+  xyzwh 272 631.981 2010 11 25
+end
+durationcanvas 147714 classinstance_ref 146818 // :ClickServlet
+  xyzwh 104 55.4397 2010 11 595
+  overlappingdurationcanvas 147842
+    xyzwh 110 68.466 2020 11 545
+    overlappingdurationcanvas 147970
+      xyzwh 116 559.392 2030 11 39
+    end
+    overlappingdurationcanvas 152706
+      xyzwh 116 266.932 2030 11 99
+    end
+    overlappingdurationcanvas 154754
+      xyzwh 116 396.096 2030 11 79
+    end
+  end
+end
+durationcanvas 148098 classinstance_ref 146690 // :Page
+  xyzwh 272 172.767 2010 11 47
+end
+durationcanvas 148610 classinstance_ref 146434 // :Control
+  xyzwh 410 609.551 2010 11 25
+end
+durationcanvas 148738 classinstance_ref 146562 // :Browser
+  xyzwh 22 58.9865 2010 11 595
+end
+durationcanvas 148866 classinstance_ref 146690 // :Page
+  xyzwh 272 134.4 2010 11 25
+end
+durationcanvas 151170 classinstance_ref 151042 // :ActionResult
+  xyzwh 788 575.705 2010 11 25
+end
+durationcanvas 151938 classinstance_ref 146434 // :Control
+  xyzwh 410 182.469 2010 11 29
+end
+durationcanvas 152194 classinstance_ref 151426 // :ControlRegistry
+  color orange
+  xyzwh 575 188.274 2010 11 25
+end
+durationcanvas 153730 classinstance_ref 146434 // :Control
+  xyzwh 410 342.702 2010 11 49
+  overlappingdurationcanvas 153986
+    xyzwh 416 360.91 2020 11 25
+  end
+end
+durationcanvas 154242 classinstance_ref 151426 // :ControlRegistry
+  xyzwh 575 279.099 2010 11 25
+end
+durationcanvas 154498 classinstance_ref 146434 // :Control
+  xyzwh 410 303.932 2010 11 25
+end
+durationcanvas 155650 classinstance_ref 155522 // :AjaxBehavior
+  color orange
+  xyzwh 725 392.354 2010 11 25
+end
+durationcanvas 155906 classinstance_ref 155522 // :AjaxBehavior
+  color orange
+  xyzwh 725 443.124 2010 11 25
+end
+msg 148994 synchronous
+  from durationcanvas_ref 147842
+  to durationcanvas_ref 148098
+  yz 178 3010 explicitmsg "onInit"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 176 168
+msg 149250 synchronous
+  from durationcanvas_ref 147842
+  to durationcanvas_ref 148866
+  yz 142 3010 explicitmsg "onSecurityCheck : boolean"
+  show_full_operations_definition yes drawing_language uml show_context_mode default
+  label_xy 128 130
+msg 149506 synchronous
+  from durationcanvas_ref 148738
+  to durationcanvas_ref 147714
+  yz 61 3010 explicitmsg "doGet"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 43 51
+reflexivemsg 149634 synchronous
+  to durationcanvas_ref 147842
+  yz 68 3005 explicitmsg "handleRequest"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 146 67
+reflexivemsg 150146 synchronous
+  to durationcanvas_ref 147970
+  yz 559 3005 explicitmsg "renderActionResult"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 149 549
+msg 150402 return
+  from durationcanvas_ref 147714
+  to durationcanvas_ref 148738
+  yz 521 2020 unspecifiedmsg
+  show_full_operations_definition default drawing_language default show_context_mode default
+msg 150658 synchronous
+  from durationcanvas_ref 147714
+  to durationcanvas_ref 147586
+  yz 637 2015 explicitmsg "onDestroy"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 161 626
+msg 150786 synchronous
+  from durationcanvas_ref 147842
+  to durationcanvas_ref 146946
+  yz 237 3010 explicitmsg "onInit"
+  show_full_operations_definition yes drawing_language uml show_context_mode default
+  label_xy 334 223
+msg 150914 synchronous
+  from durationcanvas_ref 147714
+  to durationcanvas_ref 148610
+  yz 616 2015 explicitmsg "onDestroy"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 319 605
+msg 151298 synchronous
+  from durationcanvas_ref 147970
+  to durationcanvas_ref 151170
+  yz 582 2035 explicitmsg "render"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 745 572
+msg 152066 synchronous
+  from durationcanvas_ref 148098
+  to durationcanvas_ref 151938
+  yz 187 3015 explicitmsg "addBehavior(Behavior)"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 295 174
+msg 152322 synchronous
+  from durationcanvas_ref 151938
+  to durationcanvas_ref 152194
+  yz 196 2015 explicitmsg "registerAjaxTarget(Control)"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 436 182
+reflexivemsg 152834 synchronous
+  to durationcanvas_ref 152706
+  yz 265 2035 explicitmsg "resolveAjaxTargetControl"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 148 259
+msg 153858 synchronous
+  from durationcanvas_ref 152706
+  to durationcanvas_ref 153730
+  yz 348 2035 explicitmsg "onProcess : boolean"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 298 333
+reflexivemsg 154114 synchronous
+  to durationcanvas_ref 153986
+  yz 359 2025 explicitmsg "dispatchAjaxBehaviors"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 450 354
+msg 154370 synchronous
+  from durationcanvas_ref 152706
+  to durationcanvas_ref 154242
+  yz 284 3005 explicitmsg "getAjaxTargetControls"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 448 271
+msg 154626 synchronous
+  from durationcanvas_ref 152706
+  to durationcanvas_ref 154498
+  yz 310 3005 explicitmsg "isAjaxTarget : boolean"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 291 298
+reflexivemsg 154882 synchronous
+  to durationcanvas_ref 154754
+  yz 396 2035 explicitmsg "fireAjaxBehaviors"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 136 391
+msg 155778 synchronous
+  from durationcanvas_ref 154754
+  to durationcanvas_ref 155650
+  yz 400 3005 explicitmsg "isAjaxTarget : boolean"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 587 386
+msg 156034 synchronous
+  from durationcanvas_ref 154754
+  to durationcanvas_ref 155906
+  yz 447 3005 explicitmsg "onAction(Control) : ActionResult"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 559 430
+end

Added: click/trunk/tools/uml/147714.diagram
URL: http://svn.apache.org/viewvc/click/trunk/tools/uml/147714.diagram?rev=1029329&view=auto
==============================================================================
--- click/trunk/tools/uml/147714.diagram (added)
+++ click/trunk/tools/uml/147714.diagram Sun Oct 31 13:08:47 2010
@@ -0,0 +1,3 @@
+format 74
+
+end



Mime
View raw message