Minor edits: generics, test script

1 files changed, 7 insertions, 8 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 12d80e42c..cc75b89c0 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -32,7 +32,6 @@ import com.jogamp.common.nio.Buffers;
 import com.jogamp.common.util.IOUtil;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.util.*;
 import jogamp.opengl.Debug;
 
 import java.util.*;
@@ -89,7 +88,7 @@ public class ShaderCode {
         id = getNextID();
     }
 
-    public static ShaderCode create(GL2ES2 gl, int type, int number, Class context, String[] sourceFiles) {
+    public static ShaderCode create(GL2ES2 gl, int type, int number, Class<?> context, String[] sourceFiles) {
         if(!ShaderUtil.isShaderCompilerAvailable(gl)) return null;
 
         String[][] shaderSources = null;
@@ -108,7 +107,7 @@ public class ShaderCode {
         return new ShaderCode(type, number, shaderSources);
     }
 
-    public static ShaderCode create(int type, int number, Class context, int binFormat, String binaryFile) {
+    public static ShaderCode create(int type, int number, Class<?> context, int binFormat, String binaryFile) {
         ByteBuffer shaderBinary = null;
         if(null!=binaryFile && 0<=binFormat) {
             shaderBinary = readShaderBinary(context, binaryFile);
@@ -142,7 +141,7 @@ public class ShaderCode {
         }
     }
 
-    public static ShaderCode create(GL2ES2 gl, int type, int number, Class context, 
+    public static ShaderCode create(GL2ES2 gl, int type, int number, Class<?> context, 
                                     String srcRoot, String binRoot, String basename) {
         ShaderCode res = null;
         String srcFileName = null;
@@ -284,7 +283,7 @@ public class ShaderCode {
         }
     }
 
-    private static int readShaderSource(Class context, URL url, StringBuffer result, int lineno) {
+    private static int readShaderSource(Class<?> context, URL url, StringBuffer result, int lineno) {
         try {
             if(DEBUG_CODE) {
                 System.err.printf("%3d: // %s\n", lineno, url);
@@ -324,7 +323,7 @@ public class ShaderCode {
         return lineno;
     }
     
-    public static void readShaderSource(Class context, URL url, StringBuffer result) {
+    public static void readShaderSource(Class<?> context, URL url, StringBuffer result) {
         if(DEBUG_CODE) {
             System.err.println();
             System.err.println("// -----------------------------------------------------------");
@@ -336,7 +335,7 @@ public class ShaderCode {
         }
     }
 
-    public static String readShaderSource(Class context, String path) {
+    public static String readShaderSource(Class<?> context, String path) {
         URL url = IOUtil.getResource(context, path);        
         if (url == null) {
             return null;
@@ -346,7 +345,7 @@ public class ShaderCode {
         return result.toString();
     }
 
-    public static ByteBuffer readShaderBinary(Class context, String path) {
+    public static ByteBuffer readShaderBinary(Class<?> context, String path) {
         try {
             URL url = IOUtil.getResource(context, path);
             if (url == null) {