Minor: fix imports, JAWTUtil: query headless 1st (faster), NativeWindowFactory added nonAWT ToolkitLock create method

1 files changed, 2 insertions, 3 deletions

diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java
index ff62c9521..9f120e9ab 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/jawt/JAWTUtil.java
@@ -40,7 +40,6 @@ import com.jogamp.nativewindow.impl.*;
 
 import javax.media.nativewindow.*;
 
-import com.jogamp.common.util.locks.RecursiveLock;
 
 import java.awt.GraphicsEnvironment;
 import java.lang.reflect.*;
@@ -178,13 +177,13 @@ public class JAWTUtil {
   }
 
   public static void lockToolkit() throws NativeWindowException {
-    if(!isJava2DQueueFlusherThread() && !headlessMode) {
+    if(!headlessMode && !isJava2DQueueFlusherThread()) {
         awtLock();
     }
   }
 
   public static void unlockToolkit() {
-    if(!isJava2DQueueFlusherThread() && !headlessMode) {
+    if(!headlessMode && !isJava2DQueueFlusherThread()) {
         awtUnlock();
     }
   }