Bug 1039: Rename GLAnimatorControl.UncaughtGLAnimatorExceptionHandler -> GLAnimatorControl.UncaughtExceptionHandler

3 files changed, 17 insertions, 17 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
index ed23a78ba..8b4e125fc 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
@@ -100,7 +100,7 @@ public abstract class AnimatorBase implements GLAnimatorControl {
     protected boolean printExceptions;
     protected boolean exclusiveContext;
     protected Thread userExclusiveContextThread;
-    protected UncaughtGLAnimatorExceptionHandler uncaughtExceptionHandler;
+    protected UncaughtExceptionHandler uncaughtExceptionHandler;
     protected FPSCounterImpl fpsCounter = new FPSCounterImpl();
 
     private final static Class<?> awtAnimatorImplClazz;
@@ -513,12 +513,12 @@ public abstract class AnimatorBase implements GLAnimatorControl {
     }
 
     @Override
-    public final UncaughtGLAnimatorExceptionHandler getUncaughtExceptionHandler() {
+    public final UncaughtExceptionHandler getUncaughtExceptionHandler() {
         return uncaughtExceptionHandler;
     }
 
     @Override
-    public final void setUncaughtExceptionHandler(final UncaughtGLAnimatorExceptionHandler handler) {
+    public final void setUncaughtExceptionHandler(final UncaughtExceptionHandler handler) {
         uncaughtExceptionHandler = handler;
     }
 
diff --git a/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java b/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java
index 50f7e9bbb..d14ada48b 100644
--- a/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java
+++ b/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java
@@ -34,14 +34,14 @@ package javax.media.opengl;
  */
 public interface GLAnimatorControl extends FPSCounter {
     /**
-     * A {@link GLAnimatorControl#setUncaughtExceptionHandler(UncaughtGLAnimatorExceptionHandler) registered}
-     * {@link UncaughtGLAnimatorExceptionHandler} instance is invoked when an {@link GLAnimatorControl animator} abruptly {@link #stop() stops}
+     * A {@link GLAnimatorControl#setUncaughtExceptionHandler(UncaughtExceptionHandler) registered}
+     * {@link UncaughtExceptionHandler} instance is invoked when an {@link GLAnimatorControl animator} abruptly {@link #stop() stops}
      * due to an uncaught exception from one of its {@link GLAutoDrawable}s.
      * @see #uncaughtException(GLAnimatorControl, GLAutoDrawable, Throwable)
-     * @see GLAnimatorControl#setUncaughtExceptionHandler(UncaughtGLAnimatorExceptionHandler)
+     * @see GLAnimatorControl#setUncaughtExceptionHandler(UncaughtExceptionHandler)
      * @since 2.2
      */
-    public static interface UncaughtGLAnimatorExceptionHandler {
+    public static interface UncaughtExceptionHandler {
         /**
          * Method invoked when the given {@link GLAnimatorControl} is {@link GLAnimatorControl#stop() stopped} due to the
          * given uncaught exception happened on the given {@link GLAutoDrawable}.
@@ -60,7 +60,7 @@ public interface GLAnimatorControl extends FPSCounter {
          * @param animator the {@link GLAnimatorControl}
          * @param drawable the causing {@link GLAutoDrawable}
          * @param cause the uncaught exception
-         * @see GLAnimatorControl#setUncaughtExceptionHandler(UncaughtGLAnimatorExceptionHandler)
+         * @see GLAnimatorControl#setUncaughtExceptionHandler(UncaughtExceptionHandler)
          * @since 2.2
          */
         void uncaughtException(final GLAnimatorControl animator, final GLAutoDrawable drawable, final Throwable cause);
@@ -215,22 +215,22 @@ public interface GLAnimatorControl extends FPSCounter {
     void remove(GLAutoDrawable drawable);
 
     /**
-     * Returns the {@link UncaughtGLAnimatorExceptionHandler} invoked when this {@link GLAnimatorControl animator} abruptly {@link #stop() stops}
+     * Returns the {@link UncaughtExceptionHandler} invoked when this {@link GLAnimatorControl animator} abruptly {@link #stop() stops}
      * due to an uncaught exception from one of its {@link GLAutoDrawable}s.
      * <p>
      * Default is <code>null</code>.
      * </p>
      * @since 2.2
      */
-    UncaughtGLAnimatorExceptionHandler getUncaughtExceptionHandler();
+    UncaughtExceptionHandler getUncaughtExceptionHandler();
 
     /**
      * Set the handler invoked when this {@link GLAnimatorControl animator} abruptly {@link #stop() stops}
      * due to an uncaught exception from one of its {@link GLAutoDrawable}s.
-     * @param handler the {@link UncaughtGLAnimatorExceptionHandler} to use as this {@link GLAnimatorControl animator}'s uncaught exception
+     * @param handler the {@link UncaughtExceptionHandler} to use as this {@link GLAnimatorControl animator}'s uncaught exception
      * handler. Pass <code>null</code> to unset the handler.
-     * @see UncaughtGLAnimatorExceptionHandler#uncaughtException(GLAnimatorControl, GLAutoDrawable, Throwable)
+     * @see UncaughtExceptionHandler#uncaughtException(GLAnimatorControl, GLAutoDrawable, Throwable)
      * @since 2.2
      */
-    void setUncaughtExceptionHandler(final UncaughtGLAnimatorExceptionHandler handler);
+    void setUncaughtExceptionHandler(final UncaughtExceptionHandler handler);
 }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLException01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLException01NEWT.java
index 83d5e9cc5..cdbe3af94 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLException01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLException01NEWT.java
@@ -190,22 +190,22 @@ public class TestGLException01NEWT extends UITestCase {
         RuntimeException exceptionAtInvoke = null;
         RuntimeException exceptionAtDispose = null;
         final List<AnimException> exceptionsAtGLAnimatorControl = new ArrayList<AnimException>();
-        final GLAnimatorControl.UncaughtGLAnimatorExceptionHandler uncaughtGLAnimatorExceptionHandler;
+        final GLAnimatorControl.UncaughtExceptionHandler uncaughtExceptionHandler;
 
         final Animator animator;
         if( onThread ) {
             animator = null;
-            uncaughtGLAnimatorExceptionHandler = null;
+            uncaughtExceptionHandler = null;
         } else {
             animator = new Animator(glWindow);
-            uncaughtGLAnimatorExceptionHandler = new GLAnimatorControl.UncaughtGLAnimatorExceptionHandler() {
+            uncaughtExceptionHandler = new GLAnimatorControl.UncaughtExceptionHandler() {
                 @Override
                 public void uncaughtException(final GLAnimatorControl animator, final GLAutoDrawable drawable, final Throwable cause) {
                     final AnimException ae = new AnimException(animator.getThread(), animator, drawable, cause);
                     exceptionsAtGLAnimatorControl.add(ae);
                     dumpThrowable(ae);
                 } };
-            animator.setUncaughtExceptionHandler(uncaughtGLAnimatorExceptionHandler);
+            animator.setUncaughtExceptionHandler(uncaughtExceptionHandler);
         }
 
         glWindow.setSize(width, height);