Added support to the LiveWindow for CAN speed controllers

Added PID velocity control and fixed PIDSubsystems

Change-Id: I81bb4109cd1ff75b99b049a7ec2abd248ad3f9a1

19 files changed, 2158 insertions, 1394 deletions

diff --git a/.gitignore b/.gitignore
index 25c67a2..02444b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ smartdashboard/lib/NetworkTables*
 dist/
 build/
 target/
-.gradle/
\ No newline at end of file
+.gradle/
+/FakeRobot/nbproject/
\ No newline at end of file
diff --git a/FakeRobot/build.xml b/FakeRobot/build.xml
index 427012b..6fc48d8 100644
--- a/FakeRobot/build.xml
+++ b/FakeRobot/build.xml
@@ -1,74 +1,73 @@
-<?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.) -->

-<!-- By default, only the Clean and Build commands use this build script. -->

-<!-- Commands such as Run, Debug, and Test only use this build script if -->

-<!-- the Compile on Save feature is turned off for the project. -->

-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->

-<!-- in the project's Project Properties dialog box.-->

-<project name="FakeRobot" default="default" basedir=".">

-    <description>Builds, tests, and runs the project FakeRobot.</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="FakeRobot-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>

+<?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.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="FakeRobot" default="default" basedir=".">
+    <description>Builds, tests, and runs the project FakeRobot.</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:                  JAR building
+      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="FakeRobot-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>
diff --git a/FakeRobot/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/FakeRobot/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
index 4cabe27..eaf6790 100644
--- a/FakeRobot/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+++ b/FakeRobot/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
diff --git a/FakeRobot/lib/NetworkTables.jar b/FakeRobot/lib/NetworkTables.jar
index 8ed6d45..f6f8cf6 100644
--- a/FakeRobot/lib/NetworkTables.jar
+++ b/FakeRobot/lib/NetworkTables.jar
diff --git a/FakeRobot/lib/nblibraries.properties b/FakeRobot/lib/nblibraries.properties
index 81b4b5f..6d0afb5 100644
--- a/FakeRobot/lib/nblibraries.properties
+++ b/FakeRobot/lib/nblibraries.properties
@@ -1,3 +1,4 @@
-libs.CopyLibs.classpath=\

-    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar

-libs.CopyLibs.displayName=CopyLibs Task

+libs.CopyLibs.classpath=\
+    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+libs.CopyLibs.displayName=CopyLibs Task
+libs.CopyLibs.prop-version=2.0
diff --git a/FakeRobot/nbproject/build-impl.xml b/FakeRobot/nbproject/build-impl.xml
index 0f3637b..f9b3d6c 100644
--- a/FakeRobot/nbproject/build-impl.xml
+++ b/FakeRobot/nbproject/build-impl.xml
@@ -1,1078 +1,1438 @@
-<?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

-  - compilation

-  - jar

-  - execution

-  - debugging

-  - javadoc

-  - junit compilation

-  - junit execution

-  - junit debugging

-  - applet

-  - cleanup

-

-        -->

-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="FakeRobot-impl">

-    <fail message="Please build using Ant 1.8.0 or higher.">

-        <condition>

-            <not>

-                <antversion atleast="1.8.0"/>

-            </not>

-        </condition>

-    </fail>

-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>

-    <!-- 

-                ======================

-                INITIALIZATION SECTION 

-                ======================

-            -->

-    <target name="-pre-init">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="-pre-init" name="-init-private">

-        <property file="nbproject/private/config.properties"/>

-        <property file="nbproject/private/configs/${config}.properties"/>

-        <property file="nbproject/private/private.properties"/>

-    </target>

-    <target name="-pre-init-libraries">

-        <property location=".\lib\nblibraries.properties" name="libraries.path"/>

-        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>

-        <pathconvert dirsep="/" property="libraries.dir">

-            <path path="${libraries.dir.nativedirsep}"/>

-        </pathconvert>

-        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>

-        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>

-    </target>

-    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">

-        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">

-            <filterchain>

-                <replacestring from="$${base}" to="${libraries.dir}"/>

-                <escapeunicode/>

-            </filterchain>

-        </loadproperties>

-    </target>

-    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">

-        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">

-            <filterchain>

-                <replacestring from="$${base}" to="${libraries.dir}"/>

-                <escapeunicode/>

-            </filterchain>

-        </loadproperties>

-    </target>

-    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">

-        <property file="${user.properties.file}"/>

-        <!-- The two properties below are usually overridden -->

-        <!-- by the active platform. Just a fallback. -->

-        <property name="default.javac.source" value="1.4"/>

-        <property name="default.javac.target" value="1.4"/>

-    </target>

-    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">

-        <property file="nbproject/configs/${config}.properties"/>

-        <property file="nbproject/project.properties"/>

-    </target>

-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">

-        <available file="${manifest.file}" property="manifest.available"/>

-        <condition property="splashscreen.available">

-            <and>

-                <not>

-                    <equals arg1="${application.splash}" arg2="" trim="true"/>

-                </not>

-                <available file="${application.splash}"/>

-            </and>

-        </condition>

-        <condition property="main.class.available">

-            <and>

-                <isset property="main.class"/>

-                <not>

-                    <equals arg1="${main.class}" arg2="" trim="true"/>

-                </not>

-            </and>

-        </condition>

-        <condition property="manifest.available+main.class">

-            <and>

-                <isset property="manifest.available"/>

-                <isset property="main.class.available"/>

-            </and>

-        </condition>

-        <condition property="do.archive">

-            <not>

-                <istrue value="${jar.archive.disabled}"/>

-            </not>

-        </condition>

-        <condition property="do.mkdist">

-            <and>

-                <isset property="do.archive"/>

-                <isset property="libs.CopyLibs.classpath"/>

-                <not>

-                    <istrue value="${mkdist.disabled}"/>

-                </not>

-            </and>

-        </condition>

-        <condition property="manifest.available+main.class+mkdist.available">

-            <and>

-                <istrue value="${manifest.available+main.class}"/>

-                <isset property="do.mkdist"/>

-            </and>

-        </condition>

-        <condition property="do.archive+manifest.available">

-            <and>

-                <isset property="manifest.available"/>

-                <istrue value="${do.archive}"/>

-            </and>

-        </condition>

-        <condition property="do.archive+main.class.available">

-            <and>

-                <isset property="main.class.available"/>

-                <istrue value="${do.archive}"/>

-            </and>

-        </condition>

-        <condition property="do.archive+splashscreen.available">

-            <and>

-                <isset property="splashscreen.available"/>

-                <istrue value="${do.archive}"/>

-            </and>

-        </condition>

-        <condition property="do.archive+manifest.available+main.class">

-            <and>

-                <istrue value="${manifest.available+main.class}"/>

-                <istrue value="${do.archive}"/>

-            </and>

-        </condition>

-        <condition property="manifest.available-mkdist.available">

-            <or>

-                <istrue value="${manifest.available}"/>

-                <isset property="do.mkdist"/>

-            </or>

-        </condition>

-        <condition property="manifest.available+main.class-mkdist.available">

-            <or>

-                <istrue value="${manifest.available+main.class}"/>

-                <isset property="do.mkdist"/>

-            </or>

-        </condition>

-        <condition property="have.tests">

-            <or>

-                <available file="${test.src.dir}"/>

-            </or>

-        </condition>

-        <condition property="have.sources">

-            <or>

-                <available file="${src.dir}"/>

-            </or>

-        </condition>

-        <condition property="netbeans.home+have.tests">

-            <and>

-                <isset property="netbeans.home"/>

-                <isset property="have.tests"/>

-            </and>

-        </condition>

-        <condition property="no.javadoc.preview">

-            <and>

-                <isset property="javadoc.preview"/>

-                <isfalse value="${javadoc.preview}"/>

-            </and>

-        </condition>

-        <property name="run.jvmargs" value=""/>

-        <property name="javac.compilerargs" value=""/>

-        <property name="work.dir" value="${basedir}"/>

-        <condition property="no.deps">

-            <and>

-                <istrue value="${no.dependencies}"/>

-            </and>

-        </condition>

-        <property name="javac.debug" value="true"/>

-        <property name="javadoc.preview" value="true"/>

-        <property name="application.args" value=""/>

-        <property name="source.encoding" value="${file.encoding}"/>

-        <property name="runtime.encoding" value="${source.encoding}"/>

-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">

-            <and>

-                <isset property="javadoc.encoding"/>

-                <not>

-                    <equals arg1="${javadoc.encoding}" arg2=""/>

-                </not>

-            </and>

-        </condition>

-        <property name="javadoc.encoding.used" value="${source.encoding}"/>

-        <property name="includes" value="**"/>

-        <property name="excludes" value=""/>

-        <property name="do.depend" value="false"/>

-        <condition property="do.depend.true">

-            <istrue value="${do.depend}"/>

-        </condition>

-        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>

-        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">

-            <length length="0" string="${endorsed.classpath}" when="greater"/>

-        </condition>

-        <condition else="false" property="jdkBug6558476">

-            <and>

-                <matches pattern="1\.[56]" string="${java.specification.version}"/>

-                <not>

-                    <os family="unix"/>

-                </not>

-            </and>

-        </condition>

-        <property name="javac.fork" value="${jdkBug6558476}"/>

-        <property name="jar.index" value="false"/>

-        <property name="jar.index.metainf" value="${jar.index}"/>

-        <property name="copylibs.rebase" value="true"/>

-        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>

-    </target>

-    <target name="-post-init">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">

-        <fail unless="src.dir">Must set src.dir</fail>

-        <fail unless="test.src.dir">Must set test.src.dir</fail>

-        <fail unless="build.dir">Must set build.dir</fail>

-        <fail unless="dist.dir">Must set dist.dir</fail>

-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>

-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>

-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>

-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>

-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>

-        <fail unless="dist.jar">Must set dist.jar</fail>

-    </target>

-    <target name="-init-macrodef-property">

-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">

-            <attribute name="name"/>

-            <attribute name="value"/>

-            <sequential>

