Fix GLES3/GLES2 relation / Use bouml 4.21.1 (Note: SVG fonts .. are too tiny, using png)

5 files changed, 114 insertions, 99 deletions

diff --git a/doc/uml/jogl/128069.diagram b/doc/uml/jogl/128069.diagram
index 757594823..b0ab78b76 100644
--- a/doc/uml/jogl/128069.diagram
+++ b/doc/uml/jogl/128069.diagram
@@ -1,137 +1,137 @@
-format 75
+format 74
 
 classcanvas 128002 class_ref 128002 // GL3bc
   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 195.8 800.5 2000
+  xyz 188.4 856.7 2000
 end
 classcanvas 128069 class_ref 128069 // GL
   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 142.4 112.6 2000
+  xyz 163.4 116 2000
 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 764.5 928.4 2000
+  xyz 786.7 985.3 2000
 end
 classcanvas 128197 class_ref 128197 // GL2ES1
   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 40.6 226.8 2000
+  xyz 59 234.4 2000
 end
 classcanvas 128258 class_ref 128258 // GL4bc
   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 195.8 928.9 2000
+  xyz 188.4 985.6 2000
 end
 classcanvas 128325 class_ref 128325 // GLES1
   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 40 480.3 2000
+  xyz 59.4 492.3 2000
 end
 classcanvas 128453 class_ref 128453 // GL2
   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 195.3 691.3 2000
+  xyz 188.9 746 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
-  xyz 274 227.1 2000
+  xyz 294.9 235.5 2000
 end
 classcanvas 128709 class_ref 128709 // GL2GL3
   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 428.4 389.7 2005
+  xyz 447.2 397.7 2005
 end
 classcanvas 128837 class_ref 128837 // GL3
   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 595.5 800 2000
+  xyz 615.2 856.2 2000
 end
 classcanvas 128965 class_ref 128965 // GLES2
   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 274 480.5 2000
+  xyz 294.9 489.6 2000
 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 669.3 480.6 2004
+  xyz 709.2 569.5 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 757 305.5 2000
+  xyz 779 313.3 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
-  xyz 422.4 23.7 2000
+  xyz 437.1 19.1 2000
 end
 classcanvas 130434 class_ref 135170 // GL3ES3
   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 588.5 273 2009
+  xyz 610.8 282.6 2009
 end
 classcanvas 130501 class_ref 130245 // GLDrawable
   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 686.2 105.3 2000
+  xyz 713.9 91.2 2000
 end
 classcanvas 130690 class_ref 135298 // GL2ES3
   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
   color transparent
-  xyz 423.5 250.8 2000
+  xyz 444.3 258 2000
 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 436.2 1048.8 2000
+  xyz 452.1 1088.4 2000
 end
 classcanvas 131141 class_ref 130757 // GLES1Impl
   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 46 574.6 2005
+  xyz 67.4 578.2 2005
 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 682.7 575.1 2000
+  xyz 724.9 656.8 2000
 end
 textcanvas 131781 "Desktop final public OpenGL Interfaces
 "
-  xyzwh 820.5 664 2000 135 37
+  xyzwh 851.5 718.6 2000 139 48
 textcanvas 131909 "Mobile final public OpenGL Interfaces"
-  xyzwh 820 522 2000 125 38
+  xyzwh 851.1 490.8 2000 125 38
 textcanvas 132037 "Private implementation (detail)"
-  xyzwh 17 1072 2000 178 18
+  xyzwh 17.5 1095.8 2000 178 18
 textcanvas 132165 "Desktop/Mobile Common Interfaces"
-  xyzwh 819.5 242 2000 129 42
+  xyzwh 851.5 206.6 2000 129 42
 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.8 200.8 2000
+  xyz 1052.2 170 2000
 end
 classcanvas 132421 class_ref 131013 // AbstractGraphicsConfiguration
   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 972.2 295.8 2000
+  xyz 994.6 261.2 2000
 end
 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.6 478.9 2000
+  xyz 1051 444.7 2000
 end
 classcanvas 132677 class_ref 131269 // Capabilities
   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 1028.1 395.5 2005
+  xyz 1061 361.9 2005
 end
 classcanvas 132805 class_ref 131397 // GLProfile
   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 1036.8 582.6 2000
+  xyz 1069.2 548.6 2000
 end
 textcanvas 135749 "Lifecycle: From the lower right to the top, left step where the GLContext is created with a suitable GL implementation matching the GLProfile."
