summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2008-12-30 21:30:18 +0000
committerKenneth Russel <[email protected]>2008-12-30 21:30:18 +0000
commit68fe3be6df92adcff103bde0c2a0d1cd0e5e0680 (patch)
tree062631939fa52a6c72787d2f1f15d0aac74f50a7
parenta17d339a11e70f2aea6c6bf5115c22a0f4226ff1 (diff)
Moved FileUtil and StreamUtil classes back into com.sun.opengl.util
package. Moved TGAWriter back into com.sun.opengl.util package to prevent creating a new package for a single class. Updated implementation and demos. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JOGL_2_SANDBOX@312 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
-rwxr-xr-xsrc/demos/misc/TiledRendering.java4
-rw-r--r--src/demos/proceduralTexturePhysics/Water.java2
-rwxr-xr-xsrc/demos/texture/TextureConvert.java2
-rwxr-xr-xsrc/demos/util/Cubemap.java2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/demos/misc/TiledRendering.java b/src/demos/misc/TiledRendering.java
index 2743b07..7b3c41b 100755
--- a/src/demos/misc/TiledRendering.java
+++ b/src/demos/misc/TiledRendering.java
@@ -1,9 +1,9 @@
package demos.misc;
-import com.sun.opengl.impl.io.FileUtil;
+import com.sun.opengl.util.FileUtil;
+import com.sun.opengl.util.TGAWriter;
import com.sun.opengl.util.awt.ImageUtil;
import com.sun.opengl.util.gl2.TileRenderer;
-import com.sun.opengl.util.io.TGAWriter;
import demos.gears.Gears;
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferByte;
diff --git a/src/demos/proceduralTexturePhysics/Water.java b/src/demos/proceduralTexturePhysics/Water.java
index 3acf6b9..bf6f980 100644
--- a/src/demos/proceduralTexturePhysics/Water.java
+++ b/src/demos/proceduralTexturePhysics/Water.java
@@ -33,7 +33,7 @@
package demos.proceduralTexturePhysics;
-import com.sun.opengl.impl.io.FileUtil;
+import com.sun.opengl.util.FileUtil;
import com.sun.opengl.util.texture.Texture;
import com.sun.opengl.util.texture.TextureData;
import com.sun.opengl.util.texture.TextureIO;
diff --git a/src/demos/texture/TextureConvert.java b/src/demos/texture/TextureConvert.java
index cd0a033..13180fc 100755
--- a/src/demos/texture/TextureConvert.java
+++ b/src/demos/texture/TextureConvert.java
@@ -39,7 +39,7 @@
package demos.texture;
-import com.sun.opengl.impl.io.FileUtil;
+import com.sun.opengl.util.FileUtil;
import com.sun.opengl.util.texture.Texture;
import com.sun.opengl.util.texture.TextureData;
import com.sun.opengl.util.texture.TextureIO;
diff --git a/src/demos/util/Cubemap.java b/src/demos/util/Cubemap.java
index 61b942a..405fc38 100755
--- a/src/demos/util/Cubemap.java
+++ b/src/demos/util/Cubemap.java
@@ -39,7 +39,7 @@
package demos.util;
-import com.sun.opengl.impl.io.FileUtil;
+import com.sun.opengl.util.FileUtil;
import com.sun.opengl.util.texture.Texture;
import com.sun.opengl.util.texture.TextureData;
import com.sun.opengl.util.texture.TextureIO;