-                <property name="@{name}" value="${@{value}}"/>

-            </sequential>

-        </macrodef>

-    </target>

-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">

-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">

-            <attribute default="${src.dir}" name="srcdir"/>

-            <attribute default="${build.classes.dir}" name="destdir"/>

-            <attribute default="${javac.classpath}" name="classpath"/>

-            <attribute default="${javac.processorpath}" name="processorpath"/>

-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>

-            <attribute default="${includes}" name="includes"/>

-            <attribute default="${excludes}" name="excludes"/>

-            <attribute default="${javac.debug}" name="debug"/>

-            <attribute default="${empty.dir}" name="sourcepath"/>

-            <attribute default="${empty.dir}" name="gensrcdir"/>

-            <element name="customize" optional="true"/>

-            <sequential>

-                <property location="${build.dir}/empty" name="empty.dir"/>

-                <mkdir dir="${empty.dir}"/>

-                <mkdir dir="@{apgeneratedsrcdir}"/>

-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">

-                    <src>

-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">

-                            <include name="*"/>

-                        </dirset>

-                    </src>

-                    <classpath>

-                        <path path="@{classpath}"/>

-                    </classpath>

-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>

-                    <compilerarg line="${javac.compilerargs}"/>

-                    <compilerarg value="-processorpath"/>

-                    <compilerarg path="@{processorpath}:${empty.dir}"/>

-                    <compilerarg line="${ap.processors.internal}"/>

-                    <compilerarg line="${annotation.processing.processor.options}"/>

-                    <compilerarg value="-s"/>

-                    <compilerarg path="@{apgeneratedsrcdir}"/>

-                    <compilerarg line="${ap.proc.none.internal}"/>

-                    <customize/>

-                </javac>

-            </sequential>

-        </macrodef>

-    </target>

-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">

-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">

-            <attribute default="${src.dir}" name="srcdir"/>

-            <attribute default="${build.classes.dir}" name="destdir"/>

-            <attribute default="${javac.classpath}" name="classpath"/>

-            <attribute default="${javac.processorpath}" name="processorpath"/>

-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>

-            <attribute default="${includes}" name="includes"/>

-            <attribute default="${excludes}" name="excludes"/>

-            <attribute default="${javac.debug}" name="debug"/>

-            <attribute default="${empty.dir}" name="sourcepath"/>

-            <attribute default="${empty.dir}" name="gensrcdir"/>

-            <element name="customize" optional="true"/>

-            <sequential>

-                <property location="${build.dir}/empty" name="empty.dir"/>

-                <mkdir dir="${empty.dir}"/>

-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">

-                    <src>

-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">

-                            <include name="*"/>

-                        </dirset>

-                    </src>

-                    <classpath>

-                        <path path="@{classpath}"/>

-                    </classpath>

-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>

-                    <compilerarg line="${javac.compilerargs}"/>

-                    <customize/>

-                </javac>

-            </sequential>

-        </macrodef>

-    </target>

-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">

-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">

-            <attribute default="${src.dir}" name="srcdir"/>

-            <attribute default="${build.classes.dir}" name="destdir"/>

-            <attribute default="${javac.classpath}" name="classpath"/>

-            <sequential>

-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">

-                    <classpath>

-                        <path path="@{classpath}"/>

-                    </classpath>

-                </depend>

-            </sequential>

-        </macrodef>

-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">

-            <attribute default="${build.classes.dir}" name="destdir"/>

-            <sequential>

-                <fail unless="javac.includes">Must set javac.includes</fail>

-                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">

-                    <path>

-                        <filelist dir="@{destdir}" files="${javac.includes}"/>

-                    </path>

-                    <globmapper from="*.java" to="*.class"/>

-                </pathconvert>

-                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>

-                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>

-                <delete>

-                    <files includesfile="${javac.includesfile.binary}"/>

-                </delete>

-                <delete>

-                    <fileset file="${javac.includesfile.binary}"/>

-                </delete>

-            </sequential>

-        </macrodef>

-    </target>

-    <target name="-init-macrodef-junit">

-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">

-            <attribute default="${includes}" name="includes"/>

-            <attribute default="${excludes}" name="excludes"/>

-            <attribute default="**" name="testincludes"/>

-            <sequential>

-                <property name="junit.forkmode" value="perTest"/>

-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">

-                    <batchtest todir="${build.test.results.dir}">

-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">

-                            <filename name="@{testincludes}"/>

-                        </fileset>

-                    </batchtest>

-                    <classpath>

-                        <path path="${run.test.classpath}"/>

-                    </classpath>

-                    <syspropertyset>

-                        <propertyref prefix="test-sys-prop."/>

-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>

-                    </syspropertyset>

-                    <formatter type="brief" usefile="false"/>

-                    <formatter type="xml"/>

-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>

-                    <jvmarg value="-ea"/>

-                    <jvmarg line="${run.jvmargs}"/>

-                </junit>

-            </sequential>

-        </macrodef>

-    </target>

-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>

-    <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 default="${main.class}" name="classname"/>

-            <element name="customize" optional="true"/>

-            <sequential>

-                <property environment="env"/>

-                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>

-                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">

-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>

-                    <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 from="run-sys-prop.*" to="*" type="glob"/>

-                    </syspropertyset>

-                    <customize/>

-                </java>

-            </sequential>

-        </macrodef>

-    </target>

-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">

-        <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>

-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">

-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">

-            <attribute default="${main.class}" name="name"/>

-            <attribute default="${debug.classpath}" name="classpath"/>

-            <attribute default="" name="stopclassname"/>

-            <sequential>

-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">

-                    <classpath>

-                        <path path="@{classpath}"/>

-                    </classpath>

-                </nbjpdastart>

-            </sequential>

-        </macrodef>

-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">

-            <attribute default="${build.classes.dir}" name="dir"/>

-            <sequential>

-                <nbjpdareload>

-                    <fileset dir="@{dir}" includes="${fix.classes}">

-                        <include name="${fix.includes}*.class"/>

-                    </fileset>

-                </nbjpdareload>

-            </sequential>

-        </macrodef>

-    </target>

-    <target name="-init-debug-args">

-        <property name="version-output" value="java version &quot;${ant.java.version}"/>

-        <condition property="have-jdk-older-than-1.4">

-            <or>

-                <contains string="${version-output}" substring="java version &quot;1.0"/>

-                <contains string="${version-output}" substring="java version &quot;1.1"/>

-                <contains string="${version-output}" substring="java version &quot;1.2"/>

-                <contains string="${version-output}" substring="java version &quot;1.3"/>

-            </or>

-        </condition>

-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">

-            <istrue value="${have-jdk-older-than-1.4}"/>

-        </condition>

-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">

-            <os family="windows"/>

-        </condition>

-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">

-            <isset property="debug.transport"/>

-        </condition>

-    </target>

-    <target depends="-init-debug-args" name="-init-macrodef-debug">

-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">

-            <attribute default="${main.class}" name="classname"/>

-            <attribute default="${debug.classpath}" name="classpath"/>

-            <element name="customize" optional="true"/>

-            <sequential>

-                <java classname="@{classname}" dir="${work.dir}" fork="true">

-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>

-                    <jvmarg line="${debug-args-line}"/>

-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>

-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>

-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>

-                    <jvmarg line="${run.jvmargs}"/>

-                    <classpath>

-                        <path path="@{classpath}"/>

-                    </classpath>

-                    <syspropertyset>

-                        <propertyref prefix="run-sys-prop."/>

-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>

-                    </syspropertyset>

-                    <customize/>

-                </java>

-            </sequential>

-        </macrodef>

-    </target>

-    <target name="-init-macrodef-java">

-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">

-            <attribute default="${main.class}" name="classname"/>

-            <attribute default="${run.classpath}" name="classpath"/>

-            <element name="customize" optional="true"/>

-            <sequential>

-                <java classname="@{classname}" dir="${work.dir}" fork="true">

-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>

-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>

-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>

-                    <jvmarg line="${run.jvmargs}"/>

-                    <classpath>

-                        <path path="@{classpath}"/>

-                    </classpath>

-                    <syspropertyset>

-                        <propertyref prefix="run-sys-prop."/>

-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>

-                    </syspropertyset>

-                    <customize/>

-                </java>

-            </sequential>

-        </macrodef>

-    </target>

-    <target name="-init-macrodef-copylibs">

-        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">

-            <attribute default="${manifest.file}" name="manifest"/>

-            <element name="customize" optional="true"/>

-            <sequential>

-                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>

-                <pathconvert property="run.classpath.without.build.classes.dir">

-                    <path path="${run.classpath}"/>

-                    <map from="${build.classes.dir.resolved}" to=""/>

-                </pathconvert>

-                <pathconvert pathsep=" " property="jar.classpath">

-                    <path path="${run.classpath.without.build.classes.dir}"/>

-                    <chainedmapper>

-                        <flattenmapper/>

-                        <globmapper from="*" to="lib/*"/>

-                    </chainedmapper>

-                </pathconvert>

-                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>

-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">

-                    <fileset dir="${build.classes.dir}"/>

-                    <manifest>

-                        <attribute name="Class-Path" value="${jar.classpath}"/>

-                        <customize/>

-                    </manifest>

-                </copylibs>

-            </sequential>

-        </macrodef>

-    </target>

-    <target name="-init-presetdef-jar">

-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">

-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">

-                <j2seproject1:fileset dir="${build.classes.dir}"/>

-            </jar>

-        </presetdef>

-    </target>

-    <target name="-init-ap-cmdline-properties">

-        <property name="annotation.processing.enabled" value="true"/>

-        <property name="annotation.processing.processors.list" value=""/>

-        <property name="annotation.processing.processor.options" value=""/>

-        <property name="annotation.processing.run.all.processors" value="true"/>

-        <property name="javac.processorpath" value="${javac.classpath}"/>

-        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>

-        <condition property="ap.supported.internal" value="true">

-            <not>

-                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>

-            </not>

-        </condition>

-    </target>

-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">

-        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">

-            <isfalse value="${annotation.processing.run.all.processors}"/>

