From d96486967efcfb6f43226da9fa60cbc3d68ab323 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 28 Jun 2008 14:30:26 +0000
Subject: 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
---
 src/classes/com/sun/opengl/impl/jawt/JAWTUtil.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/classes/com/sun/opengl/impl/jawt/JAWTUtil.java')

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
-- 
cgit v1.2.3