diff options
author | Sven Gothel <[email protected]> | 2011-02-22 07:44:41 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-02-22 07:44:41 +0100 |
commit | 282b52c1daaef63d65b5c0f4a633061980f6a3f6 (patch) | |
tree | 67cc9917db8efcf9707017ce00e2011e4170964d /src/newt/classes/com | |
parent | ab1d8180e3a20eeb11df48bed49ca5d28e34df4b (diff) |
Cleanup NEWT MainThread, using new AWTEDTUtil impl. / Sync AWTCanvas with GLCanvas changes
Cleanup NEWT MainThread, using new AWTEDTUtil impl.
- Allow simple singleton AWTEDTUtil to be used for AWTDisplay and more ..
Sync AWTCanvas with GLCanvas changes
- Latest GLCanvas changes around addNotify() had to be synced
Diffstat (limited to 'src/newt/classes/com')
-rw-r--r-- | src/newt/classes/com/jogamp/newt/util/MainThread.java | 86 |
1 files changed, 38 insertions, 48 deletions
diff --git a/src/newt/classes/com/jogamp/newt/util/MainThread.java b/src/newt/classes/com/jogamp/newt/util/MainThread.java index 607645052..9f66fefe6 100644 --- a/src/newt/classes/com/jogamp/newt/util/MainThread.java +++ b/src/newt/classes/com/jogamp/newt/util/MainThread.java @@ -37,16 +37,25 @@ package com.jogamp.newt.util; -import java.util.*; import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; -import java.security.*; - -import javax.media.nativewindow.*; - -import com.jogamp.common.util.*; -import com.jogamp.newt.*; -import jogamp.newt.*; +import java.security.AccessControlContext; +import java.security.AccessController; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Timer; +import java.util.TimerTask; + +import javax.media.nativewindow.NativeWindowFactory; + +import com.jogamp.common.util.ReflectionUtil; +import com.jogamp.common.util.RunnableTask; +import com.jogamp.newt.Display; +import jogamp.newt.Debug; +import jogamp.newt.NEWTJNILibLoader; +import jogamp.newt.awt.AWTEDTUtil; /** * NEWT Utility class MainThread<P> @@ -103,16 +112,11 @@ public class MainThread implements EDTUtil { private static Map/*<Display, Runnable>*/ pumpMessageDisplayMap = new HashMap(); private static boolean useMainThread = false; - private static Class cAWTEventQueue=null; - private static Method mAWTInvokeAndWait=null; - private static Method mAWTInvokeLater=null; - private static Method mAWTIsDispatchThread=null; static class MainAction extends Thread { private String mainClassName; private String[] mainClassArgs; - private Class mainClass; private Method mainClassMain; public MainAction(String mainClassName, String[] mainClassArgs) { @@ -237,33 +241,28 @@ public class MainThread implements EDTUtil { } } - private void initAWTReflection() { - if(null == cAWTEventQueue) { - ClassLoader cl = MainThread.class.getClassLoader(); - cAWTEventQueue = ReflectionUtil.getClass("java.awt.EventQueue", true, cl); - mAWTInvokeAndWait = ReflectionUtil.getMethod(cAWTEventQueue, "invokeAndWait", new Class[] { java.lang.Runnable.class }, cl); - mAWTInvokeLater = ReflectionUtil.getMethod(cAWTEventQueue, "invokeLater", new Class[] { java.lang.Runnable.class }, cl); - mAWTIsDispatchThread = ReflectionUtil.getMethod(cAWTEventQueue, "isDispatchThread", new Class[] { }, cl); + final public void reset() { + if(NativeWindowFactory.isAWTAvailable()) { + AWTEDTUtil.getSingleton().reset(); } - } - - public void reset() { // nop } - public void start() { + final public void start() { + if(NativeWindowFactory.isAWTAvailable()) { + AWTEDTUtil.getSingleton().start(); + } // nop } - public boolean isCurrentThreadEDT() { + final public boolean isCurrentThreadEDT() { if(NativeWindowFactory.isAWTAvailable()) { - initAWTReflection(); - return ((Boolean) ReflectionUtil.callMethod(null, mAWTIsDispatchThread, null) ).booleanValue(); + return AWTEDTUtil.getSingleton().isCurrentThreadEDT(); } return isRunning() && mainThread == Thread.currentThread() ; } - public boolean isRunning() { + final public boolean isRunning() { if( useMainThread ) { synchronized(taskWorkerLock) { return isRunning; @@ -284,11 +283,11 @@ public class MainThread implements EDTUtil { } } - public void invokeStop(Runnable r) { + final public void invokeStop(Runnable r) { invokeImpl(true, r, true); } - public void invoke(boolean wait, Runnable r) { + final public void invoke(boolean wait, Runnable r) { invokeImpl(wait, r, false); } @@ -298,22 +297,7 @@ public class MainThread implements EDTUtil { } if(NativeWindowFactory.isAWTAvailable()) { - initAWTReflection(); - - // handover to AWT MainThread .. - try { - if ( ((Boolean) ReflectionUtil.callMethod(null, mAWTIsDispatchThread, null) ).booleanValue() ) { - r.run(); - return; - } - if(wait) { - ReflectionUtil.callMethod(null, mAWTInvokeAndWait, new Object[] { r }); - } else { - ReflectionUtil.callMethod(null, mAWTInvokeLater, new Object[] { r }); - } - } catch (Exception e) { - throw new NativeWindowException(e); - } + AWTEDTUtil.getSingleton().invokeImpl(wait, r, stop); return; } @@ -355,10 +339,16 @@ public class MainThread implements EDTUtil { } } - public void waitUntilIdle() { + final public void waitUntilIdle() { + if(NativeWindowFactory.isAWTAvailable()) { + AWTEDTUtil.getSingleton().waitUntilIdle(); + } } - public void waitUntilStopped() { + final public void waitUntilStopped() { + if(NativeWindowFactory.isAWTAvailable()) { + AWTEDTUtil.getSingleton().waitUntilStopped(); + } } private void waitUntilRunning() { |