-  xyzwh 781 16 2000 208 93
+  xyzwh 845.2 10.6 2000 208 93
 classcanvas 135877 class_ref 132549 // GLBase
   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 144 12.6 2000
+  xyz 164.9 7.5 2000
 end
 textcanvas 136261 "Common GL Stuff"
-  xyzwh 271 135.5 2000 108 17
+  xyzwh 271.2 135.4 2000 108 17
 fragment 136517 "Programmable Shader"
-  color blue xyzwh 236.4 195.8 1994 709 972
-  separator 2748
-  separator 4543
-  separator 1893
+  color blue xyzwh 237.5 195.6 1994 744 972
+  separator 2892
+  separator 5265
+  separator 2006
 end
 fragment 136645 "Fixed Function"
-  color lightgray xyzwh 2 195.8 1989 236 972
-  separator 2746
-  separator 4546
-  separator 1888
+  color lightgray xyzwh 2.7 195.6 1989 236 972
+  separator 2890
+  separator 5270
+  separator 2001
 end
 textcanvas 136773 "Common Desktop Profile"
-  xyzwh 820.5 402.5 2000 115 39
+  xyzwh 851.1 401.6 2000 115 39
 relationcanvas 128386 relation_ref 128002 // <realization>
   from ref 130885 z 2001 to ref 128002
   no_role_a no_role_b
@@ -225,7 +225,7 @@ end
 relationcanvas 130629 relation_ref 130501 // <association>
   from ref 130501 z 1999 to ref 130245
   no_role_a no_role_b
-  multiplicity_a_pos 514 67 3000 multiplicity_b_pos 660 122 3000
+  multiplicity_a_pos 533 61 3000 multiplicity_b_pos 694 110 3000
 end
 relationcanvas 130818 relation_ref 136066 // <generalisation>
   from ref 130434 z 2010 to ref 130690
@@ -272,6 +272,11 @@ relationcanvas 132226 relation_ref 137218 // <realization>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 132354 relation_ref 143746 // <generalisation>
+  from ref 130050 z 2005 to ref 128965
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 relationcanvas 132933 relation_ref 131141 // <generalisation>
   from ref 132549 z 1999 to ref 132677
   no_role_a no_role_b
@@ -281,8 +286,8 @@ relationcanvas 133061 relation_ref 131269 // <association>
   decenter_begin 326
   decenter_end 104
   from ref 132421 z 1999 to ref 132677
-  role_a_pos 1043 373 3000 no_role_b
-  multiplicity_a_pos 1015 373 3000 no_multiplicity_b
+  role_a_pos 1080 336 3000 no_role_b
+  multiplicity_a_pos 1052 336 3000 no_multiplicity_b
 end
 relationcanvas 133701 relation_ref 131525 // <association>
   decenter_begin 493
@@ -304,8 +309,8 @@ relationcanvas 134213 relation_ref 131397 // <association>
   decenter_begin 814
   decenter_end 625
   from ref 132677 z 1999 to ref 132421
-  no_role_a role_b_pos 1115 373 3000
-  no_multiplicity_a multiplicity_b_pos 1080 373 3000
+  no_role_a role_b_pos 1146 336 3000
+  no_multiplicity_a multiplicity_b_pos 1118 336 3000
 end
 relationcanvas 134725 relation_ref 131781 // <association>
   from ref 132805 z 1999 to ref 132549
@@ -320,6 +325,6 @@ end
 relationcanvas 136133 relation_ref 133189 // <association>
   from ref 135877 z 1999 to ref 130245
   no_role_a no_role_b
-  multiplicity_a_pos 397 51 3000 multiplicity_b_pos 248 51 3000
+  multiplicity_a_pos 418 49 3000 multiplicity_b_pos 272 49 3000
 end
 end
diff --git a/doc/uml/jogl/134786.diagram b/doc/uml/jogl/134786.diagram
index eaac88d82..ea3909cc2 100644
--- a/doc/uml/jogl/134786.diagram
+++ b/doc/uml/jogl/134786.diagram
@@ -1,104 +1,104 @@
-format 75
+format 74
 
 classcanvas 128069 class_ref 128069 // GL
   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 143.8 112.2 2000
+  xyz 162.3 120.7 2000
 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 642.5 851.8 2000
+  xyz 664.1 879.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
-  xyz 143 238.2 2000
+  xyz 162.5 246.7 2000
 end
 classcanvas 128709 class_ref 128709 // GL2GL3
   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
   color transparent
