Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31258/src/jake2/render/opengl
Modified Files:
Jsr231Driver.java
Log Message:
format only
Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Jsr231Driver.java 11 Dec 2006 22:57:56 -0000 1.23
--- Jsr231Driver.java 12 Dec 2006 13:18:44 -0000 1.24
***************
*** 221,225 ****
while (!canvas.isDisplayable() || !window.isDisplayable()) {
try {
! Thread.sleep(50);
} catch (InterruptedException e) {}
}
--- 221,225 ----
while (!canvas.isDisplayable() || !window.isDisplayable()) {
try {
! Thread.sleep(100);
} catch (InterruptedException e) {}
}
***************
*** 239,276 ****
public void shutdown() {
! try {
! EventQueue.invokeAndWait(new Runnable() {
! public void run() {
! if (oldDisplayMode != null
! && device.getFullScreenWindow() != null) {
! try {
! if (device.isFullScreenSupported()) {
! if (!device.getDisplayMode().equals(
! oldDisplayMode))
! device.setDisplayMode(oldDisplayMode);
}
- device.setFullScreenWindow(null);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- });
- } catch (Exception e) {
- e.printStackTrace();
- }
- if (window != null) {
- if (display != null) display.destroy();
- window.dispose();
- while (window.isDisplayable()) {
- try {
- Thread.sleep(50);
- } catch (InterruptedException e) {
- }
}
! }
! display = null;
}
--- 239,276 ----
public void shutdown() {
! try {
! EventQueue.invokeAndWait(new Runnable() {
! public void run() {
! if (oldDisplayMode != null
! && device.getFullScreenWindow() != null) {
! try {
! if (device.isFullScreenSupported()) {
! if (!device.getDisplayMode().equals(
! oldDisplayMode))
! device.setDisplayMode(oldDisplayMode);
+ }
+ device.setFullScreenWindow(null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if (window != null) {
+ if (display != null) display.destroy();
+ window.dispose();
+ while (window.isDisplayable()) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
}
+ }
}
! display = null;
}
***************
*** 373,377 ****
public void removeNotify() {
if (drawable != null) {
! drawable.setRealized(false);
drawable = null;
}
--- 373,377 ----
public void removeNotify() {
if (drawable != null) {
! drawable.setRealized(false);
drawable = null;
}
***************
*** 393,405 ****
drawable.swapBuffers();
}
!
void destroy() {
! if (context != null) {
! release();
! context.destroy();
! context = null;
! }
}
!
private static GraphicsConfiguration unwrap(AWTGraphicsConfiguration config) {
if (config == null) {
--- 393,405 ----
drawable.swapBuffers();
}
!
void destroy() {
! if (context != null) {
! release();
! context.destroy();
! context = null;
! }
}
!
private static GraphicsConfiguration unwrap(AWTGraphicsConfiguration config) {
if (config == null) {
|
