summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-11-17 10:53:49 +0100
committerSven Gothel <[email protected]>2010-11-17 10:53:49 +0100
commit1b7b5d34b65745f39befc57e4de567f87d5a2041 (patch)
tree0c168a4bd43d985eded2a83f4b7392382afd341a /src
parentd7e07a5638d1dffe47df572ae071eb4dabe52426 (diff)
GLWindow becomes NEWTEventConsumer (missed that one) ; Adding test for NEWTEventConsumer and AWTTreeLock
The unit test for NEWTEventConsumer and AWTTreeLock, tests previous commit 'JAWTWindow: Avoid AWTTreeLock' b0b1e3fb9c0f915cdf8d237c0f61a9d08ca83b01
Diffstat (limited to 'src')
-rw-r--r--src/junit/com/jogamp/test/junit/newt/TestCloseNewtAWT.java118
-rw-r--r--src/newt/classes/com/jogamp/newt/opengl/GLWindow.java9
2 files changed, 126 insertions, 1 deletions
diff --git a/src/junit/com/jogamp/test/junit/newt/TestCloseNewtAWT.java b/src/junit/com/jogamp/test/junit/newt/TestCloseNewtAWT.java
new file mode 100644
index 000000000..4aa028308
--- /dev/null
+++ b/src/junit/com/jogamp/test/junit/newt/TestCloseNewtAWT.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+package com.jogamp.test.junit.newt;
+
+import org.junit.Test;
+
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import java.awt.EventQueue;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.media.nativewindow.util.Point;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLProfile;
+import com.jogamp.newt.Window;
+import com.jogamp.newt.awt.NewtCanvasAWT;
+import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.test.junit.util.UITestCase;
+
+public class TestCloseNewtAWT extends UITestCase {
+
+ GLWindow newtWindow = null;
+ NewtCanvasAWT newtCanvas = null;
+ JFrame frame = null;
+
+ class MyCanvas extends NewtCanvasAWT {
+ public MyCanvas(Window window) {
+ super(window);
+ }
+
+ public void addNotify() {
+ System.err.println("MyCanvas START add: "+Thread.currentThread()+", holds AWTTreeLock: "+Thread.holdsLock(this.getTreeLock()));
+ super.addNotify();
+ System.err.println("MyCanvas END add: "+Thread.currentThread()+", holds AWTTreeLock: "+Thread.holdsLock(this.getTreeLock()));
+ }
+
+ public void removeNotify() {
+ System.err.println("MyCanvas START remove: "+Thread.currentThread()+", holds AWTTreeLock: "+Thread.holdsLock(this.getTreeLock()));
+
+ // trigger critical situation around the AWT TreeLock
+ newtWindow.runOnEDTIfAvail(true, new Runnable() {
+ public void run() {
+ // NEWT EDT while AWT is locked
+ System.err.println("MyCanvas On NEWT-EDT From AWT-EDT: "+Thread.currentThread()+
+ ", holds AWTTreeLock: "+Thread.holdsLock(MyCanvas.this.getTreeLock()));
+
+ // Critical: Within NEWT EDT, while AWT is locked
+ Point p = MyCanvas.this.getNativeWindow().getLocationOnScreen(null);
+ System.err.println("MyCanvas On NEWT-EDT: position: "+p);
+ }
+ });
+ System.err.println("MyCanvas passed critical: "+Thread.currentThread()+", holds AWTTreeLock: "+Thread.holdsLock(this.getTreeLock()));
+
+ super.removeNotify();
+
+ System.err.println("MyCanvas END remove: "+Thread.currentThread()+", holds AWTTreeLock: "+Thread.holdsLock(this.getTreeLock()));
+ }
+ }
+
+ @Test
+ public void testCloseNewtAWT() throws InterruptedException, InvocationTargetException {
+ newtWindow = GLWindow.create(new GLCapabilities(GLProfile.getDefault()));
+ newtCanvas = new MyCanvas(newtWindow);
+
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ frame = new JFrame("NEWT Close Test");
+ frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ frame.getContentPane().add(newtCanvas);
+ frame.pack();
+ frame.setSize(800, 600);
+ frame.setVisible(true);
+ }
+ });
+ Thread.sleep(1000);
+
+ // programatically close window
+ EventQueue.invokeAndWait(new Runnable() {
+ public void run() {
+ frame.dispose();
+ }
+ });
+
+ GLProfile.shutdown();
+ }
+
+ public static void main(String[] args) {
+ String tstname = TestCloseNewtAWT.class.getName();
+ org.junit.runner.JUnitCore.main(tstname);
+ }
+
+}
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index 72963eaa3..53b704d1c 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -60,7 +60,7 @@ import javax.media.nativewindow.util.Insets;
* via {@link #invoke(boolean, javax.media.opengl.GLRunnable)} to the OpenGL command stream.<br>
* <p>
*/
-public class GLWindow implements GLAutoDrawable, Window {
+public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer {
private WindowImpl window;
/**
@@ -687,6 +687,13 @@ public class GLWindow implements GLAutoDrawable, Window {
}
//----------------------------------------------------------------------
+ // NEWTEventConsumer
+ //
+ public boolean consumeEvent(NEWTEvent event) {
+ return window.consumeEvent(event);
+ }
+
+ //----------------------------------------------------------------------
// Window completion
//
public final void windowRepaint(int x, int y, int width, int height) {