-  xyz 298.6 414.4 2005
+  xyz 317.6 413.1 2005
 end
 classcanvas 128837 class_ref 128837 // GL3
   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 462.8 708 2000
+  xyz 481.8 774.1 2000
 end
 classcanvas 128965 class_ref 128965 // GLES2
   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 143 506.5 2000
+  xyz 162.5 500.2 2000
 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 537.9 508.6 2004
+  xyz 581.8 586.1 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 635 316 2000
+  xyz 657.5 324.5 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
-  xyz 422.4 23.6 2000
+  xyz 436.9 27.6 2000
 end
 classcanvas 130434 class_ref 135170 // GL3ES3
   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 456.8 284.9 2009
+  xyz 474.8 292.4 2009
 end
 classcanvas 130501 class_ref 130245 // GLDrawable
   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 686.9 105.8 2000
+  xyz 703.9 109.8 2000
 end
 classcanvas 130690 class_ref 135298 // GL2ES3
   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
   color transparent
-  xyz 292 261.2 2000
+  xyz 312.3 269.2 2000
 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 652.3 966.6 2000
+  xyz 672.3 990.3 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
+  xyz 596.1 689.3 2000
 end
 textcanvas 131909 "Mobile final public OpenGL Interfaces"
-  xyzwh 817 530 2000 153 42
+  xyzwh 817.8 496.2 2000 153 42
 textcanvas 132165 "Desktop/Mobile Common Interfaces"
-  xyzwh 817 257 2000 139 49
+  xyzwh 817.4 215.1 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
+  xyz 1040.2 208.3 2000
 end
 fragment 132354 "Programmable Shader"
-  color blue xyzwh 10 206.8 1994 940 836
-  separator 5296
+  color blue xyzwh 9.5 206.8 1994 940 836
+  separator 6384
   separator 3351
-  separator 2308
+  separator 2367
 end
 classcanvas 132421 class_ref 131013 // AbstractGraphicsConfiguration
   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 972.1 295.3 2000
+  xyz 982.2 299.3 2000
 end
 textcanvas 132482 "Desktop final public OpenGL Interfaces
 "
-  xyzwh 817 681 2000 135 37
+  xyzwh 817 749.1 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
+  xyz 1039.4 482.8 2000
 end
 classcanvas 132677 class_ref 131269 // Capabilities
   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 1028.4 395 2005
+  xyz 1049.4 399 2005
 end
 classcanvas 132805 class_ref 131397 // GLProfile
   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 1036.4 581.1 2000
+  xyz 1057.5 585.1 2000
 end
 textcanvas 135749 "Lifecycle: From the lower right to the top, left step where the GLContext is created with a suitable GL implementation matching the GLProfile."
-  xyzwh 782 16 2000 208 93
+  xyzwh 853.9 16 2000 208 93
 classcanvas 135877 class_ref 132549 // GLBase
   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 143.9 12.2 2000
+  xyz 162.4 15.7 2000
 end
 textcanvas 136261 "Common GL Stuff"
-  xyzwh 271 135 2000 108 17
+  xyzwh 271 135.5 2000 108 17
 relationcanvas 128770 relation_ref 128386 // <realization>
   decenter_begin 479
   from ref 130885 z 2001 to ref 128130
@@ -138,7 +138,7 @@ end
 relationcanvas 130629 relation_ref 130501 // <association>
   from ref 130501 z 1999 to ref 130245
   no_role_a no_role_b
-  multiplicity_a_pos 514 67 3000 multiplicity_b_pos 660 122 3000
+  multiplicity_a_pos 532 72 3000 multiplicity_b_pos 684 126 3000
 end
 relationcanvas 130818 relation_ref 136066 // <generalisation>
   from ref 130434 z 2010 to ref 130690
@@ -180,6 +180,11 @@ relationcanvas 132226 relation_ref 137218 // <realization>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 132610 relation_ref 143746 // <generalisation>
+  from ref 130050 z 2005 to ref 128965
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 relationcanvas 132933 relation_ref 131141 // <generalisation>
   from ref 132549 z 1999 to ref 132677
   no_role_a no_role_b
@@ -189,8 +194,8 @@ relationcanvas 133061 relation_ref 131269 // <association>
   decenter_begin 326
   decenter_end 104
   from ref 132421 z 1999 to ref 132677