-        </condition>

-        <condition else="" property="ap.proc.none.internal" value="-proc:none">

-            <isfalse value="${annotation.processing.enabled}"/>

-        </condition>

-    </target>

-    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">

-        <property name="ap.cmd.line.internal" value=""/>

-    </target>

-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>

-    <!--

-                ===================

-                COMPILATION SECTION

-                ===================

-            -->

-    <target name="-deps-jar-init" unless="built-jar.properties">

-        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>

-        <delete file="${built-jar.properties}" quiet="true"/>

-    </target>

-    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">

-        <echo level="warn" message="Cycle detected: FakeRobot was already built"/>

-    </target>

-    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">

-        <mkdir dir="${build.dir}"/>

-        <touch file="${built-jar.properties}" verbose="false"/>

-        <property file="${built-jar.properties}" prefix="already.built.jar."/>

-        <antcall target="-warn-already-built-jar"/>

-        <propertyfile file="${built-jar.properties}">

-            <entry key="${basedir}" value=""/>

-        </propertyfile>

-    </target>

-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>

-    <target depends="init" name="-check-automatic-build">

-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>

-    </target>

-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">

-        <antcall target="clean"/>

-    </target>

-    <target depends="init,deps-jar" name="-pre-pre-compile">

-        <mkdir dir="${build.classes.dir}"/>

-    </target>

-    <target name="-pre-compile">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target if="do.depend.true" name="-compile-depend">

-        <pathconvert property="build.generated.subdirs">

-            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">

-                <include name="*"/>

-            </dirset>

-        </pathconvert>

-        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>

-    </target>

-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">

-        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>

-        <copy todir="${build.classes.dir}">

-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>

-        </copy>

-    </target>

-    <target if="has.persistence.xml" name="-copy-persistence-xml">

-        <mkdir dir="${build.classes.dir}/META-INF"/>

-        <copy todir="${build.classes.dir}/META-INF">

-            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>

-        </copy>

-    </target>

-    <target name="-post-compile">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>

-    <target name="-pre-compile-single">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">

-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>

-        <j2seproject3:force-recompile/>

-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>

-    </target>

-    <target name="-post-compile-single">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>

-    <!--

-                ====================

-                JAR BUILDING SECTION

-                ====================

-            -->

-    <target depends="init" name="-pre-pre-jar">

-        <dirname file="${dist.jar}" property="dist.jar.dir"/>

-        <mkdir dir="${dist.jar.dir}"/>

-    </target>

-    <target name="-pre-jar">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">

-        <j2seproject1:jar/>

-    </target>

-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">

-        <j2seproject1:jar manifest="${manifest.file}"/>

-    </target>

-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">

-        <j2seproject1:jar manifest="${manifest.file}">

-            <j2seproject1:manifest>

-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>

-            </j2seproject1:manifest>

-        </j2seproject1:jar>

-        <echo level="info">To run this application from the command line without Ant, try:</echo>

-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>

-        <property location="${dist.jar}" name="dist.jar.resolved"/>

-        <pathconvert property="run.classpath.with.dist.jar">

-            <path path="${run.classpath}"/>

-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>

-        </pathconvert>

-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>

-    </target>

-    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">

-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>

-        <touch file="${tmp.manifest.file}" verbose="false"/>

-    </target>

-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">

-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>

-        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>

-    </target>

-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">

-        <manifest file="${tmp.manifest.file}" mode="update">

-            <attribute name="Main-Class" value="${main.class}"/>

-        </manifest>

-    </target>

-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">

-        <basename file="${application.splash}" property="splashscreen.basename"/>

-        <mkdir dir="${build.classes.dir}/META-INF"/>

-        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>

-        <manifest file="${tmp.manifest.file}" mode="update">

-            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>

-        </manifest>

-    </target>

-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">

-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>

-        <echo level="info">To run this application from the command line without Ant, try:</echo>

-        <property location="${dist.jar}" name="dist.jar.resolved"/>

-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>

-    </target>

-    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">

-        <delete>

-            <fileset file="${tmp.manifest.file}"/>

-        </delete>

-    </target>

-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>

-    <target name="-post-jar">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>

-    <!--

-                =================

-                EXECUTION SECTION

-                =================

-            -->

-    <target depends="init,compile" description="Run a main class." name="run">

-        <j2seproject1:java>

-            <customize>

-                <arg line="${application.args}"/>

-            </customize>

-        </j2seproject1:java>

-    </target>

-    <target name="-do-not-recompile">

-        <property name="javac.includes.binary" value=""/>

-    </target>

-    <target depends="init,compile-single" name="run-single">

-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>

-        <j2seproject1:java classname="${run.class}"/>

-    </target>

-    <target depends="init,compile-test-single" name="run-test-with-main">

-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>

-        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>

-    </target>

-    <!--

-                =================

-                DEBUGGING SECTION

-                =================

-            -->

-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">

-        <j2seproject1:nbjpdastart name="${debug.class}"/>

-    </target>

-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">

-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>

-    </target>

-    <target depends="init,compile" name="-debug-start-debuggee">

-        <j2seproject3:debug>

-            <customize>

-                <arg line="${application.args}"/>

-            </customize>

-        </j2seproject3:debug>

-    </target>

-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>

-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">

-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>

-    </target>

-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>

-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">

-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>

-        <j2seproject3:debug classname="${debug.class}"/>

-    </target>

-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>

-    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">

-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>

-        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>

-    </target>

-    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>

-    <target depends="init" name="-pre-debug-fix">

-        <fail unless="fix.includes">Must set fix.includes</fail>

-        <property name="javac.includes" value="${fix.includes}.java"/>

-    </target>

-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">

-        <j2seproject1:nbjpdareload/>

-    </target>

-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>

-    <!--

-                =================

-                PROFILING SECTION

-                =================

-            -->

-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">

-        <nbprofiledirect>

-            <classpath>

-                <path path="${run.classpath}"/>

-            </classpath>

-        </nbprofiledirect>

-        <profile/>

-    </target>

-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">

-        <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 depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">

-        <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 depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">

-        <nbprofiledirect>

-            <classpath>

-                <path path="${run.test.classpath}"/>

-            </classpath>

-        </nbprofiledirect>

-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">

-            <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 from="test-sys-prop.*" to="*" type="glob"/>

-            </syspropertyset>

-            <formatter type="brief" usefile="false"/>

-            <formatter type="xml"/>

-        </junit>

-    </target>

-    <!--

-                ===============

-                JAVADOC SECTION

-                ===============

-            -->

-    <target depends="init" if="have.sources" name="-javadoc-build">

-        <mkdir dir="${dist.javadoc.dir}"/>

-        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">

-            <and>

-                <isset property="endorsed.classpath.cmd.line.arg"/>

-                <not>

-                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>

-                </not>

-            </and>

-        </condition>

-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">

-            <classpath>

-                <path path="${javac.classpath}"/>

-            </classpath>

-            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">

-                <filename name="**/*.java"/>

-            </fileset>

-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">

-                <include name="**/*.java"/>

-                <exclude name="*.java"/>

-            </fileset>

-            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>

-        </javadoc>

-        <copy todir="${dist.javadoc.dir}">

-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">

-                <filename name="**/doc-files/**"/>

-            </fileset>

-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">

-                <include name="**/doc-files/**"/>

-            </fileset>

-        </copy>

-    </target>

-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">

-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>

-    </target>

-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>

-    <!--

-                =========================

-                JUNIT COMPILATION SECTION

-                =========================

-            -->

-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">

-        <mkdir dir="${build.test.classes.dir}"/>

-    </target>

-    <target name="-pre-compile-test">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target if="do.depend.true" name="-compile-test-depend">

-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>

-    </target>

-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">

-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>

-        <copy todir="${build.test.classes.dir}">

-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>

-        </copy>

-    </target>

-    <target name="-post-compile-test">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>

-    <target name="-pre-compile-test-single">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">

-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>

-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>

-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>

-        <copy todir="${build.test.classes.dir}">

-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>

-        </copy>

-    </target>

-    <target name="-post-compile-test-single">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>

-    <!--

-                =======================

-                JUNIT EXECUTION SECTION

-                =======================

-            -->

-    <target depends="init" if="have.tests" name="-pre-test-run">

-        <mkdir dir="${build.test.results.dir}"/>

-    </target>

-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">

-        <j2seproject3:junit testincludes="**/*Test.java"/>

-    </target>

-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">

-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>

-    </target>

-    <target depends="init" if="have.tests" name="test-report"/>

-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>

-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>

-    <target depends="init" if="have.tests" name="-pre-test-run-single">

-        <mkdir dir="${build.test.results.dir}"/>

-    </target>

-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">

-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>

-        <j2seproject3:junit excludes="" includes="${test.includes}"/>

-    </target>

-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">

-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>

-    </target>

-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>

-    <!--

-                =======================

-                JUNIT DEBUGGING SECTION

-                =======================

-            -->

-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">

-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>

-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>

-        <delete file="${test.report.file}"/>

-        <mkdir dir="${build.test.results.dir}"/>

-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">

-            <customize>

-                <syspropertyset>

-                    <propertyref prefix="test-sys-prop."/>

-                    <mapper from="test-sys-prop.*" to="*" type="glob"/>

-                </syspropertyset>

-                <arg value="${test.class}"/>

-                <arg value="showoutput=true"/>

-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>

-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>

-            </customize>

-        </j2seproject3:debug>

-    </target>

-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">

-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>

-    </target>

-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>

-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">

-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>

-    </target>

-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>

-    <!--

-                =========================

-                APPLET EXECUTION SECTION

-                =========================

-            -->

-    <target depends="init,compile-single" name="run-applet">

-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>

-        <j2seproject1:java classname="sun.applet.AppletViewer">

-            <customize>

-                <arg value="${applet.url}"/>

-            </customize>

-        </j2seproject1:java>

-    </target>

-    <!--

-                =========================

-                APPLET DEBUGGING  SECTION

-                =========================

-            -->

-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">

-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>

