Android Cleanup: Remove commented code, make immutables final again

2 files changed, 3 insertions, 16 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java
index ab332e659..8a423c6a8 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java
@@ -158,7 +158,6 @@ public class EGLGLCapabilities extends GLCapabilities {
     if(null == sink) {
         sink = new StringBuffer();
     }
-    // sink.append("0x").append(Long.toHexString(eglcfg)).append(", ");
     sink.append("0x").append(Long.toHexString(eglcfgid)).append(": ");
     sink.append("vid 0x").append(Integer.toHexString(nativeVisualID)).append(", ");
     super.toString(sink);
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java
index 1eda2fb7a..ed5b88455 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java
@@ -152,15 +152,15 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
                                                  GLProfile glp, long display, long config,
                                                  int winattrmask) {
         final int allDrawableTypeBits = EGLConfigDrawableTypeBits(display, config);
-        int drawableTypeBits = winattrmask & allDrawableTypeBits;
+        final int drawableTypeBits = winattrmask & allDrawableTypeBits;
 
         if( 0 == drawableTypeBits ) {
             return false;
         }
 
         final IntBuffer val = Buffers.newDirectIntBuffer(1);
-        int cfgID;
-        int rType;
+        final int cfgID;
+        final int rType;
         
         // get the configID
         if(!EGL.eglGetConfigAttrib(display, config, EGL.EGL_CONFIG_ID, val)) {
@@ -234,18 +234,6 @@ public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration imple
                 caps.setTransparentAlphaValue(val.get(0)==EGL.EGL_DONT_CARE?-1:val.get(0));
             } */
         }
-        /**
-        if(caps.getNativeVisualID() == 0) {
-            boolean isWindowBit = 0 != ( drawableTypeBits & GLGraphicsConfigurationUtil.WINDOW_BIT );
-            drawableTypeBits &= ~GLGraphicsConfigurationUtil.WINDOW_BIT;
-            if( 0 == drawableTypeBits ) {
-                if(DEBUG) {
-                    System.err.println("EGL_NATIVE_VISUAL_ID: 0, windowBit removed: "+isWindowBit+
-                                       ", no drawable bits left, bail out for: "+ caps); 
-                }
-                return false;
-            }
-        } */
         return GLGraphicsConfigurationUtil.addGLCapabilitiesPermutations(capsBucket, caps, drawableTypeBits );
     }