Replaced checked exceptions with RuntimeException

23 files changed, 73 insertions, 63 deletions

@@ -23,13 +23,13 @@ public interface Event {
     public void setLocation(Point location);
     public void setLocation(int x, int y);
     
-    public void render(Graphics g) throws Exception;
+    public void render(Graphics g);
     
-    public Direction getDirection() throws Exception;
-    public void setDirection(Direction direction) throws Exception;
+    public Direction getDirection();
+    public void setDirection(Direction direction);
 
     public boolean isMoving();
-    public void startMoving(Direction direction) throws Exception;
+    public void startMoving(Direction direction);
     
-    public Layer getLayer() throws Exception;
+    public Layer getLayer();
 }
@@ -12,7 +12,6 @@ import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.Game;
 import com.fourisland.fourpuzzle.GameCharacter;
 import com.fourisland.fourpuzzle.gamestate.mapview.CharSet;
-import com.fourisland.fourpuzzle.NoCharactersInPartyException;
 
 /**
  *
@@ -44,7 +43,7 @@ public class HeroEvent implements Event {
         location.setLocation(x, y);
     }
     
-    public void render(Graphics g) throws Exception
+    public void render(Graphics g)
     {
         int x = (location.x * 16) - 4;
         int y = (location.y * 16) - 16;
@@ -66,15 +65,10 @@ public class HeroEvent implements Event {
             }
         }
         
-        try
-        {
-            GameCharacter toDraw = Game.getSaveFile().getParty().getLeader();
-            if (!toDraw.getGraphic().equals("blank"))
-            {
-                g.drawImage(CharSet.getCharSet(toDraw.getGraphic()).getImage(toDraw.getGraphicOffset(), direction, animationStep), x, y, null);
-            }
-        } catch (NoCharactersInPartyException ex)
+        GameCharacter toDraw = Game.getSaveFile().getParty().getLeader();
+        if (!toDraw.getGraphic().equals("blank"))
         {
+            g.drawImage(CharSet.getCharSet(toDraw.getGraphic()).getImage(toDraw.getGraphicOffset(), direction, animationStep), x, y, null);
         }
     }
     
@@ -91,7 +85,7 @@ public class HeroEvent implements Event {
     
     private int moveTimer;
     private Direction moveDirection;
-    public void startMoving(Direction toMove) throws Exception
+    public void startMoving(Direction toMove)
     {
         setDirection(toMove);
         setAnimationStep(2);
@@ -99,7 +93,7 @@ public class HeroEvent implements Event {
         moving = true;
         moveDirection = toMove;
     }
-    public void processMoving() throws Exception
+    public void processMoving()
     {
         if (moving)
         {
@@ -149,7 +143,7 @@ public class HeroEvent implements Event {
         this.animationStep = animationStep;
     }
 
-    public Layer getLayer() throws Exception
+    public Layer getLayer()
     {
         return Layer.Middle;
     }
@@ -68,7 +68,7 @@ public class LayerEvent implements Event {
         events.add(pe);
     }
     
-    private PossibleEvent getPossibleEvent() throws Exception
+    private PossibleEvent getPossibleEvent()
     {
         int i;
         for (i=(events.size()-1);i>-1;i--)
@@ -89,7 +89,7 @@ public class LayerEvent implements Event {
         return new PossibleEvent();
     }
     
-    public void render(Graphics g) throws Exception
+    public void render(Graphics g)
     {
         int x = (location.x * 16) - 4;
         int y = (location.y * 16) - 16;
@@ -131,7 +131,7 @@ public class LayerEvent implements Event {
     
     private int moveTimer;
     private Direction moveDirection;
-    public void startMoving(Map map) throws Exception
+    public void startMoving(Map map)
     {
         Direction toMove = getPossibleEvent().getMovement().startMoving();
         
@@ -143,7 +143,7 @@ public class LayerEvent implements Event {
             }
         }
     }
-    public void startMoving(Direction toMove) throws Exception
+    public void startMoving(Direction toMove)
     {
         getPossibleEvent().setDirection(toMove);
         getPossibleEvent().setAnimationStep(2);
@@ -151,7 +151,7 @@ public class LayerEvent implements Event {
         moving = true;
         moveDirection = toMove;
     }
-    public void processMoving() throws Exception
+    public void processMoving()
     {
         if (moving)
         {
@@ -181,26 +181,26 @@ public class LayerEvent implements Event {
         }
     }
     
-    public Direction getDirection() throws Exception
+    public Direction getDirection()
     {
         return getPossibleEvent().getDirection();
     }
-    public void setDirection(Direction direction) throws Exception
+    public void setDirection(Direction direction)
     {
         getPossibleEvent().setDirection(direction);
     }
 
-    public Layer getLayer() throws Exception
+    public Layer getLayer()
     {
         return getPossibleEvent().getLayer();
     }
     
-    public EventCallTime getCalltime() throws Exception
+    public EventCallTime getCalltime()
     {
         return getPossibleEvent().getCalltime();
     }
     
-    public EventCall getCallback() throws Exception
+    public EventCall getCallback()
     {
         return getPossibleEvent().getCallback();
     }
@@ -47,7 +47,7 @@ public class PossibleEvent {
         animationStep = 1;
     }
         
-    public BufferedImage getImage() throws Exception
+    public BufferedImage getImage()
     {        
         return graphic.getImage();
     }
@@ -88,7 +88,8 @@ public class PossibleEvent {
         return direction;
     }
 
-    public void setDirection(Direction direction) throws Exception {
+    public void setDirection(Direction direction)
+    {
         if (Functions.canTurn(this))
         {
             this.direction = direction;
@@ -129,18 +129,16 @@ public class SpecialEvent {
     
     /**
      * Triggers the Game Over sequence
-     * @throws Exception 
      */
