From 74f4304a4f53c72b542fca49701a442274df0fef Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 18 Jul 2013 14:14:39 +0200 Subject: UML: Fix 'core' layout - more similar to 'all' --- doc/uml/html-svg/fig128069.svg | 14 +- doc/uml/html-svg/fig134786.svg | 276 +++++++++++++++++----------------- doc/uml/html-svg/index-withframe.html | 2 +- doc/uml/html-svg/index.html | 4 +- doc/uml/html-svg/navig.html | 2 +- doc/uml/html/fig134786.png | Bin 45971 -> 45683 bytes doc/uml/html/index-withframe.html | 2 +- doc/uml/html/index.html | 2 +- doc/uml/html/navig.html | 2 +- doc/uml/jogl/128069.diagram | 0 doc/uml/jogl/134786.diagram | 21 ++- doc/uml/jogl/2.session | 2 +- doc/uml/jogl/generation_settings | 0 doc/uml/jogl/jogl.prj | 4 +- doc/uml/jogl/stereotypes | 0 15 files changed, 161 insertions(+), 170 deletions(-) mode change 100755 => 100644 doc/uml/jogl/128069.diagram mode change 100755 => 100644 doc/uml/jogl/134786.diagram mode change 100755 => 100644 doc/uml/jogl/generation_settings mode change 100755 => 100644 doc/uml/jogl/jogl.prj mode change 100755 => 100644 doc/uml/jogl/stereotypes (limited to 'doc/uml') diff --git a/doc/uml/html-svg/fig128069.svg b/doc/uml/html-svg/fig128069.svg index ca0f67f84..a3e12c5aa 100644 --- a/doc/uml/html-svg/fig128069.svg +++ b/doc/uml/html-svg/fig128069.svg @@ -471,17 +471,11 @@ 1 - 1 - - - 1 + chosen 0..1 - - chosen - 1 @@ -491,4 +485,10 @@ 1 + + 1 + + + 1 + diff --git a/doc/uml/html-svg/fig134786.svg b/doc/uml/html-svg/fig134786.svg index e193a4ed4..9b52bd150 100644 --- a/doc/uml/html-svg/fig134786.svg +++ b/doc/uml/html-svg/fig134786.svg @@ -1,28 +1,22 @@ - -c:/projects/JOGAMP/jogl/doc/bouml/html-svg/index-withframe +C:/projects/JOGAMP/jogl/doc/uml/html-svg/index-withframe diff --git a/doc/uml/html-svg/index.html b/doc/uml/html-svg/index.html index 046f333bd..9338bd2ef 100644 --- a/doc/uml/html-svg/index.html +++ b/doc/uml/html-svg/index.html @@ -18,7 +18,7 @@ Documentation

Properties:

html dir:
c:/projects/JOGAMP/jogl/doc/bouml/html-svg/
html dir:
C:/projects/JOGAMP/jogl/doc/uml/html-svg/

1 Class View javax.media.opengl

@@ -27,7 +27,7 @@ Documentation

OpenGL Interfaces - All

-

+

OpenGL Interfaces - Core Only

Class GL

Class GL2ES1

diff --git a/doc/uml/html-svg/navig.html b/doc/uml/html-svg/navig.html index fcbff52cb..b49965a99 100644 --- a/doc/uml/html-svg/navig.html +++ b/doc/uml/html-svg/navig.html @@ -4,7 +4,7 @@ -c:/projects/JOGAMP/jogl/doc/bouml/html-svg/navig +C:/projects/JOGAMP/jogl/doc/uml/html-svg/navig diff --git a/doc/uml/html/fig134786.png b/doc/uml/html/fig134786.png index f3751e3e6..78d00c200 100644 Binary files a/doc/uml/html/fig134786.png and b/doc/uml/html/fig134786.png differ diff --git a/doc/uml/html/index-withframe.html b/doc/uml/html/index-withframe.html index a046f596b..7ea3a2866 100644 --- a/doc/uml/html/index-withframe.html +++ b/doc/uml/html/index-withframe.html @@ -4,7 +4,7 @@ -c:/projects/JOGAMP/jogl/doc/bouml/html/index-withframe +C:/projects/JOGAMP/jogl/doc/uml/html/index-withframe diff --git a/doc/uml/html/index.html b/doc/uml/html/index.html index be4f78eb0..f5988be1e 100644 --- a/doc/uml/html/index.html +++ b/doc/uml/html/index.html @@ -18,7 +18,7 @@ Documentation

Properties:

html dir:
c:/projects/JOGAMP/jogl/doc/bouml/html/
html dir:
C:/projects/JOGAMP/jogl/doc/uml/html/

1 Class View javax.media.opengl

