13 files changed, 338 insertions, 44 deletions

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<project name="Four_Puzzle_Library" default="default" basedir=".">
+    <description>Builds, tests, and runs the project Four Puzzle Library.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="Four_Puzzle_Library-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
@@ -5,7 +5,8 @@
 <project name="Four_Puzzle_Library" default="default" basedir=".">
     <description>Builds, tests, and runs the project Four Puzzle Library.</description>
     <import file="nbproject/build-impl.xml"/>
-    <!--
+
+    <import file="nbproject/profiler-build-impl.xml"/>    <!--
 
     There exist several targets which are by default empty and which can be 
     used for execution of your tasks. These targets are usually executed 
@@ -6,3 +6,6 @@ build.xml.stylesheet.CRC32=be360661
 nbproject/build-impl.xml.data.CRC32=15d90fc1
 nbproject/build-impl.xml.script.CRC32=3013fcc1
 nbproject/build-impl.xml.stylesheet.CRC32=487672f9
+nbproject/profiler-build-impl.xml.data.CRC32=15d90fc1
+nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
+nbproject/profiler-build-impl.xml.stylesheet.CRC32=42cb6bcf
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - profiling
+  - applet profiling
+
+-->
+<project name="-profiler-impl" default="profile" basedir="..">
+    <target name="default" depends="profile" description="Build and profile the project."/>
+    <!--
+    ======================
+    INITIALIZATION SECTION
+    ======================
+    -->
+    <target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check"/>
+    <target name="-profile-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-init-macrodef-profile">
+        <macrodef name="resolve">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${env.@{value}}"/>
+            </sequential>
+        </macrodef>
+        <macrodef name="profile">
+            <attribute name="classname" default="${main.class}"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property environment="env"/>
+                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+                <java fork="true" classname="@{classname}" dir="${profiler.info.dir}" jvm="${profiler.info.jvm}">
+                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                    <jvmarg line="${profiler.info.jvmargs}"/>
+                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                    <arg line="${application.args}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-profile-init-check" depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile">
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+    </target>
+    <!--
+    =================
+    PROFILING SECTION
+    =================
+    -->
+    <target name="profile" if="netbeans.home" depends="profile-init,compile" description="Profile a project in the IDE.">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile/>
+    </target>
+    <target name="profile-single" if="netbeans.home" depends="profile-init,compile-single" description="Profile a selected class in the IDE.">
+        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="${profile.class}"/>
+    </target>
+    <!--
+    =========================
+    APPLET PROFILING  SECTION
+    =========================
+    -->
+    <target name="profile-applet" if="netbeans.home" depends="profile-init,compile-single">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </profile>
+    </target>
+    <!--
+    =========================
+    TESTS PROFILING  SECTION
+    =========================
+    -->
+    <target name="profile-test-single" if="netbeans.home" depends="profile-init,compile-test-single">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <junit showoutput="true" fork="true" dir="${profiler.info.dir}" jvm="${profiler.info.jvm}" failureproperty="tests.failed" errorproperty="tests.failed">
+            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg line="${profiler.info.jvmargs}"/>
+            <test name="${profile.class}"/>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+            <syspropertyset>
+                <propertyref prefix="test-sys-prop."/>
+                <mapper type="glob" from="test-sys-prop.*" to="*"/>
+            </syspropertyset>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+    </target>
+</project>
@@ -20,7 +20,7 @@ public abstract class Map {
 
     public abstract void initalize();
     
-    public void initalize(Dimension size)
+    protected void initalize(Dimension size)
     {
         setSize(size);
         mapData = new Vector<HashMap<Integer,Integer>>();
@@ -31,7 +31,7 @@ public abstract class Map {
     {
         return size;
     }
-    public void setSize(Dimension size)
+    private void setSize(Dimension size)
     {
         if ((size.width < 20) || (size.height < 15))
         {
@@ -58,7 +58,7 @@ public abstract class Map {
         
         return null;
     }
-
+    
     public boolean checkForCollision(int x, int y, Direction toMove)
     {
         if ((toMove == Direction.North) && (y == 0))
@@ -75,48 +75,22 @@ public abstract class Map {
             return true;
         }
         
-        for (LayerEvent ev : events)
-        {
-            if (ev.getLayer() == Layer.Middle)
-            {
-                if ((ev.getLocation().y == (y - 1)) && (ev.getLocation().x == x) && (toMove == Direction.North))
-                {
-                    return true;
-                }
-                
-                if ((ev.getLocation().x == (x - 1)) && (ev.getLocation().y == y) && (toMove == Direction.West))
-                {
-                    return true;
-                }
-                
-                if ((ev.getLocation().y == (y + 1)) && (ev.getLocation().x == x) && (toMove == Direction.South))
-                {
-                    return true;
-                }
-                
-                if ((ev.getLocation().x == (x + 1)) && (ev.getLocation().y == y) && (toMove == Direction.East))
-                {
-                    return true;
-                }
-            }
-        }
-        
-        if ((Game.getHeroEvent().getLocation().y == (y - 1)) && (Game.getHeroEvent().getLocation().x == x) && (toMove == Direction.North))
+        if ((toMove == Direction.North) && (checkForEventCollision(x, y-1)))
         {
             return true;
         }
-
-        if ((Game.getHeroEvent().getLocation().x == (x - 1)) && (Game.getHeroEvent().getLocation().y == y) && (toMove == Direction.West))
+        
+        if ((toMove == Direction.West) && (checkForEventCollision(x-1, y)))
         {
             return true;
         }
-
-        if ((Game.getHeroEvent().getLocation().y == (y + 1)) && (Game.getHeroEvent().getLocation().x == x) && (toMove == Direction.South))
+        
+        if ((toMove == Direction.South) && (checkForEventCollision(x, y+1)))
         {
             return true;
         }
-
-        if ((Game.getHeroEvent().getLocation().x == (x + 1)) && (Game.getHeroEvent().getLocation().y == y) && (toMove == Direction.East))
+        
+        if ((toMove == Direction.East) && (checkForEventCollision(x+1, y)))
         {
             return true;
         }
@@ -156,6 +130,27 @@ public abstract class Map {
         
         return false;
     }
+    
+    private boolean checkForEventCollision(int x, int y)
+    {
+        for (LayerEvent ev : events)
+        {
+            if (ev.getLayer() == Layer.Middle)
+            {
+                if (ev.isOccupyingSpace(x, y))
+                {
+                    return true;
+                }
+            }
+        }
+
+        if (Game.getHeroEvent().isOccupyingSpace(x, y))
+        {
+            return true;
+        }
+       
+        return false;
+    }
 
     private String chipSet;
     public String getChipSet() {
@@ -159,6 +159,14 @@ public class MapViewGameState implements GameState {
 
     public void render(Graphics2D g)
     {
+        /* TODO Add code that checks to see if the map has been switched
+         * or if the hero has moved in such a way so as to move the
+         * viewpoint. If one or more of these conditions are filled, the
+         * already existing below code should run along with a snippet that
+         * saves a cache of the current viewpoint. If not, the previously
+         * mentioned cache should be displayed rather than re-rendering the
+         * map.
+         */
         ChipSet chipSet = ChipSet.getChipSet(currentMap.getChipSet());
         int i,x,y;
         for (i=0;i<currentMap.getMapData().size();i++)
@@ -32,4 +32,6 @@ public interface Event {
     public void startMoving(Direction direction);
     
     public Layer getLayer();
+    
+    public boolean isOccupyingSpace(int x, int y);
 }
@@ -12,6 +12,7 @@ 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.util.Functions;
 
 /**
  *
@@ -65,6 +66,10 @@ public class HeroEvent implements Event {
             }
         }
         
+        /* TODO Change the specification of GameCharacter
+         * to require an EventGraphic instead of a graphic name
+         * and offset
+         */
         GameCharacter toDraw = Game.getSaveFile().getParty().getLeader();
         if (!toDraw.getGraphic().equals("blank"))
         {
@@ -147,5 +152,20 @@ public class HeroEvent implements Event {
     {
         return Layer.Middle;
     }
+    
+    public boolean isOccupyingSpace(int x, int y)
+    {
+        if (getLocation().equals(new Point(x,y)))
+        {
+            return true;
+        }
+        
+        if (Functions.isMovingTo(this, x, y))
+        {
+            return true;
+        }
+        
+        return false;
+    }
 
 }
@@ -11,6 +11,7 @@ import java.awt.Point;
 import java.util.ArrayList;
 import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.gamestate.mapview.Map;
+import com.fourisland.fourpuzzle.util.Functions;
 
 /**
  *
@@ -209,4 +210,19 @@ public class LayerEvent implements Event {
         this.label = string;
     }
     
+    public boolean isOccupyingSpace(int x, int y)
+    {
+        if (getLocation().equals(new Point(x,y)))
+        {
+            return true;
+        }
+        
+        if (Functions.isMovingTo(this, x, y))
+        {
+            return true;
+        }
+        
+        return false;
+    }
+    
 }
\ No newline at end of file
@@ -17,6 +17,14 @@ import java.util.logging.Logger;
  * @author hatkirby
  */
 public class SpecialEvent {
+    
+    /* TODO Create a manager for SpecialEvent action threads that
+     * controls when they are executed and allows MapViewGameState
+     * to poll it to see if it is currently managing any action
+     * threads. If it is, MapViewGameState should be able to prevent
+     * certain actions from occuring (unless the action thread is
+     * ParallelProcess) such as keyboard input.
+     */
 
     /**
      * Display a message on the screen.
@@ -120,11 +128,7 @@ public class SpecialEvent {
      */
     public void MoveEventWait()
     {
-        try {
-            MoveEventThread.moveEventWait.await();
-        } catch (InterruptedException ex) {
-            Logger.getLogger(SpecialEvent.class.getName()).log(Level.SEVERE, null, ex);
-        }
+        MoveEventThread.moveAll();
     }
     
     /**
@@ -13,6 +13,7 @@ import com.fourisland.fourpuzzle.Direction;
  */
 public interface MovementType {
     
+    // TODO Rename the following method to getNextDirection
     public Direction startMoving();
     
 }
@@ -20,9 +20,10 @@ import java.util.logging.Logger;
  */
 public class MoveEventThread implements Runnable {
     
-    public static volatile CountDownLatch moveEventWait = new CountDownLatch(0);
     public static volatile int countMoveEventThreads = 0;
-    public static volatile List<Event> events = new Vector<Event>();
+    
+    static volatile List<Event> events = new Vector<Event>();
+    static volatile CountDownLatch moveEventWait = new CountDownLatch(0);
     
     Event ev;
     MoveEvent[] actions;
@@ -51,6 +52,10 @@ public class MoveEventThread implements Runnable {
         moveEventWait.countDown();
     }
     
+    /* TODO Rename the two following methods (isHeroMoving and isOtherMoving)
+     * to isHeroActive and isOtherActive respectively.
+     */
+    
     public static boolean isHeroMoving()
     {
         return (events.contains(Game.getHeroEvent()));
@@ -60,5 +65,14 @@ public class MoveEventThread implements Runnable {
     {
         return (events.contains(event));
     }
+    
+    public static void moveAll()
+    {
+        try {
+            moveEventWait.await();
+        } catch (InterruptedException ex) {
+            Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
 
 }
@@ -48,6 +48,36 @@ public class Functions {
         
         return false;
     }
+
+    public static boolean isMovingTo(Event ev, int x, int y)
+    {        
+        if (ev.isMoving() == false)
+        {
+            return false;
+        }
+        
+        if ((ev.getDirection() == Direction.North) && ((ev.getLocation().y-1) == y) && (ev.getLocation().x == x))
+        {
+            return true;
+        }
+        
+        if ((ev.getDirection() == Direction.West) && (ev.getLocation().y == y) && ((ev.getLocation().x-1) == x))
+        {
+            return true;
+        }
+        
+        if ((ev.getDirection() == Direction.South) && ((ev.getLocation().y+1) == y) && (ev.getLocation().x == x))
+        {
+            return true;
+        }
+        
+        if ((ev.getDirection() == Direction.East) && (ev.getLocation().y == y) && ((ev.getLocation().x+1) == x))
+        {
+            return true;
+        }
+        
+        return false;
+    }
     
     public static Direction oppositeDirection(Direction dir)
     {