Fixed bug where chained 'move' path commands were not switching to 'line' after first path segment. Switched from using Vector to List. Added new project containing example files.

git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@70 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b

3 files changed, 212 insertions, 41 deletions

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 8389c14..eae6ae1 100755
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -20,6 +20,13 @@ is divided into following sections:
 

         -->

 <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="svg-salamander-core-impl">

+    <fail message="Please build using Ant 1.7.1 or higher.">

+        <condition>

+            <not>

+                <antversion atleast="1.7.1"/>

+            </not>

+        </condition>

+    </fail>

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

     <!-- 

                 ======================

@@ -35,22 +42,28 @@ is divided into following sections:
         <property file="nbproject/private/configs/${config}.properties"/>

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

     </target>

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

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

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

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

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

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

+        <property location="..\libraries\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.1.path}" property="libraries.1.basename" suffix=".properties"/>

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

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

+        <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.1.dir}"/>

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

+                <escapeunicode/>

             </filterchain>

         </loadproperties>

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

+    </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.1.dir}"/>

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

+                <escapeunicode/>

             </filterchain>

         </loadproperties>

     </target>

@@ -67,21 +80,52 @@ is divided into following sections:
     </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="manifest.available+main.class">

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

             <and>

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

                 <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.mkdist">

+            <and>

+                <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="libs.CopyLibs.classpath"/>

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

             </and>

         </condition>

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

+            <and>

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

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

+            </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}"/>

@@ -121,6 +165,7 @@ is divided into following sections:
         <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"/>

@@ -136,12 +181,11 @@ is divided into following sections:
         <condition property="do.depend.true">

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

         </condition>

-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">

-            <and>

-                <isset property="jaxws.endorsed.dir"/>

-                <available file="nbproject/jaxws-build.xml"/>

-            </and>

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

+        <property name="javac.fork" value="false"/>

     </target>

     <target name="-post-init">

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

@@ -181,14 +225,23 @@ is divided into following sections:
             <attribute default="${includes}" name="includes"/>

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

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

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

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

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

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

             <sequential>

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

+                <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="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>

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

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

                     <customize/>

                 </javac>

             </sequential>

@@ -227,7 +280,7 @@ is divided into following sections:
             <attribute default="${excludes}" name="excludes"/>

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

             <sequential>

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

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

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

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

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

@@ -245,6 +298,7 @@ is divided into following sections:
                     </syspropertyset>

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

                     <formatter type="xml"/>

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

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

                 </junit>

             </sequential>

@@ -301,8 +355,11 @@ is divided into following sections:
             <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}"/>

@@ -319,12 +376,16 @@ is divided into following sections:
     <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="${run.classpath}"/>

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

                     </classpath>

                     <syspropertyset>

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

@@ -348,7 +409,22 @@ is divided into following sections:
                 COMPILATION SECTION

                 ===================

             -->

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

+    <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: svg-salamander-core 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"/>

@@ -364,10 +440,15 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->

     </target>

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

-        <j2seproject3:depend/>

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

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

+                <include name="*"/>

+            </dirset>

+        </pathconvert>

+        <j2seproject3:depend srcdir="${src.www.dir}:${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}:${build.generated.subdirs}"/>

     </target>

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

-        <j2seproject3:javac/>

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

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

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

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

@@ -388,7 +469,7 @@ is divided into following sections:
     <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="" includes="${javac.includes}" sourcepath="${src.www.dir}:${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}"/>

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

     </target>

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

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

@@ -408,10 +489,10 @@ is divided into following sections:
         <!-- 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" name="-do-jar-without-manifest" unless="manifest.available">

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

         <j2seproject1:jar/>

     </target>

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

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

@@ -454,11 +535,53 @@ is divided into following sections:
         <property location="${dist.jar}" name="dist.jar.resolved"/>

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

     </target>

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

+        <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}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">

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

+            <manifest>

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

+            </manifest>

+        </copylibs>

+    </target>

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

+        <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}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">

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

+            <manifest>

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

+            </manifest>

+        </copylibs>

+    </target>

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

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

     <!--

                 =================

                 EXECUTION SECTION

@@ -474,10 +597,14 @@ is divided into following sections:
     <target name="-do-not-recompile">

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

     </target>

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

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

@@ -486,6 +613,9 @@ is divided into following sections:
     <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>

@@ -502,7 +632,12 @@ is divided into following sections:
         <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,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>

+    <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"/>

@@ -537,6 +672,9 @@ is divided into following sections:
             <fileset dir="${res.dir}" excludes="${excludes}" includes="${includes}">

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

             </fileset>

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

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

+            </fileset>

         </javadoc>

     </target>

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

@@ -600,7 +738,7 @@ is divided into following sections:
         <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">Some tests failed; see details above.</fail>

+        <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"/>

@@ -613,9 +751,9 @@ is divided into following sections:
         <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">Some tests failed; see details above.</fail>

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

     </target>

-    <target depends="init,-do-not-recompile,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,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>

     <!--

                 =======================

                 JUNIT DEBUGGING SECTION

@@ -642,7 +780,7 @@ is divided into following sections:
     <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,-do-not-recompile,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" 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>

@@ -679,14 +817,45 @@ is divided into following sections:
                 CLEANUP SECTION

                 ===============

             -->

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

+    <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: svg-salamander-core 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}"/>

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

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 45c7481..7c6ac93 100755
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=be360661
 # 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=478066e1

-nbproject/build-impl.xml.script.CRC32=f848e329

-nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5

+nbproject/build-impl.xml.script.CRC32=659f9806

+nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45

diff --git a/nbproject/project.properties b/nbproject/project.properties
index e09d66c..70220d9 100755
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -5,6 +5,7 @@ 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

@@ -51,6 +52,7 @@ javadoc.splitindex=true
 javadoc.use=true

 javadoc.version=false

 javadoc.windowtitle=

+jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"

 jnlp.codebase.type=user

 jnlp.codebase.user=https://svgsalamander.dev.java.net/binaries/

 jnlp.enabled=false