Refined VersionInfo usage

8 files changed, 50 insertions, 22 deletions

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index ba44f3871..790ec614f 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -40,23 +40,31 @@ function jrun() {
     #D_ARGS="-Djogl.debug.GraphicsConfiguration"
     #D_ARGS="-Djogl.debug.GLCanvas"
     #X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=true"
-    java $awtarg $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log
+    echo
+    echo "Test Start: $*"
+    echo
+    java $awtarg $X_ARGS $D_ARGS $*
+    echo
+    echo "Test End: $*"
+    echo
 }
 
 function testnoawt() {
-    jrun -Djava.awt.headless=true $*
+    jrun -Djava.awt.headless=true $* 2>&1 | tee -a java-run.log
 }
 
 function testawt() {
-    jrun -Djava.awt.headless=false $*
+    jrun -Djava.awt.headless=false $* 2>&1 | tee -a java-run.log
 }
 
 #
 # newt (testnoawt and testawt)
 #
-#testnoawt com.jogamp.newt.opengl.GLWindow $*
-#testawt com.jogamp.newt.opengl.GLWindow $*
-#testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $*
+testnoawt com.jogamp.nativewindow.NativeWindowVersion $*
+testnoawt com.jogamp.opengl.JoglVersion $*
+testnoawt com.jogamp.newt.NewtVersion $*
+testnoawt com.jogamp.newt.opengl.GLWindow $*
+testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $*
 #testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $*
 #testnoawt com.jogamp.test.junit.jogl.glsl.TestTransformFeedbackVaryingsBug407NEWT $*
 #testnoawt com.jogamp.test.junit.jogl.glsl.TestGLSLSimple01NEWT $*
