diff --git a/uml/lumiera/128517 b/uml/lumiera/128517 index 057be77a3..019609aa8 100644 --- a/uml/lumiera/128517 +++ b/uml/lumiera/128517 @@ -1,6 +1,6 @@ format 58 "CommonLib" // CommonLib - revision 16 + revision 17 modified_by 5 "hiv" // class settings //class diagram settings @@ -215,6 +215,316 @@ ${inlines} end end + classview 134533 "Advice" + //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 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_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 + //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 + //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 141445 "Advice entities" + 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 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_infonote default shadow default show_stereotype_properties default + size A4 + end + + class 163973 "Advice" + visibility package stereotype "entity" + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} { +${members}} +" + php_decl "${comment}${final}${visibility}${abstract}class ${name}${extends}${implements} { +${members}} +" + python_2_2 python_decl "class ${name}${inherit}: +${docstring}${members} +" + idl_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} { +${members}}; +" + explicit_switch_type "" + + end + + class 164101 "PointOfAdvice" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 198661 // + relation 188165 ---> + stereotype "holds" + a role_name "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 198661 // + b parent class_ref 163973 // Advice + end + end + + class 164229 "Advisor" + visibility package stereotype "actor" + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 199045 // + relation 188549 ---> + stereotype "add" + a role_name "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 199045 // + b parent class_ref 164613 // AdviceProvision + end + end + + class 164357 "Advised" + visibility package stereotype "actor" + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 198917 // + relation 188421 ---> + stereotype "owns" + a role_name "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 198917 // + b parent class_ref 164485 // AdviceRequest + end + end + + class 164485 "AdviceRequest" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 198789 // + relation 188293 ---|> + a public + cpp default "${type}" + classrelation_ref 198789 // + b parent class_ref 164101 // PointOfAdvice + end + + classrelation 199685 // + relation 188933 ---- + a role_name "" multiplicity "1" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 199685 // + b role_name "" multiplicity "1" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 199813 // + end + + end + + class 164613 "AdviceProvision" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 199173 // + relation 188677 ---- + a role_name "" multiplicity "1" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 199173 // + b role_name "" multiplicity "1" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 199301 // + end + + classrelation 199941 // + relation 189061 ---|> + a public + cpp default "${type}" + classrelation_ref 199941 // + b parent class_ref 164101 // PointOfAdvice + end + end + + class 164741 "Binding" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 199301 // + relation_ref 188677 // + end + + classrelation 199813 // + relation_ref 188933 // + end + end + + objectdiagram 141573 "Advice solving" + 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 + size A4 + end + + classinstance 142981 "" + type class_ref 164613 // AdviceProvision + attributes + end + relations + end + end + + classinstance 143109 "" + type class_ref 164613 // AdviceProvision + attributes + end + relations + end + end + + classinstance 143237 "" + type class_ref 164613 // AdviceProvision + attributes + end + relations + end + end + + classinstance 143365 "" + type class_ref 164229 // Advisor + attributes + end + relations + end + end + + classinstance 143493 "" + type class_ref 164357 // Advised + attributes + end + relations + end + end + + classinstance 143621 "" + type class_ref 164485 // AdviceRequest + attributes + end + relations + end + end + + classinstance 143749 "" + type class_ref 164357 // Advised + attributes + end + relations + end + end + + classinstance 143877 "" + type class_ref 164485 // AdviceRequest + attributes + end + relations + end + end + + classinstance 144005 "" + type class_ref 164741 // Binding + attributes + end + relations + end + end + + classinstance 144133 "" + type class_ref 164741 // Binding + attributes + end + relations + end + end + + classinstance 144261 "" + type class_ref 164741 // Binding + attributes + end + relations + end + end + + classinstance 144389 "" + type class_ref 164741 // Binding + attributes + end + relations + end + end + + classinstance 144517 "" + type class_ref 164741 // Binding + attributes + end + relations + end + end + + end + classview 129285 "StreamType" //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 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_infonote default shadow default show_stereotype_properties default diff --git a/uml/lumiera/141445.diagram b/uml/lumiera/141445.diagram new file mode 100644 index 000000000..f8d4b9195 --- /dev/null +++ b/uml/lumiera/141445.diagram @@ -0,0 +1,74 @@ +format 58 + +classcanvas 128005 class_ref 163973 // Advice + 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 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_infonote default shadow default show_stereotype_properties default + color lightmagenta + xyz 348 20 2000 +end +classcanvas 128133 class_ref 164101 // PointOfAdvice + 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 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_infonote default shadow default show_stereotype_properties default + xyz 265 102 2000 +end +classcanvas 128389 class_ref 164229 // Advisor + 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 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_infonote default shadow default show_stereotype_properties default + xyz 20 188 2000 +end +classcanvas 128517 class_ref 164357 // Advised + 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 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_infonote default shadow default show_stereotype_properties default + xyz 551 189 2000 +end +classcanvas 128645 class_ref 164485 // AdviceRequest + 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 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_infonote default shadow default show_stereotype_properties default + xyz 364 207 2000 +end +classcanvas 129157 class_ref 164613 // AdviceProvision + 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 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_infonote default shadow default show_stereotype_properties default + xyz 157 207 2000 +end +classcanvas 129285 class_ref 164741 // Binding + 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 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_infonote default shadow default show_stereotype_properties default + xyz 283 207 2000 +end +relationcanvas 128261 relation_ref 188165 // + from ref 128133 z 1999 stereotype "<>" xyz 340 79 3000 to ref 128005 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 128773 relation_ref 188293 // + geometry VHV + from ref 128645 z 1999 to point 405 171 + line 128901 z 1999 to point 304 171 + line 129029 z 1999 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 129413 relation_ref 188421 // + from ref 128517 z 1999 stereotype "<>" xyz 475 225 3000 to ref 128645 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 129541 relation_ref 188549 // + from ref 128389 z 1999 stereotype "<>" xyz 89 225 3000 to ref 129157 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 129669 relation_ref 188677 // + from ref 129157 z 1999 to ref 129285 + no_role_a no_role_b + multiplicity_a_pos 266 232 3000 multiplicity_b_pos 259 232 3000 +end +relationcanvas 129925 relation_ref 188933 // + from ref 128645 z 1999 to ref 129285 + no_role_a no_role_b + multiplicity_a_pos 341 232 3000 multiplicity_b_pos 347 232 3000 +end +relationcanvas 130053 relation_ref 189061 // + geometry VHV + from ref 129157 z 1999 to point 201 171 + line 130181 z 1999 to point 304 171 + line 130309 z 1999 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +preferred_whz 635 331 1 +end diff --git a/uml/lumiera/141573.diagram b/uml/lumiera/141573.diagram new file mode 100644 index 000000000..2def53e54 --- /dev/null +++ b/uml/lumiera/141573.diagram @@ -0,0 +1,75 @@ +format 58 + +classinstancecanvas 128005 classinstance_ref 142981 // + xyz 149 66 2000 +end +classinstancecanvas 128133 classinstance_ref 143109 // + xyz 149 101 2000 +end +classinstancecanvas 128261 classinstance_ref 143237 // + xyz 149 135 2000 +end +classinstancecanvas 128389 classinstance_ref 143365 // + xyz 7 62 2005 color blue +end +classinstancecanvas 128645 classinstance_ref 143237 // + xyz 7 135 2000 +end +classinstancecanvas 128773 classinstance_ref 143493 // + xyz 482 164 2000 color blue +end +classinstancecanvas 128901 classinstance_ref 143621 // + xyz 388 164 2005 +end +classinstancecanvas 129029 classinstance_ref 143749 // + xyz 482 108 2000 color blue +end +classinstancecanvas 129157 classinstance_ref 143877 // + xyz 388 108 2010 +end +classinstancecanvas 129285 classinstance_ref 144005 // + xyz 311 281 2000 +end +classinstancecanvas 129413 classinstance_ref 144133 // + xyz 311 308 2000 +end +classinstancecanvas 129541 classinstance_ref 144261 // + xyz 226 254 2000 +end +classinstancecanvas 129669 classinstance_ref 144389 // + xyz 226 281 2000 +end +classinstancecanvas 129797 classinstance_ref 144517 // + xyz 226 308 2000 +end +textcanvas 131205 "match" + xyzwh 280 318 2005 29 13 +fragment 131333 "Binding index" + color green xyzwh 206 229 1994 164 113 +end +note 131461 "Advice +Solution" + color green fg darkgreen xyzwh 285 145 2004 63 44 +fragment 131589 "Advice system" + color lightgreen xyzwh 135 18 1989 245 334 +end +objectlinkcanvas 131077 norel + from ref 129797 z 1999 to ref 129413 + no_role_a no_role_b +objectlinkcanvas 131973 norel + from ref 128901 z 1999 to ref 128261 + no_role_a no_role_b +line 130053 -_-_ + from ref 128389 z 1999 to ref 128645 +line 130181 -_-_ + from ref 128645 z 1999 to ref 128261 +line 130309 -_-_ + from ref 128773 z 1999 to ref 128901 +line 130437 -_-_ geometry HVr + from ref 128901 z 1999 to point 428 316 + line 130565 z 1999 to ref 129413 +line 130693 -_-_ geometry VH + from ref 128261 z 1999 to point 191 316 + line 130949 z 1999 to ref 129797 +preferred_whz 556 483 1 +end diff --git a/uml/lumiera/5.session b/uml/lumiera/5.session index b86df7d15..194b63b33 100644 --- a/uml/lumiera/5.session +++ b/uml/lumiera/5.session @@ -6,8 +6,12 @@ diagrams 730 488 100 4 0 0 classdiagram_ref 139141 // Meta-Asset Relations 469 451 100 4 0 0 - active classdiagram_ref 140293 // TypedLookup + classdiagram_ref 140293 // TypedLookup 721 697 100 4 0 0 + classdiagram_ref 141445 // Advice entities + 635 331 100 4 0 0 + active objectdiagram_ref 141573 // Advice solving + 556 483 100 4 0 0 end show_stereotypes selected @@ -33,7 +37,10 @@ open classview_ref 128261 // Builder Workings usecaseview_ref 128261 // config examples class_ref 133253 // Frame - classview_ref 129285 // StreamType + class_ref 164485 // AdviceRequest + class_ref 164613 // AdviceProvision + class_ref 164741 // Binding + class_ref 145285 // MediaKind package_ref 131077 // ConfigQuery class_ref 152965 // Handle diff --git a/uml/lumiera/lumiera.prj b/uml/lumiera/lumiera.prj index 1b9206c7a..13b4b5791 100644 --- a/uml/lumiera/lumiera.prj +++ b/uml/lumiera/lumiera.prj @@ -1,6 +1,6 @@ format 58 "lumiera" - revision 61 + revision 62 modified_by 5 "hiv" cpp_root_dir "../../src/"