changes due to code cleanup in gluegen.

     - StringBuffer -> StringBuilder
     - ReflectionUtil.getBaseName -> class.getSimpleName()
     - cleanup imports, generics and @Override for all touched classes

3 files changed, 9 insertions, 9 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
index b1db2974a..ef1ecd7e7 100644
--- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
+++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
@@ -33,7 +33,6 @@ 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.common.util.ReflectionUtil;
 import com.jogamp.nativewindow.NativeWindowVersion;
 import java.util.jar.Manifest;
 import javax.media.nativewindow.AbstractGraphicsDevice;
@@ -59,7 +58,7 @@ public class JoglVersion extends JogampVersion {
         return jogampCommonVersionInfo;
     }
 
-    public StringBuffer toString(GL gl, StringBuffer sb) {
+    public StringBuilder toString(GL gl, StringBuilder sb) {
         sb = super.toString(sb).append(Platform.getNewline());
         getGLInfo(gl, sb);
         return sb;
@@ -69,16 +68,16 @@ public class JoglVersion extends JogampVersion {
         return toString(gl, null).toString();
     }
 
-    public static StringBuffer getGLInfo(GL gl, StringBuffer sb) {
+    public static StringBuilder getGLInfo(GL gl, StringBuilder sb) {
         AbstractGraphicsDevice device = gl.getContext().getGLDrawable().getNativeSurface()
                                             .getGraphicsConfiguration().getNativeGraphicsConfiguration().getScreen().getDevice();
         if(null==sb) {
-            sb = new StringBuffer();
+            sb = new StringBuilder();
         }
         GLContext ctx = gl.getContext();
 
         sb.append(VersionUtil.SEPERATOR).append(Platform.getNewline());
-        sb.append(ReflectionUtil.getBaseName(device.getClass())).append("[type ")
+        sb.append(device.getClass().getSimpleName()).append("[type ")
                 .append(device.getType()).append(", connection ").append(device.getConnection()).append("]: ")
                 .append(GLProfile.glAvailabilityToString(device));
         sb.append(Platform.getNewline());
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 478acba4e..d5059eb74 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -172,8 +172,8 @@ public abstract class GLContextImpl extends GLContext {
 
   public GL setGL(GL gl) {
     if(DEBUG) {
-        String sgl1 = (null!=this.gl)?ReflectionUtil.getBaseName(this.gl.getClass())+", "+this.gl.toString():"<null>";
-        String sgl2 = (null!=gl)?ReflectionUtil.getBaseName(gl.getClass())+", "+gl.toString():"<null>";
+        String sgl1 = (null!=this.gl)?this.gl.getClass().getSimpleName()+", "+this.gl.toString():"<null>";
+        String sgl2 = (null!=gl)?gl.getClass().getSimpleName()+", "+gl.toString():"<null>";
         Exception e = new Exception("Info: setGL (OpenGL "+getGLVersion()+"): "+Thread.currentThread().getName()+", "+sgl1+" -> "+sgl2);
         e.printStackTrace();
     }
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java
index eb8bd522e..4d8f2ac3e 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java
@@ -41,7 +41,6 @@ import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
 import javax.media.opengl.*;
 import com.jogamp.common.nio.PointerBuffer;
-import com.jogamp.common.util.ReflectionUtil;
 import jogamp.opengl.*;
 
 public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
@@ -76,6 +75,7 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
         return new EGLGraphicsConfiguration(absScreen, caps, capsRequested, new DefaultGLCapabilitiesChooser());
     }
 
+    @Override
     public Object clone() {
         return super.clone();
     }
@@ -299,8 +299,9 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
         return attrs;
     }
 
+    @Override
     public String toString() {
-        return ReflectionUtil.getBaseName(getClass())+"["+getScreen()+", eglConfigID "+toHexString(getNativeConfigID())+
+        return getClass().getSimpleName()+"["+getScreen()+", eglConfigID "+toHexString(getNativeConfigID())+
                                      ",\n\trequested " + getRequestedCapabilities()+
                                      ",\n\tchosen    " + getChosenCapabilities()+
                                      "]";