ShaderState: 'Update' vertexAttribMap on enable

ShaderProgram:
  - shaderCode's HashMap -> HashSet
  - adding HashSet for attached ShaderCode
  - link: allow relink, attachShader only if not yet attached
  - new add(gl, ShaderCode, ..) method, allowing compile/attach pre linkage
  - remove boxing of integer 'id', use generics style (warnings)
  - rename: glReplaceShader -> replaceShader, glUseProgram -> useProgram
  - fix: replaceShader
  - hashCode _is_ 'id'

ShaderCode:
  - remove boxing of integer 'id', use generics style (warnings)
  - hashCode _is_ 'id'

ShaderUtil: Use generics style (warnings), static names

1 files changed, 9 insertions, 17 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
index c735de468..20b032a41 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -155,9 +155,9 @@ public class ShaderCode {
                 return res;
             }
         }
-        Set binFmts = ShaderUtil.getShaderBinaryFormats(gl);
-        for(Iterator iter=binFmts.iterator(); null==res && iter.hasNext(); ) {
-            int bFmt = ((Integer)(iter.next())).intValue();
+        Set<Integer> binFmts = ShaderUtil.getShaderBinaryFormats(gl);
+        for(Iterator<Integer> iter=binFmts.iterator(); null==res && iter.hasNext(); ) {
+            int bFmt = iter.next().intValue();
             String bFmtPath = getBinarySubPath(bFmt);
             if(null==bFmtPath) continue;
             binFileName = binRoot + '/' + bFmtPath + '/' + basename + "." + getFileSuffix(true, type);
@@ -174,16 +174,8 @@ public class ShaderCode {
 
     /**
      * returns the uniq shader id as an integer
-     * @see #key()
      */
-    public int        id() { return id.intValue(); }
-
-    /**
-     * returns the uniq shader id as an Integer
-     *
-     * @see #id()
-     */
-    public Integer    key() { return id; }
+    public int id() { return id; }
 
     public int        shaderType() { return shaderType; }
     public String     shaderTypeStr() { return shaderTypeStr(shaderType); }
@@ -239,7 +231,7 @@ public class ShaderCode {
         shaderSource=null;
         shaderBinaryFormat=-1;
         shaderType=-1;
-        id=null;
+        id=-1;
     }
 
     public boolean equals(Object obj) {
@@ -250,7 +242,7 @@ public class ShaderCode {
         return false;
     }
     public int hashCode() {
-        return id.intValue();
+        return id;
     }
     public String toString() {
         StringBuffer buf = new StringBuffer("ShaderCode [id="+id+", type="+shaderTypeStr()+", valid="+valid+", shader: ");
@@ -359,12 +351,12 @@ public class ShaderCode {
     protected int        shaderBinaryFormat = -1;
     protected IntBuffer  shader = null;
     protected int        shaderType = -1;
-    protected Integer    id = null;
+    protected int        id = -1;
 
     protected boolean valid=false;
 
-    private static synchronized Integer getNextID() {
-        return new Integer(nextID++);
+    private static synchronized int getNextID() {
+        return nextID++;
     }
     protected static int nextID = 1;
 }