Refactoring common io code

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1765 232f8b59-042b-4e1e-8c03-345bb8c30851

5 files changed, 155 insertions, 108 deletions

diff --git a/src/classes/com/sun/opengl/util/io/Locator.java b/src/classes/com/sun/opengl/util/io/Locator.java
new file mode 100644
index 000000000..a321837f2
--- /dev/null
+++ b/src/classes/com/sun/opengl/util/io/Locator.java
@@ -0,0 +1,106 @@
+package com.sun.opengl.util.io;
+
+import javax.media.opengl.util.*;
+
+import java.util.*;
+import java.nio.*;
+import java.io.*;
+import java.net.*;
+
+/** Utilities for dealing with streams. */
+
+public class Locator {
+    private Locator() {}
+
+    /**
+     * Locates the resource using 'getResource(String path, ClassLoader cl)',
+     * with this context ClassLoader and the path as is,
+     * as well with the context's package name path plus the path.
+     *
+     * @see #getResource(String, ClassLoader)
+     */
+    public static URL getResource(Class context, String path) {
+        ClassLoader contextCL = (null!=context)?context.getClassLoader():null;
+        URL url = getResource(path, contextCL);
+        if (url == null && null!=context) {
+            // Try again by scoping the path within the class's package
+            String className = context.getName().replace('.', '/');
+            int lastSlash = className.lastIndexOf('/');
+            if (lastSlash >= 0) {
+                String tmpPath = className.substring(0, lastSlash + 1) + path;
+                url = getResource(tmpPath, contextCL);
+            }
+        }
+        return url;
+    }
+
+    /**
+     * Locates the resource using the ClassLoader's facility,
+     * the absolute URL and absolute file.
+     *
+     * @see ClassLoader#getResource(String)
+     * @see ClassLoader#getSystemResource(String)
+     * @see URL#URL(String)
+     * @see File#File(String)
+     */
+    public static URL getResource(String path, ClassLoader cl) {
+        URL url = null;
+        if (cl != null) {
+            url = cl.getResource(path);
+        } else {
+            url = ClassLoader.getSystemResource(path);
+        }
+        if(!urlExists(url)) {
+            url = null;
+            try {
+                url = new URL(path);
+            } catch (MalformedURLException e) { }
+        }
+        if(!urlExists(url)) {
+            url = null;
+            try {
+                File file = new File(path);
+                if(file.exists()) {
+                    url = file.toURL();
+                }
+            } catch (MalformedURLException e) {}
+        }
+        return url;
+    }
+
+    /**
+     * Generates a path for the 'relativeFile' relative to the 'absoluteFileLocation'
+     */
+    public static String getRelativeOf(String absoluteFileLocation, String relativeFile) {
+        File file = new File(absoluteFileLocation);
+        file = file.getParentFile();
+        while (file != null && relativeFile.startsWith("../")) {
+            file = file.getParentFile();
+            relativeFile = relativeFile.substring(3);
+        }
+        if (file != null) {
+            String res = new File(file, relativeFile).getPath();
+	        // Handle things on Windows
+            return res.replace('\\', '/');
+        } else {
+            return relativeFile;
+        }
+    }
+
+    /**
+     * Returns true, if the url exists,
+     * trying to open a connection.
+     */
+    public static boolean urlExists(URL url) {
+        boolean v = false;
+        if(null!=url) {
+            try {
+                URLConnection uc = url.openConnection();
+                v = true;
+            } catch (IOException ioe) { }
+        }
+        return v;
+    }
+
+}
+
diff --git a/src/classes/com/sun/opengl/util/io/StreamUtil.java b/src/classes/com/sun/opengl/util/io/StreamUtil.java
index 30cc0234a..70df3e075 100755
--- a/src/classes/com/sun/opengl/util/io/StreamUtil.java
+++ b/src/classes/com/sun/opengl/util/io/StreamUtil.java
@@ -39,16 +39,37 @@
 
 package com.sun.opengl.util.io;
 
+import javax.media.opengl.util.*;
+
 import java.io.*;
