From 22deb2e572586fd56b080714cd706501de3403b4 Mon Sep 17 00:00:00 2001 From: "nathan.sweet" Date: Tue, 2 Nov 2010 03:47:23 +0000 Subject: [PATCH] [changed] ApplicationListener destroy => dispose. --- .../badlogic/gdx/backends/android/AndroidGraphics.java | 2 +- .../com/badlogic/gdx/backends/jogl/JoglApplication.java | 2 +- .../src/com/badlogic/gdx/backends/jogl/JoglGraphics.java | 2 +- .../badlogic/gdx/backends/desktop/LwjglApplication.java | 2 +- .../com/badlogic/gdx/backends/desktop/LwjglCanvas.java | 9 +++------ extensions/hiero/src/com/badlogic/gdx/hiero/Hiero.java | 2 +- .../badlogic/gdx/hiero/unicodefont/UnicodeFontTest.java | 2 +- .../badlogic/gdx/graphics/particles/ParticleEditor.java | 2 +- .../src/com/badlogic/gdx/twl/tests/ButtonTest.java | 15 ++++----------- .../src/com/badlogic/gdx/twl/tests/TextAreaTest.java | 9 ++++----- gdx/src/com/badlogic/gdx/ApplicationListener.java | 2 +- gdx/src/com/badlogic/gdx/Game.java | 2 +- .../src/com/badlogic/gdx/tests/android/WindowedTest.java | 2 +- .../src/com/badlogic/gdx/tests/AudioDeviceTest.java | 2 +- tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java | 2 +- .../src/com/badlogic/gdx/tests/Box2DTestCollection.java | 2 +- tests/gdx-tests/src/com/badlogic/gdx/tests/FloatTest.java | 2 +- .../com/badlogic/gdx/tests/ImmediateModeRendererTest.java | 2 +- .../badlogic/gdx/tests/IndexBufferObjectClassTest.java | 2 +- .../badlogic/gdx/tests/IndexBufferObjectShaderTest.java | 2 +- .../src/com/badlogic/gdx/tests/LifeCycleTest.java | 2 +- tests/gdx-tests/src/com/badlogic/gdx/tests/MD5Test.java | 2 +- .../gdx-tests/src/com/badlogic/gdx/tests/SimpleTest.java | 2 +- .../src/com/badlogic/gdx/tests/VertexArrayClassTest.java | 2 +- .../badlogic/gdx/tests/VertexBufferObjectClassTest.java | 2 +- .../badlogic/gdx/tests/VertexBufferObjectShaderTest.java | 2 +- .../src/com/badlogic/gdx/tests/box2d/Box2DTest.java | 2 +- .../src/com/badlogic/gdx/tests/utils/GdxTest.java | 2 +- 28 files changed, 36 insertions(+), 47 deletions(-) diff --git a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGraphics.java b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGraphics.java index 34b1cf79a..02b69161d 100644 --- a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGraphics.java +++ b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGraphics.java @@ -322,7 +322,7 @@ final class AndroidGraphics implements Graphics, Renderer { } if(destroy) { - app.listener.destroy(); + app.listener.dispose(); destroy = false; } } diff --git a/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglApplication.java b/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglApplication.java index 0bb0d4359..cce99a3be 100644 --- a/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglApplication.java +++ b/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglApplication.java @@ -177,7 +177,7 @@ public final class JoglApplication implements Application { } @Override - public void destroy() { + public void dispose() { System.out.println("destroy"); } diff --git a/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglGraphics.java b/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglGraphics.java index f81163771..4ba63a47c 100644 --- a/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglGraphics.java +++ b/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglGraphics.java @@ -80,6 +80,6 @@ public class JoglGraphics extends JoglGraphicsBase implements GLEventListener { public void destroy() { canvas.getContext().makeCurrent(); - listener.destroy(); + listener.dispose(); } } diff --git a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/desktop/LwjglApplication.java b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/desktop/LwjglApplication.java index 56fac654b..86f239bd9 100644 --- a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/desktop/LwjglApplication.java +++ b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/desktop/LwjglApplication.java @@ -89,7 +89,7 @@ public class LwjglApplication implements Application { } listener.pause(); - listener.destroy(); + listener.dispose(); Display.destroy(); } diff --git a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/desktop/LwjglCanvas.java b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/desktop/LwjglCanvas.java index d8b4a995a..a4b204130 100644 --- a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/desktop/LwjglCanvas.java +++ b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/desktop/LwjglCanvas.java @@ -30,10 +30,8 @@ public class LwjglCanvas implements Application { LwjglInput input; final ApplicationListener listener; Thread mainLoopThread; - boolean running = true; Canvas canvas; Timer timer = new Timer("LwjglCanvas Timer"); - Runnable updateRunnable; public LwjglCanvas (ApplicationListener listener, boolean useGL2) { LwjglNativesLoader.load(); @@ -114,7 +112,7 @@ public class LwjglCanvas implements Application { listener.create(); listener.resize(graphics.getWidth(), graphics.getHeight()); - updateRunnable = new Runnable() { + final Runnable runnable = new Runnable() { int lastWidth = graphics.getWidth(); int lastHeight = graphics.getHeight(); @@ -138,7 +136,7 @@ public class LwjglCanvas implements Application { timer.schedule(new TimerTask() { public void run () { try { - EventQueue.invokeAndWait(updateRunnable); + EventQueue.invokeAndWait(runnable); } catch (Exception ex) { throw new GdxRuntimeException(ex); } @@ -147,12 +145,11 @@ public class LwjglCanvas implements Application { } public void stop () { - running = false; timer.cancel(); SwingUtilities.invokeLater(new Runnable() { public void run () { listener.pause(); - listener.destroy(); + listener.dispose(); Display.destroy(); } }); diff --git a/extensions/hiero/src/com/badlogic/gdx/hiero/Hiero.java b/extensions/hiero/src/com/badlogic/gdx/hiero/Hiero.java index c11b756d2..326f737f3 100644 --- a/extensions/hiero/src/com/badlogic/gdx/hiero/Hiero.java +++ b/extensions/hiero/src/com/badlogic/gdx/hiero/Hiero.java @@ -1251,7 +1251,7 @@ public class Hiero extends JFrame { @Override public void resume () { } - @Override public void destroy () { + @Override public void dispose () { } } diff --git a/extensions/hiero/src/com/badlogic/gdx/hiero/unicodefont/UnicodeFontTest.java b/extensions/hiero/src/com/badlogic/gdx/hiero/unicodefont/UnicodeFontTest.java index 3d83d4519..16c04a8f4 100644 --- a/extensions/hiero/src/com/badlogic/gdx/hiero/unicodefont/UnicodeFontTest.java +++ b/extensions/hiero/src/com/badlogic/gdx/hiero/unicodefont/UnicodeFontTest.java @@ -88,7 +88,7 @@ public class UnicodeFontTest implements ApplicationListener { } @Override - public void destroy() { + public void dispose() { // TODO Auto-generated method stub } diff --git a/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/ParticleEditor.java b/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/ParticleEditor.java index 7c83a65ef..7a27e7add 100644 --- a/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/ParticleEditor.java +++ b/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/ParticleEditor.java @@ -346,7 +346,7 @@ public class ParticleEditor extends JFrame { public void dispose () { } - @Override public void destroy () { + @Override public void dispose () { // TODO Auto-generated method stub } diff --git a/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/ButtonTest.java b/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/ButtonTest.java index e95aa8a2c..113213e03 100644 --- a/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/ButtonTest.java +++ b/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/ButtonTest.java @@ -17,6 +17,7 @@ public class ButtonTest implements ApplicationListener { GUI gui; TwlInputListener guiInputListener; + @Override public void create () { if (gui != null) return; @@ -37,6 +38,7 @@ public class ButtonTest implements ApplicationListener { gui.setSize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); } + @Override public void render () { Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); @@ -44,25 +46,16 @@ public class ButtonTest implements ApplicationListener { gui.update(); } - public void dispose () { - gui.destroy(); - } - @Override - public void destroy() { - // TODO Auto-generated method stub - + public void dispose() { + gui.destroy(); } @Override public void pause() { - // TODO Auto-generated method stub - } @Override public void resume() { - // TODO Auto-generated method stub - } } diff --git a/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/TextAreaTest.java b/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/TextAreaTest.java index 4ee0f76de..0967d942e 100644 --- a/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/TextAreaTest.java +++ b/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/TextAreaTest.java @@ -24,6 +24,7 @@ public class TextAreaTest implements ApplicationListener { GUI gui; TwlInputListener guiInputListener; + @Override public void create () { if (gui != null) return; @@ -79,25 +80,23 @@ public class TextAreaTest implements ApplicationListener { TwlRenderer.updateSize(gui); } + @Override public void render () { Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); Gdx.input.processEvents(guiInputListener); gui.update(); } - public void destroy () { + @Override + public void dispose () { gui.destroy(); } @Override public void pause() { - // TODO Auto-generated method stub - } @Override public void resume() { - // TODO Auto-generated method stub - } } diff --git a/gdx/src/com/badlogic/gdx/ApplicationListener.java b/gdx/src/com/badlogic/gdx/ApplicationListener.java index 6fd7ab851..c19d21b77 100644 --- a/gdx/src/com/badlogic/gdx/ApplicationListener.java +++ b/gdx/src/com/badlogic/gdx/ApplicationListener.java @@ -62,5 +62,5 @@ public interface ApplicationListener { /** * Called when the {@link Application} is destroyed. Preceded by a call to {@link #pause()}. */ - public void destroy (); + public void dispose (); } diff --git a/gdx/src/com/badlogic/gdx/Game.java b/gdx/src/com/badlogic/gdx/Game.java index 12451ff74..fb218d4f9 100644 --- a/gdx/src/com/badlogic/gdx/Game.java +++ b/gdx/src/com/badlogic/gdx/Game.java @@ -18,7 +18,7 @@ public abstract class Game implements ApplicationListener { } @Override - public void destroy() { + public void dispose() { screen.dispose(); } diff --git a/tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/WindowedTest.java b/tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/WindowedTest.java index 37fa71b72..e397a12cc 100644 --- a/tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/WindowedTest.java +++ b/tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/WindowedTest.java @@ -77,7 +77,7 @@ public class WindowedTest extends AndroidApplication implements ApplicationListe } - @Override public void destroy () { + @Override public void dispose () { // TODO Auto-generated method stub } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/AudioDeviceTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/AudioDeviceTest.java index 132ee0678..e4248fa1b 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/AudioDeviceTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/AudioDeviceTest.java @@ -48,7 +48,7 @@ public class AudioDeviceTest extends GdxTest { } } - @Override public void destroy () { + @Override public void dispose () { stop = true; try { thread.join(); diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java index b22ad34fa..9bddb5ef7 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java @@ -309,7 +309,7 @@ public class Box2DTest extends GdxTest implements InputProcessor { return false; } - @Override public void destroy () { + @Override public void dispose () { world.dispose(); } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java index 94a850000..627519a02 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java @@ -62,7 +62,7 @@ public class Box2DTestCollection extends GdxTest implements InputProcessor { @Override public boolean keyDown (int keycode) { if (keycode == Keys.KEYCODE_SPACE) { app.log("TestCollection", "disposing test '" + tests[testIndex].getClass().getName()); - tests[testIndex].destroy(); + tests[testIndex].dispose(); testIndex++; if (testIndex >= tests.length) testIndex = 0; Box2DTest test = tests[testIndex]; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/FloatTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/FloatTest.java index 183a087e5..46a1c1eb5 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/FloatTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/FloatTest.java @@ -35,7 +35,7 @@ public class FloatTest extends GdxTest { float angle = 0; float angleIncrement = 0.1f; - @Override public void destroy () { + @Override public void dispose () { tex.dispose(); tex2.dispose(); } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererTest.java index a27f37205..95ce52bb3 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererTest.java @@ -26,7 +26,7 @@ public class ImmediateModeRendererTest extends GdxTest { ImmediateModeRenderer renderer; Texture texture; - @Override public void destroy () { + @Override public void dispose () { texture.dispose(); } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectClassTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectClassTest.java index a2dab6d24..496c1c7e3 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectClassTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectClassTest.java @@ -26,7 +26,7 @@ public class IndexBufferObjectClassTest extends GdxTest { } @Override - public void destroy() { + public void dispose() { texture.dispose(); vbo.dispose(); ibo.dispose(); diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectShaderTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectShaderTest.java index d65f4a31d..f333c98bf 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectShaderTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectShaderTest.java @@ -27,7 +27,7 @@ public class IndexBufferObjectShaderTest extends GdxTest { } @Override - public void destroy() { + public void dispose() { texture.dispose(); shader.dispose(); ibo.dispose(); diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/LifeCycleTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/LifeCycleTest.java index 0c2678c9c..9fce67e69 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/LifeCycleTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/LifeCycleTest.java @@ -25,7 +25,7 @@ import com.badlogic.gdx.tests.utils.GdxTest; */ public class LifeCycleTest extends GdxTest { - @Override public void destroy () { + @Override public void dispose () { Gdx.app.log("Test", "Thread=" + Thread.currentThread().getId() + ", app destroyed"); } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/MD5Test.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/MD5Test.java index 9386eccbd..24cad37eb 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/MD5Test.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/MD5Test.java @@ -106,7 +106,7 @@ public class MD5Test extends GdxTest implements InputProcessor { } @Override - public void destroy() { + public void dispose() { batch.dispose(); renderer.dispose(); font.dispose(); diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleTest.java index a379a3ecf..5dea3ac15 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleTest.java @@ -35,7 +35,7 @@ public class SimpleTest extends GdxTest implements InputProcessor { } - @Override public void destroy () { + @Override public void dispose () { Gdx.app.log("Simple Test", "Thread=" + Thread.currentThread().getId() + ", application destroyed"); } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexArrayClassTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexArrayClassTest.java index b882d9f07..67cd47934 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexArrayClassTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexArrayClassTest.java @@ -26,7 +26,7 @@ public class VertexArrayClassTest extends GdxTest { } @Override - public void destroy() { + public void dispose() { texture.dispose(); va.dispose(); } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectClassTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectClassTest.java index 7aabcb5e5..95c42d1ef 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectClassTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectClassTest.java @@ -26,7 +26,7 @@ public class VertexBufferObjectClassTest extends GdxTest { } @Override - public void destroy() { + public void dispose() { texture.dispose(); vbo.dispose(); } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectShaderTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectShaderTest.java index d7b17bba2..936e5f2eb 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectShaderTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectShaderTest.java @@ -28,7 +28,7 @@ public class VertexBufferObjectShaderTest extends GdxTest { } @Override - public void destroy() { + public void dispose() { texture.dispose(); vbo.dispose(); shader.dispose(); diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/box2d/Box2DTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/box2d/Box2DTest.java index 5e2e37113..043479c2a 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/box2d/Box2DTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/box2d/Box2DTest.java @@ -99,7 +99,7 @@ public abstract class Box2DTest implements ApplicationListener, InputProcessor { createWorld(world); } - @Override public void destroy () { + @Override public void dispose () { renderer.dispose(); world.dispose(); diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTest.java index 1e72fd4c5..7fb6dc1dc 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTest.java @@ -10,5 +10,5 @@ public abstract class GdxTest implements ApplicationListener public void render( ) { }; public void resize(int width, int height) { }; public void pause( ) { }; - public void destroy( ) { }; + public void dispose( ) { }; } -- 2.11.0