Doc: Update UML diagram and 'Overview-OpenGL-Evolution-And-JOGL'

1 files changed, 134 insertions, 15 deletions

diff --git a/doc/uml/jogl/jogl.prj b/doc/uml/jogl/jogl.prj
index 607638cc2..b2322a7d5 100644..100755
--- a/doc/uml/jogl/jogl.prj
+++ b/doc/uml/jogl/jogl.prj
@@ -1,6 +1,6 @@
-format 67
+format 75
 "jogl"
-  revision 7
+  revision 10
   modified_by 2 "sven"
 
 
@@ -8,13 +8,13 @@ format 67
   // class settings
   default_attribute_visibility private default_relation_visibility private default_operation_visibility public
   //class diagram settings
-  draw_all_relations yes hide_attributes no hide_operations no show_members_full_definition no show_members_visibility no show_members_stereotype no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab no class_drawing_mode natural drawing_language uml show_context_mode no auto_label_position yes show_relation_modifiers no show_infonote no shadow yes show_stereotype_properties no
+  draw_all_relations yes hide_attributes no hide_operations no hide_getset_operations no show_members_full_definition no show_members_visibility no show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab no class_drawing_mode natural drawing_language uml show_context_mode no auto_label_position yes show_relation_modifiers no show_relation_visibility no show_infonote no shadow yes show_stereotype_properties no
   //use case diagram settings
   package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes class_drawing_mode actor shadow yes show_stereotype_properties no
   //sequence diagram settings
-  show_full_operations_definition no write_horizontally yes class_drawing_mode natural drawing_language uml draw_all_relations yes shadow yes show_stereotype_properties no
+  show_full_operations_definition no write_horizontally yes class_drawing_mode natural drawing_language uml draw_all_relations yes shadow yes show_stereotype_properties no show_class_context_mode no show_msg_context_mode no
   //collaboration diagram settings
-  show_full_operations_definition no show_hierarchical_rank no write_horizontally yes drawing_language uml package_name_in_tab no show_context no draw_all_relations yes shadow yes show_stereotype_properties no
+  show_full_operations_definition no show_hierarchical_rank no write_horizontally yes drawing_language uml package_name_in_tab no show_context no show_msg_context no draw_all_relations yes shadow yes show_stereotype_properties no
   //object diagram settings
    write_horizontally yes package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes shadow yes show_stereotype_properties no
   //component diagram settings
@@ -34,19 +34,21 @@ format 67
   font_size 10
   diagram_format A4
 
+  image_root_dir ""
+
   mark_for_import
   
   ncouples 1
-  key "html dir" value "/usr/local/projects/JOGL/jogl/doc/bouml/html/"
+  key "html dir" value "C:/projects/JOGAMP/jogl/doc/bouml/html-all/"
   classview 128069 "javax.media.opengl"
     //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
@@ -54,8 +56,13 @@ format 67
     //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 128069 "OpenGL Interfaces"
-      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
+    classdiagram 128069 "OpenGL Interfaces - All"
+      draw_all_relations no hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+      size A3-Landscape
+    end
+
+    classdiagram 134786 "OpenGL Interfaces - Core Only"
+      draw_all_relations no hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
       size A3-Landscape
     end
 
@@ -209,6 +216,14 @@ ${members}};
 	    classrelation_ref 130117 // <generalisation>
 	  b parent class_ref 128581 // GL2ES2
       end
+
+      classrelation 136322 // <generalisation>
+	relation 136322 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 136322 // <generalisation>
+	  b parent class_ref 135298 // GL2ES3
+      end
     end
 
     class 128837 "GL3"
@@ -233,6 +248,14 @@ ${members}};
 	    classrelation_ref 129861 // <generalisation>
 	  b parent class_ref 128709 // GL2GL3
       end
+
+      classrelation 136834 // <generalisation>
+	relation 136834 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 136834 // <generalisation>
+	  b parent class_ref 135170 // GL3ES3
+      end
     end
 
     class 128965 "GLES2"
@@ -359,7 +382,7 @@ ${members}}
       end
     end
 
-    class 130629 "GLES2Impl"
+    class 130629 "GLES3Impl"
       visibility private stereotype "entity"
       cpp_decl ""
       java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
@@ -370,13 +393,21 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 131013 // <realization>
-	relation 130757 -_-|>
+      classrelation 137090 // <realization>
+	relation 137090 -_-|>
 	  a public
 	    java "${type}"
-	    classrelation_ref 131013 // <realization>
+	    classrelation_ref 137090 // <realization>
 	  b parent class_ref 128965 // GLES2
       end
+
+      classrelation 137218 // <realization>
+	relation 137218 -_-|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 137218 // <realization>
+	  b parent class_ref 134914 // GLES3
+      end
     end
 
     class 130757 "GLES1Impl"
@@ -645,6 +676,14 @@ ${members}};
 	    classrelation_ref 128770 // <generalisation>
 	  b parent class_ref 128837 // GL3
       end
+
+      classrelation 136962 // <generalisation>
+	relation 136962 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 136962 // <generalisation>
+	  b parent class_ref 135042 // GL4ES3
+      end
     end
 
     class 128258 "GL4bc"
@@ -706,5 +745,85 @@ ${members}}
 	  b parent class_ref 128581 // GL2ES2
       end
     end
+
+    class 134914 "GLES3"
+      visibility public stereotype "@interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}@interface ${name}${extends} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 135810 // <generalisation>
+	relation 135810 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 135810 // <generalisation>
+	  b parent class_ref 135042 // GL4ES3
+      end
+    end
+
+    class 135042 "GL4ES3"
+      visibility public stereotype "@interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}@interface ${name}${extends} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 135938 // <generalisation>
+	relation 135938 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 135938 // <generalisation>
+	  b parent class_ref 135170 // GL3ES3
+      end
+    end
+
+    class 135170 "GL3ES3"
+      visibility public stereotype "@interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}@interface ${name}${extends} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 136066 // <generalisation>
+	relation 136066 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 136066 // <generalisation>
+	  b parent class_ref 135298 // GL2ES3
+      end
+    end
+
+    class 135298 "GL2ES3"
+      abstract visibility package stereotype "metaclass"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}@interface ${name}${extends} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 136194 // <generalisation>
+	relation 136194 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 136194 // <generalisation>
+	  b parent class_ref 128581 // GL2ES2
+      end
+    end
   end
 end