Bug 1237 - Clarify IOUtil.getResource(..) for better efficiency, i.e. allow caller to skip relative futile lookup

IOUtil.getResource(..) and IOUtil.ClassResources, needs more clarity.

ClassLoader shall be passed explicitly next to the optional
relative context Class instance.

This allows better efficiency, i.e. caller can pass ClassLoader
but skip a possible relative lookup, if not existing.

2 files changed, 5 insertions, 5 deletions

diff --git a/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java b/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java
index 5167abb..1bb88c5 100644
--- a/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java
+++ b/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java
@@ -38,7 +38,7 @@ public class AssetURLConnectionUnregisteredTest extends AssetURLConnectionBase {
 
     @Test
     public void assetUnregisteredIOUtilGetResourceRel0_RT() throws IOException, URISyntaxException {
-        final URLConnection urlConn0 = IOUtil.getResource(this.getClass(), test_asset_test2_rel.get());
+        final URLConnection urlConn0 = IOUtil.getResource(test_asset_test2_rel.get(), this.getClass().getClassLoader(), this.getClass());
         testAssetConnection(urlConn0, test_asset_test2_entry);
 
         final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel);
diff --git a/src/junit/com/jogamp/common/util/TestIOUtil01.java b/src/junit/com/jogamp/common/util/TestIOUtil01.java
index e85aa37..be0c9a4 100644
--- a/src/junit/com/jogamp/common/util/TestIOUtil01.java
+++ b/src/junit/com/jogamp/common/util/TestIOUtil01.java
@@ -79,7 +79,7 @@ public class TestIOUtil01 extends SingletonJunitCase {
 
     @Test
     public void testCopyStream01Array() throws IOException {
-        final URLConnection urlConn = IOUtil.getResource(this.getClass(), tfilename);
+        final URLConnection urlConn = IOUtil.getResource(tfilename, this.getClass().getClassLoader(), this.getClass());
         Assert.assertNotNull(urlConn);
         final BufferedInputStream bis = new BufferedInputStream( urlConn.getInputStream() );
         final byte[] bb;
@@ -95,7 +95,7 @@ public class TestIOUtil01 extends SingletonJunitCase {
 
     @Test
     public void testCopyStream02Buffer() throws IOException {
-        final URLConnection urlConn = IOUtil.getResource(this.getClass(), tfilename);
+        final URLConnection urlConn = IOUtil.getResource(tfilename, this.getClass().getClassLoader(), this.getClass());
         Assert.assertNotNull(urlConn);
         final BufferedInputStream bis = new BufferedInputStream( urlConn.getInputStream() );
         final ByteBuffer bb;
@@ -113,14 +113,14 @@ public class TestIOUtil01 extends SingletonJunitCase {
     @Test
     public void testCopyStream03Buffer() throws IOException {
         final String tfilename2 = "./test2.bin" ;
-        final URLConnection urlConn1 = IOUtil.getResource(this.getClass(), tfilename);
+        final URLConnection urlConn1 = IOUtil.getResource(tfilename, this.getClass().getClassLoader(), this.getClass());
         Assert.assertNotNull(urlConn1);
 
         final File file2 = new File(tfilename2);
         file2.deleteOnExit();
         try {
             IOUtil.copyURLConn2File(urlConn1, file2);
-            final URLConnection urlConn2 = IOUtil.getResource(this.getClass(), tfilename2);
+            final URLConnection urlConn2 = IOUtil.getResource(tfilename2, this.getClass().getClassLoader(), this.getClass());
             Assert.assertNotNull(urlConn2);
 
             final BufferedInputStream bis = new BufferedInputStream( urlConn2.getInputStream() );