diff options
author | Sven Gothel <[email protected]> | 2008-06-28 14:30:26 +0000 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2008-06-28 14:30:26 +0000 |
commit | d96486967efcfb6f43226da9fa60cbc3d68ab323 (patch) | |
tree | adbda7e1a8fce8f3300c46dbba398783e4039a1e /src/classes/com/sun/opengl/impl/jawt/JAWTUtil.java | |
parent | 8d00556b137564705a4ae8b963804d0adab078fb (diff) |
3rd round cdcfp - compile clean.
Re-adding cdcfp:
com/sun/opengl/impl/glu/mipmap/*
com/sun/opengl/impl/GLPbufferImpl.java
Using 'BufferUtil.nativeOrder(ByteBuffer)'
to set up the native byte order.
'BufferUtil.nativeOrder' is now public.
GLDrawableFactory:
- removed 'hardcoded' awt attribute.
Cleanup NEWT's AWT wrapping implementation.
- NativeWindowFactory incooperates with the wrapping property.
Bugs on X11/NEWT/AWT:
- no events
- deadlock at shutdown
- deadlock if EGLDrawable with AWT get's locked
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1700 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/classes/com/sun/opengl/impl/jawt/JAWTUtil.java')
-rw-r--r-- | src/classes/com/sun/opengl/impl/jawt/JAWTUtil.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/classes/com/sun/opengl/impl/jawt/JAWTUtil.java b/src/classes/com/sun/opengl/impl/jawt/JAWTUtil.java index 790d965e9..c542b4703 100644 --- a/src/classes/com/sun/opengl/impl/jawt/JAWTUtil.java +++ b/src/classes/com/sun/opengl/impl/jawt/JAWTUtil.java @@ -64,7 +64,7 @@ public class JAWTUtil { private static boolean lockedToolkit; - public static void lockToolkit() throws GLException { + public static synchronized void lockToolkit() throws GLException { if (lockedToolkit) { throw new GLException("Toolkit already locked"); } @@ -84,13 +84,13 @@ public class JAWTUtil { JAWT.getJAWT().Lock(); } } catch (Exception e) { j2dOk=false; } - } + } if(!j2dOk) { JAWT.getJAWT().Lock(); } } - public static void unlockToolkit() { + public static synchronized void unlockToolkit() { if (lockedToolkit) { if (headlessMode) { // Workaround for running (to some degree) in headless |