-    public void GameOver() throws Exception
+    public void GameOver()
     {
         throw new UnsupportedOperationException("Not yet implemented");
     }
     
     /**
      * Returns the player to the Title Screen
-     * @throws Exception 
      */
-    public void TitleScreen() throws Exception
+    public void TitleScreen()
     {
         throw new UnsupportedOperationException("Not yet implemented");
     }
@@ -151,9 +149,8 @@ public class SpecialEvent {
      * @param map The name of the map to move to
      * @param x The X position on the map to move to
      * @param y The Y position on the map to move to
-     * @throws java.lang.Exception
      */
-    public void Teleport(String map, int x, int y) throws Exception
+    public void Teleport(String map, int x, int y)
     {
         throw new UnsupportedOperationException("Not yet implemented");
     }
@@ -162,11 +159,14 @@ public class SpecialEvent {
      * Waits for a specified interval
      * 
      * @param wait The time to wait in milliseconds
-     * @throws java.lang.InterruptedException
      */
-    public void Wait(int wait) throws InterruptedException
+    public void Wait(int wait)
     {
-        Thread.sleep(wait);
+        try {
+            Thread.sleep(wait);
+        } catch (InterruptedException ex) {
+            Logger.getLogger(SpecialEvent.class.getName()).log(Level.SEVERE, null, ex);
+        }
     }
     
 }
@@ -17,7 +17,8 @@ public class BlankEventGraphic implements EventGraphic {
     private Direction direction;
     private int animationStep;
 
-    public BufferedImage getImage() throws Exception {
+    public BufferedImage getImage()
+    {
         return null;
     }
 
@@ -26,7 +26,7 @@ public class CharSetEventGraphic implements EventGraphic {
         this.graphicOffset = graphicOffset;
     }
 
-    public BufferedImage getImage() throws Exception
+    public BufferedImage getImage()
     {
         return CharSet.getCharSet(getGraphic()).getImage(getGraphicOffset(), getDirection(), getAnimationStep());
     }
@@ -14,7 +14,7 @@ import java.awt.image.BufferedImage;
  */
 public interface EventGraphic {
     
-    public BufferedImage getImage() throws Exception;
+    public BufferedImage getImage();
     
     public Direction getDirection();
     public void setDirection(Direction direction);
@@ -21,7 +21,7 @@ public class CustomMovementType implements MovementType {
         this.moves = moves;
     }
     
-    public Direction startMoving() throws Exception
+    public Direction startMoving()
     {        
         if (step >= moves.length)
         {
@@ -13,7 +13,7 @@ import com.fourisland.fourpuzzle.Direction;
  */
 public interface MovementType {
     
-    public Direction startMoving() throws Exception;
+    public Direction startMoving();
     
 }
     
@@ -14,7 +14,8 @@ import java.util.Random;
  */
 public class RandomMovementType implements MovementType {
 
-    public Direction startMoving() throws Exception {
+    public Direction startMoving()
+    {
         Random r = new Random();
         int ra = r.nextInt(1000);
         Direction toMove = null;
@@ -13,7 +13,7 @@ import com.fourisland.fourpuzzle.Direction;
  */
 public class StayStillMovementType implements MovementType {
 
-    public Direction startMoving() throws Exception
+    public Direction startMoving()
     {
         return null; // Do nothing, stay still
     }
@@ -20,7 +20,8 @@ public class HeroInPartyPrecondition implements Precondition {
         this.heroName = heroName;
     }
     
-    public boolean match() {
+    public boolean match()
+    {
         return Game.getSaveFile().getParty().exists(heroName);
     }
     
@@ -22,7 +22,8 @@ public class HeroLevelPrecondition implements Precondition {
         this.level = level;
     }
     
-    public boolean match() throws Exception {
+    public boolean match()
+    {
         return (Game.getSaveFile().getParty().exists(heroName) && (Game.getSaveFile().getParty().get(heroName).getLevel() == level));
     }
     
@@ -11,6 +11,6 @@ package com.fourisland.fourpuzzle.gamestate.mapview.event.precondition;
  */
 public interface Precondition {
 
-    public boolean match() throws Exception;
+    public boolean match();
     
 }
@@ -20,7 +20,8 @@ public class SwitchPrecondition implements Precondition {
         this.switchID = switchID;
     }
     
-    public boolean match() {
+    public boolean match() 
+    {
         return (Game.getSaveFile().getSwitches().containsKey(switchID) && Game.getSaveFile().getSwitches().get(switchID));
     }
 
@@ -25,7 +25,8 @@ public class VariableNumberPrecondition implements Precondition {
         this.number = number;
     }
     
-    public boolean match() {
+    public boolean match()
+    {
         if (Game.getSaveFile().getVariables().containsKey(variableID))
         {
             int n1 = Game.getSaveFile().getVariables().get(variableID);
@@ -25,7 +25,8 @@ public class VariableVariablePrecondition implements Precondition {
         this.variableID2 = variableID2;
     }
     
-    public boolean match() {
+    public boolean match()
+    {
         if (Game.getSaveFile().getVariables().containsKey(variableID))
         {
             int n1 = Game.getSaveFile().getVariables().get(variableID);
@@ -20,7 +20,7 @@ public class FaceMoveEvent implements MoveEvent {
         this.direction = direction;
     }
     
-    public void doAction(Event ev) throws Exception
+    public void doAction(Event ev)
     {
         ev.setDirection(direction);
     }
@@ -14,6 +14,6 @@ import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
  */
 public interface MoveEvent {
 
-    public void doAction(Event ev) throws Exception;
+    public void doAction(Event ev);
     
 }
@@ -42,11 +42,7 @@ public class MoveEventThread implements Runnable {
         
         for (MoveEvent action : actions)
         {
-            try {
-                action.doAction(ev);
-            } catch (Exception ex) {
-                Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
-            }
+            action.doAction(ev);
         }
         
         events.remove(ev);
@@ -7,6 +7,8 @@ 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;
 
 /**
  *
@@ -20,13 +22,17 @@ public class StepMoveEvent implements MoveEvent {
         this.direction = direction;
     }
     
-    public void doAction(Event ev) throws Exception
+    public void doAction(Event ev)
     {
         ev.startMoving(direction);
 
         while (ev.isMoving())
         {
-            Thread.sleep(2);
+            try {
+                Thread.sleep(2);
+            } catch (InterruptedException ex) {
+                Logger.getLogger(StepMoveEvent.class.getName()).log(Level.SEVERE, null, ex);
+            }
         }
     }
 
@@ -6,6 +6,8 @@
 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;
 
 /**
  *
@@ -19,9 +21,13 @@ public class WaitMoveEvent implements MoveEvent {
         this.wait = wait;
     }
     
-    public void doAction(Event ev) throws Exception
+    public void doAction(Event ev)
     {
-        Thread.sleep(wait);
+        try {
+            Thread.sleep(wait);
+        } catch (InterruptedException ex) {
+            Logger.getLogger(WaitMoveEvent.class.getName()).log(Level.SEVERE, null, ex);
+        }
     }
 
 }