From f3bc93b003c05684e48d75eee9107c16a9dc7283 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Sat, 27 Mar 2010 23:31:01 +0100 Subject: refactoring part 4 (remaining files): renamed com.sun.opengl -> com.jogamp.opengl. --- doxygen/doxygen-all-pub.cfg | 2 +- .../classes/com/jogamp/opengl/cg/CgException.java | 67 ++++++++++++++++++++++ .../classes/com/sun/opengl/cg/CgException.java | 67 ---------------------- src/jogl/classes/com/sun/openmax/OMXInstance.java | 16 +++--- .../opengl/test/junit/texture/awt/Texture1.java | 12 ++-- .../texture/util/gl2/TextureGL2ListenerDraw1.java | 8 +-- .../sun/nativewindow/impl/InternalBufferUtil.java | 2 +- .../com/sun/nativewindow/impl/jawt/JAWTUtil.java | 2 +- .../com/sun/javafx/newt/opengl/GLWindow.java | 2 +- .../javafx/newt/opengl/broadcom/egl/Display.java | 2 +- .../javafx/newt/opengl/broadcom/egl/Window.java | 2 +- .../com/sun/javafx/newt/opengl/kd/KDDisplay.java | 2 +- .../com/sun/javafx/newt/opengl/kd/KDWindow.java | 2 +- test/Issue326Test1.java | 6 +- test/Issue326Test2.java | 2 +- test/Issue344Base.java | 4 +- 16 files changed, 99 insertions(+), 99 deletions(-) create mode 100644 src/jogl/classes/com/jogamp/opengl/cg/CgException.java delete mode 100644 src/jogl/classes/com/sun/opengl/cg/CgException.java 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/jogamp/opengl/cg/CgException.java b/src/jogl/classes/com/jogamp/opengl/cg/CgException.java new file mode 100644 index 000000000..8bfd9e23e --- /dev/null +++ b/src/jogl/classes/com/jogamp/opengl/cg/CgException.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistribution in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of Sun Microsystems, Inc. or the names of + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * This software is provided "AS IS," without a warranty of any kind. ALL + * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN + * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR + * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR + * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR + * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR + * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE + * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, + * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF + * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * + * You acknowledge that this software is not designed or intended for use + * in the design, construction, operation or maintenance of any nuclear + * facility. + * + * Sun gratefully acknowledges that this software was originally authored + * and developed by Kenneth Bradley Russell and Christopher John Kline. + */ + +package com.jogamp.opengl.cg; + +/** + * A generic exception for errors that occur throughout the NVidia Cg + * binding, as a substitute for {@link RuntimeException}. + */ +public class CgException extends RuntimeException { + /** Constructs a CgException object. */ + public CgException() { + super(); + } + + /** Constructs a CgException object with the specified detail message. */ + public CgException(String message) { + super(message); + } + + /** Constructs a CgException object with the specified detail message and + root cause. */ + public CgException(String message, Throwable cause) { + super(message, cause); + } + + /** Constructs a CgException object with the specified root cause. */ + public CgException(Throwable cause) { + super(cause); + } +} diff --git a/src/jogl/classes/com/sun/opengl/cg/CgException.java b/src/jogl/classes/com/sun/opengl/cg/CgException.java deleted file mode 100644 index 3380bb540..000000000 --- a/src/jogl/classes/com/sun/opengl/cg/CgException.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * - Redistribution of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistribution in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * Neither the name of Sun Microsystems, Inc. or the names of - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, - * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN - * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR - * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR - * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR - * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR - * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE - * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, - * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF - * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * - * You acknowledge that this software is not designed or intended for use - * in the design, construction, operation or maintenance of any nuclear - * facility. - * - * Sun gratefully acknowledges that this software was originally authored - * and developed by Kenneth Bradley Russell and Christopher John Kline. - */ - -package com.sun.opengl.cg; - -/** - * A generic exception for errors that occur throughout the NVidia Cg - * binding, as a substitute for {@link RuntimeException}. - */ -public class CgException extends RuntimeException { - /** Constructs a CgException object. */ - public CgException() { - super(); - } - - /** Constructs a CgException object with the specified detail message. */ - public CgException(String message) { - super(message); - } - - /** Constructs a CgException object with the specified detail message and - root cause. */ - public CgException(String message, Throwable cause) { - super(message, cause); - } - - /** Constructs a CgException object with the specified root cause. */ - public CgException(Throwable cause) { - super(cause); - } -} 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) * -- cgit v1.2.3