summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl/classes')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/Animator.java2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/av/AudioSinkFactory.java2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayerFactory.java2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java4
-rw-r--r--src/jogl/classes/javax/media/opengl/GLDrawableFactory.java2
-rw-r--r--src/jogl/classes/javax/media/opengl/GLProfile.java2
-rw-r--r--src/jogl/classes/javax/media/opengl/awt/GLCanvas.java2
-rw-r--r--src/jogl/classes/javax/media/opengl/awt/GLJPanel.java2
-rw-r--r--src/jogl/classes/jogamp/opengl/GLContextImpl.java2
-rw-r--r--src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java2
-rw-r--r--src/jogl/classes/jogamp/opengl/GLDrawableHelper.java6
-rw-r--r--src/jogl/classes/jogamp/opengl/SharedResourceRunner.java2
-rw-r--r--src/jogl/classes/jogamp/opengl/awt/Java2D.java10
-rw-r--r--src/jogl/classes/jogamp/opengl/egl/EGLContext.java2
-rw-r--r--src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java2
-rw-r--r--src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java6
-rw-r--r--src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java4
-rw-r--r--src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java10
18 files changed, 32 insertions, 32 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/Animator.java b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
index 799069292..31938612a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/Animator.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
@@ -194,7 +194,7 @@ public class Animator extends AnimatorBase {
}
} catch( ThreadDeath td) {
if(DEBUG) {
- System.err.println("Animator Catched: "+td.getClass().getName()+": "+td.getMessage());
+ System.err.println("Animator caught: "+td.getClass().getName()+": "+td.getMessage());
td.printStackTrace();
}
} finally {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/av/AudioSinkFactory.java b/src/jogl/classes/com/jogamp/opengl/util/av/AudioSinkFactory.java
index 2cfd40df7..386b1e085 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/av/AudioSinkFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/av/AudioSinkFactory.java
@@ -59,7 +59,7 @@ public class AudioSinkFactory {
return audioSink;
}
} catch (Throwable t) {
- if(AudioSink.DEBUG) { System.err.println("Catched "+t.getClass().getName()+": "+t.getMessage()); t.printStackTrace(); }
+ if(AudioSink.DEBUG) { System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage()); t.printStackTrace(); }
}
}
return null;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayerFactory.java b/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayerFactory.java
index 248e265f5..558d59630 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayerFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayerFactory.java
@@ -60,7 +60,7 @@ public class GLMediaPlayerFactory {
if(((Boolean)ReflectionUtil.callStaticMethod(implName, isAvailableMethodName, null, null, cl)).booleanValue()) {
return (GLMediaPlayer) ReflectionUtil.createInstance(implName, cl);
}
- } catch (Throwable t) { if(GLMediaPlayer.DEBUG) { System.err.println("Catched "+t.getClass().getName()+": "+t.getMessage()); t.printStackTrace(); } }
+ } catch (Throwable t) { if(GLMediaPlayer.DEBUG) { System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage()); t.printStackTrace(); } }
return null;
}
}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
index 5cd384c58..ad5331a28 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
@@ -173,7 +173,7 @@ public class ShaderUtil {
}
}
} catch (GLException gle) {
- System.err.println("Catched Exception on thread "+Thread.currentThread().getName());
+ System.err.println("Caught exception on thread "+Thread.currentThread().getName());
gle.printStackTrace();
}
}
@@ -203,7 +203,7 @@ public class ShaderUtil {
info.shaderCompilerAvailable = new Boolean(v);
queryOK = true;
} catch (GLException gle) {
- System.err.println("Catched Exception on thread "+Thread.currentThread().getName());
+ System.err.println("Caught exception on thread "+Thread.currentThread().getName());
gle.printStackTrace();
}
if(!queryOK) {
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index 9b823a6f8..077daf6e9 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -222,7 +222,7 @@ public abstract class GLDrawableFactory {
gldf.resetDisplayGamma();
gldf.shutdownImpl();
} catch (Throwable t) {
- System.err.println("GLDrawableFactory.shutdownImpl: Catched "+t.getClass().getName()+" during factory shutdown #"+(i+1)+"/"+gldfCount+" "+gldf.getClass().getName());
+ System.err.println("GLDrawableFactory.shutdownImpl: Caught "+t.getClass().getName()+" during factory shutdown #"+(i+1)+"/"+gldfCount+" "+gldf.getClass().getName());
if( DEBUG ) {
t.printStackTrace();
}
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 3d1925214..addc977d8 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -1568,7 +1568,7 @@ public class GLProfile {
return ReflectionUtil.getConstructor(clazzName, glObject ? ctorGLArgs : ctorProcArgs, false, cl);
} catch (Throwable t) {
if( DEBUG ) {
- System.err.println("Catched: "+t.getMessage());
+ System.err.println("Caught: "+t.getMessage());
t.printStackTrace();
}
return null;
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index 9086d1a78..e3a7838e7 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -995,7 +995,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
}
}
} catch (NoninvertibleTransformException nte) {
- System.err.println("Catched: Inversion failed of: "+g2d.getTransform());
+ System.err.println("Caught: Inversion failed of: "+g2d.getTransform());
nte.printStackTrace();
}
if( DEBUG ) {
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index 1cf0348ba..558970df6 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -838,7 +838,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
}
}
} catch (NoninvertibleTransformException nte) {
- System.err.println("Catched: Inversion failed of: "+g2d.getTransform());
+ System.err.println("Caught: Inversion failed of: "+g2d.getTransform());
nte.printStackTrace();
}
if( DEBUG ) {
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index c815556ff..b88bdcdae 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -1158,7 +1158,7 @@ public abstract class GLContextImpl extends GLContext {
finalizeInit = ReflectionUtil.getMethod(gl.getClass(), "finalizeInit", new Class<?>[]{ });
} catch ( Throwable t ) {
if(DEBUG) {
- System.err.println("Catched "+t.getClass().getName()+": "+t.getMessage());
+ System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage());
t.printStackTrace();
}
}
diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
index 2dbd6dee3..a401944ef 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
@@ -97,7 +97,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
}
} catch (GLException gle) {
if(DEBUG) {
- System.err.println("Catched Exception on thread "+getThreadName());
+ System.err.println("Caught exception on thread "+getThreadName());
gle.printStackTrace();
}
}
diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
index c0603383a..bf791822f 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
@@ -1045,7 +1045,7 @@ public class GLDrawableHelper {
}
flushGLRunnables();
} catch (Exception e) {
- System.err.println("Catched Exception on thread "+getThreadName());
+ System.err.println("Caught exception on thread "+getThreadName());
e.printStackTrace();
}
if (lastContext != null) {
@@ -1131,7 +1131,7 @@ public class GLDrawableHelper {
try {
context.release();
} catch (Exception e) {
- System.err.println("Catched Exception on thread "+getThreadName());
+ System.err.println("Caught exception on thread "+getThreadName());
e.printStackTrace();
}
}
@@ -1237,7 +1237,7 @@ public class GLDrawableHelper {
context.release();
ctxReleased = true;
} catch (Exception e) {
- System.err.println("Catched Exception on thread "+getThreadName());
+ System.err.println("Caught exception on thread "+getThreadName());
e.printStackTrace();
}
}
diff --git a/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java b/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java
index 283ecdb9d..1688d1044 100644
--- a/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java
+++ b/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java
@@ -343,7 +343,7 @@ public class SharedResourceRunner implements Runnable {
try {
impl.releaseSharedResource(iter.next());
} catch (Throwable t) {
- System.err.println("Catched Exception on thread "+getThreadName());
+ System.err.println("Caught exception on thread "+getThreadName());
t.printStackTrace();
}
}
diff --git a/src/jogl/classes/jogamp/opengl/awt/Java2D.java b/src/jogl/classes/jogamp/opengl/awt/Java2D.java
index 886cd9368..5735b875e 100644
--- a/src/jogl/classes/jogamp/opengl/awt/Java2D.java
+++ b/src/jogl/classes/jogamp/opengl/awt/Java2D.java
@@ -121,7 +121,7 @@ public class Java2D {
if (DEBUG) {
System.err.println("Checking for Java2D/OpenGL support");
}
- Throwable catched = null;
+ Throwable caught = null;
try {
isHeadless = true;
// Figure out whether the default graphics configuration is an
@@ -269,7 +269,7 @@ public class Java2D {
}
}
} catch (Exception e) {
- catched = e;
+ caught = e;
if (DEBUG) {
System.err.println("Info: Disabling Java2D/JOGL integration");
}
@@ -281,12 +281,12 @@ public class Java2D {
// The AWT is running in headless mode, so the Java 2D / JOGL bridge is clearly disabled
} catch (Error e) {
// issued on OSX Java7: java.lang.Error: Could not find class: sun.awt.HeadlessGraphicsEnvironment
- catched = e;
+ caught = e;
}
if (DEBUG) {
- if(null != catched) {
- catched.printStackTrace();
+ if(null != caught) {
+ caught.printStackTrace();
}
System.err.println("JOGL/Java2D OGL Pipeline active " + isOGLPipelineActive + ", resourceCompatible "+isOGLPipelineResourceCompatible);
}
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
index f89ded4f6..da1c8aa47 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
@@ -173,7 +173,7 @@ public class EGLContext extends GLContextImpl {
try {
// might be unavailable on EGL < 1.2
if( !EGL.eglBindAPI(EGL.EGL_OPENGL_ES_API) ) {
- throw new GLException("Catched: eglBindAPI to ES failed , error "+toHexString(EGL.eglGetError()));
+ throw new GLException("Caught: eglBindAPI to ES failed , error "+toHexString(EGL.eglGetError()));
}
} catch (GLException glex) {
if (DEBUG) {
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
index 9ee0134f1..e50cb7262 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
@@ -545,7 +545,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
}
} catch (Throwable t) {
if(DEBUG) {
- System.err.println("Catched Exception on thread "+getThreadName());
+ System.err.println("Caught exception on thread "+getThreadName());
t.printStackTrace();
}
success = false;
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
index 19a334b75..dadad1e15 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
@@ -785,7 +785,7 @@ public class MacOSXCGLContext extends GLContextImpl
ols.detachSurfaceLayer();
}
} catch(Throwable t) {
- System.err.println("Catched Exception on thread "+getThreadName());
+ System.err.println("Caught exception on thread "+getThreadName());
t.printStackTrace();
}
CGL.releaseNSOpenGLLayer(cmd.nsOpenGLLayer);
@@ -963,7 +963,7 @@ public class MacOSXCGLContext extends GLContextImpl
}
} catch (GLException gle) {
if(DEBUG) {
- System.err.println("MacOSXCGLContext.NSOpenGLImpl.release: INFO: glFlush() catched exception:");
+ System.err.println("MacOSXCGLContext.NSOpenGLImpl.release: INFO: glFlush() caught exception:");
gle.printStackTrace();
}
}
@@ -1211,7 +1211,7 @@ public class MacOSXCGLContext extends GLContextImpl
}
} catch (GLException gle) {
if(DEBUG) {
- System.err.println("MacOSXCGLContext.CGLImpl.release: INFO: glFlush() catched exception:");
+ System.err.println("MacOSXCGLContext.CGLImpl.release: INFO: glFlush() caught exception:");
gle.printStackTrace();
}
}
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
index 9ce71cfe9..8931045d1 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -273,7 +273,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
}
} catch (GLException gle) {
if (DEBUG) {
- System.err.println("MacOSXCGLDrawableFactory.createShared: INFO: makeCurrent catched exception:");
+ System.err.println("MacOSXCGLDrawableFactory.createShared: INFO: makeCurrent caught exception:");
gle.printStackTrace();
}
} finally {
@@ -281,7 +281,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
sharedContext.destroy();
} catch (GLException gle) {
if (DEBUG) {
- System.err.println("MacOSXCGLDrawableFactory.createShared: INFO: destroy catched exception:");
+ System.err.println("MacOSXCGLDrawableFactory.createShared: INFO: destroy caught exception:");
gle.printStackTrace();
}
}
diff --git a/src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java b/src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java
index 2c3adf957..6817ece8f 100644
--- a/src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java
+++ b/src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java
@@ -123,7 +123,7 @@ public class ALAudioSink implements AudioSink {
_alExt = ALFactory.getALExt();
} catch(Throwable t) {
if( DEBUG ) {
- System.err.println("ALAudioSink: Catched "+t.getClass().getName()+": "+t.getMessage());
+ System.err.println("ALAudioSink: Caught "+t.getClass().getName()+": "+t.getMessage());
t.printStackTrace();
}
}
@@ -287,7 +287,7 @@ public class ALAudioSink implements AudioSink {
alc.alcDestroyContext(context);
} catch (Throwable t) {
if( DEBUG ) {
- System.err.println("Catched "+t.getClass().getName()+": "+t.getMessage());
+ System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage());
t.printStackTrace();
}
}
@@ -495,7 +495,7 @@ public class ALAudioSink implements AudioSink {
al.alDeleteBuffers(alBufferNames.length, alBufferNames, 0);
} catch (Throwable t) {
if( DEBUG ) {
- System.err.println("Catched "+t.getClass().getName()+": "+t.getMessage());
+ System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage());
t.printStackTrace();
}
}
@@ -525,7 +525,7 @@ public class ALAudioSink implements AudioSink {
al.alDeleteSources(1, alSource, 0);
} catch (Throwable t) {
if( DEBUG ) {
- System.err.println("Catched "+t.getClass().getName()+": "+t.getMessage());
+ System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage());
t.printStackTrace();
}
}
@@ -541,7 +541,7 @@ public class ALAudioSink implements AudioSink {
alc.alcCloseDevice(device);
} catch (Throwable t) {
if( DEBUG ) {
- System.err.println("Catched "+t.getClass().getName()+": "+t.getMessage());
+ System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage());
t.printStackTrace();
}
}