-        <j2seproject3:debug classname="sun.applet.AppletViewer">

-            <customize>

-                <arg value="${applet.url}"/>

-            </customize>

-        </j2seproject3:debug>

-    </target>

-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>

-    <!--

-                ===============

-                CLEANUP SECTION

-                ===============

-            -->

-    <target name="-deps-clean-init" unless="built-clean.properties">

-        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>

-        <delete file="${built-clean.properties}" quiet="true"/>

-    </target>

-    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">

-        <echo level="warn" message="Cycle detected: FakeRobot was already built"/>

-    </target>

-    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">

-        <mkdir dir="${build.dir}"/>

-        <touch file="${built-clean.properties}" verbose="false"/>

-        <property file="${built-clean.properties}" prefix="already.built.clean."/>

-        <antcall target="-warn-already-built-clean"/>

-        <propertyfile file="${built-clean.properties}">

-            <entry key="${basedir}" value=""/>

-        </propertyfile>

-    </target>

-    <target depends="init" name="-do-clean">

-        <delete dir="${build.dir}"/>

-        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>

-    </target>

-    <target name="-post-clean">

-        <!-- Empty placeholder for easier customization. -->

-        <!-- You can override this target in the ../build.xml file. -->

-    </target>

-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>

-    <target name="-check-call-dep">

-        <property file="${call.built.properties}" prefix="already.built."/>

-        <condition property="should.call.dep">

-            <not>

-                <isset property="already.built.${call.subproject}"/>

-            </not>

-        </condition>

-    </target>

-    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">

-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">

-            <propertyset>

-                <propertyref prefix="transfer."/>

-                <mapper from="transfer.*" to="*" type="glob"/>

-            </propertyset>

-        </ant>

-    </target>

-</project>

+<?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
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - test compilation
+  - test execution
+  - test debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="FakeRobot-impl">
+    <fail message="Please build using Ant 1.8.0 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.8.0"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target name="-pre-init-libraries">
+        <property location=".\lib\nblibraries.properties" name="libraries.path"/>
+        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
+        <pathconvert dirsep="/" property="libraries.dir">
+            <path path="${libraries.dir.nativedirsep}"/>
+        </pathconvert>
+        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
+        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
+    </target>
+    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <property name="platform.java" value="${java.home}/bin/java"/>
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="splashscreen.available">
+            <and>
+                <not>
+                    <equals arg1="${application.splash}" arg2="" trim="true"/>
+                </not>
+                <available file="${application.splash}"/>
+            </and>
+        </condition>
+        <condition property="main.class.available">
+            <and>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="profile.available">
+            <and>
+                <isset property="javac.profile"/>
+                <length length="0" string="${javac.profile}" when="greater"/>
+                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
+            </and>
+        </condition>
+        <condition property="do.archive">
+            <or>
+                <not>
+                    <istrue value="${jar.archive.disabled}"/>
+                </not>
+                <istrue value="${not.archive.disabled}"/>
+            </or>
+        </condition>
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+main.class.available">
+            <and>
+                <isset property="main.class.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+splashscreen.available">
+            <and>
+                <isset property="splashscreen.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+profile.available">
+            <and>
+                <isset property="profile.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="run.jvmargs.ide" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <property name="runtime.encoding" value="${source.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <and>
+                <isset property="endorsed.classpath"/>
+                <not>
+                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
+            <isset property="profile.available"/>
+        </condition>
+        <condition else="false" property="jdkBug6558476">
+            <and>
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                <not>
+                    <os family="unix"/>
+                </not>
+            </and>
+        </condition>
+        <property name="javac.fork" value="${jdkBug6558476}"/>
+        <property name="jar.index" value="false"/>
+        <property name="jar.index.metainf" value="${jar.index}"/>
+        <property name="copylibs.rebase" value="true"/>
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+        <condition property="junit.available">
+            <or>
+                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
+                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
+            </or>
+        </condition>
+        <condition property="testng.available">
+            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
+        </condition>
+        <condition property="junit+testng.available">
+            <and>
+                <istrue value="${junit.available}"/>
+                <istrue value="${testng.available}"/>
+            </and>
+        </condition>
+        <condition else="testng" property="testng.mode" value="mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
+        <condition else="" property="testng.debug.mode" value="-mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+                <delete>
+                    <files includesfile="${javac.includesfile.binary}"/>
+                </delete>
+                <delete>
+                    <fileset file="${javac.includesfile.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${junit.available}" name="-init-macrodef-junit-init">
+        <condition else="false" property="nb.junit.batch" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <not>
+                    <isset property="test.method"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="false" property="nb.junit.single" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <isset property="test.method"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-init-test-properties">
+        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
+        <property name="test.binarytestincludes" value=""/>
+        <property name="test.binaryexcludes" value=""/>
+    </target>
+    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                            <filename name="${test.binarytestincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
+    <target if="${testng.available}" name="-init-macrodef-testng">
+        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
+                    <isset property="test.method"/>
+                </condition>
+                <union id="test.set">
+                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
+                </union>
+                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="FakeRobot" testname="TestNG tests" workingDir="${work.dir}">
+                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
+                    <propertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </propertyset>
+                    <customize/>
+                </testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-test-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <echo>No tests executed.</echo>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
+        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <sequential>
+                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${run.jvmargs}"/>
+                        <jvmarg line="${run.jvmargs.ide}"/>
+                    </customize>
+                </j2seproject3:test-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                            <filename name="${test.binarytestincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:junit-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${testng.available}" name="-init-macrodef-testng-debug">
+        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element name="customize2" optional="true"/>
+            <sequential>
+                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
+                    <isset property="test.method"/>
+                </condition>
+                <condition else="-suitename FakeRobot -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                    <matches pattern=".*\.xml" string="@{testClass}"/>
+                </condition>
+                <delete dir="${build.test.results.dir}" quiet="true"/>
+                <mkdir dir="${build.test.results.dir}"/>
+                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
+                    <customize>
+                        <customize2/>
+                        <jvmarg value="-ea"/>
+                        <arg line="${testng.debug.mode}"/>
+                        <arg line="-d ${build.test.results.dir}"/>
+                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
+                        <arg line="${testng.cmd.args}"/>
+                    </customize>
+                </j2seproject3:debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
+        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element implicit="true" name="customize2" optional="true"/>
+            <sequential>
+                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2/>
+                </j2seproject3:testng-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${run.jvmargs}"/>
+                        <jvmarg line="${run.jvmargs.ide}"/>
+                    </customize>
+                </j2seproject3:test-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2>
+                        <syspropertyset>
+                            <propertyref prefix="test-sys-prop."/>
+                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                        </syspropertyset>
+                    </customize2>
+                </j2seproject3:testng-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
+    <!--
+                pre NB7.2 profiling section; consider it deprecated
+            -->
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
+    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="profiler.info.jvmargs.agent" 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 default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property environment="env"/>
+                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <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 from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
+        <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>
+    <!--
+                end of pre NB7.2 profiling section
+            -->
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${manifest.file}" name="manifest"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+                <pathconvert property="run.classpath.without.build.classes.dir">
+                    <path path="${run.classpath}"/>
+                    <map from="${build.classes.dir.resolved}" to=""/>
+                </pathconvert>
+                <pathconvert pathsep=" " property="jar.classpath">
+                    <path path="${run.classpath.without.build.classes.dir}"/>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <filtermapper>
+                            <replacestring from=" " to="%20"/>
+                        </filtermapper>
+                        <globmapper from="*" to="lib/*"/>
+                    </chainedmapper>
+                </pathconvert>
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
+                    <manifest>
+                        <attribute name="Class-Path" value="${jar.classpath}"/>
+                        <customize/>
+                    </manifest>
+                </copylibs>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.processor.options" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target name="-deps-jar-init" unless="built-jar.properties">
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+        <delete file="${built-jar.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+        <echo level="warn" message="Cycle detected: FakeRobot was already built"/>
+    </target>
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-jar.properties}" verbose="false"/>
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>
+        <antcall target="-warn-already-built-jar"/>
+        <propertyfile file="${built-jar.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy todir="${build.classes.dir}/META-INF">
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <touch file="${tmp.manifest.file}" verbose="false"/>
+    </target>
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Main-Class" value="${main.class}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Profile" value="${javac.profile}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
+        <basename file="${application.splash}" property="splashscreen.basename"/>
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+        </manifest>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
+            <isset property="main.class.available"/>
+        </condition>
+        <condition else="debug" property="jar.usage.level" value="info">
+            <isset property="main.class.available"/>
+        </condition>
+        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
+    </target>
+    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
+        <delete>
+            <fileset file="${tmp.manifest.file}"/>
+        </delete>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                =================
+                PROFILING SECTION
+                =================
+            -->
+    <!--
+                pre NB7.2 profiler integration
+            -->
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile/>
+    </target>
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
+        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="${profile.class}"/>
+    </target>
+    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </profile>
+    </target>
+    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
+            <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 from="test-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+    </target>
+    <!--
+                end of pre NB72 profiling section
+            -->
+    <target if="netbeans.home" name="-profile-check">
+        <condition property="profiler.configured">
+            <or>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
+            </or>
+        </condition>
+    </target>
+    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
+        <startprofiler/>
+        <antcall target="run"/>
+    </target>
+    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <startprofiler/>
+        <antcall target="run-single"/>
+    </target>
+    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
+    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <startprofiler/>
+        <antcall target="test-single"/>
+    </target>
+    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <startprofiler/>
+        <antcal target="run-test-with-main"/>
+    </target>
+    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <startprofiler/>
+        <antcall target="run-applet"/>
+    </target>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" if="have.sources" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
+            <and>
+                <isset property="endorsed.classpath.cmd.line.arg"/>
+                <not>
+                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <condition else="" property="bug5101868workaround" value="*.java">
+            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+        </condition>
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+                <exclude name="*.java"/>
+            </fileset>
+            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
+        </javadoc>
+        <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/doc-files/**"/>
+            </fileset>
+        </copy>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                TEST COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                TEST EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
+        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
+    <!--
+                =======================
+                TEST DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target name="-deps-clean-init" unless="built-clean.properties">
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+        <delete file="${built-clean.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+        <echo level="warn" message="Cycle detected: FakeRobot was already built"/>
+    </target>
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-clean.properties}" verbose="false"/>
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>
+        <antcall target="-warn-already-built-clean"/>
+        <propertyfile file="${built-clean.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target name="-check-call-dep">
+        <property file="${call.built.properties}" prefix="already.built."/>
+        <condition property="should.call.dep">
+            <and>
+                <not>
+                    <isset property="already.built.${call.subproject}"/>
+                </not>
+                <available file="${call.script}"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+            <propertyset>
+                <propertyref prefix="transfer."/>
+                <mapper from="transfer.*" to="*" type="glob"/>
+            </propertyset>
+        </ant>
+    </target>
+</project>
diff --git a/FakeRobot/nbproject/genfiles.properties b/FakeRobot/nbproject/genfiles.properties
index 3fda7d0..88a9e92 100644
--- a/FakeRobot/nbproject/genfiles.properties
+++ b/FakeRobot/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=42e58587

-build.xml.script.CRC32=65e52e08

-build.xml.stylesheet.CRC32=28e38971@1.50.3.46

-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.

-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.

-nbproject/build-impl.xml.data.CRC32=42e58587

-nbproject/build-impl.xml.script.CRC32=3c08be4f

-nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.3.46

+build.xml.data.CRC32=42e58587
+build.xml.script.CRC32=bfcdca7e
+build.xml.stylesheet.CRC32=8064a381@1.75.2.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=42e58587
+nbproject/build-impl.xml.script.CRC32=ca57dc8f
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
diff --git a/FakeRobot/nbproject/project.properties b/FakeRobot/nbproject/project.properties
index fbbd528..3201a7e 100644
--- a/FakeRobot/nbproject/project.properties
+++ b/FakeRobot/nbproject/project.properties
@@ -1,75 +1,75 @@
-annotation.processing.enabled=true

-annotation.processing.enabled.in.editor=false

-annotation.processing.processors.list=

-annotation.processing.run.all.processors=true

-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output

-application.title=FakeRobot

-application.vendor=Sam

-build.classes.dir=${build.dir}/classes

-build.classes.excludes=**/*.java,**/*.form

-# This directory is removed when the project is cleaned:

-build.dir=build

-build.generated.dir=${build.dir}/generated

-build.generated.sources.dir=${build.dir}/generated-sources

-# Only compile against the classpath explicitly listed here:

-build.sysclasspath=ignore

-build.test.classes.dir=${build.dir}/test/classes

-build.test.results.dir=${build.dir}/test/results

-# Uncomment to specify the preferred debugger connection transport:

-#debug.transport=dt_socket

-debug.classpath=\

-    ${run.classpath}

-debug.test.classpath=\

-    ${run.test.classpath}

-# This directory is removed when the project is cleaned:

-dist.dir=dist

-dist.jar=${dist.dir}/FakeRobot.jar

-dist.javadoc.dir=${dist.dir}/javadoc

-endorsed.classpath=

-excludes=

-file.reference.networktables-desktop-r158.jar=lib/networktables-desktop-r158.jar

-includes=**

-jar.compress=false

-javac.classpath=\

-    ${file.reference.networktables-desktop-r158.jar}

-# Space-separated list of extra javac options

-javac.compilerargs=

-javac.deprecation=false

-javac.processorpath=\

-    ${javac.classpath}

-javac.source=1.7

-javac.target=1.7

-javac.test.classpath=\

-    ${javac.classpath}:\

-    ${build.classes.dir}

-javac.test.processorpath=\

-    ${javac.test.classpath}

-javadoc.additionalparam=

-javadoc.author=false

-javadoc.encoding=${source.encoding}

-javadoc.noindex=false

-javadoc.nonavbar=false

-javadoc.notree=false

-javadoc.private=false

-javadoc.splitindex=true

-javadoc.use=true

-javadoc.version=false

-javadoc.windowtitle=

-main.class=livewindowfakerobot.LiveWindowFakeRobot

-manifest.file=manifest.mf

-meta.inf.dir=${src.dir}/META-INF

-mkdist.disabled=false

-platform.active=default_platform

-run.classpath=\

-    ${javac.classpath}:\

-    ${build.classes.dir}

-# Space-separated list of JVM arguments used when running the project

-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value

-# or test-sys-prop.name=value to set system properties for unit tests):

-run.jvmargs=

-run.test.classpath=\

-    ${javac.test.classpath}:\

-    ${build.test.classes.dir}

-source.encoding=UTF-8

-src.dir=src

-test.src.dir=test

+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=FakeRobot
+application.vendor=Sam
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/FakeRobot.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.NetworkTables.jar=lib/NetworkTables.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.NetworkTables.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.7
+javac.target=1.7
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=livewindowfakerobot.LiveWindowFakeRobot
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/FakeRobot/src/livewindowfakerobot/LiveWindowFakeRobot.java b/FakeRobot/src/livewindowfakerobot/LiveWindowFakeRobot.java
index bfb544d..32666bf 100644
--- a/FakeRobot/src/livewindowfakerobot/LiveWindowFakeRobot.java
+++ b/FakeRobot/src/livewindowfakerobot/LiveWindowFakeRobot.java
@@ -20,13 +20,13 @@ public class LiveWindowFakeRobot {
                                 wPotentiometer  = createTable(wrist, "Potentiometer", "Analog Input"),

                                 wVictor         = createTable(wrist, "Victor", "Speed Controller"), 

 

-                                elevator        = createTable(liveWindow, "Elevator", "LW Subsystem"), 

+                                elevator        = createTable(liveWindow, "Elevator", "PIDSubsystem"), 

                                 ePotentiometer  = createTable(elevator, "Potentiometer", "Analog Input"), 

                                 eVictor         = createTable(elevator, "Victor", "Speed Controller"),

             

                                 testSys         = createTable(liveWindow, "TestSystem", "LW Subsystem"), 

                                 tComp           = createTable(testSys, "Compressor", "Compressor"), 

-                                tGearTooth      = createTable(testSys, "Gear Tooth Sensor", "Gear Tooth Sensor"), 

+                                tGearTooth      = createTable(testSys, "Gear Tooth Sensor", "Gear Tooth"), 

                                 tVictor         = createTable(testSys, "Victor", "Speed Controller"), 

                                 tPotentiometer  = createTable(testSys, "Potentiometer", "Analog Input"), 

                                 tRelay          = createTable(testSys, "Spike", "Relay"), 

@@ -38,18 +38,32 @@ public class LiveWindowFakeRobot {
                                 tEncoder1       = createTable(testSys, "Encoder 1", "Encoder"), 

                                 tUltra          = createTable(testSys, "Ultrasonic", "Ultrasonic"), 

                                 tCompass        = createTable(testSys, "Compass", "Compass"), 

-                                tSwitch         = createTable(testSys, "Limit Switch", "Digital Input");

+                                tSwitch         = createTable(testSys, "Limit Switch", "Digital Input"),

+            

+                                canSystem       = createTable(liveWindow, "CAN Subsystem", "LW Subsystem"),

+                                canJag          = createTable(canSystem, "CAN Jaguar", "CANSpeedController"),

+                                canTalon        = createTable(canSystem, "CAN Talon", "CANSpeedController");

     

     public static void main(String[] args) {

         

         System.out.println();

         

-        STATUS.putBoolean("LW Enabled", false);

+        STATUS.putBoolean("LW Enabled", true);

         STATUS.putString("Robot", "Testing");

         wPotentiometer.putNumber("Value", 2.6);

         ePotentiometer.putNumber("Value", -11.6872);

         tSwitch.putString("Value", "Off");

         

+        elevator.putNumber("p", 0.5);

+        elevator.putNumber("i", 0.5);

+        elevator.putNumber("d", 0.5);

+        elevator.putNumber("f", 0.5);

+        elevator.putNumber("setpoint", 0.5);

+        elevator.putBoolean("enabled", false);

+        

+        canJag.putString("Type", "CANJaguar");

+        canTalon.putString("Type", "CANTalon");

+        

         

         (new Timer()).schedule(

             new TimerTask(){

diff --git a/smartdashboard/build.gradle b/smartdashboard/build.gradle
index d373503..c85fee5 100644
--- a/smartdashboard/build.gradle
+++ b/smartdashboard/build.gradle
@@ -1,24 +1,27 @@
 apply plugin: 'java'
 apply plugin: 'maven-publish'
+apply plugin: 'application'
+
+mainClassName = "edu.wpi.first.smartdashboard.main"
 
 sourceSets {
-  main {
-    java.srcDir "src/"
-  }
+    main {
+        java.srcDir "src/"
+    }
 }
 
 dependencies {
-  compile 'edu.wpi.first.wpilib.networktables.java:NetworkTables:0.1.0-SNAPSHOT'
-  compile 'junit:junit:4.12'
-  compile 'jcommon:jcommon:0.9.5'
-  compile 'jfreechart:jfreechart:1.0.0'
+    compile 'edu.wpi.first.wpilib.networktables.java:NetworkTables:0.1.0-SNAPSHOT'
+    compile 'junit:junit:4.12'
+    compile 'jcommon:jcommon:0.9.5'
+    compile 'jfreechart:jfreechart:1.0.0'
 }
 
 repositories {
-  maven {
-    url "http://first.wpi.edu/FRC/roborio/maven/"
-  }
-  mavenCentral()
+    maven {
+        url "http://first.wpi.edu/FRC/roborio/maven/"
+    }
+    mavenCentral()
 }
 
 publishing {
@@ -27,7 +30,7 @@ publishing {
             from components.java
 
             artifact (jar) {
-              classifier = 'jar'
+                classifier = 'jar'
             }
 
             groupId 'edu.wpi.first.wpilib'
@@ -43,8 +46,8 @@ publishing {
 }
 
 jar {
-  manifest {
-    attributes 'Main-Class': 'edu.wpi.first.smartdashboard.main'
-  }
-  from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    manifest {
+        attributes 'Main-Class': 'edu.wpi.first.smartdashboard.main'
+    }
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 }
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/PIDEditor.java b/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/PIDEditor.java
index f7a0cac..8ef4991 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/PIDEditor.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/PIDEditor.java
@@ -1,6 +1,8 @@
+
 package edu.wpi.first.smartdashboard.gui.elements;
 
 import edu.wpi.first.smartdashboard.gui.elements.bindings.AbstractTableWidget;
+import edu.wpi.first.smartdashboard.livewindow.elements.Controller;
 import edu.wpi.first.smartdashboard.livewindow.elements.NameTag;
 import java.awt.*;
 
@@ -14,101 +16,138 @@ import edu.wpi.first.smartdashboard.types.named.*;
  *
  * @author Joe Grinstead
  */
-public class PIDEditor extends AbstractTableWidget {
-
-	public static final DataType[] TYPES = {PIDType.get()};
-
-	private NumberTableField pField;
-	private NumberTableField iField;
-	private NumberTableField dField;
-	private NumberTableField fField;
-	private NumberTableField sField;
-	private BooleanTableCheckBox eBox;
-	private JLabel pLabel;
-	private JLabel iLabel;
-	private JLabel dLabel;
-	private JLabel fLabel;
-	private JLabel sLabel;
-	private JLabel eLabel;
-	
-	public PIDEditor() {//TODO alert user when the robot is about reset modified PID values
-		setLayout(new GridBagLayout());
-
-		pLabel = new JLabel("P:");
-		iLabel = new JLabel("I:");
-		dLabel = new JLabel("D:");
-		fLabel = new JLabel("F:");
-		sLabel = new JLabel("Setpoint:");
-		eLabel = new JLabel("Enabled:");
-		pLabel.setHorizontalAlignment(JLabel.RIGHT);
-		iLabel.setHorizontalAlignment(JLabel.RIGHT);
-		dLabel.setHorizontalAlignment(JLabel.RIGHT);
-		fLabel.setHorizontalAlignment(JLabel.RIGHT);
-		sLabel.setHorizontalAlignment(JLabel.RIGHT);
-		eLabel.setHorizontalAlignment(JLabel.RIGHT);
-
-		pField = new NumberTableField("p");
-		iField = new NumberTableField("i");
-		dField = new NumberTableField("d");
-		fField = new NumberTableField("f");
-		sField = new NumberTableField("setpoint");
-		eBox = new BooleanTableCheckBox("enabled");
-
-		int columns = 10;
-		pField.setColumns(columns);
-		iField.setColumns(columns);
-		dField.setColumns(columns);
-		fField.setColumns(columns);
-		sField.setColumns(columns);
-
-		
-		GridBagConstraints c = new GridBagConstraints();
-		
-        
-		c.gridy = 1;
-		add(pLabel, c);
-		c.gridy = 2;
-		add(iLabel, c);
-		c.gridy = 3;
-		add(dLabel, c);
-		c.gridy = 4;
-		add(fLabel, c);
-		c.gridy = 5;
-		add(sLabel, c);
-		c.gridy = 6;
-		add(eLabel, c);
-		
-		c.gridx = 1;
-		c.weightx = 1.0;
-		c.gridy = 0;
-		c.fill = GridBagConstraints.HORIZONTAL;
+public class PIDEditor extends AbstractTableWidget implements Controller {
+
+    public static final DataType[] TYPES = {PIDType.get()};
+
+    private static final String[] pidTypes = {"Displacement", "Rate"}; // kDisplacement, kRate
+
+    private final boolean editType;
+
+    private NumberTableComboBox tBox;
+    private NumberTableField pField;
+    private NumberTableField iField;
+    private NumberTableField dField;
+    private NumberTableField fField;
+    private NumberTableField sField;
+    private BooleanTableCheckBox eBox;
+    private JLabel tLabel;
+    private JLabel pLabel;
+    private JLabel iLabel;
+    private JLabel dLabel;
+    private JLabel fLabel;
+    private JLabel sLabel;
+    private JLabel eLabel;
+
+    public PIDEditor() {
+        this(true);
+    }
+
+    public PIDEditor(boolean editType) {//TODO alert user when the robot is about reset modified PID values
+        this.editType = editType;
+    }
+
+    @Override
+    public void init() {
+        setLayout(new GridBagLayout());
+
+        if (editType) {
+            tLabel = new JLabel("PID type: ");
+        }
+        pLabel = new JLabel("P:");
+        iLabel = new JLabel("I:");
+        dLabel = new JLabel("D:");
+        fLabel = new JLabel("F:");
+        sLabel = new JLabel("Setpoint:");
+        eLabel = new JLabel("Enabled:");
+        if (editType) {
+            tLabel.setHorizontalAlignment(JLabel.RIGHT);
+        }
+        pLabel.setHorizontalAlignment(JLabel.RIGHT);
+        iLabel.setHorizontalAlignment(JLabel.RIGHT);
+        dLabel.setHorizontalAlignment(JLabel.RIGHT);
+        fLabel.setHorizontalAlignment(JLabel.RIGHT);
+        sLabel.setHorizontalAlignment(JLabel.RIGHT);
+        eLabel.setHorizontalAlignment(JLabel.RIGHT);
+        if (editType) {
+            tBox = new NumberTableComboBox<>("PID Type", pidTypes);
+        }
+        pField = new NumberTableField("p");
+        iField = new NumberTableField("i");
+        dField = new NumberTableField("d");
+        fField = new NumberTableField("f");
+        sField = new NumberTableField("setpoint");
+        eBox = new BooleanTableCheckBox("enabled");
+
+        int columns = 10;
+        pField.setColumns(columns);
+        iField.setColumns(columns);
+        dField.setColumns(columns);
+        fField.setColumns(columns);
+        sField.setColumns(columns);
+
+        if (editType) {
+            System.out.println("tbox="+tBox);
+            System.out.println("table="+table);
+            tBox.addActionListener(e -> table.putNumber("PID Type", tBox.getSelectedIndex()));
+        }
+
+        GridBagConstraints c = new GridBagConstraints();
+
+
+        c.gridy = 1;
+        if (editType) {
+            add(tLabel, c);
+        }
+        c.gridy = 2;
+        add(pLabel, c);
+        c.gridy = 3;
+        add(iLabel, c);
+        c.gridy = 4;
+        add(dLabel, c);
+        c.gridy = 5;
+        add(fLabel, c);
+        c.gridy = 6;
+        add(sLabel, c);
+        c.gridy = 7;
+        add(eLabel, c);
+
+        c.gridx = 1;
+        c.weightx = 1.0;
+        c.gridy = 0;
+        c.fill = GridBagConstraints.HORIZONTAL;
         add(nameTag = new NameTag(""), c);
-		nameTag.setHorizontalAlignment(JLabel.LEFT);
-		c.gridy = 1;
-		add(pField, c);
-		c.gridy = 2;
-		add(iField, c);
-		c.gridy = 3;
-		add(dField, c);
-		c.gridy = 4;
-		add(fField, c);
-		c.gridy = 5;
-		add(sField, c);
-		c.gridy = 6;
-		add(eBox, c);
-
-		setMaximumSize(new Dimension(Integer.MAX_VALUE, getPreferredSize().height));
-
-		revalidate();
-		repaint();
-	}
-	
-	@Override
-	public void init(){
-		nameTag.setText(getFieldName());
-	}
-
-	@Override
-	public void propertyChanged(Property property) {
-	}
+        nameTag.setHorizontalAlignment(JLabel.LEFT);
+        nameTag.setText(getFieldName());
+        c.gridy = 1;
+        if (editType) {
+            add(tBox, c);
+        }
+        c.gridy = 2;
+        add(pField, c);
+        c.gridy = 3;
+        add(iField, c);
+        c.gridy = 4;
+        add(dField, c);
+        c.gridy = 5;
+        add(fField, c);
+        c.gridy = 6;
+        add(sField, c);
+        c.gridy = 7;
+        add(eBox, c);
+
+        setMaximumSize(new Dimension(Integer.MAX_VALUE, getPreferredSize().height));
+
+        revalidate();
+        repaint();
+    }
+
+    @Override
+    public void propertyChanged(Property property) {
+    }
+
+    @Override
+    public void reset() {
+        eBox.setBindableValue(false);
+    }
 }
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/bindings/AbstractTableWidget.java b/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/bindings/AbstractTableWidget.java
index e20b5bb..99f232a 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/bindings/AbstractTableWidget.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/bindings/AbstractTableWidget.java
@@ -7,6 +7,7 @@ import edu.wpi.first.smartdashboard.types.DataType;
 import edu.wpi.first.wpilibj.tables.*;

 import java.awt.Point;

 import java.util.*;

+import javax.swing.JComboBox;

 

 /**

  * An abstraction for creating a widget that wraps a network table

@@ -54,12 +55,12 @@ public abstract class AbstractTableWidget extends Widget implements ITableListen
         if(value != null) {

             element.setValue(value);

         }

-        subsystem.add(element);

+        subsystem.addWidget(element);

     }

 

-	private Map<String, BooleanBindable> booleanFields = new HashMap<String, BooleanBindable>();

-	private Map<String, NumberBindable> numberFields = new HashMap<String, NumberBindable>();

-	private Map<String, StringBindable> stringFields = new HashMap<String, StringBindable>();

+	private Map<String, List<BooleanBindable>> booleanFields = new HashMap<>();

+	private Map<String, List<NumberBindable>> numberFields = new HashMap<>();

+	private Map<String, List<StringBindable>> stringFields = new HashMap<>();

 	@Override

 	public void valueChanged(ITable source, String key, Object value, boolean isNew) {

 		if(value instanceof Boolean)

@@ -74,19 +75,19 @@ public abstract class AbstractTableWidget extends Widget implements ITableListen
 

 

 	public void booleanChanged(ITable source, String key, boolean value, boolean isNew) {

-		BooleanBindable field = booleanFields.get(key);

-		if(field!=null)

-			field.setBindableValue(value);

+                if(!booleanFields.containsKey(key)) booleanFields.put(key, new ArrayList<>());

+		List<BooleanBindable> field = booleanFields.get(key);

+                field.stream().forEach(bindable -> bindable.setBindableValue(value));

 	}

 	public void doubleChanged(ITable source, String key, double value, boolean isNew) {

-		NumberBindable field = numberFields.get(key);

-		if(field!=null)

-			field.setBindableValue(value);

+                if(!numberFields.containsKey(key)) numberFields.put(key, new ArrayList<>());

+		List<NumberBindable> field = numberFields.get(key);

+                field.stream().forEach(bindable -> bindable.setBindableValue(value));

 	}

 	public void stringChanged(ITable source, String key, String value, boolean isNew) {

-		StringBindable field = stringFields.get(key);

-		if(field!=null)

-			field.setBindableValue(value);

+                if(!stringFields.containsKey(key)) stringFields.put(key, new ArrayList<>());

+		List<StringBindable> field = stringFields.get(key);

+                field.stream().forEach(bindable -> bindable.setBindableValue(value));

 	}

 	public void tableChanged(ITable source, String key, ITable value, boolean isNew) {

 	}

@@ -114,20 +115,17 @@ public abstract class AbstractTableWidget extends Widget implements ITableListen
 

 

 	protected void setBooleanBinding(String key, BooleanBindable displayer){

-		if(booleanFields.containsKey(key))//TODO maybe remove and just let them overwrite???

-			throw new RuntimeException("Cannot have multiple boolean fields for the same key: "+key);

-		booleanFields.put(key, displayer);

+                if(!booleanFields.containsKey(key)) booleanFields.put(key, new ArrayList<>());

+		booleanFields.get(key).add(displayer);

 	}

 	protected void setNumberBinding(String key, NumberBindable displayer){

-		if(numberFields.containsKey(key))

-			throw new RuntimeException("Cannot have multiple number fields for the same key: "+key);

-		numberFields.put(key, displayer);

+                if(!numberFields.containsKey(key)) numberFields.put(key, new ArrayList<>());

+		numberFields.get(key).add(displayer);

 	}

 	protected void setStringBinding(String key, StringBindable displayer, String defaultValue){

-		if(stringFields.containsKey(key))

-			throw new RuntimeException("Cannot have multiple string fields for the same key: "+key);

                 displayer.setBindableValue(defaultValue);

-		stringFields.put(key, displayer);

+                if(!stringFields.containsKey(key)) stringFields.put(key, new ArrayList<>());

+		stringFields.get(key).add(displayer);

 	}

 

 

@@ -157,4 +155,29 @@ public abstract class AbstractTableWidget extends Widget implements ITableListen
 			setStringBinding(key, this, "");

 		}

 	}

+        public class StringTableComboBox extends JComboBox<String> implements StringBindable {

+                public StringTableComboBox(final String key, String... items) {

+                    super(items);

+                    getTableEntryBindable(key);

+                    setStringBinding(key, this, "");

+                    addActionListener(e -> table.putString(key, (String) getSelectedItem()));

+                }

+                @Override

+                public void setBindableValue(String value) {

+                    setSelectedItem(value);

+                }

+        }

+        public class NumberTableComboBox<E> extends JComboBox<E> implements NumberBindable {

+                public NumberTableComboBox(final String key, E... items) {

+                    super(items);

+                    getTableEntryBindable(key);

+                    setNumberBinding(key, this);

+                    addActionListener(e -> table.putNumber(key, getSelectedIndex()));

+                }

+                @Override

+                public void setBindableValue(double value) {

+                    if((int) value == value && value >= 0 && value < getItemCount())

+                    setSelectedIndex((int) value);

+                }

+        }

 }

diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/CANSpeedController.java b/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/CANSpeedController.java
new file mode 100644
index 0000000..faad078
--- /dev/null
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/CANSpeedController.java
@@ -0,0 +1,242 @@
+
+package edu.wpi.first.smartdashboard.livewindow.elements;
+
+import edu.wpi.first.smartdashboard.gui.elements.PIDEditor;
+import edu.wpi.first.smartdashboard.gui.elements.bindings.AbstractTableWidget;
+import edu.wpi.first.smartdashboard.properties.Property;
+import edu.wpi.first.smartdashboard.types.DataType;
+import edu.wpi.first.smartdashboard.types.named.CANSpeedControllerType;
+import edu.wpi.first.wpilibj.tables.ITable;
+
+import java.awt.CardLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionListener;
+import javax.swing.JComboBox;
+
+import javax.swing.JPanel;
+
+/**
+ *
+ * @author Sam Carlberg
+ */
+public class CANSpeedController extends AbstractTableWidget implements Controller {
+
+    public static final DataType[] TYPES = {CANSpeedControllerType.get()};
+
+    private static final String TYPE_TALON = "CANTalon";
+    private static final String TYPE_JAGUAR = "CANJaguar";
+
+    /**
+     * The type of the CAN controller.
+     */
+    private String type = "";
+    /**
+     * The mode the CAN controller is operating in.
+     */
+    private int mode = 0;
+
+    private static final int TALON_DISABLED_MODE = 15;
+
+    /**
+     * The modes that the CAN Talon can run in.
+     */
+    private static final String[] talonModes = {"PercentVbus", "Position", "Speed", "Current", "Voltage", "Follower", "Disabled"};
+
+    /**
+     * The modes that the CAN Jaguar can run in.
+     */
+    private static final String[] jaguarModes = {"PercentVbus", "Current", "Speed", "Position", "Voltage"};
+
+    private JComboBox<String> talonModeBox = new JComboBox<>(talonModes);
+    private JComboBox<String> jaguarModeBox = new JComboBox<>(jaguarModes);
+    private JComboBox<String> modeBox = talonModeBox;
+
+    /**
+     * Header panel containing the name tag and the mode combobox.
+     */
+    private JPanel headerPanel;
+
+    /**
+     * Control panel containing the PID editor / speed controller editor.
+     */
+    private JPanel controlPanel;
+    private PIDEditor pidControlPanel;
+    private SpeedController normalControlPanel;
+
+    private ActionListener modeSelection = e -> {
+        int m = modeBox.getSelectedIndex();
+        if (m == 6) {
+            // CAN Talon mode #6 has a value of 15
+            m = TALON_DISABLED_MODE;
+        }
+        normalControlPanel.reset();
+        mode = m;
+        table.putBoolean("Enabled", mode == 0 || mode == 4); // enable on %VBus and voltage, disable on all others
+        table.putNumber("Mode", mode);
+    };
+
+    @Override
+    public void init() {
+        nameTag = new NameTag(getFieldName());
+        headerPanel = new JPanel();
+        controlPanel = new JPanel();
+        createPIDControlPanel();
+        createNormalControlPanel();
+        controlPanel.add(normalControlPanel);
+
+        headerPanel.setLayout(new GridBagLayout());
+        GridBagConstraints headerConstraints = new GridBagConstraints();
+        headerConstraints.fill = GridBagConstraints.BOTH;
+        headerConstraints.gridx = 0;
+        headerConstraints.gridy = 0;
+        headerPanel.add(nameTag, headerConstraints);
+        headerConstraints.gridx++;
+        headerPanel.add(modeBox, headerConstraints);
+
+        setLayout(new GridBagLayout());
+        GridBagConstraints controlConstraints = new GridBagConstraints();
+        controlConstraints.gridx = 0;
+        controlConstraints.gridy = 0;
+        controlConstraints.fill = GridBagConstraints.BOTH;
+        add(headerPanel, controlConstraints);
+        controlConstraints.gridy++;
+        add(controlPanel, controlConstraints);
+
+        talonModeBox.addActionListener(modeSelection);
+        jaguarModeBox.addActionListener(modeSelection);
+    }
+
+    private void createPIDControlPanel() {
+        pidControlPanel = new PIDEditor(false);
+        pidControlPanel.setValue(this.table);
+        pidControlPanel.init();
+    }
+
+    private void createNormalControlPanel() {
+        normalControlPanel = new SpeedController();
+        normalControlPanel.setValue(this.table);
+        normalControlPanel.init();
+    }
+
+    @Override
+    public void setValue(Object value) {
+        super.setValue(value);
+        pidControlPanel.setValue(value);
+        normalControlPanel.setValue(value);
+        this.type = table.getString("Type", "[unknown]");
+        this.mode = (int) table.getNumber("Mode", 0);
+
+        headerPanel.remove(modeBox);
+        switch (type) {
+            case TYPE_TALON:
+                modeBox = talonModeBox;
+                break;
+            case TYPE_JAGUAR:
+                modeBox = jaguarModeBox;
+                break;
+        }
+        headerPanel.add(modeBox);
+        modeBox.setSelectedIndex(mode == TALON_DISABLED_MODE ? 6 : mode);
+        setControlPanel();
+    }
+
+    @Override
+    public void booleanChanged(ITable source, String key, boolean value, boolean isNew) {
+        pidControlPanel.booleanChanged(source, key, value, isNew);
+        normalControlPanel.booleanChanged(source, key, value, isNew);
+    }
+
+    @Override
+    public void doubleChanged(ITable source, String key, double value, boolean isNew) {
+        if ("Mode".equals(key)) {
+            this.mode = (int) value;
+            modeBox.setSelectedIndex(mode == TALON_DISABLED_MODE ? 6 : mode);
+            setControlPanel();
+            normalControlPanel.reset();
+        }
+        pidControlPanel.doubleChanged(source, key, value, isNew);
+        normalControlPanel.doubleChanged(source, key, value, isNew);
+    }
+
+    @Override
+    public void stringChanged(ITable source, String key, String value, boolean isNew) {
+        if ("Type".equals(key)) {
+            this.type = value;
+        }
+        pidControlPanel.stringChanged(source, key, value, isNew);
+        normalControlPanel.stringChanged(source, key, value, isNew);
+    }
+
+    @Override
+    public void valueChanged(ITable source, String key, Object value, boolean isNew) {
+        super.valueChanged(source, key, value, isNew);
+        pidControlPanel.valueChanged(source, key, value, isNew);
+        normalControlPanel.valueChanged(source, key, value, isNew);
+    }
+
+    @Override
+    public void propertyChanged(Property property) {
+        pidControlPanel.propertyChanged(property);
+        normalControlPanel.propertyChanged(property);
+    }
+
+    @Override
+    public void reset() {
+        normalControlPanel.reset();
+        pidControlPanel.reset();
+    }
+
+    private void setControlPanel() {
+        if (mode == TALON_DISABLED_MODE || mode == 5) {
+            // empty (follower or disabled)
+            normalControlPanel.reset();
+            pidControlPanel.reset();
+            controlPanel.removeAll();
+            controlPanel.setSize(0, 0);
+        } else if (isPID()) {
+            if (pidControlPanel.getParent() != controlPanel) {
+                // set control to PID and resize
+                normalControlPanel.reset();
+                controlPanel.removeAll();
+                controlPanel.add(pidControlPanel);
+                controlPanel.setSize(pidControlPanel.getSize());
+            }
+        } else {
+            if (normalControlPanel.getParent() != controlPanel) {
+                // set control to normal and resize
+                pidControlPanel.reset();
+                controlPanel.removeAll();
+                controlPanel.add(normalControlPanel);
+                controlPanel.setSize(normalControlPanel.getSize());
+            }
+            // set the range on the slider depending on the mode
+            switch(mode) {
+                case 0: // Percent vbus
+                    normalControlPanel.setRange(-1, 1);
+                    break;
+                case 4: // voltage
+                    normalControlPanel.setRange(-12, 12);
+                    break;
+                default:
+                    normalControlPanel.setRange(-0.0, 0);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Checks if the current type and mode are PID-compatible.
+     */
+    private boolean isPID() {
+        switch (type) {
+            case TYPE_TALON:
+                return mode == 1 || mode == 2 || mode == 3; // position, speed, current
+            case TYPE_JAGUAR:
+                return mode == 1 || mode == 2 || mode == 3; // current, speed, position
+            default:
+                return false;
+        }
+    }
+
+}
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/LiveWindowWidgetRegistrar.java b/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/LiveWindowWidgetRegistrar.java
index 0faa69d..4595ba2 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/LiveWindowWidgetRegistrar.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/LiveWindowWidgetRegistrar.java
@@ -13,6 +13,7 @@ public class LiveWindowWidgetRegistrar {
      */

     public static void init() {

         DisplayElementRegistry.registerWidget(LWSubsystem.class);

+        DisplayElementRegistry.registerWidget(PIDSubsystem.class);

         DisplayElementRegistry.registerWidget(SpeedController.class);

         DisplayElementRegistry.registerWidget(RelayController.class);

         DisplayElementRegistry.registerWidget(DigitalOutputController.class);

@@ -23,6 +24,7 @@ public class LiveWindowWidgetRegistrar {
         DisplayElementRegistry.registerWidget(ServoController.class);

         DisplayElementRegistry.registerWidget(PowerDistributionPanel.class);

         DisplayElementRegistry.registerWidget(ThreeAxisAccelerometer.class);

+        DisplayElementRegistry.registerWidget(CANSpeedController.class);

     }

     

 }

diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/PIDSubsystem.java b/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/PIDSubsystem.java
new file mode 100644
index 0000000..fa4fe17
--- /dev/null
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/PIDSubsystem.java
@@ -0,0 +1,45 @@
+
+package edu.wpi.first.smartdashboard.livewindow.elements;
+
+import edu.wpi.first.smartdashboard.gui.elements.PIDEditor;
+import edu.wpi.first.smartdashboard.types.DataType;
+import edu.wpi.first.smartdashboard.types.named.PIDSubsystemType;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Sam Carlberg
+ */
+public class PIDSubsystem extends LWSubsystem {
+
+    public static final DataType[] TYPES = {PIDSubsystemType.get()};
+
+    private PIDEditor pidController;
+
+    @Override
+    public void init() {
+        System.out.println("PIDSubsystem init()");
+        super.init();
+        try {
+            pidController = (PIDEditor) DataType.getType("PIDController", true).getDefault().newInstance();
+            pidController.setFieldName("Controller");
+            pidController.setType(DataType.getType("PIDController", true));
+            System.out.println("PIDSubsystem table=" + table);
+            pidController.setValue(table);
+            pidController.init();
+            addWidget(pidController);
+        } catch (InstantiationException | IllegalAccessException ex) {
+            Logger.getLogger(PIDSubsystem.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
+
+    @Override
+    public void setValue(Object value) {
+        System.out.println("PIDSubsystem setValue(value=" + value + ")");
+        super.setValue(value);
+        pidController.setValue(value);
+    }
+
+}
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/SpeedController.java b/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/SpeedController.java
index bd0a779..aee670c 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/SpeedController.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/livewindow/elements/SpeedController.java
@@ -90,5 +90,10 @@ public class SpeedController extends AbstractTableWidget implements Controller {
     public void propertyChanged(Property property) {

         

     }

+

+    public void setRange(double min, double max) {

+        controller.setMin(min);

+        controller.setMax(max);

+    }

     

 }

diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/main.java b/smartdashboard/src/edu/wpi/first/smartdashboard/main.java
index 2971495..296a417 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/main.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/main.java
@@ -16,10 +16,10 @@ import edu.wpi.first.smartdashboard.robot.*;
  * @author pmalmsten
  */
 public class main {
-    
+
     /** Variable used in the {@link main#inCompetition() inCompetition()} method */
     private static boolean inCompetition = false;
-    
+
     /**
      * Returns whether or not this is in "competition" mode. Competition mode
      * should be used on the netbook provided for teams to use the dashboard. If
@@ -33,7 +33,7 @@ public class main {
     public static boolean inCompetition() {
         return inCompetition;
     }
-    
+
     
     private static DashboardFrame frame;
     /**
@@ -56,17 +56,17 @@ public class main {
             ex.printStackTrace();
             System.exit(2);
         }
-        
+
         // Present a loading bar (it will only show up if this is going slowly)
         final ProgressMonitor monitor = new ProgressMonitor(null, "Loading SmartDashboard", "Initializing internal code...", 0, 1000);
-        
+
         // Search the filesystem for extensions (49%)
         FileSniffer.findExtensions(monitor, 0, 490);
 
         // Parse arguments
         ArgParser argParser = new ArgParser(args, true, true, new String[] { "ip" });
         inCompetition = argParser.hasFlag("competition");
-        
+
         // Initialize GUI
         try {
             SwingUtilities.invokeAndWait(new Runnable() {
@@ -77,7 +77,7 @@ public class main {
             ex.printStackTrace();
             System.exit(2);
         }
-                
+
         if (argParser.hasValue("ip")) {
             monitor.setProgress(650);
             monitor.setNote("Connecting to robot at: "+argParser.getValue("ip"));
@@ -98,35 +98,37 @@ public class main {
                     }
                     teamNumber = Integer.parseInt(input);
                 } catch(Exception e){}
-            }
-            
+                }
+
             monitor.setProgress(650);
             monitor.setNote("Connecting to robot of team: "+teamNumber);
             teamProp.setValue(teamNumber);
+            Robot.setUseMDNS(DashboardPrefs.getInstance().usemDNS.getValue());
+            Robot.setTeam(teamNumber);
         }
-        
+
         try {
             SwingUtilities.invokeAndWait(new Runnable() {
-                
+
                 public void run() {
                     try {
                         frame.pack();
                         frame.setVisible(true);
-                        
+
                         monitor.setProgress(750);
                         monitor.setNote("Loading From Save");
-                        
+
                         // Load
                         File file = new File(frame.getPrefs().saveFile.getValue());
                         if (file.exists()) {
                             frame.load(file.getPath());
                         }
-                        
+
                         monitor.setProgress(1000);
-                        
+
                     } catch (Exception e) {
                         e.printStackTrace();
-                        
+
                         System.exit(1);
                     }
                 }
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/types/named/CANSpeedControllerType.java b/smartdashboard/src/edu/wpi/first/smartdashboard/types/named/CANSpeedControllerType.java
new file mode 100644
index 0000000..c20fab9
--- /dev/null
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/types/named/CANSpeedControllerType.java
@@ -0,0 +1,27 @@
+
+package edu.wpi.first.smartdashboard.types.named;
+
+import edu.wpi.first.smartdashboard.livewindow.elements.CANSpeedController;
+import edu.wpi.first.smartdashboard.types.NamedDataType;
+
+/**
+ *
+ * @author Sam Carlberg
+ */
+public class CANSpeedControllerType extends NamedDataType {
+
+    public static final String LABEL = "CANSpeedController";
+
+    private CANSpeedControllerType() {
+        super(LABEL, CANSpeedController.class);
+    }
+
+    public static NamedDataType get() {
+        if (NamedDataType.get(LABEL) != null) {
+            return NamedDataType.get(LABEL);
+        } else {
+            return new CANSpeedControllerType();
+        }
+    }
+
+}
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/types/named/PIDSubsystemType.java b/smartdashboard/src/edu/wpi/first/smartdashboard/types/named/PIDSubsystemType.java
index abcd121..610985e 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/types/named/PIDSubsystemType.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/types/named/PIDSubsystemType.java
@@ -1,5 +1,6 @@
 package edu.wpi.first.smartdashboard.types.named;
 
+import edu.wpi.first.smartdashboard.livewindow.elements.PIDSubsystem;
 import edu.wpi.first.smartdashboard.types.NamedDataType;
 
 /**
@@ -11,7 +12,7 @@ public class PIDSubsystemType extends NamedDataType {
     public static final String LABEL = "PIDSubsystem";
 
     private PIDSubsystemType() {
-        super(LABEL, SubsystemType.get(), PIDType.get());
+        super(LABEL, PIDSubsystem.class, SubsystemType.get(), PIDType.get());
     }
 
     public static NamedDataType get() {