-  role_a_pos 1043 373 3000 no_role_b
-  multiplicity_a_pos 1015 373 3000 no_multiplicity_b
+  role_a_pos 1068 374 3000 no_role_b
+  multiplicity_a_pos 1040 374 3000 no_multiplicity_b
 end
 relationcanvas 133701 relation_ref 131525 // <association>
   decenter_begin 493
@@ -212,8 +217,8 @@ relationcanvas 134213 relation_ref 131397 // <association>
   decenter_begin 814
   decenter_end 625
   from ref 132677 z 1999 to ref 132421
-  no_role_a role_b_pos 1115 373 3000
-  no_multiplicity_a multiplicity_b_pos 1080 373 3000
+  no_role_a role_b_pos 1134 374 3000
+  no_multiplicity_a multiplicity_b_pos 1106 374 3000
 end
 relationcanvas 134725 relation_ref 131781 // <association>
   from ref 132805 z 1999 to ref 132549
@@ -228,6 +233,6 @@ end
 relationcanvas 136133 relation_ref 133189 // <association>
   from ref 135877 z 1999 to ref 130245
   no_role_a no_role_b
-  multiplicity_a_pos 397 51 3000 multiplicity_b_pos 248 51 3000
+  multiplicity_a_pos 417 57 3000 multiplicity_b_pos 270 57 3000
 end
 end
diff --git a/doc/uml/jogl/2.session b/doc/uml/jogl/2.session
index d8aaad531..f2e91bf06 100644
--- a/doc/uml/jogl/2.session
+++ b/doc/uml/jogl/2.session
@@ -1,16 +1,15 @@
-window_sizes 1898 1332 450 1344 884 38
+window_sizes 1920 1060 450 1464 982 0
+windows_style
 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 0 0
+  classdiagram_ref 128069 // OpenGL Interfaces - All
+    1463 849 100 17 253 0
+  active  classdiagram_ref 134786 // OpenGL Interfaces - Core Only
+    1464 982 100 17 0 0
 end
 show_stereotypes
 selected 
   package_ref 129 // jogl
 open
-  class_ref 128837 // GL3
-  class_ref 130501 // GL4bcImpl
-  class_ref 130629 // GLES3Impl
+  class_ref 134914 // GLES3
 end
 end
diff --git a/doc/uml/jogl/generation_settings b/doc/uml/jogl/generation_settings
index e66b84528..6e7065d11 100644
--- a/doc/uml/jogl/generation_settings
+++ b/doc/uml/jogl/generation_settings
@@ -110,7 +110,7 @@ ${items}
   cpp_default_operation_definition "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{
   ${body}}
 "
-  cpp_indent_visibility "  "java_default_src_content "${comment}
+  java_default_src_content "${comment}
 ${package}
 ${imports}
 ${definition}"
diff --git a/doc/uml/jogl/jogl.prj b/doc/uml/jogl/jogl.prj
index 8efc4be70..3e64cb449 100644
--- a/doc/uml/jogl/jogl.prj
+++ b/doc/uml/jogl/jogl.prj
@@ -1,7 +1,7 @@
-format 75
+format 74
 "jogl"
-  revision 14
-  modified_by 2 "sven"
+  revision 15
+  modified_by 2 "qun"
 
 
   
@@ -31,15 +31,13 @@ format 75
   show_infonote yes drawing_language uml show_stereotype_properties no
   
   class_color yellow duration_color transparent continuation_color gray note_color blue fragment_color transparent subject_color transparent usecase_color yellow package_color transparent component_color green artifact_color green deploymentnode_color gray state_color yellow stateaction_color transparent activity_color transparent activityregion_color transparent activitypartition_color transparent activityaction_color transparent parameterpin_color white 
-  font_size 10
+  font_size 7
   diagram_format A4
 
-  image_root_dir ""
-
   mark_for_import
   
   ncouples 1
-  key "html dir" value "C:/projects/JOGAMP/jogl/doc/uml/html-svg/"
+  key "html dir" value "/usr/local/projects/JOGL/jogl/doc/uml/html/"
   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
@@ -764,6 +762,14 @@ ${members}}
 	    classrelation_ref 135810 // <generalisation>
 	  b parent class_ref 135042 // GL4ES3
       end
+
+      classrelation 143746 // <generalisation>
+	relation 143746 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 143746 // <generalisation>
+	  b parent class_ref 128965 // GLES2
+      end
     end
 
     class 135042 "GL4ES3"