[changed] ApplicationListener destroy => dispose.

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 34b1cf7..02b6916 100644 (file)
--- 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 {
                        }\r
                        \r
                        if(destroy) {                   \r
-                               app.listener.destroy();\r
+                               app.listener.dispose();\r
                                destroy = false;\r
                        }\r
                }\r

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 0bb0d43..cce99a3 100644 (file)
--- 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 {
                        }\r
                        \r
                        @Override\r
-                       public void destroy() {\r
+                       public void dispose() {\r
                                System.out.println("destroy");                          \r
                        }\r
                        \r

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 f811637..4ba63a4 100644 (file)
--- 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 {
 \r
        public void destroy() {         \r
                canvas.getContext().makeCurrent();\r
-               listener.destroy();\r
+               listener.dispose();\r
        }\r
 }\r

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 56fac65..86f239b 100644 (file)
--- 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 {
                }\r
                \r
                listener.pause();\r
-               listener.destroy();\r
+               listener.dispose();\r
                Display.destroy();\r
        }\r
        \r

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 d8b4a99..a4b2041 100644 (file)
--- 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;\r
        final ApplicationListener listener;\r
        Thread mainLoopThread;\r
-       boolean running = true;\r
        Canvas canvas;\r
        Timer timer = new Timer("LwjglCanvas Timer");\r
