Fix: TextureIO.java* DDSImage.java* (Relocation of io utils)

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

4 files changed, 7 insertions, 7 deletions

diff --git a/src/classes/com/sun/opengl/impl/io/StreamUtil.java b/src/classes/com/sun/opengl/impl/io/StreamUtil.java
index 1d6a42ae1..948159223 100755
--- a/src/classes/com/sun/opengl/impl/io/StreamUtil.java
+++ b/src/classes/com/sun/opengl/impl/io/StreamUtil.java
@@ -50,7 +50,7 @@ public class StreamUtil {
   private StreamUtil() {}
 
   public static byte[] readAll2Array(InputStream stream) throws IOException {
-    BytesRead bytesRead = readAll(stream);
+    BytesRead bytesRead = readAllImpl(stream);
     byte[] data = bytesRead.data;
     if (bytesRead.payloadLen != data.length) {
       data = new byte[bytesRead.payloadLen];
@@ -60,11 +60,11 @@ public class StreamUtil {
   }
 
   public static ByteBuffer readAll2Buffer(InputStream stream) throws IOException {
-        BytesRead bytesRead = readAll(stream);
+        BytesRead bytesRead = readAllImpl(stream);
         return BufferUtil.newByteBuffer(bytesRead.data, 0, bytesRead.payloadLen);
   }
 
-  private static BytesRead readAll(InputStream stream) throws IOException {
+  private static BytesRead readAllImpl(InputStream stream) throws IOException {
     // FIXME: Shall we do this here ?
     if( !(stream instanceof BufferedInputStream) ) {
         stream = new BufferedInputStream(stream);
diff --git a/src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp b/src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
index 72e07b4bb..c6b6271da 100755
--- a/src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
+++ b/src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
@@ -47,7 +47,7 @@ import java.util.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.io.*;
+import com.sun.opengl.impl.io.*;
 import com.sun.opengl.util.texture.spi.*;
 
 /** <P> Provides input and output facilities for both loading OpenGL
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 f1a957100..d9ae5b6c4 100755
--- a/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase
+++ b/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase
@@ -47,7 +47,7 @@ import java.util.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.io.*;
+import com.sun.opengl.impl.io.*;
 import com.sun.opengl.util.texture.spi.*;
 
 /** <P> Provides input and output facilities for both loading OpenGL
diff --git a/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp b/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
index de776a2e1..eadae84f8 100755
--- a/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
+++ b/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
@@ -44,7 +44,7 @@ import java.nio.*;
 
 import javax.media.opengl.*;
 import javax.media.opengl.util.*;
-import com.sun.opengl.util.io.*;
+import com.sun.opengl.impl.io.*;
 import com.sun.opengl.util.texture.*;
 
 /** A reader and writer for DirectDraw Surface (.dds) files, which are
@@ -699,7 +699,7 @@ public class DDSImage {
         header = new Header();
         header.read(leInput);
         fixupHeader();
-        buf = ByteBuffer.wrap(StreamUtil.readAll(input));
+        buf = StreamUtil.readAll2Buffer(input);
     }
 
     private void initFromData(int d3dFormat,