6 files changed, 18 insertions, 38 deletions

@@ -5,7 +5,6 @@
 
 package com.fourisland.fourpuzzle.gamestate.mapview.event;
 
-import com.fourisland.fourpuzzle.gamestate.mapview.Map;
 import java.util.concurrent.Future;
 
 /**
@@ -22,9 +21,9 @@ public abstract class EventCall extends SpecialEvent implements Runnable {
             }
         };
     }
-
-    public abstract void run();
     
+    public abstract void run();
+
     private Future isRunning = null;
     public void activate(EventCallTime calltime)
     {
@@ -14,8 +14,6 @@ import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.FixedViewpoint;
 import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.MovingViewpoint;
 import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.Viewpoint;
 import java.util.concurrent.CountDownLatch;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
@@ -128,8 +126,9 @@ public class SpecialEvent {
     
     /**
      * Waits until all previously called MoveEvent()s have finished
+     * @throws InterruptedException
      */
-    public void MoveEventWait()
+    public void MoveEventWait() throws InterruptedException
     {
         MoveEventThread.moveAll();
     }
@@ -166,14 +165,11 @@ public class SpecialEvent {
      * Waits for a specified interval
      * 
      * @param wait The time to wait in milliseconds
+     * @throws InterruptedException
      */
-    public void Wait(int wait)
+    public void Wait(int wait) throws InterruptedException
     {
-        try {
-            Thread.sleep(wait);
-        } catch (InterruptedException ex) {
-            Logger.getLogger(SpecialEvent.class.getName()).log(Level.SEVERE, null, ex);
-        }
+        Thread.sleep(wait);
     }
     
     /**
@@ -193,8 +189,9 @@ public class SpecialEvent {
      * @param length How long (in milliseconds) it will take to pan
      * @param block If true, the game will wait for the pan to complete
      *              before executing any more commands
+     * @throws InterruptedException
      */
-    public void PanViewpoint(final int x, final int y, int length, final boolean block)
+    public void PanViewpoint(final int x, final int y, int length, final boolean block) throws InterruptedException
     {
         Viewpoint viewpoint = mapView.getViewpoint();
         final CountDownLatch blocker;
@@ -220,11 +217,7 @@ public class SpecialEvent {
         
         if (block)
         {
-            try {
-                blocker.await();
-            } catch (InterruptedException ex) {
-                Logger.getLogger(SpecialEvent.class.getName()).log(Level.SEVERE, null, ex);
-            }
+            blocker.await();
         }
     }
     
@@ -11,8 +11,6 @@ import com.fourisland.fourpuzzle.gamestate.mapview.event.LayerEvent;
 import java.util.List;
 import java.util.Vector;
 import java.util.concurrent.Semaphore;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
@@ -37,7 +35,7 @@ public class MoveEventThread implements Runnable {
         try {
             moveEventWait.acquire();
         } catch (InterruptedException ex) {
-            Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
+            Thread.currentThread().interrupt();
         }
         
         while (ev.isMoving())
@@ -45,7 +43,7 @@ public class MoveEventThread implements Runnable {
             try {
                 Thread.sleep(2);
             } catch (InterruptedException ex) {
-                Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
+                Thread.currentThread().interrupt();
             }
         }
         
@@ -74,14 +72,10 @@ public class MoveEventThread implements Runnable {
         return (events.contains(event));
     }
     
-    public static void moveAll()
+    public static void moveAll() throws InterruptedException
     {
-        try {
-            moveEventWait.acquire(100);
-            moveEventWait.release(100);
-        } catch (InterruptedException ex) {
-            Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
-        }
+        moveEventWait.acquire(100);
+        moveEventWait.release(100);
     }
 
 }
@@ -7,8 +7,6 @@ package com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove;
 
 import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * StepMoveEvent moves the event in the direction specified.
@@ -32,7 +30,7 @@ public class StepMoveEvent implements MoveEvent {
                 try {
                     Thread.sleep(2);
                 } catch (InterruptedException ex) {
-                    Logger.getLogger(StepMoveEvent.class.getName()).log(Level.SEVERE, null, ex);
+                    Thread.currentThread().interrupt();
                 }
             }
         }
@@ -6,8 +6,6 @@
 package com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove;
 
 import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * WaitMoveEvent pauses for the specifed amount of milliseconds.
@@ -27,7 +25,7 @@ public class WaitMoveEvent implements MoveEvent {
         try {
             Thread.sleep(wait);
         } catch (InterruptedException ex) {
-            Logger.getLogger(WaitMoveEvent.class.getName()).log(Level.SEVERE, null, ex);
+            Thread.currentThread().interrupt();
         }
     }
 
@@ -6,8 +6,6 @@
 package com.fourisland.fourpuzzle.transition;
 
 import com.fourisland.fourpuzzle.Display;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
@@ -28,7 +26,7 @@ public class TransitionCallbackThread implements Runnable {
             try {
                 Thread.sleep(300);
             } catch (InterruptedException ex) {
-                Logger.getLogger(TransitionCallbackThread.class.getName()).log(Level.SEVERE, null, ex);
+                Thread.currentThread().interrupt();
             }
         }