-       Runnable updateRunnable;\r
 \r
        public LwjglCanvas (ApplicationListener listener, boolean useGL2) {\r
                LwjglNativesLoader.load();\r
@@ -114,7 +112,7 @@ public class LwjglCanvas implements Application {
                listener.create();\r
                listener.resize(graphics.getWidth(), graphics.getHeight());\r
 \r
-               updateRunnable = new Runnable() {\r
+               final Runnable runnable = new Runnable() {\r
                        int lastWidth = graphics.getWidth();\r
                        int lastHeight = graphics.getHeight();\r
 \r
@@ -138,7 +136,7 @@ public class LwjglCanvas implements Application {
                timer.schedule(new TimerTask() {\r
                        public void run () {\r
                                try {\r
-                                       EventQueue.invokeAndWait(updateRunnable);\r
+                                       EventQueue.invokeAndWait(runnable);\r
                                } catch (Exception ex) {\r
                                        throw new GdxRuntimeException(ex);\r
                                }\r
@@ -147,12 +145,11 @@ public class LwjglCanvas implements Application {
        }\r
 \r
        public void stop () {\r
-               running = false;\r
                timer.cancel();\r
                SwingUtilities.invokeLater(new Runnable() {\r
                        public void run () {\r
                                listener.pause();\r
-                               listener.destroy();\r
+                               listener.dispose();\r
                                Display.destroy();\r
                        }\r
                });\r

diff --git a/extensions/hiero/src/com/badlogic/gdx/hiero/Hiero.java b/extensions/hiero/src/com/badlogic/gdx/hiero/Hiero.java
index c11b756..326f737 100644 (file)
--- 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 () {\r
                }\r
                \r
-               @Override public void destroy () {\r
+               @Override public void dispose () {\r
                }\r
        }\r
 \r

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 3d83d45..16c04a8 100644 (file)
--- 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 {
        }\r
 \r
        @Override\r
-       public void destroy() {\r
+       public void dispose() {\r
                // TODO Auto-generated method stub\r
 \r
        }\r

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 7c83a65..7a27e7a 100644 (file)
--- 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 () {\r
                }\r
 \r
-               @Override public void destroy () {\r
+               @Override public void dispose () {\r
                        // TODO Auto-generated method stub\r
 \r
                }\r

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 e95aa8a..113213e 100644 (file)
--- 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;        \r
        TwlInputListener guiInputListener;\r
 \r
+       @Override\r
        public void create () {\r
                if (gui != null) return;\r
 \r
@@ -37,6 +38,7 @@ public class ButtonTest implements ApplicationListener {
                gui.setSize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());         \r
        }\r
 \r
+       @Override\r
        public void render () {\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);       \r
                \r
@@ -44,25 +46,16 @@ public class ButtonTest implements ApplicationListener {
                gui.update();           \r
        }\r
 \r
-       public void dispose () {\r
-               gui.destroy();\r
-       }       \r
-\r
        @Override\r
-       public void destroy() {\r
-               // TODO Auto-generated method stub\r
-               \r
+       public void dispose() {\r
+               gui.destroy();\r
        }\r
 \r
        @Override\r
        public void pause() {\r
-               // TODO Auto-generated method stub\r
-               \r
        }\r
 \r
        @Override\r
        public void resume() {\r
-               // TODO Auto-generated method stub\r
-               \r
        }\r
 }\r

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 4ee0f76..0967d94 100644 (file)
--- 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;\r
        TwlInputListener guiInputListener;\r
 \r
+       @Override\r
        public void create () {\r
                if (gui != null) return;\r
 \r
@@ -79,25 +80,23 @@ public class TextAreaTest implements ApplicationListener {
                TwlRenderer.updateSize(gui);\r
        }\r
 \r
+       @Override\r
        public void render () {\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                Gdx.input.processEvents(guiInputListener);\r
                gui.update();\r
        }\r
 \r
-       public void destroy () {\r
+       @Override\r
+       public void dispose () {\r
                gui.destroy();\r
        }\r
 \r
        @Override\r
        public void pause() {\r
-               // TODO Auto-generated method stub\r
-               \r
        }\r
 \r
        @Override\r
        public void resume() {\r
-               // TODO Auto-generated method stub\r
-               \r
        }\r
 }\r

diff --git a/gdx/src/com/badlogic/gdx/ApplicationListener.java b/gdx/src/com/badlogic/gdx/ApplicationListener.java
index 6fd7ab8..c19d21b 100644 (file)
--- a/gdx/src/com/badlogic/gdx/ApplicationListener.java
+++ b/gdx/src/com/badlogic/gdx/ApplicationListener.java
@@ -62,5 +62,5 @@ public interface ApplicationListener {
        /**\r
         * Called when the {@link Application} is destroyed. Preceded by a call to {@link #pause()}.\r
         */\r
-       public void destroy ();\r
+       public void dispose ();\r
 }\r

diff --git a/gdx/src/com/badlogic/gdx/Game.java b/gdx/src/com/badlogic/gdx/Game.java
index 12451ff..fb218d4 100644 (file)
--- 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 {
        }\r
 \r
        @Override\r
-       public void destroy() {         \r
+       public void dispose() {         \r
                screen.dispose();\r
        }\r
 \r

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 37fa71b..e397a12 100644 (file)
--- 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
 \r
        }\r
 \r
-       @Override public void destroy () {\r
+       @Override public void dispose () {\r
                // TODO Auto-generated method stub\r
 \r
        }\r

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 132ee06..e4248fa 100644 (file)
--- 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 {
                }\r
        }\r
        \r
-       @Override public void destroy () {\r
+       @Override public void dispose () {\r
                stop = true;\r
                try {\r
                        thread.join();\r

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 b22ad34..9bddb5e 100644 (file)
--- 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;\r
        }\r
 \r
-       @Override public void destroy () {\r
+       @Override public void dispose () {\r
                world.dispose();\r
        }\r
        \r

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 94a8500..627519a 100644 (file)
--- 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) {\r
                if (keycode == Keys.KEYCODE_SPACE) {\r
                        app.log("TestCollection", "disposing test '" + tests[testIndex].getClass().getName());\r
-                       tests[testIndex].destroy();\r
+                       tests[testIndex].dispose();\r
                        testIndex++;\r
                        if (testIndex >= tests.length) testIndex = 0;\r
                        Box2DTest test = tests[testIndex];\r

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 183a087..46a1c1e 100644 (file)
--- 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;\r
        float angleIncrement = 0.1f;\r
 \r
-       @Override public void destroy () {\r
+       @Override public void dispose () {\r
                tex.dispose();\r
                tex2.dispose();\r
        }\r

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 a27f372..95ce52b 100644 (file)
--- 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;\r
        Texture texture;\r
 \r
-       @Override public void destroy () {\r
+       @Override public void dispose () {\r
                texture.dispose();\r
        }\r
 \r

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 a2dab6d..496c1c7 100644 (file)
--- 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 {
        }\r
 \r
        @Override\r
-       public void destroy() {\r
+       public void dispose() {\r
                texture.dispose();\r
                vbo.dispose();\r
                ibo.dispose();\r

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 d65f4a3..f333c98 100644 (file)
--- 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 {
        }\r
 \r
        @Override\r
-       public void destroy() {\r
+       public void dispose() {\r
                texture.dispose();\r
                shader.dispose();\r
                ibo.dispose();\r

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 0c2678c..9fce67e 100644 (file)
--- 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;
  */\r
 public class LifeCycleTest extends GdxTest {\r
 \r
-       @Override public void destroy () {\r
+       @Override public void dispose () {\r
                Gdx.app.log("Test", "Thread=" + Thread.currentThread().getId() + ", app destroyed");\r
        }\r
 \r

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 9386ecc..24cad37 100644 (file)
--- 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 {
        }\r
 \r
        @Override\r
-       public void destroy() {\r
+       public void dispose() {\r
                batch.dispose();\r
                renderer.dispose();\r
                font.dispose();\r

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 a379a3e..5dea3ac 100644 (file)
--- 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 {
 \r
        }\r
 \r
-       @Override public void destroy () {\r
+       @Override public void dispose () {\r
                Gdx.app.log("Simple Test", "Thread=" + Thread.currentThread().getId() + ", application destroyed");\r
        }\r
 \r

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 b882d9f..67cd479 100644 (file)
--- 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 {
        }\r
 \r
        @Override\r
-       public void destroy() {\r
+       public void dispose() {\r
                texture.dispose();\r
                va.dispose();\r
        }\r

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 7aabcb5..95c42d1 100644 (file)
--- 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 {
        }\r
 \r
        @Override\r
-       public void destroy() {\r
+       public void dispose() {\r
                texture.dispose();\r
                vbo.dispose();          \r
        }\r

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 d7b17bb..936e5f2 100644 (file)
--- 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 {
        }\r
 \r
        @Override\r
-       public void destroy() {\r
+       public void dispose() {\r
                texture.dispose();\r
                vbo.dispose();\r
                shader.dispose();\r

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 5e2e371..043479c 100644 (file)
--- 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);\r
        }\r
 \r
-       @Override public void destroy () {              \r
+       @Override public void dispose () {              \r
                renderer.dispose();\r
                world.dispose();\r
 \r

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 1e72fd4..7fb6dc1 100644 (file)
--- 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( ) { };\r
        public void resize(int width, int height) { };\r
        public void pause( ) { };\r
-       public void destroy( ) { };\r
+       public void dispose( ) { };\r
 }\r