Bug 1237: Adopt GlueGen's clarification of IOUtil.getResource(..), commit d78bb1be0a6290cb94918b21865a023c01825048

- Skip relative lookup for IOUtil.ClassResources using 'asset' only (from JAR file)

- Tested w/ jar file and build-dir, see scripts/tests.sh 'USE_BUILDDIR'

5 files changed, 11 insertions, 13 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/font/FontFactory.java b/src/jogl/classes/com/jogamp/graph/font/FontFactory.java
index be16e030f..76badcda8 100644
--- a/src/jogl/classes/com/jogamp/graph/font/FontFactory.java
+++ b/src/jogl/classes/com/jogamp/graph/font/FontFactory.java
@@ -199,7 +199,7 @@ public class FontFactory {
                 throw new IOException(e);
             }
         } else {
-            stream = IOUtil.getResource(context, fname).getInputStream();
+            stream = IOUtil.getResource(fname, context.getClassLoader(), context).getInputStream();
         }
         if( null != stream ) {
             return FontFactory.get ( stream, true ) ;
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 e5ef3b268..173c394ba 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -1106,7 +1106,7 @@ public class ShaderCode {
                     nextConn = IOUtil.openURL(relUri.toURL(), "ShaderCode.relativeOf ");
                     if (nextConn == null) {
                         // Try relative of class and absolute
-                        nextConn = IOUtil.getResource(context, includeFile);
+                        nextConn = IOUtil.getResource(includeFile, context.getClassLoader(), context);
                     }
                     if (nextConn == null) {
                         // Fail
@@ -1158,7 +1158,7 @@ public class ShaderCode {
      * @see IOUtil#getResource(Class, String)
      */
     public static CharSequence readShaderSource(final Class<?> context, final String path, final boolean mutableStringBuilder) throws IOException {
-        final URLConnection conn = IOUtil.getResource(context, path);
+        final URLConnection conn = IOUtil.getResource(path, context.getClassLoader(), context);
         if (conn == null) {
             return null;
         }
@@ -1204,7 +1204,7 @@ public class ShaderCode {
      * @see IOUtil#getResource(Class, String)
      */
     public static ByteBuffer readShaderBinary(final Class<?> context, final String path) throws IOException {
-        final URLConnection conn = IOUtil.getResource(context, path);
+        final URLConnection conn = IOUtil.getResource(path, context.getClassLoader(), context);
         if (conn == null) {
             return null;
         }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
index f5dec1cab..376afb8ce 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
@@ -52,7 +52,7 @@ public abstract class CompileShader {
         final String justName = basename(resourceName);
         outName = justName.substring(0, justName.length() - suffixLen) +
                   ShaderCode.getFileSuffix(true, type);
-        final URL resourceURL = IOUtil.getResource(null, resourceName).getURL();
+        final URL resourceURL = IOUtil.getResource(resourceName, this.getClass().getClassLoader(), null).getURL();
         final String dirName = dirname(resourceURL.getPath());
 
         outName = dirName + File.separator + "bin" + File.separator +
@@ -64,7 +64,7 @@ public abstract class CompileShader {
     public void processOneShader(final String resourceName, final String outName, final int type)
         throws IOException, UnsupportedEncodingException, InterruptedException
     {
-        final URL resourceURL = IOUtil.getResource(null, resourceName).getURL();
+        final URL resourceURL = IOUtil.getResource(resourceName, this.getClass().getClassLoader(), null).getURL();
         final String dirName = dirname(resourceURL.getPath());
 
         final CharSequence shader = ShaderCode.readShaderSource(null, resourceName, false);
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java b/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java
index 0f51c2e14..e485e5452 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java
@@ -77,7 +77,7 @@ public class ImageSequence implements TextureSequence {
     }
 
     public final void addFrame(final GL gl, final Class<?> context, final String imageResourcePath, final String imageSuffix) throws IOException {
-        final URLConnection urlConn = IOUtil.getResource(context, imageResourcePath);
+        final URLConnection urlConn = IOUtil.getResource(imageResourcePath, context.getClassLoader(), context);
         if(null != urlConn) {
             final TextureData texData = TextureIO.newTextureData(GLProfile.getGL2ES2(), urlConn.getInputStream(), false, imageSuffix);
             final Texture tex = new Texture(getTextureTarget());
diff --git a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java
index e4b0cb2a8..f52292769 100644
--- a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java
+++ b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java
@@ -52,7 +52,6 @@ public class UbuntuFontLoader implements FontSet {
     private static final Uri.Encoded jarSubDir = Uri.Encoded.cast("atomic/");
     private static final Uri.Encoded jarName = Uri.Encoded.cast("jogl-fonts-p0.jar");
 
-    private static final String relFontPath = "fonts/ubuntu/" ;
     private static final String absFontPath = "jogamp/graph/font/fonts/ubuntu/" ;
 
     private static final FontSet fontLoader = new UbuntuFontLoader();
@@ -160,15 +159,14 @@ public class UbuntuFontLoader implements FontSet {
                 }
             }
         }
-        final String path = useTempJARCache ? absFontPath : relFontPath;
         try {
-            final Font f = abspathImpl(path+fname, family, style);
+            final Font f = abspathImpl(absFontPath+fname, family, style);
             if( null != f ) {
                 return f;
             }
-            throw new IOException(String.format("Problem loading font %s, stream %s%s", fname, path, fname));
+            throw new IOException(String.format("Problem loading font %s, stream %s%s", fname, absFontPath, fname));
         } catch(final Exception e) {
-            throw new IOException(String.format("Problem loading font %s, stream %s%s", fname, path, fname), e);
+            throw new IOException(String.format("Problem loading font %s, stream %s%s", fname, absFontPath, fname), e);
         }
     }
     private Font abspathImpl(final String fname, final int family, final int style) throws IOException {
@@ -190,7 +188,7 @@ public class UbuntuFontLoader implements FontSet {
                 throw new IOException(privErr[0]);
             }
         } else {
-            final URLConnection urlConn = IOUtil.getResource(UbuntuFontLoader.class, fname);
+            final URLConnection urlConn = IOUtil.getResource(fname, getClass().getClassLoader(), null);
             stream = null != urlConn ? urlConn.getInputStream() : null;
         }
         if(null != stream) {