updated NetBeans integration targets.

2 files changed, 57 insertions, 29 deletions

diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
index f763c48..46dc184 100644
--- a/nbproject/ide-file-targets.xml
+++ b/nbproject/ide-file-targets.xml
@@ -1,73 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir=".." name="GlueGen-IDE">
-    
     <!-- edit the following targets according to your needs -->
     <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html-->
-    
     <target name="compile-test">
-
         <mkdir dir="build/test/build/classes"/>
-
-        <javac destdir="build/test/build/classes" failonerror="false" source="1.5" srcdir="test/junit" debug="true" debuglevel="lines,vars,source">
+        <javac debug="true" debuglevel="lines,vars,source" destdir="build/test/build/classes" failonerror="false" source="1.5" srcdir="test/junit">
             <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
         </javac>
     </target>
-
     <target name="compile-selected-files-in-junit">
         <fail unless="files">Must set property 'files'</fail>
-
         <mkdir dir="build/test/build/classes"/>
-
-        <javac destdir="build/test/build/classes" includes="${files}" source="1.5" srcdir="test/junit" debug="true" debuglevel="lines,vars,source">
+        <javac debug="true" debuglevel="lines,vars,source" destdir="build/test/build/classes" includes="${files}" source="1.5" srcdir="test/junit">
             <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
         </javac>
     </target>
-
-    <target name="run-selected-file-in-junit" depends="compile-test">
+    <target depends="compile-test" name="run-selected-file-in-junit">
         <fail unless="run.class">Must set property 'run.class'</fail>
-
         <java classname="${run.class}" failonerror="true" fork="true">
             <classpath>
                 <path path="build/test/build/classes:build/classes:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
             </classpath>
         </java>
     </target>
-
-    <target name="test-selected-file-in-junit" depends="compile-test">
+    <target depends="compile-test" name="test-selected-file-in-junit">
         <fail unless="run.class">Must set property 'run.class'</fail>
-        <junit forkmode="once" showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed">
-            <test name="${run.class}">
-            </test>
+        <junit errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="once" showoutput="true">
+            <test name="${run.class}"/>
             <jvmarg value="-Djava.library.path=${basedir}/build/test/build/natives"/>
             <classpath>
                 <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
             </classpath>
-            <formatter usefile="false" type="brief"/>
+            <formatter type="brief" usefile="false"/>
         </junit>
     </target>
-    
-    <target name="debug-selected-file-in-junit" depends="compile-test">
+    <target depends="compile-test" name="debug-selected-file-in-junit">
         <fail unless="run.class">Must set property 'debug.class'</fail>
-
         <path id="cp">
             <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
         </path>
-
         <nbjpdastart addressproperty="jpda.address" name="GlueGen" transport="dt_socket">
             <classpath refid="cp"/>
         </nbjpdastart>
-
-        <junit forkmode="once" showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed">
-            <test name="${run.class}">
-            </test>
+        <junit errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="once" showoutput="true">
+            <test name="${run.class}"/>
             <classpath refid="cp"/>
             <jvmarg value="-Djava.library.path=${basedir}/build/test/build/natives"/>
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-            <formatter usefile="false" type="brief"/>
+            <formatter type="brief" usefile="false"/>
         </junit>
-        <java classname="${run.class}" fork="true">
+        <java classname="${run.class}" fork="true"/>
+    </target>
+    <!-- TODO: edit the following target according to your needs -->
+    <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle) -->
+    <target name="run-selected-file-in-java">
+        <fail unless="run.class">Must set property 'run.class'</fail>
+        <java classname="${run.class}" failonerror="true" fork="true">
+            <classpath>
+                <pathelement path="build/classes:${jdk.home}/lib/tools.jar:/lib/antlr-3.2.jar"/>
+                <pathelement location="build/classes"/>
+            </classpath>
         </java>
     </target>
-    
+    <!-- TODO: edit the following target according to your needs -->
+    <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#compilesingle) -->
+    <target name="compile-selected-files-in-java">
+        <fail unless="files">Must set property 'files'</fail>
+        <mkdir dir="build/classes"/>
+        <javac destdir="build/classes" includes="${files}" source="1.5" srcdir="src/java">
+            <classpath path="build/classes:${jdk.home}/lib/tools.jar:${ant.core.lib}:lib/antlr-3.2.jar"/>
+        </javac>
+    </target>
 </project>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 054a6bc..66a1c6c 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -137,6 +137,32 @@
                     <script>${ant.script}</script>
                     <target>test</target>
                 </action>
+                <action name="run.single">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>run-selected-file-in-java</target>
+                    <context>
+                        <property>run.class</property>
+                        <folder>src/java</folder>
+                        <pattern>\.java$</pattern>
+                        <format>java-name</format>
+                        <arity>
+                            <one-file-only/>
+                        </arity>
+                    </context>
+                </action>
+                <action name="compile.single">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>compile-selected-files-in-java</target>
+                    <context>
+                        <property>files</property>
+                        <folder>src/java</folder>
+                        <pattern>\.java$</pattern>
+                        <format>relative-path</format>
+                        <arity>
+                            <separated-files>,</separated-files>
+                        </arity>
+                    </context>
+                </action>
             </ide-actions>
             <export>
                 <type>folder</type>