Synced with JOGL 2 changes from revision 1949

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JOGL_2_SANDBOX@348 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

17 files changed, 22 insertions, 23 deletions

diff --git a/src/demos/GLInfo.java b/src/demos/GLInfo.java
index 28f17be..ab30a72 100755
--- a/src/demos/GLInfo.java
+++ b/src/demos/GLInfo.java
@@ -20,7 +20,7 @@ public class GLInfo extends Thread implements GLEventListener {
     private void init(String glprofile, int type) {
         int width = 640;
         int height = 480;
-        glp = GLProfile.GetProfile(glprofile);
+        glp = GLProfile.get(glprofile);
         System.err.println(glp+" GLInfo.start()");
         try {
             GLCapabilities caps = new GLCapabilities(glp);
diff --git a/src/demos/context/DualContext.java b/src/demos/context/DualContext.java
index 5f62d19..c7d734c 100755
--- a/src/demos/context/DualContext.java
+++ b/src/demos/context/DualContext.java
@@ -142,7 +142,7 @@ public class DualContext extends Canvas {
   public static void main(String[] args) {
     JFrame frame = new JFrame("Dual OpenGL Context Test");
 
-    GLProfile glp = GLProfile.GetProfileDefault(); // warm up ..
+    GLProfile glp = GLProfile.getDefault(); // warm up ..
 
     AWTGraphicsScreen screen = (AWTGraphicsScreen)AWTGraphicsScreen.createDefault();
     AWTGraphicsConfiguration config = (AWTGraphicsConfiguration)
diff --git a/src/demos/es1/Info.java b/src/demos/es1/Info.java
index 17fe5b1..8d83692 100755
--- a/src/demos/es1/Info.java
+++ b/src/demos/es1/Info.java
@@ -17,7 +17,7 @@ public class Info implements GLEventListener {
         int height = 10;
         System.err.println("Info.run()");
         try {
-            GLCapabilities caps = new GLCapabilities(GLProfile.GetProfileGL2ES1());
+            GLCapabilities caps = new GLCapabilities(GLProfile.getGL2ES1());
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index a7ede75..4227418 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -79,7 +79,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
         System.err.println(glp+" RedSquare.run() 0");
         int width = 800;
         int height = 480;
-        glp = GLProfile.GetProfile(glprofile);
+        glp = GLProfile.get(glprofile);
         try {
             GLCapabilities caps = new GLCapabilities(glp);
 
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index 5f120a5..d2149bc 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -71,7 +71,7 @@ public class RedSquare extends Thread implements WindowListener, MouseListener,
         System.err.println(glp+" RedSquare.run()");
         int width = 800;
         int height = 480;
-        glp = GLProfile.GetProfile(glprofile);
+        glp = GLProfile.get(glprofile);
         try {
             GLCapabilities caps = new GLCapabilities(glp);
 
diff --git a/src/demos/es2/openmax/MovieCube.java b/src/demos/es2/openmax/MovieCube.java
index 1a0fb93..40ba583 100755
--- a/src/demos/es2/openmax/MovieCube.java
+++ b/src/demos/es2/openmax/MovieCube.java
@@ -87,7 +87,7 @@ public class MovieCube implements MouseListener, GLEventListener, OMXEventListen
     private void run() {
         System.err.println("MovieCube.run()");
         try {
-            GLCapabilities caps = new GLCapabilities(GLProfile.GetProfileGL2ES2());
+            GLCapabilities caps = new GLCapabilities(GLProfile.getGL2ES2());
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);
diff --git a/src/demos/es2/openmax/MovieSimple.java b/src/demos/es2/openmax/MovieSimple.java
index cba3c2c..9088977 100755
--- a/src/demos/es2/openmax/MovieSimple.java
+++ b/src/demos/es2/openmax/MovieSimple.java
@@ -94,7 +94,7 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList
     private void run() {
         System.err.println("MovieSimple.run()");
         try {
-            GLCapabilities caps = new GLCapabilities(GLProfile.GetProfileGL2ES2());
+            GLCapabilities caps = new GLCapabilities(GLProfile.getGL2ES2());
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);
diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java
index 91c6711..f023e4d 100755
--- a/src/demos/es2/perftst/Perftst.java
+++ b/src/demos/es2/perftst/Perftst.java
@@ -44,7 +44,7 @@ public class Perftst implements MouseListener, GLEventListener {
         pmod = pm;
         System.err.println("Perftst.run()");
         try {
-            GLCapabilities caps = new GLCapabilities(GLProfile.GetProfileGL2ES2());
+            GLCapabilities caps = new GLCapabilities(GLProfile.getGL2ES2());
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);
diff --git a/src/demos/hdr/HDR.java b/src/demos/hdr/HDR.java
index 087be00..2f71c3c 100755
--- a/src/demos/hdr/HDR.java
+++ b/src/demos/hdr/HDR.java
@@ -315,7 +315,7 @@ public class HDR extends Demo {
     caps.setAlphaBits(floatAlphaBits);
     caps.setDepthBits(floatDepthBits);
     int[] tmp = new int[1];
-    if (!GLDrawableFactory.getFactory(GLProfile.GetProfileDefault()).canCreateGLPbuffer()) {
+    if (!GLDrawableFactory.getFactory(GLProfile.getDefault()).canCreateGLPbuffer()) {
       unavailableExtension("Can not create pbuffer");
     }
     if (pbuffer != null) {
@@ -336,15 +336,15 @@ public class HDR extends Demo {
     }
 
     GLContext parentContext = drawable.getContext();
-    pbuffer = GLDrawableFactory.getFactory(GLProfile.GetProfileDefault()).createGLPbuffer(caps, null, pbuffer_w, pbuffer_h, parentContext);
+    pbuffer = GLDrawableFactory.getFactory(GLProfile.getDefault()).createGLPbuffer(caps, null, pbuffer_w, pbuffer_h, parentContext);
     pbuffer.addGLEventListener(new PbufferListener());
     gl.glGenTextures(1, tmp, 0);
     pbuffer_tex = tmp[0];
-    blur_pbuffer = GLDrawableFactory.getFactory(GLProfile.GetProfileDefault()).createGLPbuffer(caps, null, blur_w, blur_h, parentContext);
+    blur_pbuffer = GLDrawableFactory.getFactory(GLProfile.getDefault()).createGLPbuffer(caps, null, blur_w, blur_h, parentContext);
     blur_pbuffer.addGLEventListener(new BlurPbufferListener());
     gl.glGenTextures(1, tmp, 0);
     blur_pbuffer_tex = tmp[0];
-    blur2_pbuffer = GLDrawableFactory.getFactory(GLProfile.GetProfileDefault()).createGLPbuffer(caps, null, blur_w, blur_h, parentContext);
+    blur2_pbuffer = GLDrawableFactory.getFactory(GLProfile.getDefault()).createGLPbuffer(caps, null, blur_w, blur_h, parentContext);
     blur2_pbuffer.addGLEventListener(new Blur2PbufferListener());
     gl.glGenTextures(1, tmp, 0);
     blur2_pbuffer_tex = tmp[0];
@@ -353,7 +353,7 @@ public class HDR extends Demo {
     caps.setGreenBits(8);
     caps.setBlueBits(8);
     caps.setDepthBits(24);
-    tonemap_pbuffer = GLDrawableFactory.getFactory(GLProfile.GetProfileDefault()).createGLPbuffer(caps, null, pbuffer_w, pbuffer_h, parentContext);
+    tonemap_pbuffer = GLDrawableFactory.getFactory(GLProfile.getDefault()).createGLPbuffer(caps, null, pbuffer_w, pbuffer_h, parentContext);
     tonemap_pbuffer.addGLEventListener(new TonemapPbufferListener());
     gl.glGenTextures(1, tmp, 0);
     tonemap_pbuffer_tex = tmp[0];
diff --git a/src/demos/j2d/TestTextureRenderer.java b/src/demos/j2d/TestTextureRenderer.java
index 9e57b3f..f85cce4 100755
--- a/src/demos/j2d/TestTextureRenderer.java
+++ b/src/demos/j2d/TestTextureRenderer.java
@@ -74,7 +74,7 @@ public class TestTextureRenderer implements GLEventListener {
   public static void main(String[] args) {
 
     Frame frame = new Frame("Java 2D Renderer Test");
-    GLCapabilities caps = new GLCapabilities(GLProfile.GetProfile(GLProfile.GL2));
+    GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2));
     caps.setAlphaBits(8);
 
     GLCanvas canvas = new GLCanvas(caps);
diff --git a/src/demos/j2d/TextCube.java b/src/demos/j2d/TextCube.java
index 5719a8f..0c97650 100755
--- a/src/demos/j2d/TextCube.java
+++ b/src/demos/j2d/TextCube.java
@@ -78,7 +78,7 @@ public class TextCube extends Demo {
     Frame frame = new Frame("Text Cube");
     frame.setLayout(new BorderLayout());
 
-    GLCapabilities caps = new GLCapabilities(GLProfile.GetProfile(GLProfile.GL2));
+    GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2));
     GLCanvas canvas = new GLCanvas(caps);
     final TextCube demo = new TextCube();
 
diff --git a/src/demos/j2d/TextFlow.java b/src/demos/j2d/TextFlow.java
index 52542c6..f3f4524 100755
--- a/src/demos/j2d/TextFlow.java
+++ b/src/demos/j2d/TextFlow.java
@@ -80,7 +80,7 @@ public class TextFlow extends Demo {
     Frame frame = new Frame("Text Flow");
     frame.setLayout(new BorderLayout());
 
-    GLCapabilities caps = new GLCapabilities(GLProfile.GetProfile(GLProfile.GL2));
+    GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2));
     GLCanvas canvas = new GLCanvas(caps);
     final TextFlow demo = new TextFlow();
 
diff --git a/src/demos/jgears/JGears.java b/src/demos/jgears/JGears.java
index 5ba25bc..e885bd5 100644
--- a/src/demos/jgears/JGears.java
+++ b/src/demos/jgears/JGears.java
@@ -44,7 +44,7 @@ public class JGears extends GLJPanel {
   private BufferedImage openglImage;
 
   static {
-    caps = new GLCapabilities(GLProfile.GetProfile(GLProfile.GL2));
+    caps = new GLCapabilities(GLProfile.get(GLProfile.GL2));
     caps.setAlphaBits(8);
   }
   
diff --git a/src/demos/jrefract/JRefract.java b/src/demos/jrefract/JRefract.java
index cf8aa0f..32f8860 100755
--- a/src/demos/jrefract/JRefract.java
+++ b/src/demos/jrefract/JRefract.java
@@ -35,8 +35,7 @@ package demos.jrefract;
 
 import demos.common.Demo;
 import demos.common.DemoListener;
-// FIXME: commenting out demos that don't compile right now
-//import demos.hdr.HDR;
+import demos.hdr.HDR;
 import demos.hwShadowmapsSimple.HWShadowmapsSimple;
 import demos.infiniteShadowVolumes.InfiniteShadowVolumes;
 import demos.j2d.FlyingText;
@@ -136,7 +135,7 @@ public class JRefract {
     inner.setClosable(true);
     inner.setVisible(true);
 
-    GLCapabilities caps = new GLCapabilities(GLProfile.GetProfile(GLProfile.GL2));
+    GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2));
     if (which == INFINITE) {
       caps.setStencilBits(16);
     }
diff --git a/src/demos/vertexBufferObject/VertexBufferObject.java b/src/demos/vertexBufferObject/VertexBufferObject.java
index 5bd6de6..0bc8b10 100644
--- a/src/demos/vertexBufferObject/VertexBufferObject.java
+++ b/src/demos/vertexBufferObject/VertexBufferObject.java
@@ -102,7 +102,7 @@ public class VertexBufferObject extends Demo {
         usage();
       }
     }
-    GLCapabilities caps = new GLCapabilities(GLProfile.GetProfile(GLProfile.GL2));
+    GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2));
     GLCanvas canvas = new GLCanvas(caps);
     VertexBufferObject demo = new VertexBufferObject();
     demo.vboEnabled = vboEnabled;
diff --git a/src/demos/xtrans/XTDesktopManager.java b/src/demos/xtrans/XTDesktopManager.java
index 2771107..0081b5c 100755
--- a/src/demos/xtrans/XTDesktopManager.java
+++ b/src/demos/xtrans/XTDesktopManager.java
@@ -117,7 +117,7 @@ public class XTDesktopManager extends OffscreenDesktopManager {
             // Get valid Java2D context
             if (j2dContext == null ||
                 j2dContextSurfaceIdentifier != Java2D.getOGLSurfaceIdentifier(g)) {
-              GLProfile glp = GLProfile.GetProfileDefault();
+              GLProfile glp = GLProfile.getDefault();
               j2dContext = GLDrawableFactory.getFactory(glp).createExternalGLContext();
               j2dContext.setGL(new DebugGL2(j2dContext.getGL().getGL2()));
               j2dContextSurfaceIdentifier = Java2D.getOGLSurfaceIdentifier(g);
diff --git a/src/demos/xtrans/XTDesktopPane.java b/src/demos/xtrans/XTDesktopPane.java
index 1c349b7..ba9dc61 100755
--- a/src/demos/xtrans/XTDesktopPane.java
+++ b/src/demos/xtrans/XTDesktopPane.java
@@ -100,7 +100,7 @@ public class XTDesktopPane extends OffscreenDesktopPane {
 
   private int textureTarget = GL.GL_TEXTURE_2D;
   private GLU glu = new GLU();
-  private GLProfile glProfile = GLProfile.GetProfileDefault();
+  private GLProfile glProfile = GLProfile.getDefault();
 
   /** Creates a new accelerated transition desktop pane. */
   public XTDesktopPane() {