diff options
Diffstat (limited to 'src')
11 files changed, 121 insertions, 144 deletions
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java index 76d982813..92be62b4d 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java @@ -280,8 +280,6 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing if(null!=animator) { if(regenerate) { animatorPaused = animator.pause(); - } else { - animator.remove(this); } } diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java index ac8311a9a..84f2f0294 100644 --- a/src/newt/classes/com/jogamp/newt/Window.java +++ b/src/newt/classes/com/jogamp/newt/Window.java @@ -55,17 +55,8 @@ public interface Window extends NativeWindow, WindowClosingProtocol { // /** - * @return True if native window is valid, can be created or recovered. - * Otherwise false, ie this window is unrecoverable due to a <code>destroy(true)</code> call. - * - * @see #destroy(boolean) - * @see #setVisible(boolean) - */ - boolean isValid(); - - /** * @return true if the native window handle is valid and ready to operate, ie - * if the native window has been created, otherwise false. + * if the native window has been created via {@link #setVisible(boolean) setVisible(true)}, otherwise false. * * @see #setVisible(boolean) * @see #destroy(boolean) @@ -102,6 +93,7 @@ public interface Window extends NativeWindow, WindowClosingProtocol { /** * Destroy the Window and it's children, incl. native destruction.<br> * The Window can be recreate via {@link #setVisible(boolean) setVisible(true)}. + * <p>Visibility is set to false.</p> * <p> * This method invokes {@link Screen#removeReference()} after it's own destruction,<br> * which will issue {@link Screen#destroy()} if the reference count becomes 0.<br> diff --git a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java index 5c242d0e7..51a43d86c 100644 --- a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java +++ b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java @@ -159,16 +159,12 @@ public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProto if( null != newtChild ) { if(attach) { awtAdapter = new AWTParentWindowAdapter(newtChild).addTo(this); - if(newtChild.isValid()) { - newtChild.addWindowListener(clearAWTMenusOnNewtFocus); - } + newtChild.addWindowListener(clearAWTMenusOnNewtFocus); newtChild.setFocusAction(focusAction); // enable AWT focus traversal newtChildCloseOp = newtChild.setDefaultCloseOperation(WindowClosingProtocol.DO_NOTHING_ON_CLOSE); awtWindowClosingProtocol.addClosingListenerOneShot(); } else { - if(newtChild.isValid()) { - newtChild.removeWindowListener(clearAWTMenusOnNewtFocus); - } + newtChild.removeWindowListener(clearAWTMenusOnNewtFocus); newtChild.setFocusAction(null); newtChild.setDefaultCloseOperation(newtChildCloseOp); awtWindowClosingProtocol.removeClosingListener(); diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java index 638e4a462..bde4373d1 100644 --- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java +++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java @@ -66,7 +66,7 @@ import com.jogamp.opengl.JoglVersion; * <p> */ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer, FPSCounter { - private WindowImpl window; + private final WindowImpl window; /** * Constructor. Do not call this directly -- use {@link #create()} instead. @@ -298,10 +298,6 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer, FPSC window.setTopLevelSize(width, height); } - public final boolean isValid() { - return window.isValid(); - } - public final boolean isNativeValid() { return window.isNativeValid(); } @@ -511,28 +507,20 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer, FPSC } public void display() { - display(false); - } - - public void display(boolean forceReshape) { - if( null == window ) { return; } - - if(sendDestroy || ( null!=window && window.hasDeviceChanged() && GLAutoDrawable.SCREEN_CHANGE_ACTION_ENABLED ) ) { + if( !isNativeValid() || !isVisible() ) { return; } + + if(sendDestroy || ( window.hasDeviceChanged() && GLAutoDrawable.SCREEN_CHANGE_ACTION_ENABLED ) ) { sendDestroy=false; destroy(); return; } - - if( null == context && isVisible() && 0<getWidth()*getHeight() ) { - // retry native window and drawable/context creation + + if( null == context && 0<getWidth()*getHeight() ) { // TODO: Check memory sync + // retry drawable and context creation setVisible(true); } - if(forceReshape) { - sendReshape = true; - } - - if( isVisible() && null != context ) { + if( null != context ) { // TODO: Check memory sync if( NativeSurface.LOCK_SURFACE_NOT_READY < lockSurface() ) { try { helper.invokeGL(drawable, context, displayAction, initAction); diff --git a/src/newt/classes/jogamp/newt/OffscreenWindow.java b/src/newt/classes/jogamp/newt/OffscreenWindow.java index 7cdcfac9a..7afc54d71 100644 --- a/src/newt/classes/jogamp/newt/OffscreenWindow.java +++ b/src/newt/classes/jogamp/newt/OffscreenWindow.java @@ -90,7 +90,7 @@ public class OffscreenWindow extends WindowImpl implements SurfaceChangeable { @Override public void setSize(int width, int height) { - if(!visible) { + if(!isVisible()) { sizeChanged(width, height, false); } } diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java index ca4188e94..7c8174a6f 100644 --- a/src/newt/classes/jogamp/newt/WindowImpl.java +++ b/src/newt/classes/jogamp/newt/WindowImpl.java @@ -74,17 +74,19 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer { public static final boolean DEBUG_TEST_REPARENT_INCOMPATIBLE = Debug.isPropertyDefined("newt.test.Window.reparent.incompatible", true); + private volatile long windowHandle = 0; // lifecycle critical + private volatile boolean visible = false; // lifecycle critical private RecursiveLock windowLock = new RecursiveLock(); // Window instance wide lock private RecursiveLock surfaceLock = new RecursiveLock(); // Surface only lock - private long windowHandle = 0; - private ScreenImpl screen = null; + + private ScreenImpl screen; // never null after create - may change reference though (reparent) private boolean screenReferenceAdded = false; private NativeWindow parentWindow = null; private long parentWindowHandle = 0; protected AbstractGraphicsConfiguration config = null; protected CapabilitiesImmutable capsRequested = null; protected CapabilitiesChooser capabilitiesChooser = null; // default null -> default - protected boolean fullscreen = false, visible = false, hasFocus = false; + protected boolean fullscreen = false, hasFocus = false; protected int width = 128, height = 128, x = 0, y = 0; // client-area size/pos w/o insets protected Insets insets = new Insets(); // insets of decoration (if top-level && decorated) @@ -272,7 +274,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer setTitleImpl(title); } // always flag visible, - // allowing to retry if visible && 0 == windowHandle + // allowing to retry if visible && !isNativeValid() setVisibleImpl(true, x, y, width, height); } } finally { @@ -283,7 +285,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer if(DEBUG_IMPLEMENTATION) { System.err.println("Window.createNative() END ("+getThreadName()+", "+this+")"); } - return 0 != windowHandle ; + return isNativeValid() ; } private void removeScreenReference() { @@ -625,11 +627,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer // public final boolean isNativeValid() { - return null != getScreen() && 0 != getWindowHandle() ; - } - - public final boolean isValid() { - return null != getScreen() ; + return 0 != windowHandle ; } public final Screen getScreen() { @@ -656,7 +654,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } } } - if(0==windowHandle && visible) { + if(!isNativeValid() && visible) { if( 0<width*height ) { nativeWindowCreated = createNative(); if(nativeWindowCreated) { @@ -665,7 +663,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } } } else if(WindowImpl.this.visible != visible) { - if(0 != windowHandle) { + if(isNativeValid()) { setVisibleImpl(visible, x, y, width, height); WindowImpl.this.waitForVisible(visible, true); madeVisible = visible; @@ -676,7 +674,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer lifecycleHook.setVisibleActionPost(visible, nativeWindowCreated); } - if(0!=windowHandle && visible && null!=childWindows && childWindows.size()>0) { + if(isNativeValid() && visible && null!=childWindows && childWindows.size()>0) { synchronized(childWindowsLock) { for(int i = 0; i < childWindows.size(); i++ ) { NativeWindow nw = childWindows.get(i); @@ -710,19 +708,17 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } public void setVisible(boolean visible) { - if(isValid()) { - if( 0==windowHandle && visible && 0>=width*height ) { - // fast-path: not realized yet, make visible, but zero size - return; - } + if( !isNativeValid() && visible && 0>=width*height ) { + // fast-path: not realized yet, make visible, but zero size + return; + } - if(DEBUG_IMPLEMENTATION) { - String msg = "Window setVisible: START ("+getThreadName()+") "+x+"/"+y+" "+width+"x"+height+", fs "+fullscreen+", windowHandle "+toHexString(windowHandle)+", visible: "+this.visible+" -> "+visible+", parentWindowHandle "+toHexString(parentWindowHandle)+", parentWindow "+(null!=parentWindow); - System.err.println(msg); - Thread.dumpStack(); - } - runOnEDTIfAvail(true, new VisibleAction(visible)); + if(DEBUG_IMPLEMENTATION) { + String msg = "Window setVisible: START ("+getThreadName()+") "+x+"/"+y+" "+width+"x"+height+", fs "+fullscreen+", windowHandle "+toHexString(windowHandle)+", visible: "+this.visible+" -> "+visible+", parentWindowHandle "+toHexString(parentWindowHandle)+", parentWindow "+(null!=parentWindow); + System.err.println(msg); + Thread.dumpStack(); } + runOnEDTIfAvail(true, new VisibleAction(visible)); } protected final void setVisibleImpl(boolean visible, int x, int y, int width, int height) { @@ -745,15 +741,15 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer String msg = "Window setSize: START "+WindowImpl.this.width+"x"+WindowImpl.this.height+" -> "+width+"x"+height+", fs "+fullscreen+", windowHandle "+toHexString(windowHandle)+", visible "+visible; System.err.println(msg); } - if ( 0 != windowHandle && 0>=width*height && visible ) { + if ( isNativeValid() && 0>=width*height && visible ) { visibleAction=1; // invisible WindowImpl.this.width = 0; WindowImpl.this.height = 0; - } else if ( 0 == windowHandle && 0<width*height && visible ) { + } else if ( !isNativeValid() && 0<width*height && visible ) { visibleAction = 2; // visible (create) WindowImpl.this.width = width; WindowImpl.this.height = height; - } else if ( 0 != windowHandle ) { + } else if ( isNativeValid() ) { // this width/height will be set by windowChanged, called by the native implementation reconfigureWindowImpl(x, y, width, height, getReconfigureFlags(0, isVisible())); } else { @@ -775,9 +771,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } public void setSize(int width, int height) { - if(isValid()) { - runOnEDTIfAvail(true, new SetSizeActionImpl(width, height)); - } + runOnEDTIfAvail(true, new SetSizeActionImpl(width, height)); } public void setTopLevelSize(int width, int height) { @@ -795,10 +789,6 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } windowLock.lock(); try { - if( !isValid() ) { - return; // nop - } - if(DEBUG_IMPLEMENTATION) { String msg = "!!! Window DestroyAction() "+getThreadName(); System.err.println(msg); @@ -827,7 +817,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } if( null != screen ) { - if( 0 != windowHandle ) { + if( isNativeValid() ) { screen.removeScreenModeListener(screenModeListenerImpl); closeNativeImpl(); removeScreenReference(); @@ -850,13 +840,13 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer if(animatorPaused) { lifecycleHook.resumeRenderingAction(); } - windowHandle = 0; + setWindowHandle(0); visible = false; fullscreen = false; hasFocus = false; parentWindowHandle = 0; - // these refs shall be kept alive - resurrection + // these refs shall be kept alive - resurrection via setVisible(true) /** if(null!=parentWindow && parentWindow instanceof Window) { ((Window)parentWindow).removeChild(WindowImpl.this); @@ -876,15 +866,8 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } public void destroy() { - if( isValid() ) { - if(DEBUG_IMPLEMENTATION) { - String msg = "Window.destroy() START "+getThreadName(); - System.err.println(msg); - //Exception ee = new Exception(msg); - //ee.printStackTrace(); - } - runOnEDTIfAvail(true, destroyAction); - } + visible = false; // Immediately mark synchronized visibility flag, avoiding possible recreation + runOnEDTIfAvail(true, destroyAction); } private class ReparentActionImpl implements Runnable, ReparentAction { @@ -902,7 +885,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer return reparentAction; } - private void setScreen(ScreenImpl newScreen) { + private void setScreen(ScreenImpl newScreen) { // never null ! WindowImpl.this.removeScreenReference(); screen = newScreen; } @@ -1163,13 +1146,9 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } public int reparentWindow(NativeWindow newParent, boolean forceDestroyCreate) { - int reparentActionStrategy = ReparentAction.ACTION_INVALID; - if(isValid()) { - ReparentActionImpl reparentAction = new ReparentActionImpl(newParent, forceDestroyCreate); - runOnEDTIfAvail(true, reparentAction); - reparentActionStrategy = reparentAction.getStrategy(); - } - return reparentActionStrategy; + ReparentActionImpl reparentAction = new ReparentActionImpl(newParent, forceDestroyCreate); + runOnEDTIfAvail(true, reparentAction); + return reparentAction.getStrategy(); } public CapabilitiesChooser setCapabilitiesChooser(CapabilitiesChooser chooser) { @@ -1226,7 +1205,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer int width = WindowImpl.this.width; int height = WindowImpl.this.height; - if( 0 != windowHandle ) { + if( isNativeValid() ) { DisplayImpl display = (DisplayImpl) screen.getDisplay(); display.dispatchMessagesNative(); // status up2date reconfigureWindowImpl(x, y, width, height, getReconfigureFlags(FLAG_CHANGE_DECORATION, isVisible())); @@ -1242,9 +1221,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } public void setUndecorated(boolean value) { - if(isValid()) { - runOnEDTIfAvail(true, new DecorationActionImpl(value)); - } + runOnEDTIfAvail(true, new DecorationActionImpl(value)); } public final boolean isUndecorated() { @@ -1455,9 +1432,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } public void setPosition(int x, int y) { - if(isValid()) { - runOnEDTIfAvail(true, new SetPositionActionImpl(x, y)); - } + runOnEDTIfAvail(true, new SetPositionActionImpl(x, y)); } public void setTopLevelPosition(int x, int y) { @@ -1544,9 +1519,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } public boolean setFullscreen(boolean fullscreen) { - if(isValid()) { - runOnEDTIfAvail(true, new FullScreenActionImpl(fullscreen)); - } + runOnEDTIfAvail(true, new FullScreenActionImpl(fullscreen)); return this.fullscreen; } @@ -1619,7 +1592,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } public void enqueueEvent(boolean wait, com.jogamp.newt.event.NEWTEvent event) { - if(isValid()) { + if(isNativeValid()) { ((DisplayImpl)getScreen().getDisplay()).enqueueEvent(wait, event); } } @@ -2180,7 +2153,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer // send synced destroy notifications enqueueWindowEvent(true, WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY); - if(handleDestroyNotify && DISPOSE_ON_CLOSE == defaultCloseOperation && isValid()) { + if(handleDestroyNotify && DISPOSE_ON_CLOSE == defaultCloseOperation) { destroy(); } @@ -2198,7 +2171,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer System.err.println("Window.windowRepaint "+getThreadName()+" - "+x+"/"+y+" "+width+"x"+height); } - if(isValid()) { + if(isNativeValid()) { NEWTEvent e = new WindowUpdateEvent(WindowEvent.EVENT_WINDOW_REPAINT, this, System.currentTimeMillis(), new Rectangle(x, y, width, height)); doEvent(false, false, e); diff --git a/src/newt/classes/jogamp/newt/awt/event/AWTParentWindowAdapter.java b/src/newt/classes/jogamp/newt/awt/event/AWTParentWindowAdapter.java index 517a67df0..358864547 100644 --- a/src/newt/classes/jogamp/newt/awt/event/AWTParentWindowAdapter.java +++ b/src/newt/classes/jogamp/newt/awt/event/AWTParentWindowAdapter.java @@ -72,23 +72,21 @@ public class AWTParentWindowAdapter if(DEBUG_IMPLEMENTATION) { System.err.println("AWT: componentResized: "+comp); } - if(getNewtWindow().isValid()) { - getNewtWindow().runOnEDTIfAvail(false, new Runnable() { - public void run() { - int cw = comp.getWidth(); - int ch = comp.getHeight(); - if( 0 < cw * ch ) { - if( getNewtWindow().getWidth() != cw || getNewtWindow().getHeight() != ch ) { - getNewtWindow().setSize(cw, ch); - if(comp.isVisible() != getNewtWindow().isVisible()) { - getNewtWindow().setVisible(comp.isVisible()); - } + getNewtWindow().runOnEDTIfAvail(false, new Runnable() { + public void run() { + int cw = comp.getWidth(); + int ch = comp.getHeight(); + if( 0 < cw * ch ) { + if( getNewtWindow().getWidth() != cw || getNewtWindow().getHeight() != ch ) { + getNewtWindow().setSize(cw, ch); + if(comp.isVisible() != getNewtWindow().isVisible()) { + getNewtWindow().setVisible(comp.isVisible()); } - } else if(getNewtWindow().isVisible()) { - getNewtWindow().setVisible(false); } - }}); - } + } else if(getNewtWindow().isVisible()) { + getNewtWindow().setVisible(false); + } + }}); } public void componentMoved(java.awt.event.ComponentEvent e) { @@ -112,14 +110,12 @@ public class AWTParentWindowAdapter if(DEBUG_IMPLEMENTATION) { System.err.println("AWT: hierarchyChanged SHOWING_CHANGED: showing "+showing+", "+changed); } - if(getNewtWindow().isValid()) { - getNewtWindow().runOnEDTIfAvail(false, new Runnable() { - public void run() { - if(getNewtWindow().isVisible() != showing) { - getNewtWindow().setVisible(showing); - } - }}); - } + getNewtWindow().runOnEDTIfAvail(false, new Runnable() { + public void run() { + if(getNewtWindow().isVisible() != showing) { + getNewtWindow().setVisible(showing); + } + }}); } if(DEBUG_IMPLEMENTATION) { if( 0 != ( java.awt.event.HierarchyEvent.DISPLAYABILITY_CHANGED & bits ) ) { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java b/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java index fb92e92ac..2809a138c 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java @@ -50,7 +50,6 @@ import java.awt.Dimension; import java.awt.AWTException; import java.awt.Robot; import java.awt.Point; -import java.awt.Rectangle; import java.awt.event.InputEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -269,12 +268,13 @@ public class TestSwingAWTRobotUsageBeforeJOGLInitBug411 extends UITestCase { Assert.assertEquals(true, anim.isAnimating()); // due to newtCanvasAWT/win1 newtCanvasAWT.destroy(); // destroys both newtCanvasAWT/win1 - Assert.assertEquals(false, win0.isNativeValid()); Assert.assertEquals(false, win1.isNativeValid()); + Assert.assertEquals(false, win0.isNativeValid()); + Assert.assertEquals(true, anim.isAnimating()); + + Assert.assertEquals(true, anim.stop()); Assert.assertEquals(false, anim.isAnimating()); - anim.stop(); - System.err.println("TestSwingAWTRobotUsageBeforeJOGLInitBug411.test01NewtCanvasAWT(): End"); } @@ -304,11 +304,15 @@ public class TestSwingAWTRobotUsageBeforeJOGLInitBug411 extends UITestCase { anim.add(glCanvas); runTestGL(glCanvas, glCanvas); + Assert.assertEquals(true, anim.isAnimating()); + anim.remove(glCanvas); + Assert.assertEquals(false, anim.isAnimating()); + /** win0.destroy(); Assert.assertEquals(true, anim.isAnimating()); */ - anim.stop(); + Assert.assertEquals(true, anim.stop()); System.err.println("TestSwingAWTRobotUsageBeforeJOGLInitBug411.test02GLCanvas(): End"); } diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows02NEWTAnimated.java b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows02NEWTAnimated.java index bfc3f43a7..3176d59e5 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows02NEWTAnimated.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows02NEWTAnimated.java @@ -124,7 +124,14 @@ public class TestGLWindows02NEWTAnimated extends UITestCase { while(animator.isAnimating() && animator.getTotalFPSDuration()<durationPerTest) { Thread.sleep(100); } - destroyWindow(window); + destroyWindow(window); // destroy - but still in animator + Assert.assertEquals(false, window.isNativeValid()); + Assert.assertEquals(false, window.isVisible()); + Assert.assertEquals(true, animator.isAnimating()); + Assert.assertEquals(false, animator.isPaused()); + Assert.assertEquals(true, animator.isStarted()); + + animator.remove(window); Assert.assertEquals(false, animator.isAnimating()); Assert.assertEquals(false, animator.isPaused()); Assert.assertEquals(true, animator.isStarted()); @@ -144,6 +151,10 @@ public class TestGLWindows02NEWTAnimated extends UITestCase { } destroyWindow(window); destroyWindow(window); + Assert.assertEquals(true, animator.isAnimating()); + Assert.assertEquals(false, animator.isPaused()); + Assert.assertEquals(true, animator.isStarted()); + animator.remove(window); Assert.assertEquals(false, animator.isAnimating()); Assert.assertEquals(false, animator.isPaused()); Assert.assertEquals(true, animator.isStarted()); @@ -193,6 +204,7 @@ public class TestGLWindows02NEWTAnimated extends UITestCase { Thread.sleep(100); } window1.destroy(); + animator.remove(window1); Assert.assertEquals(true, animator.isStarted()); Assert.assertEquals(true, animator.isAnimating()); Assert.assertEquals(false, animator.isPaused()); @@ -201,6 +213,7 @@ public class TestGLWindows02NEWTAnimated extends UITestCase { Thread.sleep(100); } window2.destroy(); + animator.remove(window2); Assert.assertEquals(true, animator.isStarted()); Assert.assertEquals(false, animator.isAnimating()); Assert.assertEquals(false, animator.isPaused()); @@ -255,6 +268,7 @@ public class TestGLWindows02NEWTAnimated extends UITestCase { Thread.sleep(100); } destroyWindow(window1); + animator.remove(window1); Assert.assertEquals(true, animator.isStarted()); Assert.assertEquals(true, animator.isAnimating()); Assert.assertEquals(false, animator.isPaused()); @@ -263,6 +277,7 @@ public class TestGLWindows02NEWTAnimated extends UITestCase { Thread.sleep(100); } destroyWindow(window2); + animator.remove(window2); Assert.assertEquals(true, animator.isStarted()); Assert.assertEquals(false, animator.isAnimating()); Assert.assertEquals(false, animator.isPaused()); diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java index 3fc9b749a..710681779 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java @@ -77,6 +77,7 @@ public class TestWindowClosingProtocol01AWT extends UITestCase { Assert.assertEquals(true, AWTRobotUtil.closeWindow(frame, false)); // nop Thread.sleep(100); Assert.assertEquals(true, frame.isDisplayable()); + Assert.assertEquals(true, frame.isVisible()); Assert.assertEquals(true, glCanvas.isValid()); Assert.assertEquals(true, glCanvas.isDisplayable()); @@ -90,6 +91,7 @@ public class TestWindowClosingProtocol01AWT extends UITestCase { Assert.assertEquals(true, AWTRobotUtil.closeWindow(frame, false)); // no frame close Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glCanvas, false)); Assert.assertEquals(true, frame.isDisplayable()); + Assert.assertEquals(true, frame.isVisible()); Assert.assertEquals(false, glCanvas.isRealized()); SwingUtilities.invokeLater(new Runnable() { diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java index c8a2327a4..c14c461f7 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java @@ -60,14 +60,23 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase { glWindow.addGLEventListener(new GearsES2()); - NewtCanvasAWT newtCanvas = new NewtCanvasAWT(glWindow); + final NewtCanvasAWT newtCanvas = new NewtCanvasAWT(glWindow); - frame.getContentPane().add(newtCanvas); - frame.pack(); - frame.setSize(512, 512); - frame.validate(); - frame.setVisible(true); - Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame, true)); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + frame.getContentPane().add(newtCanvas); + frame.pack(); + frame.setSize(512, 512); + frame.validate(); + frame.setVisible(true); + } }); + Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame, true)); + Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, true)); + Assert.assertEquals(true, frame.isDisplayable()); + Assert.assertEquals(true, frame.isVisible()); + Assert.assertEquals(true, newtCanvas.isValid()); + Assert.assertEquals(true, newtCanvas.isDisplayable()); + Assert.assertEquals(true, glWindow.isNativeValid()); // // close with op: DO_NOTHING_ON_CLOSE -> NOP / HIDE (default) @@ -78,6 +87,7 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase { Assert.assertEquals(true, AWTRobotUtil.closeWindow(frame, false)); Assert.assertEquals(true, frame.isDisplayable()); + Assert.assertEquals(false, frame.isVisible()); Assert.assertEquals(true, newtCanvas.isValid()); Assert.assertEquals(true, newtCanvas.isDisplayable()); Assert.assertEquals(true, glWindow.isNativeValid()); @@ -88,8 +98,10 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase { public void run() { frame.setVisible(true); } }); - Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame, true)); - + Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame, true)); + Assert.assertEquals(true, frame.isDisplayable()); + Assert.assertEquals(true, frame.isVisible()); + // // close with op (JFrame): DISPOSE_ON_CLOSE -- newtCanvas -- glWindow --> dispose // @@ -100,6 +112,7 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase { Assert.assertEquals(true, AWTRobotUtil.closeWindow(frame, true)); Assert.assertEquals(false, frame.isDisplayable()); + Assert.assertEquals(false, frame.isVisible()); Assert.assertEquals(false, newtCanvas.isValid()); Assert.assertEquals(false, newtCanvas.isDisplayable()); Assert.assertEquals(false, glWindow.isNativeValid()); |