From b76bffcd2ff88fe4bd8e2321a5f0e54bf4c192ec Mon Sep 17 00:00:00 2001
From: "jul..om" <julien.gouesse@gmail.com>
Date: Thu, 25 Oct 2012 23:03:04 +0000
Subject: [PATCH] Fixes a minor threading problem and removes useless imports

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9896 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../com/jme3/renderer/jogl/JoglRenderer.java  |  5 ---
 .../com/jme3/system/jogl/JoglDisplay.java     | 32 +++++++++++--------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java b/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java
index 3f56b0eb0..56537c5b6 100644
--- a/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java
+++ b/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java
@@ -61,8 +61,6 @@ import com.jme3.texture.Image;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapAxis;
 import com.jme3.util.BufferUtils;
-import com.jme3.util.IntMap;
-import com.jme3.util.IntMap.Entry;
 import com.jme3.util.ListMap;
 import com.jme3.util.NativeObjectManager;
 import com.jme3.util.SafeArrayList;
@@ -73,12 +71,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GL2ES2;
 import javax.media.opengl.GL2GL3;
 import javax.media.opengl.GLContext;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.fixedfunc.GLPointerFunc;
 import jme3tools.converters.MipMapGenerator;
 import jme3tools.shader.ShaderDebug;
 
diff --git a/engine/src/jogl/com/jme3/system/jogl/JoglDisplay.java b/engine/src/jogl/com/jme3/system/jogl/JoglDisplay.java
index b47326dc0..055203023 100644
--- a/engine/src/jogl/com/jme3/system/jogl/JoglDisplay.java
+++ b/engine/src/jogl/com/jme3/system/jogl/JoglDisplay.java
@@ -272,26 +272,30 @@ public class JoglDisplay extends JoglAbstractDisplay {
     }
 
     public void create(boolean waitFor){
-        try {
-            if (waitFor){
-                try{
-                    SwingUtilities.invokeAndWait(new Runnable() {
+        if (SwingUtilities.isEventDispatchThread()) {
+            initInEDT();
+        } else {
+            try {
+                if (waitFor) {
+                    try {
+                        SwingUtilities.invokeAndWait(new Runnable() {
+                            public void run() {
+                                initInEDT();
+                            }
+                        });
+                    } catch (InterruptedException ex) {
+                        listener.handleError("Interrupted", ex);
+                    }
+                } else {
+                    SwingUtilities.invokeLater(new Runnable() {
                         public void run() {
                             initInEDT();
                         }
                     });
-                } catch (InterruptedException ex) {
-                    listener.handleError("Interrupted", ex);
                 }
-            }else{
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        initInEDT();
-                    }
-                });
+            } catch (InvocationTargetException ex) {
+                throw new AssertionError(); // can never happen
             }
-        } catch (InvocationTargetException ex) {
-            throw new AssertionError(); // can never happen
         }
     }