summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-07-06 09:06:03 +0200
committerSven Gothel <[email protected]>2012-07-06 09:06:03 +0200
commit4e70a4811a860255b53eeae7a841ca473e1aba86 (patch)
treee8b3c6cb05d3e680529f5bd8869b4c28b528216a
parentdfee8c58d4915f78f57545c26a492668b2b68a87 (diff)
Fix commit dfee8c58d4915f78f57545c26a492668b2b68a87
-rwxr-xr-xmake/scripts/tests.sh5
-rw-r--r--src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java1
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java5
3 files changed, 3 insertions, 8 deletions
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 4d46ec4f4..0258187fd 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -293,12 +293,13 @@ function testawtswt() {
#
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTEclipseGLCanvas01GLn $*
testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $*
-#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor02GLn $*
+#testawtswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $*
+#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor02GLn $*
#
# awtswt (testawtswt)
#
-#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor03AWTGLn $*
+#testawtswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor03AWTGLn $*
#
# newt.awt (testawt)
diff --git a/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java b/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java
index 2cd87f276..4d472b01a 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java
@@ -30,7 +30,6 @@ package jogamp.nativewindow.macosx;
import javax.media.nativewindow.NativeWindowException;
import javax.media.nativewindow.util.Point;
-import jogamp.common.awt.AWTEDTExecutor;
import jogamp.nativewindow.Debug;
import jogamp.nativewindow.NWJNILibLoader;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java
index ba33aa31d..5e3d4dd8e 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java
@@ -34,8 +34,6 @@ import javax.media.opengl.GLCapabilitiesImmutable;
import javax.media.opengl.GLEventListener;
import javax.media.opengl.GLProfile;
-import jogamp.nativewindow.macosx.OSXUtil;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
@@ -80,9 +78,6 @@ public class TestSWTJOGLGLCanvas01GLn extends UITestCase {
@BeforeClass
public static void startup() {
System.out.println( "GLProfile " + GLProfile.glAvailabilityToString() );
- if( Platform.OS_TYPE == Platform.OSType.MACOS ) {
- System.err.println("OSXUtil.isAWTEDTMainThread: "+ OSXUtil.isAWTEDTMainThread() );
- }
}
@Before