diff options
| -rw-r--r-- | src/newt/classes/com/jogamp/newt/ScreenMode.java | 10 | ||||
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01NEWT.java | 22 |
2 files changed, 17 insertions, 15 deletions
diff --git a/src/newt/classes/com/jogamp/newt/ScreenMode.java b/src/newt/classes/com/jogamp/newt/ScreenMode.java index 414e2fb9c..1f12217bb 100644 --- a/src/newt/classes/com/jogamp/newt/ScreenMode.java +++ b/src/newt/classes/com/jogamp/newt/ScreenMode.java @@ -101,7 +101,7 @@ import com.jogamp.newt.util.MonitorMode; * </pre> * */ -public class ScreenMode implements Cloneable { +public class ScreenMode { /** zero rotation, compared to normal settings */ public static final int ROTATE_0 = 0; @@ -134,14 +134,6 @@ public class ScreenMode implements Cloneable { this.rotation = rotation; } - public Object clone() { - try { - return super.clone(); - } catch (CloneNotSupportedException ex) { - throw new InternalError(); - } - } - /** Returns the unrotated <code>MonitorMode</code> */ public final MonitorMode getMonitorMode() { return monitorMode; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01NEWT.java index e7457b905..506fcc1b7 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01NEWT.java @@ -176,8 +176,6 @@ public class TestScreenMode01NEWT extends UITestCase { // check reset .. - ScreenMode saveOrigMode = (ScreenMode) smOrig.clone(); - Assert.assertEquals(true,display.isNativeValid()); Assert.assertEquals(true,screen.isNativeValid()); Assert.assertEquals(true,window.isNativeValid()); @@ -200,7 +198,7 @@ public class TestScreenMode01NEWT extends UITestCase { System.err.println("[1] current/orig: "+smCurrent); Assert.assertNotNull(smCurrent); - Assert.assertEquals(saveOrigMode, smOrig); + Assert.assertEquals(smCurrent, smOrig); screen.destroy(); @@ -210,7 +208,7 @@ public class TestScreenMode01NEWT extends UITestCase { Thread.sleep(waitTimeShort); } - @Test + // @Test public void testScreenModeChangeWithFS01Pre() throws InterruptedException { Thread.sleep(waitTimeShort); testScreenModeChangeWithFS01Impl(true) ; @@ -251,6 +249,7 @@ public class TestScreenMode01NEWT extends UITestCase { if(preFS) { System.err.println("[0] set FS pre 0: "+window.isFullscreen()); window.setFullscreen(true); + System.err.println("[0] set FS pre 1: "+window.isFullscreen()); Assert.assertEquals(true, window.isFullscreen()); System.err.println("[0] set FS pre X: "+window.isFullscreen()); } @@ -269,18 +268,29 @@ public class TestScreenMode01NEWT extends UITestCase { // check reset .. - ScreenMode saveOrigMode = (ScreenMode) smOrig.clone(); + Assert.assertEquals(true,display.isNativeValid()); + Assert.assertEquals(true,screen.isNativeValid()); + Assert.assertEquals(true,window.isNativeValid()); + Assert.assertEquals(true,window.isVisible()); animator.stop(); destroyWindow(window); + Assert.assertEquals(false,window.isVisible()); + Assert.assertEquals(false,window.isNativeValid()); + Assert.assertEquals(false,screen.isNativeValid()); + Assert.assertEquals(false,display.isNativeValid()); + screen.createNative(); // trigger native re-creation + Assert.assertEquals(true,display.isNativeValid()); + Assert.assertEquals(true,screen.isNativeValid()); + ScreenMode smCurrent = screen.getCurrentScreenMode(); System.err.println("[1] current/orig: "+smCurrent); Assert.assertNotNull(smCurrent); - Assert.assertEquals(saveOrigMode, smOrig); + Assert.assertEquals(smCurrent, smOrig); screen.destroy(); } |