Adapt to GlueGen commit b1eb7ca6b9d7dec7ff62c1f1e8ef0a0545724d2f: Function- RunnableTask adds PrintStream 'exceptionOut' argument in ctor.

6 files changed, 10 insertions, 8 deletions

diff --git a/src/newt/classes/jogamp/newt/DefaultEDTUtil.java b/src/newt/classes/jogamp/newt/DefaultEDTUtil.java
index d8d04e79f..3c015d3ec 100644
--- a/src/newt/classes/jogamp/newt/DefaultEDTUtil.java
+++ b/src/newt/classes/jogamp/newt/DefaultEDTUtil.java
@@ -178,7 +178,7 @@ public class DefaultEDTUtil implements EDTUtil {
                             // drop task and don't wait
                             task = null;
                             System.err.println(Thread.currentThread()+": Warning: Default-EDT is about (3) to stop and stopped already, dropping task. Remaining tasks: "+edt.tasks.size()+" - "+edt);
-                            if(true || DEBUG) {
+                            if(DEBUG) {
                                 Thread.dumpStack();
                             }
                         }
@@ -190,7 +190,8 @@ public class DefaultEDTUtil implements EDTUtil {
                         synchronized(edt.tasks) {
                             rTask = new RunnableTask(task,
                                                      wait ? rTaskLock : null,
-                                                     true /* always catch and report Exceptions, don't disturb EDT */);
+                                                     true /* always catch and report Exceptions, don't disturb EDT */, 
+                                                     wait ? null : System.err);
                             if(stop) {
                                 rTask.setAttachment(new Boolean(true)); // mark final task, will imply shouldStop:=true
                             }
diff --git a/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java b/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java
index cecb1dd7e..fc9bbb848 100644
--- a/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java
@@ -160,7 +160,8 @@ public class AWTEDTUtil implements EDTUtil {
                 } else {            
                     rTask = new RunnableTask(task,
                                              wait ? rTaskLock : null,
-                                             true /* always catch and report Exceptions, don't disturb EDT */);
+                                             true /* always catch and report Exceptions, don't disturb EDT */, 
+                                             wait ? null : System.err);
                     AWTEDTExecutor.singleton.invoke(false, rTask);
                 }
             }
diff --git a/src/newt/classes/jogamp/newt/swt/SWTEDTUtil.java b/src/newt/classes/jogamp/newt/swt/SWTEDTUtil.java
index 7297e5858..2008b5ea4 100644
--- a/src/newt/classes/jogamp/newt/swt/SWTEDTUtil.java
+++ b/src/newt/classes/jogamp/newt/swt/SWTEDTUtil.java
@@ -172,7 +172,8 @@ public class SWTEDTUtil implements EDTUtil {
                 } else {
                     rTask = new RunnableTask(task,
                                              wait ? rTaskLock : null,
-                                             true /* always catch and report Exceptions, don't disturb EDT */);
+                                             true /* always catch and report Exceptions, don't disturb EDT */, 
+                                             wait ? null : System.err);
                     swtDisplay.asyncExec(rTask);
                 }
             }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java
index eab1a37e3..43415136d 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java
@@ -80,7 +80,7 @@ public class TestFBOAutoDrawableDeadlockAWT extends UITestCase {
             Assert.assertTrue(EventQueue.isDispatchThread());
             JAWTUtil.lockToolkit();
             try {
-                final RunnableTask rTask = new RunnableTask(pbufferCreationAction, new Object(), false);                    
+                final RunnableTask rTask = new RunnableTask(pbufferCreationAction, new Object(), false, null);                    
                 System.err.println("BB.0: "+rTask.getSyncObject());
                 synchronized (rTask.getSyncObject()) {
                     System.err.println("BB.1: "+rTask.getSyncObject());
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java
index 90934f1b5..3f97cbc54 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java
@@ -81,7 +81,7 @@ public class TestPBufferDeadlockAWT extends UITestCase {
             Assert.assertTrue(EventQueue.isDispatchThread());
             JAWTUtil.lockToolkit();
             try {
-                final RunnableTask rTask = new RunnableTask(pbufferCreationAction, new Object(), false);                    
+                final RunnableTask rTask = new RunnableTask(pbufferCreationAction, new Object(), false, null);                    
                 System.err.println("BB.0: "+rTask.getSyncObject());
                 synchronized (rTask.getSyncObject()) {
                     System.err.println("BB.1: "+rTask.getSyncObject());
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java b/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java
index 4dd3bb98a..05a24272c 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java
@@ -33,7 +33,6 @@ import java.util.ArrayList ;
 
 import javax.media.opengl.GLProfile ;
 
-import org.junit.After;
 import org.junit.Assert ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
@@ -342,7 +341,7 @@ public abstract class BaseNewtEventModifiers extends UITestCase {
         
         Throwable throwable = null;
         // final Object sync = new Object();
-        final RunnableTask rt = new RunnableTask( testAction, null, true );
+        final RunnableTask rt = new RunnableTask( testAction, null, true, System.err );
         try {
             // synchronized(sync) {
                 new Thread(rt, "Test-Thread").start();