Engine: Abstracted game state transitions

Previously, every game state transition was manually executed with a thread, some exception handling and Display. Now, Display has a method that takes care of it without leaving all of the bulk in random classes.

1 files changed, 33 insertions, 0 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;