Renamed com.sun.opengl.utils to com.sun.opengl.util. Moved

TextureIO-related classes to com.sun.opengl.util.texture and
TextureProvider, TextureWriter and format-specific readers to
com.sun.opengl.util.texture.spi. Renamed BufferUtils to BufferUtil.
Added ImageUtil and FileUtil. Cleaned up javadoc. Updated demos.
Cleaned up some imports.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@165 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

2 files changed, 5 insertions, 4 deletions

diff --git a/src/demos/texture/TestTexture.java b/src/demos/texture/TestTexture.java
index 923fbd6..e6fcde2 100755
--- a/src/demos/texture/TestTexture.java
+++ b/src/demos/texture/TestTexture.java
@@ -46,7 +46,7 @@ import javax.swing.*;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.utils.*;
+import com.sun.opengl.util.texture.*;
 
 /** Demonstrates simple use of the TextureIO texture loader. */
 
@@ -106,7 +106,7 @@ public class TestTexture implements GLEventListener {
     menuBar.add(menu);
 
     canvas.addGLEventListener(this);
-    frame.add(canvas);
+    frame.getContentPane().add(canvas);
     frame.setJMenuBar(menuBar);
     frame.setSize(800, 600);
     frame.show();
diff --git a/src/demos/texture/TextureConvert.java b/src/demos/texture/TextureConvert.java
index b0c6bbd..f4af495 100755
--- a/src/demos/texture/TextureConvert.java
+++ b/src/demos/texture/TextureConvert.java
@@ -43,7 +43,8 @@ import java.io.*;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.utils.*;
+import com.sun.opengl.util.*;
+import com.sun.opengl.util.texture.*;
 
 /** Demonstrates how the TextureIO subsystem may be used to convert
     textures between multiple file formats, including texture
@@ -72,7 +73,7 @@ public class TextureConvert {
     GL gl = pbuffer.getGL();
 
     boolean attemptCompression = false;
-    if (TextureIO.DDS.equals(TextureIO.getFileSuffix(outputFile))) {
+    if (TextureIO.DDS.equals(FileUtil.getFileSuffix(outputFile))) {
       if (gl.isExtensionAvailable("GL_EXT_texture_compression_s3tc") ||
           gl.isExtensionAvailable("GL_NV_texture_compression_vtc")) {
         attemptCompression = true;