diff --git a/doc/uml/html/navig.html b/doc/uml/html/navig.html index e3e586c38..66c16e873 100644 --- a/doc/uml/html/navig.html +++ b/doc/uml/html/navig.html @@ -4,7 +4,7 @@ -c:/projects/JOGAMP/jogl/doc/bouml/html/navig +C:/projects/JOGAMP/jogl/doc/uml/html/navig diff --git a/doc/uml/jogl/128069.diagram b/doc/uml/jogl/128069.diagram old mode 100755 new mode 100644 diff --git a/doc/uml/jogl/134786.diagram b/doc/uml/jogl/134786.diagram old mode 100755 new mode 100644 index 070ade302..eaac88d82 --- a/doc/uml/jogl/134786.diagram +++ b/doc/uml/jogl/134786.diagram @@ -6,7 +6,7 @@ classcanvas 128069 class_ref 128069 // GL end classcanvas 128130 class_ref 128130 // GL4 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 821.5 801.8 2000 + xyz 642.5 851.8 2000 end classcanvas 128581 class_ref 128581 // GL2ES2 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 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 @@ -27,11 +27,11 @@ classcanvas 128965 class_ref 128965 // GLES2 end classcanvas 130050 class_ref 134914 // GLES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 638.9 506.6 2004 + xyz 537.9 508.6 2004 end classcanvas 130178 class_ref 135042 // GL4ES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 638 316 2000 + xyz 635 316 2000 end classcanvas 130245 class_ref 130117 // GLContext 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 @@ -52,22 +52,22 @@ classcanvas 130690 class_ref 135298 // GL2ES3 end classcanvas 130885 class_ref 130501 // GL4bcImpl draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 829.3 933.6 2000 + xyz 652.3 966.6 2000 end classcanvas 131202 class_ref 130629 // GLES3Impl draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default xyz 552 586 2000 end textcanvas 131909 "Mobile final public OpenGL Interfaces" - xyzwh 6 588 2000 153 42 + xyzwh 817 530 2000 153 42 textcanvas 132165 "Desktop/Mobile Common Interfaces" - xyzwh 6 306 2000 139 49 + xyzwh 817 257 2000 139 49 classcanvas 132293 class_ref 130885 // NativeWindow 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default xyz 1021.7 200.8 2000 end fragment 132354 "Programmable Shader" - color blue xyzwh -2 207.8 1994 940 836 + color blue xyzwh 10 206.8 1994 940 836 separator 5296 separator 3351 separator 2308 @@ -78,7 +78,7 @@ classcanvas 132421 class_ref 131013 // AbstractGraphicsConfiguration end textcanvas 132482 "Desktop final public OpenGL Interfaces " - xyzwh 6 672 2000 135 37 + xyzwh 817 681 2000 135 37 classcanvas 132549 class_ref 131141 // GLCapabilities draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default xyz 1019.9 478.3 2000 @@ -100,6 +100,7 @@ end textcanvas 136261 "Common GL Stuff" xyzwh 271 135 2000 108 17 relationcanvas 128770 relation_ref 128386 // + decenter_begin 479 from ref 130885 z 2001 to ref 128130 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -229,8 +230,4 @@ relationcanvas 136133 relation_ref 133189 // no_role_a no_role_b multiplicity_a_pos 397 51 3000 multiplicity_b_pos 248 51 3000 end -line 132610 -_-_ - from ref 132354 z 1995 to point -31 207 - line 132738 z 1995 to point -31 237 - line 132866 z 1995 to ref 132354 end diff --git a/doc/uml/jogl/2.session b/doc/uml/jogl/2.session index ef995db6c..d8aaad531 100644 --- a/doc/uml/jogl/2.session +++ b/doc/uml/jogl/2.session @@ -3,7 +3,7 @@ diagrams active classdiagram_ref 128069 // OpenGL Interfaces - All 1442 1217 100 17 0 0 classdiagram_ref 134786 // OpenGL Interfaces - Core Only - 1149 974 100 17 93 0 + 1149 974 100 17 0 0 end show_stereotypes selected diff --git a/doc/uml/jogl/generation_settings b/doc/uml/jogl/generation_settings old mode 100755 new mode 100644 diff --git a/doc/uml/jogl/jogl.prj b/doc/uml/jogl/jogl.prj old mode 100755 new mode 100644 index c6751e0ef..8efc4be70 --- a/doc/uml/jogl/jogl.prj +++ b/doc/uml/jogl/jogl.prj @@ -1,6 +1,6 @@ format 75 "jogl" - revision 13 + revision 14 modified_by 2 "sven" @@ -39,7 +39,7 @@ format 75 mark_for_import ncouples 1 - key "html dir" value "c:/projects/JOGAMP/jogl/doc/bouml/html/" + key "html dir" value "C:/projects/JOGAMP/jogl/doc/uml/html-svg/" classview 128069 "javax.media.opengl" //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 diff --git a/doc/uml/jogl/stereotypes b/doc/uml/jogl/stereotypes old mode 100755 new mode 100644 -- cgit v1.2.3