5 files changed, 7 insertions, 8 deletions
diff --git a/src/demos/util/Bunny.java b/src/demos/util/Bunny.java
index 50033b2..b9565d6 100644
--- a/src/demos/util/Bunny.java
+++ b/src/demos/util/Bunny.java
@@ -42,7 +42,6 @@ package demos.util;
 import java.io.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.utils.*;
 
 /** Renders a bunny.
 
diff --git a/src/demos/util/Cubemap.java b/src/demos/util/Cubemap.java
index fc7cd16..52e2977 100755
--- a/src/demos/util/Cubemap.java
+++ b/src/demos/util/Cubemap.java
@@ -42,7 +42,8 @@ package demos.util;
 import java.io.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.utils.*;
+import com.sun.opengl.util.*;
+import com.sun.opengl.util.texture.*;
 
 /** Helper class for loading cubemaps from a set of textures. */
 
@@ -65,7 +66,7 @@ public class Cubemap {
       String resourceName = basename + suffixes[i] + "." + suffix;
       TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
                                                   mipmapped,
-                                                  TextureIO.getFileSuffix(resourceName));
+                                                  FileUtil.getFileSuffix(resourceName));
       if (data == null) {
         throw new IOException("Unable to load texture " + resourceName);
       }
diff --git a/src/demos/util/DxTex.java b/src/demos/util/DxTex.java
index 2fb65de..433a2b4 100644
--- a/src/demos/util/DxTex.java
+++ b/src/demos/util/DxTex.java
@@ -47,7 +47,7 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.filechooser.*;
 
-import com.sun.opengl.utils.*;
+import com.sun.opengl.util.texture.spi.*;
 
 /** Simplified clone of DxTex tool from the DirectX SDK, written in
     Java using the DDSImage; tests fetching of texture data */
diff --git a/src/demos/util/ObjReader.java b/src/demos/util/ObjReader.java
index 1204ed5..51da398 100644
--- a/src/demos/util/ObjReader.java
+++ b/src/demos/util/ObjReader.java
@@ -43,7 +43,7 @@ import java.io.*;
 import java.nio.*;
 import java.util.*;
 
-import com.sun.opengl.utils.*;
+import com.sun.opengl.util.*;
 
 /** Simple parser for Wavefront .OBJ files. Does not support all file
     options -- currently requires vertices and normals (only) to be
@@ -310,10 +310,10 @@ public class ObjReader {
     newVertices.trim();
     newVertexNormals.trim();
     newIndices.trim();
-    vertices = BufferUtils.newFloatBuffer(newVertices.size());
+    vertices = BufferUtil.newFloatBuffer(newVertices.size());
     vertices.put(newVertices.getData());
     vertices.rewind();
-    normals = BufferUtils.newFloatBuffer(newVertexNormals.size());
+    normals = BufferUtil.newFloatBuffer(newVertexNormals.size());
     normals.put(newVertexNormals.getData());
     normals.rewind();
     faceIndices = newIndices;
diff --git a/src/demos/util/Triceratops.java b/src/demos/util/Triceratops.java
index 6256a0c..c7fa115 100644
--- a/src/demos/util/Triceratops.java
+++ b/src/demos/util/Triceratops.java
@@ -42,7 +42,6 @@ package demos.util;
 import java.io.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.utils.*;
 
 /** Renders a triceratops. <P>