From df85f0dfafc09e147f9d422adf5ee8eabf67977b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 27 Sep 2011 11:59:06 +0200 Subject: Adapt to GlueGen's Lock ChangeSet: e4baba27507ce78e64a150ec6f69fb96f5721a34 ; Use generics --- src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/nativewindow/classes/jogamp') diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java index 65fb31d72..2c80392ad 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java @@ -37,6 +37,7 @@ package jogamp.nativewindow.jawt; +import com.jogamp.common.util.locks.LockFactory; import com.jogamp.common.util.locks.RecursiveLock; import java.awt.Component; @@ -112,13 +113,13 @@ public abstract class JAWTWindow implements NativeWindow { // NativeSurface // - private RecursiveLock surfaceLock = new RecursiveLock(); + private RecursiveLock surfaceLock = LockFactory.createRecursiveLock(); protected abstract int lockSurfaceImpl() throws NativeWindowException; public final int lockSurface() throws NativeWindowException { surfaceLock.lock(); - int res = surfaceLock.getRecursionCount() == 0 ? LOCK_SURFACE_NOT_READY : LOCK_SUCCESS; + int res = surfaceLock.getHoldCount() == 1 ? LOCK_SURFACE_NOT_READY : LOCK_SUCCESS; // new lock ? if ( LOCK_SURFACE_NOT_READY == res ) { try { @@ -145,7 +146,7 @@ public abstract class JAWTWindow implements NativeWindow { public final void unlockSurface() { surfaceLock.validateLocked(); - if (surfaceLock.getRecursionCount() == 0) { + if (surfaceLock.getHoldCount() == 1) { final AbstractGraphicsDevice adevice = config.getScreen().getDevice(); try { unlockSurfaceImpl(); -- cgit v1.2.3