Refined VersionInfo usage

2 files changed, 9 insertions, 7 deletions

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) {