diff options
author | Michael Bien <[email protected]> | 2010-03-27 23:31:01 +0100 |
---|---|---|
committer | Michael Bien <[email protected]> | 2010-03-27 23:31:01 +0100 |
commit | f3bc93b003c05684e48d75eee9107c16a9dc7283 (patch) | |
tree | 379d21f119d4d2bd78eb78a48639bea87295acf5 /src/jogl/classes/com/sun | |
parent | 3f72e907e869370b98dc7519ae5fc53681376450 (diff) |
refactoring part 4 (remaining files): renamed com.sun.opengl -> com.jogamp.opengl.
Diffstat (limited to 'src/jogl/classes/com/sun')
-rw-r--r-- | src/jogl/classes/com/sun/opengl/cg/CgException.java | 67 | ||||
-rw-r--r-- | src/jogl/classes/com/sun/openmax/OMXInstance.java | 16 |
2 files changed, 8 insertions, 75 deletions
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, |