From 1d300e8d06916acd80039a6c4b198111ff1f66fb Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 22 Jul 2012 04:18:07 +0200
Subject: Align TestSWTAccessor02GLn w/ TestSWTJOGLGLCanvas01GLn, dropping the
canvas cstr on SWT thread, which seems not to be required.
---
.../opengl/test/junit/jogl/swt/TestSWTAccessor02GLn.java | 13 +------------
.../test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java | 3 +--
2 files changed, 2 insertions(+), 14 deletions(-)
(limited to 'src')
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor02GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor02GLn.java
index c7053885e..2e225ec0e 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor02GLn.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor02GLn.java
@@ -122,24 +122,13 @@ public class TestSWTAccessor02GLn extends UITestCase {
composite = null;
}
- class CanvasCStr implements Runnable {
- Canvas canvas;
-
- public void run() {
- canvas = new Canvas( composite, SWT.NO_BACKGROUND);
- }
- }
-
protected void runTestAGL( GLProfile glprofile ) throws InterruptedException {
GLCapabilities caps = new GLCapabilities(glprofile);
GLDrawableFactory factory = GLDrawableFactory.getFactory(glprofile);
// need SWT.NO_BACKGROUND to prevent SWT from clearing the window
// at the wrong times (we use glClear for this instead)
- CanvasCStr canvasCstr = new CanvasCStr();
-
- SWTAccessor.invoke(true, canvasCstr);
- final Canvas canvas = canvasCstr.canvas;
+ final Canvas canvas = new Canvas( composite, SWT.NO_BACKGROUND);
Assert.assertNotNull( canvas );
SWTAccessor.setRealized(canvas, true);
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 5e3d4dd8e..19e76419f 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
@@ -47,7 +47,6 @@ import org.junit.BeforeClass;
import org.junit.After;
import org.junit.Test;
-import com.jogamp.common.os.Platform;
import com.jogamp.nativewindow.swt.SWTAccessor;
import com.jogamp.opengl.swt.GLCanvas;
import com.jogamp.opengl.test.junit.jogl.demos.es1.OneTriangle;
@@ -122,7 +121,7 @@ public class TestSWTJOGLGLCanvas01GLn extends UITestCase {
// at the wrong times (we use glClear for this instead)
final GLCapabilitiesImmutable caps = new GLCapabilities( glprofile );
- final GLCanvas canvas = new GLCanvas( composite, SWT.NO_BACKGROUND, caps, null, null);
+ final GLCanvas canvas = new GLCanvas( composite, 0, caps, null, null);
Assert.assertNotNull( canvas );
canvas.addGLEventListener(new GLEventListener() {
--
cgit v1.2.3