4 files changed, 41 insertions, 51 deletions

@@ -5,6 +5,7 @@
 
 package com.fourisland.fourpuzzle;
 
+import com.fourisland.fourpuzzle.gamestate.GameState;
 import com.fourisland.fourpuzzle.transition.InTransition;
 import com.fourisland.fourpuzzle.transition.MultidirectionalTransition;
 import com.fourisland.fourpuzzle.transition.OutTransition;
@@ -28,6 +29,8 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.jdesktop.application.ResourceMap;
@@ -204,6 +207,36 @@ public class Display {
         }
     }
     
+    private static Executor transitioner = Executors.newSingleThreadExecutor();
+    public static void transition(final Transition out, final GameState gameState, final Transition in, boolean thread)
+    {
+        Runnable transitionCall = new Runnable() {
+            public void run()
+            {
+                try {
+                    Display.transition(out);
+                    Game.setGameState(gameState);
+                    Display.transition(in);
+                } catch (InterruptedException ex) {
+                    Thread.currentThread().interrupt();
+                } catch (RuntimeException ex)
+                {
+                    PuzzleApplication.INSTANCE.reportError(ex);
+                } catch (Error ex)
+                {
+                    PuzzleApplication.INSTANCE.reportError(ex);
+                }
+            }
+        };
+        
+        if (thread)
+        {
+            transitioner.execute(transitionCall);
+        } else {
+            transitionCall.run();
+        }
+    }
+    
     public static boolean isTransitionRunning()
     {
         return transitionRunning;
@@ -38,23 +38,7 @@ public class GameOverGameState implements GameState {
         {
             Game.setSaveFile(new SaveFile());
             
-            new Thread(new Runnable() {
-                public void run() {
-                    try {
-                        Display.transition(Database.getTransition(Transitions.GameOverToTitle));
-                    } catch (InterruptedException ex) {
-                        Thread.currentThread().interrupt();
-                    }
-                    
-                    Game.setGameState(new TitleScreenGameState());
-                    
-                    try {
-                        Display.transition(Database.getTransition(Transitions.TitleEnter));
-                    } catch (InterruptedException ex) {
-                        Thread.currentThread().interrupt();
-                    }
-                }
-            }).start();
+            Display.transition(Database.getTransition(Transitions.GameOverToTitle), new TitleScreenGameState(), Database.getTransition(Transitions.TitleEnter), true);
         }
     }
 
@@ -56,23 +56,7 @@ public class TitleScreenGameState implements GameState {
                 {
                     Game.setSaveFile(new SaveFile());
 
-                    new Thread(new Runnable() {
-                        public void run() {
-                            try {
-                                Display.transition(Database.getTransition(Transitions.TitleExit));
-                            } catch (InterruptedException ex) {
-                                Thread.currentThread().interrupt();
-                            }
-
-                            Game.setGameState(new MapViewGameState("TestMap", 1, 2));
-
-                            try {
-                                Display.transition(Database.getTransition(Transitions.TitleToMap));
-                            } catch (InterruptedException ex) {
-                                Thread.currentThread().interrupt();
-                            }
-                        }
-                    }).start();
+                    Display.transition(Database.getTransition(Transitions.TitleExit), new MapViewGameState("TestMap", 1, 2), Database.getTransition(Transitions.TitleToMap), true);
                 } else if (choices.getSelected().equals(Database.getVocab(Vocabulary.LoadGame)))
                 {
                     // Do nothing, yet
@@ -155,12 +155,9 @@ public class SpecialEvent {
      */
     public void GameOver() throws InterruptedException
     {
-        Display.transition(Database.getTransition(Transitions.MapToGameOver));
-
         Audio.stopMusic();
-        Game.setGameState(new GameOverGameState());
-
-        Display.transition(Database.getTransition(Transitions.GameOverEnter));
+        
+        Display.transition(Database.getTransition(Transitions.MapToGameOver), new GameOverGameState(), Database.getTransition(Transitions.GameOverEnter), false);
     }
     
     /**
@@ -170,12 +167,9 @@ public class SpecialEvent {
      */
     public void TitleScreen() throws InterruptedException
     {
-        Display.transition(Database.getTransition(Transitions.MapToTitle));
-
         Audio.stopMusic();
-        Game.setGameState(new TitleScreenGameState());
 
-        Display.transition(Database.getTransition(Transitions.TitleEnter));
+        Display.transition(Database.getTransition(Transitions.MapToTitle), new TitleScreenGameState(), Database.getTransition(Transitions.TitleEnter), false);
     }
     
     private boolean startedTransition = false;
@@ -217,14 +211,9 @@ public class SpecialEvent {
     {
         if (!startedTransition)
         {
-            Display.transition(Database.getTransition(Transitions.MapExit));
-        }
-        
-        Game.setGameState(new MapViewGameState(map, x, y));
-        
-        if (!startedTransition)
-        {
-            Display.transition(Database.getTransition(Transitions.MapEnter));
+            Display.transition(Database.getTransition(Transitions.MapExit), new MapViewGameState(map, x, y), Database.getTransition(Transitions.MapEnter), false);
+        } else {
+            Game.setGameState(new MapViewGameState(map, x, y));
         }
     }