+import java.nio.*;
 
 /** Utilities for dealing with streams. */
 
 public class StreamUtil {
   private StreamUtil() {}
 
-  public static byte[] readAll(InputStream in) throws IOException {
-    in = new BufferedInputStream(in);
-    int avail = in.available();
+  public static byte[] readAll2Array(InputStream stream) throws IOException {
+    BytesRead bytesRead = readAll(stream);
+    byte[] data = bytesRead.data;
+    if (bytesRead.payloadLen != data.length) {
+      data = new byte[bytesRead.payloadLen];
+      System.arraycopy(bytesRead.data, 0, data, 0, bytesRead.payloadLen);
+    }
+    return data;
+  }
+
+  public static ByteBuffer readAll2Buffer(InputStream stream) throws IOException {
+        BytesRead bytesRead = readAll(stream);
+        return BufferUtil.newByteBuffer(bytesRead.data, 0, bytesRead.payloadLen);
+  }
+
+  private static BytesRead readAll(InputStream stream) throws IOException {
+    // FIXME: Shall we do this here ?
+    if( !(stream instanceof BufferedInputStream) ) {
+        stream = new BufferedInputStream(stream);
+    }
+    int avail = stream.available();
     byte[] data = new byte[avail];
     int numRead = 0;
     int pos = 0;
@@ -58,17 +79,22 @@ public class StreamUtil {
         System.arraycopy(data, 0, newData, 0, pos);
         data = newData;
       }
-      numRead = in.read(data, pos, avail);
+      numRead = stream.read(data, pos, avail);
       if (numRead >= 0) {
         pos += numRead;
       }
-      avail = in.available();
+      avail = stream.available();
     } while (avail > 0 && numRead >= 0);
-    if (pos != data.length) {
-      byte[] newData = new byte[pos];
-      System.arraycopy(data, 0, newData, 0, pos);
-      data = newData;
+
+    return new BytesRead(pos, data);
+  }
+
+  private static class BytesRead {
+    BytesRead(int payloadLen, byte[] data) {
+        this.payloadLen=payloadLen;
+        this.data=data;
     }
-    return data;
+    int payloadLen;
+    byte[] data;
   }
 }
diff --git a/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase b/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase
index 567432172..f1a957100 100755
--- a/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase
+++ b/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase
@@ -813,7 +813,7 @@ public class TextureIO {
                                           String fileSuffix) throws IOException {
             if (DDS.equals(fileSuffix) ||
                 DDSImage.isDDSImage(stream)) {
-                byte[] data = StreamUtil.readAll(stream);
+                byte[] data = StreamUtil.readAll2Array(stream);
                 ByteBuffer buf = ByteBuffer.wrap(data);
                 DDSImage image = DDSImage.read(buf);
                 return newTextureData(image, internalFormat, pixelFormat, mipmap);
diff --git a/src/classes/javax/media/opengl/glsl/ShaderCode.java b/src/classes/javax/media/opengl/glsl/ShaderCode.java
index e8b5555b6..0c404c460 100644
--- a/src/classes/javax/media/opengl/glsl/ShaderCode.java
+++ b/src/classes/javax/media/opengl/glsl/ShaderCode.java
@@ -3,6 +3,8 @@ package javax.media.opengl.glsl;
 
 import javax.media.opengl.*;
 import javax.media.opengl.util.*;
+import com.sun.opengl.util.io.StreamUtil;
+import com.sun.opengl.util.io.Locator;
 
 import java.util.*;
 import java.nio.*;
@@ -223,12 +225,12 @@ public class ShaderCode {
                 if (line.startsWith("#include ")) {
                     String includeFile = line.substring(9).trim();
                     // Try relative path first
-                    String next = makeRelative(path, includeFile);
-                    URL nextURL = getResource(next, context);
+                    String next = Locator.getRelativeOf(path, includeFile);
+                    URL nextURL = Locator.getResource(next, context);
                     if (nextURL == null) {
                         // Try absolute path
                         next = includeFile;
-                        nextURL = getResource(next, context);
+                        nextURL = Locator.getResource(next, context);
                     }
                     if (nextURL == null) {
                         // Fail
@@ -246,14 +248,14 @@ public class ShaderCode {
 
     public static String readShaderSource(Class context, String path) {
         ClassLoader contextCL = (null!=context)?context.getClassLoader():null;
-        URL url = getResource(path, contextCL);
+        URL url = Locator.getResource(path, contextCL);
         if (url == null && null!=context) {
             // Try again by scoping the path within the class's package
             String className = context.getName().replace('.', '/');
             int lastSlash = className.lastIndexOf('/');
             if (lastSlash >= 0) {
                 String tmpPath = className.substring(0, lastSlash + 1) + path;
-                url = getResource(tmpPath, contextCL);
+                url = Locator.getResource(tmpPath, contextCL);
                 if (url != null) {
                     path = tmpPath;
                 }
@@ -269,11 +271,11 @@ public class ShaderCode {
 
     public static ByteBuffer readShaderBinary(Class context, String path) {
         try {
-            URL url = getResource(context, path);
+            URL url = Locator.getResource(context, path);
             if (url == null) {
                 return null;
             }
-            return readAll(new BufferedInputStream(url.openStream()));
+            return StreamUtil.readAll2Buffer(new BufferedInputStream(url.openStream()));
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -283,94 +285,6 @@ public class ShaderCode {
     // Internals only below this point
     //
 
-    public static URL getResource(Class context, String path) {
-        ClassLoader contextCL = (null!=context)?context.getClassLoader():null;
-        URL url = getResource(path, contextCL);
-        if (url == null && null!=context) {
-            // Try again by scoping the path within the class's package
-            String className = context.getName().replace('.', '/');
-            int lastSlash = className.lastIndexOf('/');
-            if (lastSlash >= 0) {
-                String tmpPath = className.substring(0, lastSlash + 1) + path;
-                url = getResource(tmpPath, contextCL);
-            }
-        }
-        return url;
-    }
-
-    public static URL getResource(String path, ClassLoader context) {
-        URL url = null;
-        if (context != null) {
-            url = context.getResource(path);
-        } else {
-            url = ClassLoader.getSystemResource(path);
-        }
-        if(!urlExists(url)) {
-            url = null;
-            try {
-                url = new URL(path);
-            } catch (MalformedURLException e) { }
-        }
-        if(!urlExists(url)) {
-            url = null;
-            try {
-                File file = new File(path);
-                if(file.exists()) {
-                    url = file.toURL();
-                }
-            } catch (MalformedURLException e) {}
-        }
-        return url;
-    }
-
-    private static boolean urlExists(URL url) {
-        boolean v = false;
-        if(null!=url) {
-            try {
-                URLConnection uc = url.openConnection();
-                v = true;
-            } catch (IOException ioe) { }
-        }
-        return v;
-    }
-
-    private static String makeRelative(String context, String includeFile) {
-        File file = new File(context);
-        file = file.getParentFile();
-        while (file != null && includeFile.startsWith("../")) {
-            file = file.getParentFile();
-            includeFile = includeFile.substring(3);
-        }
-        if (file != null) {
-            String res = new File(file, includeFile).getPath();
-	    // Handle things on Windows
-            return res.replace('\\', '/');
-        } else {
-            return includeFile;
-        }
-    }
-
-    private static ByteBuffer readAll(InputStream stream) throws IOException {
-        byte[] data = new byte[1024];
-        int numRead = 0;
-        int pos = 0;
-        do {
-            int avail = data.length - pos;
-            if (avail == 0) {
-                int newSize = 2 * data.length;
-                byte[] newData = new byte[newSize];
-                System.arraycopy(data, 0, newData, 0, data.length);
-                data = newData;
-                avail = data.length - pos;
-            }
-            numRead = stream.read(data, pos, avail);
-            if (numRead > 0) {
-                pos += numRead;
-            }
-        } while (numRead >= 0);
-        ByteBuffer res = BufferUtil.newByteBuffer(data, 0, pos);
-        return res;
-    }
     protected String[][] shaderSource = null;
     protected Buffer     shaderBinary = null;
     protected int        shaderBinaryFormat = -1;
diff --git a/src/classes/javax/media/opengl/sdk/glsl/CompileShader.java b/src/classes/javax/media/opengl/sdk/glsl/CompileShader.java
index 398836527..1e239df9c 100755
--- a/src/classes/javax/media/opengl/sdk/glsl/CompileShader.java
+++ b/src/classes/javax/media/opengl/sdk/glsl/CompileShader.java
@@ -2,6 +2,7 @@ package javax.media.opengl.sdk.glsl;
 
 import javax.media.opengl.glsl.*;
 import javax.media.opengl.*;
+import com.sun.opengl.util.io.Locator;
 
 import java.io.*;
 import java.net.*;
@@ -49,7 +50,7 @@ public abstract class CompileShader {
         String justName = basename(resourceName);
         outName = justName.substring(0, justName.length() - suffixLen) +
                   ShaderCode.getFileSuffix(true, type);
-        URL resourceURL = ShaderCode.getResource(null, resourceName);
+        URL resourceURL = Locator.getResource(null, resourceName);
         String dirName = dirname(resourceURL.getPath());
 
         outName = dirName + File.separator + "bin" + File.separator + 
@@ -61,7 +62,7 @@ public abstract class CompileShader {
     public void processOneShader(String resourceName, String outName, int type)
         throws IOException, UnsupportedEncodingException, InterruptedException
     {
-        URL resourceURL = ShaderCode.getResource(null, resourceName);
+        URL resourceURL = Locator.getResource(null, resourceName);
         String dirName = dirname(resourceURL.getPath());
 
         String shader = ShaderCode.readShaderSource(null, resourceName);