@@ -78,9 +86,9 @@ function testawt() {
 #
 # awt (testawt)
 #
-#testawt javax.media.opengl.awt.GLCanvas $*
+testawt javax.media.opengl.awt.GLCanvas $*
 #testawt com.jogamp.test.junit.jogl.awt.TestAWT01GLn $*
-testawt com.jogamp.test.junit.jogl.awt.TestAWT03GLCanvasRecreate01 $*
+#testawt com.jogamp.test.junit.jogl.awt.TestAWT03GLCanvasRecreate01 $*
 #testawt com.jogamp.test.junit.jogl.awt.TestAWT02WindowClosing
 #testawt com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn
 #testawt com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsAWT
diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
index 8bd3c4777..ae650d059 100644
--- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
+++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
@@ -28,10 +28,12 @@
  
 package com.jogamp.opengl;
 
+import com.jogamp.common.GlueGenVersion;
 import javax.media.opengl.*;
 import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.VersionUtil;
 import com.jogamp.common.util.JogampVersion;
+import com.jogamp.nativewindow.NativeWindowVersion;
 import java.util.jar.Manifest;
 
 public class JoglVersion extends JogampVersion {
@@ -56,12 +58,8 @@ public class JoglVersion extends JogampVersion {
     }
 
     public StringBuffer toString(GL gl, StringBuffer sb) {
-        sb = super.toString(sb);
-
+        sb = super.toString(sb).append(Platform.getNewline());
         getGLInfo(gl, sb);
-        sb.append("-----------------------------------------------------------------------------------------------------");
-        sb.append(Platform.getNewline());
-
         return sb;
     }
 
@@ -74,6 +72,7 @@ public class JoglVersion extends JogampVersion {
             sb = new StringBuffer();
         }
 
+        sb.append(VersionUtil.SEPERATOR).append(Platform.getNewline());
         sb.append("Default Desktop ").append(GLProfile.getDefaultDesktopDevice().getConnection()).append(": ").append(GLProfile.glAvailabilityToString(GLProfile.getDefaultDesktopDevice()));
         sb.append(Platform.getNewline());
         sb.append("Default EGL ").append(GLProfile.getDefaultEGLDevice().getConnection()).append(": ").append(GLProfile.glAvailabilityToString(GLProfile.getDefaultEGLDevice()));
@@ -92,12 +91,15 @@ public class JoglVersion extends JogampVersion {
         sb.append(Platform.getNewline());
         sb.append("              ").append(gl.glGetString(gl.GL_EXTENSIONS));
         sb.append(Platform.getNewline());
+        sb.append(VersionUtil.SEPERATOR);
 
         return sb;
     }
 
     public static void main(String args[]) {
         System.err.println(VersionUtil.getPlatformInfo());
+        System.err.println(GlueGenVersion.getInstance());
+        System.err.println(NativeWindowVersion.getInstance());
         System.err.println(JoglVersion.getInstance());
     }
 }
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index d4c256165..711e33494 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -809,7 +809,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable {
     System.err.println(VersionUtil.getPlatformInfo());
     System.err.println(GlueGenVersion.getInstance());
     System.err.println(NativeWindowVersion.getInstance());
-    System.err.print(JoglVersion.getInstance());
+    System.err.println(JoglVersion.getInstance());
 
     GLCapabilitiesImmutable caps = new GLCapabilities( GLProfile.getDefault(GLProfile.getDefaultDesktopDevice()) );
     Frame frame = new Frame("JOGL AWT Test");
@@ -821,7 +821,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable {
     glCanvas.addGLEventListener(new GLEventListener() {
         public void init(GLAutoDrawable drawable) {
             GL gl = drawable.getGL();
-            System.err.println(JoglVersion.getInstance().toString(gl));
+            System.err.println(JoglVersion.getInstance().getGLInfo(gl, null));
         }
 
         public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
diff --git a/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01NEWT.java
index 860a181a4..fc48ac39f 100644
--- a/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01NEWT.java
@@ -28,8 +28,11 @@
  
 package com.jogamp.test.junit.jogl.acore;
 
+import com.jogamp.common.GlueGenVersion;
+import com.jogamp.common.util.VersionUtil;
+import com.jogamp.nativewindow.NativeWindowVersion;
 import com.jogamp.test.junit.util.UITestCase;
-import com.jogamp.test.junit.util.DumpVersion;
+import com.jogamp.test.junit.util.DumpGLInfo;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -42,6 +45,7 @@ import com.jogamp.newt.*;
 import com.jogamp.newt.opengl.*;
 
 import com.jogamp.newt.*;
+import com.jogamp.opengl.JoglVersion;
 import java.io.IOException;
 
 public class TestGLProfile01NEWT extends UITestCase {
@@ -59,6 +63,15 @@ public class TestGLProfile01NEWT extends UITestCase {
     }
 
     @Test
+    public void test00Version() {
+        System.err.println(VersionUtil.getPlatformInfo());
+        System.err.println(GlueGenVersion.getInstance());
+        System.err.println(NativeWindowVersion.getInstance());
+        System.err.println(JoglVersion.getInstance());
+        System.err.println(NewtVersion.getInstance());
+    }
+
+    @Test
     public void test01GLProfileDefault() {
         System.out.println("GLProfile <static> "+GLProfile.glAvailabilityToString());
         GLProfile glp = GLProfile.getDefault();
@@ -145,7 +158,7 @@ public class TestGLProfile01NEWT extends UITestCase {
         Assert.assertNotNull(glWindow);
         glWindow.setTitle("TestGLProfile01NEWT");
 
-        glWindow.addGLEventListener(new DumpVersion());
+        glWindow.addGLEventListener(new DumpGLInfo());
 
         glWindow.setSize(128, 128);
         glWindow.setVisible(true);
diff --git a/src/junit/com/jogamp/test/junit/util/DumpVersion.java b/src/junit/com/jogamp/test/junit/util/DumpGLInfo.java
index 25b1fe86a..fd7844f67 100644
--- a/src/junit/com/jogamp/test/junit/util/DumpVersion.java
+++ b/src/junit/com/jogamp/test/junit/util/DumpGLInfo.java
@@ -33,12 +33,11 @@ import javax.media.opengl.*;
 import com.jogamp.opengl.JoglVersion;
 
 
-public class DumpVersion implements GLEventListener {
+public class DumpGLInfo implements GLEventListener {
 
     public void init(GLAutoDrawable drawable) {
         GL gl = drawable.getGL();
-
-        System.err.println(JoglVersion.getInstance().toString(gl));
+        System.err.println(JoglVersion.getInstance().getGLInfo(gl, null));
     }
 
     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java
index 6f4c75887..ccb2176fc 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java
@@ -28,6 +28,7 @@
  
 package com.jogamp.nativewindow;
 
+import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.util.JogampVersion;
 import com.jogamp.common.util.VersionUtil;
 import java.util.jar.Manifest;
@@ -55,6 +56,7 @@ public class NativeWindowVersion extends JogampVersion {
 
     public static void main(String args[]) {
         System.err.println(VersionUtil.getPlatformInfo());
+        System.err.println(GlueGenVersion.getInstance());
         System.err.println(NativeWindowVersion.getInstance());
     }
 }
diff --git a/src/newt/classes/com/jogamp/newt/NewtVersion.java b/src/newt/classes/com/jogamp/newt/NewtVersion.java
index aee67c4bc..a38dca34c 100644
--- a/src/newt/classes/com/jogamp/newt/NewtVersion.java
+++ b/src/newt/classes/com/jogamp/newt/NewtVersion.java
@@ -28,8 +28,10 @@
  
 package com.jogamp.newt;
 
+import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.util.JogampVersion;
 import com.jogamp.common.util.VersionUtil;
+import com.jogamp.nativewindow.NativeWindowVersion;
 import java.util.jar.Manifest;
 
 public class NewtVersion extends JogampVersion {
@@ -55,6 +57,8 @@ public class NewtVersion extends JogampVersion {
 
     public static void main(String args[]) {
         System.err.println(VersionUtil.getPlatformInfo());
+        System.err.println(GlueGenVersion.getInstance());
+        System.err.println(NativeWindowVersion.getInstance());
         System.err.println(NewtVersion.getInstance());
     }
 }
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index 0f96facbd..5531bf168 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -867,7 +867,7 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer {
         System.err.println(VersionUtil.getPlatformInfo());
         System.err.println(GlueGenVersion.getInstance());
         System.err.println(NativeWindowVersion.getInstance());
-        System.err.print(JoglVersion.getInstance());
+        System.err.println(JoglVersion.getInstance());
         System.err.println(NewtVersion.getInstance());
         GLCapabilitiesImmutable caps = new GLCapabilities( GLProfile.getDefault() );
 
@@ -877,7 +877,7 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer {
         glWindow.addGLEventListener(new GLEventListener() {
             public void init(GLAutoDrawable drawable) {
                 GL gl = drawable.getGL();
-                System.err.println(JoglVersion.getInstance().toString(gl));
+                System.err.println(JoglVersion.getInstance().getGLInfo(gl, null));
             }
 
             public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {