Engine: Allowed LoopUntilCollisionMoveEvent to be cancelled

3 files changed, 17 insertions, 8 deletions

@@ -6,7 +6,6 @@
 package com.fourisland.fourpuzzle.gamestate.mapview.event;
 
 import com.fourisland.fourpuzzle.PuzzleApplication;
-import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.AutomaticViewpoint;
 import com.fourisland.fourpuzzle.util.ResourceNotFoundException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -163,7 +163,7 @@ public class SpecialEvent {
     /**
      * Waits until all previously called MoveEvent()s have finished
      * 
-     * @throws InterruptedException
+     * @throws InterruptedException 
      */
     public void MoveEventWait() throws InterruptedException
     {
@@ -32,14 +32,24 @@ public class LoopUntilCollisionMoveEvent implements MoveEvent {
     {
         loc = new Point();
         
-        while ((loc == null) || (!loc.equals(ev.getLocation())))
-        {
-            loc.setLocation(ev.getLocation());
-            
-            for (MoveEvent move : moves)
+        try {
+            while ((loc == null) || (!loc.equals(ev.getLocation())))
             {
-                move.doAction(ev);
+                loc.setLocation(ev.getLocation());
+
+                for (MoveEvent move : moves)
+                {
+                    move.doAction(ev);
+
+                    if (Thread.currentThread().isInterrupted())
+                    {
+                        throw new InterruptedException();
+                    }
+                }
             }
+        } catch (InterruptedException ex) {
+            /* The special event has been cancelled; Propogate the interrupt to
+             * the MoveEventThread */
         }
     }