From 16e23f079b1e5fdc15b64bf1593cbda8e8dcffc0 Mon Sep 17 00:00:00 2001
From: Kenneth Russel <kbrussel@alum.mit.edu>
Date: Fri, 13 Jan 2006 07:29:23 +0000
Subject: 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/trunk@538 232f8b59-042b-4e1e-8c03-345bb8c30851
---
 make/build.xml               |  8 +++-----
 make/glu-CustomJavaCode.java | 14 +++++++-------
 make/glu-common.cfg          |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'make')

diff --git a/make/build.xml b/make/build.xml
index daec80ed8..ba85a0436 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -240,12 +240,12 @@
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
         <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 Draft Public Review Specification" />
         <property name="javadoc.overview" value="spec-overview.html" />
-        <property name="javadoc.packagenames" value="javax.media.opengl,javax.media.opengl.glu,com.sun.opengl.utils" />
         <property name="javadoc.spec.packagenames" value="javax.media.opengl,javax.media.opengl.glu" />
+        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.sun.opengl.util,com.sun.opengl.util.texture,com.sun.opengl.util.texture.spi" />
         <property name="javadoc.dev.packagenames.win32"  value="com.sun.opengl.impl.windows" />
         <property name="javadoc.dev.packagenames.x11"    value="com.sun.opengl.impl.x11" />
         <property name="javadoc.dev.packagenames.macosx" value="com.sun.opengl.impl.macosx" />
-        <property name="javadoc.dev.packagenames" value="javax.media.opengl,javax.media.opengl.glu,com.sun.opengl.impl,com.sun.opengl.utils,com.sun.gluegen,com.sun.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="javax.media.opengl,javax.media.opengl.glu,com.sun.opengl.impl,com.sun.opengl.util,com.sun.gluegen,com.sun.gluegen.runtime" />
 	<property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
     
@@ -918,9 +918,7 @@
             <fileset dir="${classes}">
                 <include name="javax/media/opengl/**" />
                 <include name="com/sun/gluegen/runtime/**" />
-                <include name="com/sun/opengl/impl/**" />
-                <include name="com/sun/opengl/utils/**" />
-                <include name="com/sun/opengl/cg/**" />
+                <include name="com/sun/opengl/**" />
             </fileset>
         </jar>
 
diff --git a/make/glu-CustomJavaCode.java b/make/glu-CustomJavaCode.java
index 56a3fc0c4..ffa3a0242 100644
--- a/make/glu-CustomJavaCode.java
+++ b/make/glu-CustomJavaCode.java
@@ -1259,13 +1259,13 @@ private ByteBuffer copyToByteBuffer(Buffer buf) {
     if (buf.position() == 0) {
       return (ByteBuffer) buf;
     }
-    return BufferUtils.copyByteBuffer((ByteBuffer) buf);
+    return BufferUtil.copyByteBuffer((ByteBuffer) buf);
   } else if (buf instanceof ShortBuffer) {
-    return BufferUtils.copyShortBufferAsByteBuffer((ShortBuffer) buf);
+    return BufferUtil.copyShortBufferAsByteBuffer((ShortBuffer) buf);
   } else if (buf instanceof IntBuffer) {
-    return BufferUtils.copyIntBufferAsByteBuffer((IntBuffer) buf);
+    return BufferUtil.copyIntBufferAsByteBuffer((IntBuffer) buf);
   } else if (buf instanceof FloatBuffer) {
-    return BufferUtils.copyFloatBufferAsByteBuffer((FloatBuffer) buf);
+    return BufferUtil.copyFloatBufferAsByteBuffer((FloatBuffer) buf);
   } else {
     throw new IllegalArgumentException("Unsupported buffer type (must be one of byte, short, int, or float)");
   }
@@ -1280,11 +1280,11 @@ private int gluScaleImageJava( int format, int widthin, int heightin,
   if( dataout instanceof ByteBuffer ) {
     out = (ByteBuffer)dataout;
   } else if( dataout instanceof ShortBuffer ) {
-    out = BufferUtils.newByteBuffer(dataout.remaining() * BufferUtils.SIZEOF_SHORT);
+    out = BufferUtil.newByteBuffer(dataout.remaining() * BufferUtil.SIZEOF_SHORT);
   } else if ( dataout instanceof IntBuffer ) {
-    out = BufferUtils.newByteBuffer(dataout.remaining() * BufferUtils.SIZEOF_INT);
+    out = BufferUtil.newByteBuffer(dataout.remaining() * BufferUtil.SIZEOF_INT);
   } else if ( dataout instanceof FloatBuffer ) {
-    out = BufferUtils.newByteBuffer(dataout.remaining() * BufferUtils.SIZEOF_FLOAT);
+    out = BufferUtil.newByteBuffer(dataout.remaining() * BufferUtil.SIZEOF_FLOAT);
   } else {
     throw new IllegalArgumentException("Unsupported destination buffer type (must be byte, short, int, or float)");
   }
diff --git a/make/glu-common.cfg b/make/glu-common.cfg
index e0a5b150a..f99e874ca 100644
--- a/make/glu-common.cfg
+++ b/make/glu-common.cfg
@@ -26,7 +26,7 @@ Import com.sun.opengl.impl.tessellator.GLUtessellatorImpl
 Import com.sun.opengl.impl.error.Error
 Import com.sun.opengl.impl.mipmap.Mipmap
 Import com.sun.opengl.impl.registry.Registry
-Import com.sun.opengl.utils.*
+Import com.sun.opengl.util.*
 Import java.security.*
 
 # Custom Java code for GLU class
-- 
cgit v1.2.3