8 files changed, 14 insertions, 13 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java b/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java
index 83414ddb0..1d68a402a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java
@@ -34,7 +34,6 @@ import javax.media.opengl.GLDrawable;
 import javax.media.opengl.GLEventListener;
 
 import jogamp.opengl.Debug;
-import jogamp.opengl.GLEventListenerState;
 
 /**
  * Providing utility functions dealing w/ {@link GLDrawable}s, {@link GLAutoDrawable} and their {@link GLEventListener}.
diff --git a/src/jogl/classes/jogamp/opengl/GLEventListenerState.java b/src/jogl/classes/com/jogamp/opengl/util/GLEventListenerState.java
index 2385460fe..ff250d27f 100644
--- a/src/jogl/classes/jogamp/opengl/GLEventListenerState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLEventListenerState.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package jogamp.opengl;
+package com.jogamp.opengl.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,6 +45,8 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLRunnable;
 
+import jogamp.opengl.Debug;
+
 import com.jogamp.nativewindow.MutableGraphicsConfiguration;
 
 /**
@@ -52,12 +54,11 @@ import com.jogamp.nativewindow.MutableGraphicsConfiguration;
  * to relocating all its {@link GLEventListener} w/ their operating {@link GLContext}, etc.
  * The components are:
  * <ul>
- *   <li>{@link AbstractGraphicsScreen}</li>
- *   <li>{@link GLCapabilitiesImmutable}</li>
- *   <li>{@link GLContext} operating all {@link GLEventListener}</li>
- *   <li>All {@link GLEventListener}</li>
- *   <li>All {@link GLEventListener}'s init state</li>
+ *   <li>{@link GLContext}</li>
+ *   <li>All {@link GLEventListener}, incl. their init state</li>
  *   <li>{@link GLAnimatorControl}</li>
+ *   <li>{@link GLCapabilitiesImmutable} for compatibility check</li>
+ *   <li>{@link AbstractGraphicsScreen} for compatibility check and preserving the {@link AbstractGraphicsDevice}</li>
  * </ul>
  * <p>
  * A GLEventListenerState instance can be created while components are {@link #moveFrom(GLAutoDrawable) moved from} a {@link GLAutoDrawable}
@@ -70,7 +71,7 @@ import com.jogamp.nativewindow.MutableGraphicsConfiguration;
  * <p>
  */
 public class GLEventListenerState {
-    private static final boolean DEBUG = GLDrawableImpl.DEBUG;
+    private static final boolean DEBUG = Debug.debug("GLDrawable");
     
     private GLEventListenerState(AbstractGraphicsScreen upstreamScreen, boolean proxyOwnsUpstreamDevice, AbstractGraphicsScreen screen, GLCapabilitiesImmutable caps, 
                                  GLContext context, int count, GLAnimatorControl anim) {
diff --git a/src/jogl/classes/jogamp/opengl/GLAutoDrawableBase.java b/src/jogl/classes/jogamp/opengl/GLAutoDrawableBase.java
index cab768e3a..e6652cfac 100644
--- a/src/jogl/classes/jogamp/opengl/GLAutoDrawableBase.java
+++ b/src/jogl/classes/jogamp/opengl/GLAutoDrawableBase.java
@@ -50,6 +50,7 @@ import javax.media.opengl.GLRunnable;
 
 import com.jogamp.common.util.locks.RecursiveLock;
 import com.jogamp.opengl.GLAutoDrawableDelegate;
+import com.jogamp.opengl.util.GLEventListenerState;
 
 
 /**
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/GLContextDrawableSwitchBase.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/GLContextDrawableSwitchBase.java
index f26a96a90..da86c8741 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/GLContextDrawableSwitchBase.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/GLContextDrawableSwitchBase.java
@@ -41,7 +41,6 @@ import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 
 import jogamp.nativewindow.jawt.JAWTUtil;
-import jogamp.opengl.GLEventListenerState;
 
 import com.jogamp.newt.opengl.GLWindow;
 
@@ -49,6 +48,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
 import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
 import com.jogamp.opengl.test.junit.util.GLEventListenerCounter;
 import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.util.GLEventListenerState;
 
 import org.junit.Assert;
 import org.junit.Assume;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch10NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch10NEWT.java
index a1611992e..694b40214 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch10NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch10NEWT.java
@@ -44,10 +44,10 @@ import javax.media.opengl.GLDrawable;
 import javax.media.opengl.GLDrawableFactory;
 import javax.media.opengl.GLProfile;
 
-import jogamp.opengl.GLEventListenerState;
 
 import com.jogamp.opengl.GLAutoDrawableDelegate;
 import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.GLEventListenerState;
 
 import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
 import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch11NewtAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch11NewtAWT.java
index 9ad89c4be..269af714d 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch11NewtAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch11NewtAWT.java
@@ -33,9 +33,9 @@ import java.io.IOException;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
 
-import jogamp.opengl.GLEventListenerState;
 
 import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.GLEventListenerState;
 
 import com.jogamp.opengl.test.junit.util.GLEventListenerCounter;
 
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch12AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch12AWT.java
index aa75fa1b1..129b2e80e 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch12AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch12AWT.java
@@ -34,9 +34,9 @@ import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
 
 import jogamp.nativewindow.jawt.JAWTUtil;
-import jogamp.opengl.GLEventListenerState;
 
 import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.GLEventListenerState;
 
 import com.jogamp.opengl.test.junit.util.GLEventListenerCounter;
 
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch21Newt2AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch21Newt2AWT.java
index d56054886..4f21d1626 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch21Newt2AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch21Newt2AWT.java
@@ -33,9 +33,9 @@ import java.io.IOException;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
 
-import jogamp.opengl.GLEventListenerState;
 
 import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.GLEventListenerState;
 
 import com.jogamp.opengl.test.junit.util.GLEventListenerCounter;