summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bien <[email protected]>2010-03-27 23:31:01 +0100
committerMichael Bien <[email protected]>2010-03-27 23:31:01 +0100
commitf3bc93b003c05684e48d75eee9107c16a9dc7283 (patch)
tree379d21f119d4d2bd78eb78a48639bea87295acf5
parent3f72e907e869370b98dc7519ae5fc53681376450 (diff)
refactoring part 4 (remaining files): renamed com.sun.opengl -> com.jogamp.opengl.
-rw-r--r--doxygen/doxygen-all-pub.cfg2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/cg/CgException.java (renamed from src/jogl/classes/com/sun/opengl/cg/CgException.java)2
-rw-r--r--src/jogl/classes/com/sun/openmax/OMXInstance.java16
-rwxr-xr-xsrc/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java12
-rwxr-xr-xsrc/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java8
-rw-r--r--src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java2
-rw-r--r--src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java2
-rw-r--r--src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java2
-rw-r--r--src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java2
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java2
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java2
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java2
-rwxr-xr-xtest/Issue326Test1.java6
-rwxr-xr-xtest/Issue326Test2.java2
-rwxr-xr-xtest/Issue344Base.java4
15 files changed, 33 insertions, 33 deletions
diff --git a/doxygen/doxygen-all-pub.cfg b/doxygen/doxygen-all-pub.cfg
index 8bf4685cb..3cac3e651 100644
--- a/doxygen/doxygen-all-pub.cfg
+++ b/doxygen/doxygen-all-pub.cfg
@@ -461,7 +461,7 @@ WARN_LOGFILE =
INPUT = ../src/jogl/classes/javax
INPUT += ../build-x86_64/jogl/gensrc/classes/javax
-INPUT += ../src/jogl/classes/com/sun/opengl/util
+INPUT += ../src/jogl/classes/com/jogamp/opengl/util
INPUT += ../src/newt/classes/com/sun/javafx/newt
# If the value of the INPUT tag contains directories, you can use the
diff --git a/src/jogl/classes/com/sun/opengl/cg/CgException.java b/src/jogl/classes/com/jogamp/opengl/cg/CgException.java
index 3380bb540..8bfd9e23e 100644
--- a/src/jogl/classes/com/sun/opengl/cg/CgException.java
+++ b/src/jogl/classes/com/jogamp/opengl/cg/CgException.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.cg;
+package com.jogamp.opengl.cg;
/**
* A generic exception for errors that occur throughout the NVidia Cg
diff --git a/src/jogl/classes/com/sun/openmax/OMXInstance.java b/src/jogl/classes/com/sun/openmax/OMXInstance.java
index 2eff166d2..84bd87809 100644
--- a/src/jogl/classes/com/sun/openmax/OMXInstance.java
+++ b/src/jogl/classes/com/sun/openmax/OMXInstance.java
@@ -3,12 +3,12 @@ package com.sun.openmax;
import javax.media.opengl.*;
import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
-import com.sun.opengl.impl.egl.EGL;
-import com.sun.opengl.impl.egl.EGLContext;
-import com.sun.opengl.impl.egl.EGLDrawable;
-import com.sun.opengl.impl.egl.EGLExt;
+import com.jogamp.opengl.impl.egl.EGL;
+import com.jogamp.opengl.impl.egl.EGLContext;
+import com.jogamp.opengl.impl.egl.EGLDrawable;
+import com.jogamp.opengl.impl.egl.EGLExt;
import java.net.URL;
import java.nio.ByteBuffer;
@@ -50,13 +50,13 @@ public class OMXInstance {
protected long o_totalFrames = 0; // duration in frames
static class EGLImageTexture {
- public EGLImageTexture(com.sun.opengl.util.texture.Texture t, long i, long s) {
+ public EGLImageTexture(com.jogamp.opengl.util.texture.Texture t, long i, long s) {
texture = t; image = i; sync = s;
}
public String toString() {
return "EGLImageTexture[" + texture + ", image " + image + ", sync "+sync+"]";
}
- protected com.sun.opengl.util.texture.Texture texture;
+ protected com.jogamp.opengl.util.texture.Texture texture;
protected long image;
protected long sync;
}
@@ -219,7 +219,7 @@ public class OMXInstance {
_setStreamEGLImageTexture2D(moviePtr, i, tex, image, sync);
eglImgTexs[i] = new EGLImageTexture(
- com.sun.opengl.util.texture.TextureIO.newTexture(tex,
+ com.jogamp.opengl.util.texture.TextureIO.newTexture(tex,
javax.media.opengl.GL2.GL_TEXTURE_2D,
width,
height,
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
index 9772d1a99..bf80ec7b3 100755
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
@@ -42,12 +42,12 @@ import javax.media.opengl.GL2;
import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLEventListener;
import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.texture.awt.AWTTextureIO;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.Animator;
import java.awt.AlphaComposite;
import java.awt.Color;
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
index cd02d5d25..bdb8bd95a 100755
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
@@ -32,10 +32,10 @@
package com.jogamp.opengl.test.junit.texture.util.gl2;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
import javax.media.opengl.GL;
import javax.media.opengl.GL2ES1;
import javax.media.opengl.GL2;
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
index 0425014df..7cf2e3ff5 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
@@ -37,7 +37,7 @@ import java.lang.reflect.*;
import java.nio.*;
/** Internal copy of selected routines from BufferUtil to avoid
- outward dependencies on com.sun.opengl.util package. */
+ outward dependencies on com.jogamp.opengl.util package. */
public class InternalBufferUtil {
public static final int SIZEOF_BYTE = 1;
public static final int SIZEOF_SHORT = 2;
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
index aac01e990..6a8f8cdb2 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
@@ -65,7 +65,7 @@ public class JAWTUtil {
Method m=null;
if(!headlessMode) {
try {
- jC = Class.forName("com.sun.opengl.impl.awt.Java2D");
+ jC = Class.forName("com.jogamp.opengl.impl.awt.Java2D");
m = jC.getMethod("isQueueFlusherThread", null);
ok = true;
} catch (Exception e) {}
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
index e809d2cdc..98010b2f1 100644
--- a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
@@ -36,7 +36,7 @@ package com.sun.javafx.newt.opengl;
import com.sun.javafx.newt.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.GLDrawableHelper;
+import com.jogamp.opengl.impl.GLDrawableHelper;
import java.util.*;
/**
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
index debe9e9b9..1b74aebc3 100644
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
@@ -34,7 +34,7 @@
package com.sun.javafx.newt.opengl.broadcom.egl;
import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.egl.*;
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
index 11672dde3..8446ec20f 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
@@ -34,7 +34,7 @@
package com.sun.javafx.newt.opengl.broadcom.egl;
import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
import javax.media.nativewindow.*;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
index 5aeae75ea..9e328a223 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
@@ -35,7 +35,7 @@ package com.sun.javafx.newt.opengl.kd;
import com.sun.javafx.newt.*;
import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.egl.*;
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
index 605e9c064..9919d1f6f 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
@@ -35,7 +35,7 @@ package com.sun.javafx.newt.opengl.kd;
import com.sun.javafx.newt.*;
import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
import javax.media.nativewindow.*;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;
diff --git a/test/Issue326Test1.java b/test/Issue326Test1.java
index 42b6ec0c7..217c2819b 100755
--- a/test/Issue326Test1.java
+++ b/test/Issue326Test1.java
@@ -13,8 +13,8 @@ import javax.media.opengl.GLCanvas;
import javax.media.opengl.GLEventListener;
import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.j2d.TextRenderer;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.j2d.TextRenderer;
/**
* Demonstrates corruption with older versions of TextRenderer. Two
@@ -65,7 +65,7 @@ public class Issue326Test1 extends Frame implements GLEventListener {
gl.glLoadIdentity();
tr.beginRendering(800,800);
- tr.draw( "die Marktwirtschaft. Da regelt sich � angeblich", 16, 32);
+ tr.draw( "die Marktwirtschaft. Da regelt sich � angeblich", 16, 32);
tr.draw( "Hello World! This text is scrambled", 16, 16);
tr.endRendering();
diff --git a/test/Issue326Test2.java b/test/Issue326Test2.java
index f2258c858..10ec4417b 100755
--- a/test/Issue326Test2.java
+++ b/test/Issue326Test2.java
@@ -2,7 +2,7 @@ import java.awt.Font;
import java.awt.Frame;
import java.awt.event.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.j2d.*;
+import com.jogamp.opengl.util.j2d.*;
/**
* Another test case demonstrating corruption with older version of
diff --git a/test/Issue344Base.java b/test/Issue344Base.java
index 548e3ec21..6d0c99290 100755
--- a/test/Issue344Base.java
+++ b/test/Issue344Base.java
@@ -7,8 +7,8 @@ import java.awt.geom.*;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.j2d.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.j2d.*;
/** Test Code adapted from TextCube.java (in JOGL demos)
*