1 files changed, 4 insertions, 11 deletions
diff --git a/src/junit/com/jogamp/test/junit/jogl/awt/TestSwingAWT01GLn.java b/src/junit/com/jogamp/test/junit/jogl/awt/TestSwingAWT01GLn.java
index 4559ee936..c330d48a0 100644
--- a/src/junit/com/jogamp/test/junit/jogl/awt/TestSwingAWT01GLn.java
+++ b/src/junit/com/jogamp/test/junit/jogl/awt/TestSwingAWT01GLn.java
@@ -106,23 +106,16 @@ public class TestSwingAWT01GLn extends UITestCase {
 
             };
 
-            //swing on EDT..
-            if(window instanceof JFrame) {
-                invokeAndWait(test);
-            }else{
-                test.run();
-            }
+            // AWT / Swing on EDT..
+            invokeAndWait(test);
 
             Animator animator = new Animator(glCanvas[0]);
             animator.start();
             Thread.sleep(500);
             animator.stop();
 
-            if(window instanceof JFrame) {
-                invokeAndWait(cleanup);
-            }else{
-                cleanup.run();
-            }
+            // AWT / Swing on EDT..
+            invokeAndWait(cleanup);
         }
     }