From 731c473740e3e7ccd26ecda7ea0200382795c3a6 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 3 Oct 2015 05:07:46 +0200
Subject: 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'
---
 src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java        | 6 +++---
 src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java | 4 ++--
 src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/jogl/classes/com/jogamp/opengl')

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());
-- 
cgit v1.2.3