Index: trunk/nbproject/project.properties
===================================================================
--- trunk/nbproject/project.properties	(revision 15)
+++ trunk/nbproject/project.properties	(revision 16)
@@ -1,82 +1,65 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
+#Thu Jul 27 20:31:16 PDT 2017
+excludes=
+javac.deprecation=false
+build.test.results.dir=${build.dir}/test/results
+run.classpath=${javac.classpath}\:${build.classes.dir}
+javadoc.nonavbar=false
+javac.external.vm=false
+run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+file.reference.junit-3.8.2.jar=lib/junit-3.8.2.jar
+javac.processorpath=${javac.classpath}
+javac.target=1.7
 annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=ScriptBuilder_Repo
+javadoc.noindex=false
+javadoc.additionalparam=
+includes=**
+build.classes.dir=${build.dir}/classes
+source.encoding=UTF-8
+javadoc.author=false
+test.src.dir=test
+build.dir=build
+file.reference.mockito-1.10.19.jar=/Users/bryanmcguffin/Desktop/Work/NetBeans/mockito-1.10.19.jar
+build.test.classes.dir=${build.dir}/test/classes
+platform.active=default_platform
+javac.compilerargs=
+main.class=scriptbuilder.gui.ScriptBuilderFrame
+dist.jar=${dist.dir}/ScriptBuilder_Repo.jar
+javac.test.processorpath=${javac.test.classpath}
+javadoc.use=true
+dist.archive.excludes=
+build.sysclasspath=ignore
+debug.test.classpath=${run.test.classpath}
+dist.dir=dist
+build.classes.excludes=**/*.java,**/*.form
+javadoc.splitindex=true
+javadoc.encoding=${source.encoding}
+javac.source=1.7
 application.vendor=bryanmcguffin
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
+junit.selected.version=3
+debug.classpath=${run.classpath}
+run.jvmargs=
 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}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/ScriptBuilder_Repo.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.junit-3.8.2.jar=lib/junit-3.8.2.jar
-file.reference.mockito-1.10.19.jar=/Users/bryanmcguffin/Desktop/Work/NetBeans/mockito-1.10.19.jar
-includes=**
 jar.compress=false
-javac.classpath=\
-    ${libs.swing-layout.classpath}:\
-    ${file.reference.junit-3.8.2.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.external.vm=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${file.reference.mockito-1.10.19.jar}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
+    ${file.reference.mockito-1.10.19.jar}:\
+    ${libs.junit_4.classpath}:\
+    ${libs.hamcrest.classpath}
 javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
+annotation.processing.run.all.processors=true
+application.title=ScriptBuilder_Repo
+meta.inf.dir=${src.dir}/META-INF
+manifest.file=manifest.mf
+annotation.processing.enabled=true
+dist.javadoc.dir=${dist.dir}/javadoc
+src.dir=src
+mkdist.disabled=false
+endorsed.classpath=
+javac.classpath=${libs.swing-layout.classpath}\:${file.reference.junit-3.8.2.jar}
+annotation.processing.enabled.in.editor=false
+build.generated.sources.dir=${build.dir}/generated-sources
 javadoc.version=false
 javadoc.windowtitle=
-main.class=scriptbuilder.gui.ScriptBuilderFrame
-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.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
+javadoc.notree=false