]> git.mxchange.org Git - addressbook-swing.git/commitdiff
Rewrite:
authorRoland Haeder <roland@mxchange.org>
Sat, 10 Oct 2015 20:02:01 +0000 (22:02 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 10 Oct 2015 20:02:17 +0000 (22:02 +0200)
- introduced jcountry-core which is a library for handling country-related data, e.g. dial prefix, country code ...
- introduced jphone-core which is a library for handling phone, fax and cell phone numbers
- these both new libraries required a rewrite of many parts

16 files changed:
.gitignore
lib/jcontacts-business-core.jar
lib/jcontacts-core.jar
lib/jcore-logger-lib.jar
lib/jcore-swing.jar
lib/jcore.jar
lib/jcountry-core.jar [new file with mode: 0644]
lib/jphone-core.jar [new file with mode: 0644]
nbproject/build-impl.xml
nbproject/genfiles.properties
nbproject/project.properties
nbproject/project.xml
src/org/mxchange/addressbook/client/console/ConsoleClient.java
src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
src/org/mxchange/addressbook/facade/contact/AddressbookContactFacade.java
src/org/mxchange/addressbook/facade/contact/ContactFacade.java

index 8f32b37c93689662609636e2c3c1390022a19cf6..0383bcc9e4d5d046929d1f5b3102c94012efafb2 100644 (file)
@@ -1,6 +1,7 @@
-/nbproject/private/\r
-/manifest.mf\r
-/build/\r
-/data/*.*\r
-/dist/\r
-/*.properties\r
+/nbproject/private/
+/nbproject/*~
+/manifest.mf
+/build/
+/dist/
+/data/*
+/*.properties
index 9607d5cafc2f4f73a146df8192b1c83889597c96..5665c86076d45e0aeacb6a44e94b985cedcd6ef8 100644 (file)
Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ
index 98ca617007e9f5e8090f6843513e80bec85acfa1..855385dcf75d9ff7c6acb19cddb65dde39bd5bc0 100644 (file)
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ
index 8e5a5b954c3f18434a17e24e50fd7392d64bf46e..4cb7da5146cc64855a32f2f76722c7325c3514cb 100644 (file)
Binary files a/lib/jcore-logger-lib.jar and b/lib/jcore-logger-lib.jar differ
index 178b58f098a5314e75aaaac9d48dac7736114474..2428479575ef4cf48b08279a8bcbb8903149a423 100644 (file)
Binary files a/lib/jcore-swing.jar and b/lib/jcore-swing.jar differ
index 57a3b6cecdc73685710c2cf6d6760b52b39a09d7..1a75fc00ef1f570f9b3af2edf1b0065404ef10eb 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ
diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
new file mode 100644 (file)
index 0000000..ed08999
Binary files /dev/null and b/lib/jcountry-core.jar differ
diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
new file mode 100644 (file)
index 0000000..480f9f8
Binary files /dev/null and b/lib/jphone-core.jar differ
index 93e31a9b971fbea7175e5910aad20b0c3db93eeb..f132aa4beeae97242672c9f2681087df6abdf752 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-*** GENERATED FROM project.xml - DO NOT EDIT  ***\r
-***         EDIT ../build.xml INSTEAD         ***\r
-\r
-For the purpose of easier reading the script\r
-is divided into following sections:\r
-\r
-  - initialization\r
-  - compilation\r
-  - jar\r
-  - execution\r
-  - debugging\r
-  - javadoc\r
-  - test compilation\r
-  - test execution\r
-  - test debugging\r
-  - applet\r
-  - cleanup\r
-\r
--->\r
-<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="Addressbook-impl">\r
-       <fail message="Please build using Ant 1.8.0 or higher.">\r
-               <condition>\r
-                       <not>\r
-                               <antversion atleast="1.8.0"/>\r
-                       </not>\r
-               </condition>\r
-       </fail>\r
-       <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>\r
-       <!--\r
-               ======================\r
-               INITIALIZATION SECTION\r
-               ======================\r
-       -->\r
-       <target name="-pre-init">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="-pre-init" name="-init-private">\r
-               <property file="nbproject/private/config.properties"/>\r
-               <property file="nbproject/private/configs/${config}.properties"/>\r
-               <property file="nbproject/private/private.properties"/>\r
-       </target>\r
-       <target depends="-pre-init,-init-private" name="-init-user">\r
-               <property file="${user.properties.file}"/>\r
-               <!-- The two properties below are usually overridden -->\r
-               <!-- by the active platform. Just a fallback. -->\r
-               <property name="default.javac.source" value="1.4"/>\r
-               <property name="default.javac.target" value="1.4"/>\r
-       </target>\r
-       <target depends="-pre-init,-init-private,-init-user" name="-init-project">\r
-               <property file="nbproject/configs/${config}.properties"/>\r
-               <property file="nbproject/project.properties"/>\r
-       </target>\r
-       <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">\r
-               <property name="platform.java" value="${java.home}/bin/java"/>\r
-               <available file="${manifest.file}" property="manifest.available"/>\r
-               <condition property="splashscreen.available">\r
-                       <and>\r
-                               <not>\r
-                                       <equals arg1="${application.splash}" arg2="" trim="true"/>\r
-                               </not>\r
-                               <available file="${application.splash}"/>\r
-                       </and>\r
-               </condition>\r
-               <condition property="main.class.available">\r
-                       <and>\r
-                               <isset property="main.class"/>\r
-                               <not>\r
-                                       <equals arg1="${main.class}" arg2="" trim="true"/>\r
-                               </not>\r
-                       </and>\r
-               </condition>\r
-               <condition property="profile.available">\r
-                       <and>\r
-                               <isset property="javac.profile"/>\r
-                               <length length="0" string="${javac.profile}" when="greater"/>\r
-                               <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>\r
-                       </and>\r
-               </condition>\r
-               <condition property="do.archive">\r
-                       <or>\r
-                               <not>\r
-                                       <istrue value="${jar.archive.disabled}"/>\r
-                               </not>\r
-                               <istrue value="${not.archive.disabled}"/>\r
-                       </or>\r
-               </condition>\r
-               <condition property="do.mkdist">\r
-                       <and>\r
-                               <isset property="do.archive"/>\r
-                               <isset property="libs.CopyLibs.classpath"/>\r
-                               <not>\r
-                                       <istrue value="${mkdist.disabled}"/>\r
-                               </not>\r
-                       </and>\r
-               </condition>\r
-               <condition property="do.archive+manifest.available">\r
-                       <and>\r
-                               <isset property="manifest.available"/>\r
-                               <istrue value="${do.archive}"/>\r
-                       </and>\r
-               </condition>\r
-               <condition property="do.archive+main.class.available">\r
-                       <and>\r
-                               <isset property="main.class.available"/>\r
-                               <istrue value="${do.archive}"/>\r
-                       </and>\r
-               </condition>\r
-               <condition property="do.archive+splashscreen.available">\r
-                       <and>\r
-                               <isset property="splashscreen.available"/>\r
-                               <istrue value="${do.archive}"/>\r
-                       </and>\r
-               </condition>\r
-               <condition property="do.archive+profile.available">\r
-                       <and>\r
-                               <isset property="profile.available"/>\r
-                               <istrue value="${do.archive}"/>\r
-                       </and>\r
-               </condition>\r
-               <condition property="have.tests">\r
-                       <or>\r
-                               <available file="${test.src.dir}"/>\r
-                       </or>\r
-               </condition>\r
-               <condition property="have.sources">\r
-                       <or>\r
-                               <available file="${src.dir}"/>\r
-                       </or>\r
-               </condition>\r
-               <condition property="netbeans.home+have.tests">\r
-                       <and>\r
-                               <isset property="netbeans.home"/>\r
-                               <isset property="have.tests"/>\r
-                       </and>\r
-               </condition>\r
-               <condition property="no.javadoc.preview">\r
-                       <and>\r
-                               <isset property="javadoc.preview"/>\r
-                               <isfalse value="${javadoc.preview}"/>\r
-                       </and>\r
-               </condition>\r
-               <property name="run.jvmargs" value=""/>\r
-               <property name="run.jvmargs.ide" value=""/>\r
-               <property name="javac.compilerargs" value=""/>\r
-               <property name="work.dir" value="${basedir}"/>\r
-               <condition property="no.deps">\r
-                       <and>\r
-                               <istrue value="${no.dependencies}"/>\r
-                       </and>\r
-               </condition>\r
-               <property name="javac.debug" value="true"/>\r
-               <property name="javadoc.preview" value="true"/>\r
-               <property name="application.args" value=""/>\r
-               <property name="source.encoding" value="${file.encoding}"/>\r
-               <property name="runtime.encoding" value="${source.encoding}"/>\r
-               <condition property="javadoc.encoding.used" value="${javadoc.encoding}">\r
-                       <and>\r
-                               <isset property="javadoc.encoding"/>\r
-                               <not>\r
-                                       <equals arg1="${javadoc.encoding}" arg2=""/>\r
-                               </not>\r
-                       </and>\r
-               </condition>\r
-               <property name="javadoc.encoding.used" value="${source.encoding}"/>\r
-               <property name="includes" value="**"/>\r
-               <property name="excludes" value=""/>\r
-               <property name="do.depend" value="false"/>\r
-               <condition property="do.depend.true">\r
-                       <istrue value="${do.depend}"/>\r
-               </condition>\r
-               <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>\r
-               <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">\r
-                       <and>\r
-                               <isset property="endorsed.classpath"/>\r
-                               <not>\r
-                                       <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>\r
-                               </not>\r
-                       </and>\r
-               </condition>\r
-               <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">\r
-                       <isset property="profile.available"/>\r
-               </condition>\r
-               <condition else="false" property="jdkBug6558476">\r
-                       <and>\r
-                               <matches pattern="1\.[56]" string="${java.specification.version}"/>\r
-                               <not>\r
-                                       <os family="unix"/>\r
-                               </not>\r
-                       </and>\r
-               </condition>\r
-               <property name="javac.fork" value="${jdkBug6558476}"/>\r
-               <property name="jar.index" value="false"/>\r
-               <property name="jar.index.metainf" value="${jar.index}"/>\r
-               <property name="copylibs.rebase" value="true"/>\r
-               <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>\r
-               <condition property="junit.available">\r
-                       <or>\r
-                               <available classname="org.junit.Test" classpath="${run.test.classpath}"/>\r
-                               <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>\r
-                       </or>\r
-               </condition>\r
-               <condition property="testng.available">\r
-                       <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>\r
-               </condition>\r
-               <condition property="junit+testng.available">\r
-                       <and>\r
-                               <istrue value="${junit.available}"/>\r
-                               <istrue value="${testng.available}"/>\r
-                       </and>\r
-               </condition>\r
-               <condition else="testng" property="testng.mode" value="mixed">\r
-                       <istrue value="${junit+testng.available}"/>\r
-               </condition>\r
-               <condition else="" property="testng.debug.mode" value="-mixed">\r
-                       <istrue value="${junit+testng.available}"/>\r
-               </condition>\r
-       </target>\r
-       <target name="-post-init">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">\r
-               <fail unless="src.dir">Must set src.dir</fail>\r
-               <fail unless="test.src.dir">Must set test.src.dir</fail>\r
-               <fail unless="build.dir">Must set build.dir</fail>\r
-               <fail unless="dist.dir">Must set dist.dir</fail>\r
-               <fail unless="build.classes.dir">Must set build.classes.dir</fail>\r
-               <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>\r
-               <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>\r
-               <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>\r
-               <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>\r
-               <fail unless="dist.jar">Must set dist.jar</fail>\r
-       </target>\r
-       <target name="-init-macrodef-property">\r
-               <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">\r
-                       <attribute name="name"/>\r
-                       <attribute name="value"/>\r
-                       <sequential>\r
-                               <property name="@{name}" value="${@{value}}"/>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">\r
-               <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${src.dir}" name="srcdir"/>\r
-                       <attribute default="${build.classes.dir}" name="destdir"/>\r
-                       <attribute default="${javac.classpath}" name="classpath"/>\r
-                       <attribute default="${javac.processorpath}" name="processorpath"/>\r
-                       <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="${javac.debug}" name="debug"/>\r
-                       <attribute default="${empty.dir}" name="sourcepath"/>\r
-                       <attribute default="${empty.dir}" name="gensrcdir"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <property location="${build.dir}/empty" name="empty.dir"/>\r
-                               <mkdir dir="${empty.dir}"/>\r
-                               <mkdir dir="@{apgeneratedsrcdir}"/>\r
-                               <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}">\r
-                                       <src>\r
-                                               <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
-                                                       <include name="*"/>\r
-                                               </dirset>\r
-                                       </src>\r
-                                       <classpath>\r
-                                               <path path="@{classpath}"/>\r
-                                       </classpath>\r
-                                       <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>\r
-                                       <compilerarg line="${javac.profile.cmd.line.arg}"/>\r
-                                       <compilerarg line="${javac.compilerargs}"/>\r
-                                       <compilerarg value="-processorpath"/>\r
-                                       <compilerarg path="@{processorpath}:${empty.dir}"/>\r
-                                       <compilerarg line="${ap.processors.internal}"/>\r
-                                       <compilerarg line="${annotation.processing.processor.options}"/>\r
-                                       <compilerarg value="-s"/>\r
-                                       <compilerarg path="@{apgeneratedsrcdir}"/>\r
-                                       <compilerarg line="${ap.proc.none.internal}"/>\r
-                                       <customize/>\r
-                               </javac>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">\r
-               <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${src.dir}" name="srcdir"/>\r
-                       <attribute default="${build.classes.dir}" name="destdir"/>\r
-                       <attribute default="${javac.classpath}" name="classpath"/>\r
-                       <attribute default="${javac.processorpath}" name="processorpath"/>\r
-                       <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="${javac.debug}" name="debug"/>\r
-                       <attribute default="${empty.dir}" name="sourcepath"/>\r
-                       <attribute default="${empty.dir}" name="gensrcdir"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <property location="${build.dir}/empty" name="empty.dir"/>\r
-                               <mkdir dir="${empty.dir}"/>\r
-                               <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}">\r
-                                       <src>\r
-                                               <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
-                                                       <include name="*"/>\r
-                                               </dirset>\r
-                                       </src>\r
-                                       <classpath>\r
-                                               <path path="@{classpath}"/>\r
-                                       </classpath>\r
-                                       <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>\r
-                                       <compilerarg line="${javac.profile.cmd.line.arg}"/>\r
-                                       <compilerarg line="${javac.compilerargs}"/>\r
-                                       <customize/>\r
-                               </javac>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">\r
-               <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${src.dir}" name="srcdir"/>\r
-                       <attribute default="${build.classes.dir}" name="destdir"/>\r
-                       <attribute default="${javac.classpath}" name="classpath"/>\r
-                       <sequential>\r
-                               <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">\r
-                                       <classpath>\r
-                                               <path path="@{classpath}"/>\r
-                                       </classpath>\r
-                               </depend>\r
-                       </sequential>\r
-               </macrodef>\r
-               <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${build.classes.dir}" name="destdir"/>\r
-                       <sequential>\r
-                               <fail unless="javac.includes">Must set javac.includes</fail>\r
-                               <pathconvert pathsep="${line.separator}" property="javac.includes.binary">\r
-                                       <path>\r
-                                               <filelist dir="@{destdir}" files="${javac.includes}"/>\r
-                                       </path>\r
-                                       <globmapper from="*.java" to="*.class"/>\r
-                               </pathconvert>\r
-                               <tempfile deleteonexit="true" property="javac.includesfile.binary"/>\r
-                               <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>\r
-                               <delete>\r
-                                       <files includesfile="${javac.includesfile.binary}"/>\r
-                               </delete>\r
-                               <delete>\r
-                                       <fileset file="${javac.includesfile.binary}"/>\r
-                               </delete>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target if="${junit.available}" name="-init-macrodef-junit-init">\r
-               <condition else="false" property="nb.junit.batch" value="true">\r
-                       <and>\r
-                               <istrue value="${junit.available}"/>\r
-                               <not>\r
-                                       <isset property="test.method"/>\r
-                               </not>\r
-                       </and>\r
-               </condition>\r
-               <condition else="false" property="nb.junit.single" value="true">\r
-                       <and>\r
-                               <istrue value="${junit.available}"/>\r
-                               <isset property="test.method"/>\r
-                       </and>\r
-               </condition>\r
-       </target>\r
-       <target name="-init-test-properties">\r
-               <property name="test.binaryincludes" value="&lt;nothing&gt;"/>\r
-               <property name="test.binarytestincludes" value=""/>\r
-               <property name="test.binaryexcludes" value=""/>\r
-       </target>\r
-       <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">\r
-               <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <property name="junit.forkmode" value="perTest"/>\r
-                               <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
-                                       <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>\r
-                                       <syspropertyset>\r
-                                               <propertyref prefix="test-sys-prop."/>\r
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
-                                       </syspropertyset>\r
-                                       <formatter type="brief" usefile="false"/>\r
-                                       <formatter type="xml"/>\r
-                                       <jvmarg value="-ea"/>\r
-                                       <customize/>\r
-                               </junit>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">\r
-               <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <property name="junit.forkmode" value="perTest"/>\r
-                               <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
-                                       <batchtest todir="${build.test.results.dir}">\r
-                                               <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">\r
-                                                       <filename name="@{testincludes}"/>\r
-                                               </fileset>\r
-                                               <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">\r
-                                                       <filename name="${test.binarytestincludes}"/>\r
-                                               </fileset>\r
-                                       </batchtest>\r
-                                       <syspropertyset>\r
-                                               <propertyref prefix="test-sys-prop."/>\r
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
-                                       </syspropertyset>\r
-                                       <formatter type="brief" usefile="false"/>\r
-                                       <formatter type="xml"/>\r
-                                       <jvmarg value="-ea"/>\r
-                                       <customize/>\r
-                               </junit>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>\r
-       <target if="${testng.available}" name="-init-macrodef-testng">\r
-               <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">\r
-                                       <isset property="test.method"/>\r
-                               </condition>\r
-                               <union id="test.set">\r
-                                       <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">\r
-                                               <filename name="@{testincludes}"/>\r
-                                       </fileset>\r
-                               </union>\r
-                               <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>\r
-                               <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="Addressbook" testname="TestNG tests" workingDir="${work.dir}">\r
-                                       <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>\r
-                                       <propertyset>\r
-                                               <propertyref prefix="test-sys-prop."/>\r
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
-                                       </propertyset>\r
-                                       <customize/>\r
-                               </testng>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target name="-init-macrodef-test-impl">\r
-               <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <element implicit="true" name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <echo>No tests executed.</echo>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">\r
-               <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <element implicit="true" name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
-                                       <customize/>\r
-                               </j2seproject3:junit>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">\r
-               <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <element implicit="true" name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
-                                       <customize/>\r
-                               </j2seproject3:testng>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">\r
-               <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <sequential>\r
-                               <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
-                                       <customize>\r
-                                               <classpath>\r
-                                                       <path path="${run.test.classpath}"/>\r
-                                               </classpath>\r
-                                               <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
-                                               <jvmarg line="${run.jvmargs}"/>\r
-                                               <jvmarg line="${run.jvmargs.ide}"/>\r
-                                       </customize>\r
-                               </j2seproject3:test-impl>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">\r
-               <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <property name="junit.forkmode" value="perTest"/>\r
-                               <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
-                                       <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>\r
-                                       <syspropertyset>\r
-                                               <propertyref prefix="test-sys-prop."/>\r
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
-                                       </syspropertyset>\r
-                                       <formatter type="brief" usefile="false"/>\r
-                                       <formatter type="xml"/>\r
-                                       <jvmarg value="-ea"/>\r
-                                       <jvmarg line="${debug-args-line}"/>\r
-                                       <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
-                                       <customize/>\r
-                               </junit>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">\r
-               <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <property name="junit.forkmode" value="perTest"/>\r
-                               <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
-                                       <batchtest todir="${build.test.results.dir}">\r
-                                               <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">\r
-                                                       <filename name="@{testincludes}"/>\r
-                                               </fileset>\r
-                                               <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">\r
-                                                       <filename name="${test.binarytestincludes}"/>\r
-                                               </fileset>\r
-                                       </batchtest>\r
-                                       <syspropertyset>\r
-                                               <propertyref prefix="test-sys-prop."/>\r
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
-                                       </syspropertyset>\r
-                                       <formatter type="brief" usefile="false"/>\r
-                                       <formatter type="xml"/>\r
-                                       <jvmarg value="-ea"/>\r
-                                       <jvmarg line="${debug-args-line}"/>\r
-                                       <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
-                                       <customize/>\r
-                               </junit>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">\r
-               <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <element implicit="true" name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
-                                       <customize/>\r
-                               </j2seproject3:junit-debug>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target if="${testng.available}" name="-init-macrodef-testng-debug">\r
-               <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${main.class}" name="testClass"/>\r
-                       <attribute default="" name="testMethod"/>\r
-                       <element name="customize2" optional="true"/>\r
-                       <sequential>\r
-                               <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">\r
-                                       <isset property="test.method"/>\r
-                               </condition>\r
-                               <condition else="-suitename Addressbook -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">\r
-                                       <matches pattern=".*\.xml" string="@{testClass}"/>\r
-                               </condition>\r
-                               <delete dir="${build.test.results.dir}" quiet="true"/>\r
-                               <mkdir dir="${build.test.results.dir}"/>\r
-                               <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">\r
-                                       <customize>\r
-                                               <customize2/>\r
-                                               <jvmarg value="-ea"/>\r
-                                               <arg line="${testng.debug.mode}"/>\r
-                                               <arg line="-d ${build.test.results.dir}"/>\r
-                                               <arg line="-listener org.testng.reporters.VerboseReporter"/>\r
-                                               <arg line="${testng.cmd.args}"/>\r
-                                       </customize>\r
-                               </j2seproject3:debug>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">\r
-               <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${main.class}" name="testClass"/>\r
-                       <attribute default="" name="testMethod"/>\r
-                       <element implicit="true" name="customize2" optional="true"/>\r
-                       <sequential>\r
-                               <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">\r
-                                       <customize2/>\r
-                               </j2seproject3:testng-debug>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">\r
-               <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <attribute default="${main.class}" name="testClass"/>\r
-                       <attribute default="" name="testMethod"/>\r
-                       <sequential>\r
-                               <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
-                                       <customize>\r
-                                               <classpath>\r
-                                                       <path path="${run.test.classpath}"/>\r
-                                               </classpath>\r
-                                               <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
-                                               <jvmarg line="${run.jvmargs}"/>\r
-                                               <jvmarg line="${run.jvmargs.ide}"/>\r
-                                       </customize>\r
-                               </j2seproject3:test-debug-impl>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">\r
-               <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${includes}" name="includes"/>\r
-                       <attribute default="${excludes}" name="excludes"/>\r
-                       <attribute default="**" name="testincludes"/>\r
-                       <attribute default="" name="testmethods"/>\r
-                       <attribute default="${main.class}" name="testClass"/>\r
-                       <attribute default="" name="testMethod"/>\r
-                       <sequential>\r
-                               <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">\r
-                                       <customize2>\r
-                                               <syspropertyset>\r
-                                                       <propertyref prefix="test-sys-prop."/>\r
-                                                       <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
-                                               </syspropertyset>\r
-                                       </customize2>\r
-                               </j2seproject3:testng-debug-impl>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>\r
-       <!--\r
-               pre NB7.2 profiling section; consider it deprecated\r
-       -->\r
-       <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>\r
-       <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target if="profiler.info.jvmargs.agent" name="-profile-post-init">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">\r
-               <macrodef name="resolve">\r
-                       <attribute name="name"/>\r
-                       <attribute name="value"/>\r
-                       <sequential>\r
-                               <property name="@{name}" value="${env.@{value}}"/>\r
-                       </sequential>\r
-               </macrodef>\r
-               <macrodef name="profile">\r
-                       <attribute default="${main.class}" name="classname"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <property environment="env"/>\r
-                               <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>\r
-                               <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">\r
-                                       <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
-                                       <jvmarg value="${profiler.info.jvmargs.agent}"/>\r
-                                       <jvmarg line="${profiler.info.jvmargs}"/>\r
-                                       <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>\r
-                                       <arg line="${application.args}"/>\r
-                                       <classpath>\r
-                                               <path path="${run.classpath}"/>\r
-                                       </classpath>\r
-                                       <syspropertyset>\r
-                                               <propertyref prefix="run-sys-prop."/>\r
-                                               <mapper from="run-sys-prop.*" to="*" type="glob"/>\r
-                                       </syspropertyset>\r
-                                       <customize/>\r
-                               </java>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">\r
-               <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>\r
-               <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>\r
-       </target>\r
-       <!--\r
-               end of pre NB7.2 profiling section\r
-       -->\r
-       <target depends="-init-debug-args" name="-init-macrodef-nbjpda">\r
-               <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">\r
-                       <attribute default="${main.class}" name="name"/>\r
-                       <attribute default="${debug.classpath}" name="classpath"/>\r
-                       <attribute default="" name="stopclassname"/>\r
-                       <sequential>\r
-                               <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">\r
-                                       <classpath>\r
-                                               <path path="@{classpath}"/>\r
-                                       </classpath>\r
-                               </nbjpdastart>\r
-                       </sequential>\r
-               </macrodef>\r
-               <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">\r
-                       <attribute default="${build.classes.dir}" name="dir"/>\r
-                       <sequential>\r
-                               <nbjpdareload>\r
-                                       <fileset dir="@{dir}" includes="${fix.classes}">\r
-                                               <include name="${fix.includes}*.class"/>\r
-                                       </fileset>\r
-                               </nbjpdareload>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target name="-init-debug-args">\r
-               <property name="version-output" value="java version &quot;${ant.java.version}"/>\r
-               <condition property="have-jdk-older-than-1.4">\r
-                       <or>\r
-                               <contains string="${version-output}" substring="java version &quot;1.0"/>\r
-                               <contains string="${version-output}" substring="java version &quot;1.1"/>\r
-                               <contains string="${version-output}" substring="java version &quot;1.2"/>\r
-                               <contains string="${version-output}" substring="java version &quot;1.3"/>\r
-                       </or>\r
-               </condition>\r
-               <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">\r
-                       <istrue value="${have-jdk-older-than-1.4}"/>\r
-               </condition>\r
-               <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">\r
-                       <os family="windows"/>\r
-               </condition>\r
-               <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">\r
-                       <isset property="debug.transport"/>\r
-               </condition>\r
-       </target>\r
-       <target depends="-init-debug-args" name="-init-macrodef-debug">\r
-               <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${main.class}" name="classname"/>\r
-                       <attribute default="${debug.classpath}" name="classpath"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <java classname="@{classname}" dir="${work.dir}" fork="true">\r
-                                       <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
-                                       <jvmarg line="${debug-args-line}"/>\r
-                                       <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
-                                       <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
-                                       <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
-                                       <jvmarg line="${run.jvmargs}"/>\r
-                                       <jvmarg line="${run.jvmargs.ide}"/>\r
-                                       <classpath>\r
-                                               <path path="@{classpath}"/>\r
-                                       </classpath>\r
-                                       <syspropertyset>\r
-                                               <propertyref prefix="run-sys-prop."/>\r
-                                               <mapper from="run-sys-prop.*" to="*" type="glob"/>\r
-                                       </syspropertyset>\r
-                                       <customize/>\r
-                               </java>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target name="-init-macrodef-java">\r
-               <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">\r
-                       <attribute default="${main.class}" name="classname"/>\r
-                       <attribute default="${run.classpath}" name="classpath"/>\r
-                       <attribute default="jvm" name="jvm"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <java classname="@{classname}" dir="${work.dir}" fork="true">\r
-                                       <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
-                                       <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
-                                       <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
-                                       <jvmarg line="${run.jvmargs}"/>\r
-                                       <jvmarg line="${run.jvmargs.ide}"/>\r
-                                       <classpath>\r
-                                               <path path="@{classpath}"/>\r
-                                       </classpath>\r
-                                       <syspropertyset>\r
-                                               <propertyref prefix="run-sys-prop."/>\r
-                                               <mapper from="run-sys-prop.*" to="*" type="glob"/>\r
-                                       </syspropertyset>\r
-                                       <customize/>\r
-                               </java>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target name="-init-macrodef-copylibs">\r
-               <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-                       <attribute default="${manifest.file}" name="manifest"/>\r
-                       <element name="customize" optional="true"/>\r
-                       <sequential>\r
-                               <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>\r
-                               <pathconvert property="run.classpath.without.build.classes.dir">\r
-                                       <path path="${run.classpath}"/>\r
-                                       <map from="${build.classes.dir.resolved}" to=""/>\r
-                               </pathconvert>\r
-                               <pathconvert pathsep=" " property="jar.classpath">\r
-                                       <path path="${run.classpath.without.build.classes.dir}"/>\r
-                                       <chainedmapper>\r
-                                               <flattenmapper/>\r
-                                               <filtermapper>\r
-                                                       <replacestring from=" " to="%20"/>\r
-                                               </filtermapper>\r
-                                               <globmapper from="*" to="lib/*"/>\r
-                                       </chainedmapper>\r
-                               </pathconvert>\r
-                               <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>\r
-                               <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}">\r
-                                       <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>\r
-                                       <manifest>\r
-                                               <attribute name="Class-Path" value="${jar.classpath}"/>\r
-                                               <customize/>\r
-                                       </manifest>\r
-                               </copylibs>\r
-                       </sequential>\r
-               </macrodef>\r
-       </target>\r
-       <target name="-init-presetdef-jar">\r
-               <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">\r
-                       <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">\r
-                               <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>\r
-                       </jar>\r
-               </presetdef>\r
-       </target>\r
-       <target name="-init-ap-cmdline-properties">\r
-               <property name="annotation.processing.enabled" value="true"/>\r
-               <property name="annotation.processing.processors.list" value=""/>\r
-               <property name="annotation.processing.processor.options" value=""/>\r
-               <property name="annotation.processing.run.all.processors" value="true"/>\r
-               <property name="javac.processorpath" value="${javac.classpath}"/>\r
-               <property name="javac.test.processorpath" value="${javac.test.classpath}"/>\r
-               <condition property="ap.supported.internal" value="true">\r
-                       <not>\r
-                               <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>\r
-                       </not>\r
-               </condition>\r
-       </target>\r
-       <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">\r
-               <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">\r
-                       <isfalse value="${annotation.processing.run.all.processors}"/>\r
-               </condition>\r
-               <condition else="" property="ap.proc.none.internal" value="-proc:none">\r
-                       <isfalse value="${annotation.processing.enabled}"/>\r
-               </condition>\r
-       </target>\r
-       <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">\r
-               <property name="ap.cmd.line.internal" value=""/>\r
-       </target>\r
-       <target depends="-pre-init,-init-private,-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"/>\r
-       <!--\r
-               ===================\r
-               COMPILATION SECTION\r
-               ===================\r
-       -->\r
-       <target name="-deps-jar-init" unless="built-jar.properties">\r
-               <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>\r
-               <delete file="${built-jar.properties}" quiet="true"/>\r
-       </target>\r
-       <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">\r
-               <echo level="warn" message="Cycle detected: Addressbook was already built"/>\r
-       </target>\r
-       <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">\r
-               <mkdir dir="${build.dir}"/>\r
-               <touch file="${built-jar.properties}" verbose="false"/>\r
-               <property file="${built-jar.properties}" prefix="already.built.jar."/>\r
-               <antcall target="-warn-already-built-jar"/>\r
-               <propertyfile file="${built-jar.properties}">\r
-                       <entry key="${basedir}" value=""/>\r
-               </propertyfile>\r
-               <antcall target="-maybe-call-dep">\r
-                       <param name="call.built.properties" value="${built-jar.properties}"/>\r
-                       <param name="call.target" value="jar"/>\r
-                       <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>\r
-                       <param name="transfer.not.archive.disabled" value="true"/>\r
-               </antcall>\r
-       </target>\r
-       <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>\r
-       <target depends="init" name="-check-automatic-build">\r
-               <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>\r
-       </target>\r
-       <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">\r
-               <antcall target="clean"/>\r
-       </target>\r
-       <target depends="init,deps-jar" name="-pre-pre-compile">\r
-               <mkdir dir="${build.classes.dir}"/>\r
-       </target>\r
-       <target name="-pre-compile">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target if="do.depend.true" name="-compile-depend">\r
-               <pathconvert property="build.generated.subdirs">\r
-                       <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
-                               <include name="*"/>\r
-                       </dirset>\r
-               </pathconvert>\r
-               <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>\r
-       </target>\r
-       <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">\r
-               <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>\r
-               <copy todir="${build.classes.dir}">\r
-                       <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
-               </copy>\r
-       </target>\r
-       <target if="has.persistence.xml" name="-copy-persistence-xml">\r
-               <mkdir dir="${build.classes.dir}/META-INF"/>\r
-               <copy todir="${build.classes.dir}/META-INF">\r
-                       <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>\r
-               </copy>\r
-       </target>\r
-       <target name="-post-compile">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>\r
-       <target name="-pre-compile-single">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">\r
-               <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>\r
-               <j2seproject3:force-recompile/>\r
-               <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>\r
-       </target>\r
-       <target name="-post-compile-single">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>\r
-       <!--\r
-               ====================\r
-               JAR BUILDING SECTION\r
-               ====================\r
-       -->\r
-       <target depends="init" name="-pre-pre-jar">\r
-               <dirname file="${dist.jar}" property="dist.jar.dir"/>\r
-               <mkdir dir="${dist.jar.dir}"/>\r
-       </target>\r
-       <target name="-pre-jar">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">\r
-               <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>\r
-               <touch file="${tmp.manifest.file}" verbose="false"/>\r
-       </target>\r
-       <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">\r
-               <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>\r
-               <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>\r
-       </target>\r
-       <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">\r
-               <manifest file="${tmp.manifest.file}" mode="update">\r
-                       <attribute name="Main-Class" value="${main.class}"/>\r
-               </manifest>\r
-       </target>\r
-       <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">\r
-               <manifest file="${tmp.manifest.file}" mode="update">\r
-                       <attribute name="Profile" value="${javac.profile}"/>\r
-               </manifest>\r
-       </target>\r
-       <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">\r
-               <basename file="${application.splash}" property="splashscreen.basename"/>\r
-               <mkdir dir="${build.classes.dir}/META-INF"/>\r
-               <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>\r
-               <manifest file="${tmp.manifest.file}" mode="update">\r
-                       <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>\r
-               </manifest>\r
-       </target>\r
-       <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">\r
-               <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>\r
-               <echo level="info">To run this application from the command line without Ant, try:</echo>\r
-               <property location="${dist.jar}" name="dist.jar.resolved"/>\r
-               <echo level="info">java -jar "${dist.jar.resolved}"</echo>\r
-       </target>\r
-       <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">\r
-               <j2seproject1:jar manifest="${tmp.manifest.file}"/>\r
-               <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>\r
-               <property location="${dist.jar}" name="dist.jar.resolved"/>\r
-               <pathconvert property="run.classpath.with.dist.jar">\r
-                       <path path="${run.classpath}"/>\r
-                       <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>\r
-               </pathconvert>\r
-               <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}">\r
-                       <isset property="main.class.available"/>\r
-               </condition>\r
-               <condition else="debug" property="jar.usage.level" value="info">\r
-                       <isset property="main.class.available"/>\r
-               </condition>\r
-               <echo level="${jar.usage.level}" message="${jar.usage.message}"/>\r
-       </target>\r
-       <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">\r
-               <delete>\r
-                       <fileset file="${tmp.manifest.file}"/>\r
-               </delete>\r
-       </target>\r
-       <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"/>\r
-       <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"/>\r
-       <target name="-post-jar">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>\r
-       <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>\r
-       <!--\r
-               =================\r
-               EXECUTION SECTION\r
-               =================\r
-       -->\r
-       <target depends="init,compile" description="Run a main class." name="run">\r
-               <j2seproject1:java>\r
-                       <customize>\r
-                               <arg line="${application.args}"/>\r
-                       </customize>\r
-               </j2seproject1:java>\r
-       </target>\r
-       <target name="-do-not-recompile">\r
-               <property name="javac.includes.binary" value=""/>\r
-       </target>\r
-       <target depends="init,compile-single" name="run-single">\r
-               <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
-               <j2seproject1:java classname="${run.class}"/>\r
-       </target>\r
-       <target depends="init,compile-test-single" name="run-test-with-main">\r
-               <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
-               <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>\r
-       </target>\r
-       <!--\r
-               =================\r
-               DEBUGGING SECTION\r
-               =================\r
-       -->\r
-       <target depends="init" if="netbeans.home" name="-debug-start-debugger">\r
-               <j2seproject1:nbjpdastart name="${debug.class}"/>\r
-       </target>\r
-       <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">\r
-               <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>\r
-       </target>\r
-       <target depends="init,compile" name="-debug-start-debuggee">\r
-               <j2seproject3:debug>\r
-                       <customize>\r
-                               <arg line="${application.args}"/>\r
-                       </customize>\r
-               </j2seproject3:debug>\r
-       </target>\r
-       <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>\r
-       <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">\r
-               <j2seproject1:nbjpdastart stopclassname="${main.class}"/>\r
-       </target>\r
-       <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>\r
-       <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">\r
-               <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>\r
-               <j2seproject3:debug classname="${debug.class}"/>\r
-       </target>\r
-       <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>\r
-       <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">\r
-               <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>\r
-               <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>\r
-       </target>\r
-       <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>\r
-       <target depends="init" name="-pre-debug-fix">\r
-               <fail unless="fix.includes">Must set fix.includes</fail>\r
-               <property name="javac.includes" value="${fix.includes}.java"/>\r
-       </target>\r
-       <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">\r
-               <j2seproject1:nbjpdareload/>\r
-       </target>\r
-       <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>\r
-       <!--\r
-               =================\r
-               PROFILING SECTION\r
-               =================\r
-       -->\r
-       <!--\r
-               pre NB7.2 profiler integration\r
-       -->\r
-       <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">\r
-               <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>\r
-               <nbprofiledirect>\r
-                       <classpath>\r
-                               <path path="${run.classpath}"/>\r
-                       </classpath>\r
-               </nbprofiledirect>\r
-               <profile/>\r
-       </target>\r
-       <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">\r
-               <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>\r
-               <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>\r
-               <nbprofiledirect>\r
-                       <classpath>\r
-                               <path path="${run.classpath}"/>\r
-                       </classpath>\r
-               </nbprofiledirect>\r
-               <profile classname="${profile.class}"/>\r
-       </target>\r
-       <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">\r
-               <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>\r
-               <nbprofiledirect>\r
-                       <classpath>\r
-                               <path path="${run.classpath}"/>\r
-                       </classpath>\r
-               </nbprofiledirect>\r
-               <profile classname="sun.applet.AppletViewer">\r
-                       <customize>\r
-                               <arg value="${applet.url}"/>\r
-                       </customize>\r
-               </profile>\r
-       </target>\r
-       <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">\r
-               <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>\r
-               <nbprofiledirect>\r
-                       <classpath>\r
-                               <path path="${run.test.classpath}"/>\r
-                       </classpath>\r
-               </nbprofiledirect>\r
-               <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">\r
-                       <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>\r
-                       <jvmarg value="${profiler.info.jvmargs.agent}"/>\r
-                       <jvmarg line="${profiler.info.jvmargs}"/>\r
-                       <test name="${profile.class}"/>\r
-                       <classpath>\r
-                               <path path="${run.test.classpath}"/>\r
-                       </classpath>\r
-                       <syspropertyset>\r
-                               <propertyref prefix="test-sys-prop."/>\r
-                               <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
-                       </syspropertyset>\r
-                       <formatter type="brief" usefile="false"/>\r
-                       <formatter type="xml"/>\r
-               </junit>\r
-       </target>\r
-       <!--\r
-               end of pre NB72 profiling section\r
-       -->\r
-       <target if="netbeans.home" name="-profile-check">\r
-               <condition property="profiler.configured">\r
-                       <or>\r
-                               <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>\r
-                               <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>\r
-                       </or>\r
-               </condition>\r
-       </target>\r
-       <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">\r
-               <startprofiler/>\r
-               <antcall target="run"/>\r
-       </target>\r
-       <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">\r
-               <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
-               <startprofiler/>\r
-               <antcall target="run-single"/>\r
-       </target>\r
-       <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>\r
-       <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">\r
-               <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>\r
-               <startprofiler/>\r
-               <antcall target="test-single"/>\r
-       </target>\r
-       <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">\r
-               <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
-               <startprofiler/>\r
-               <antcal target="run-test-with-main"/>\r
-       </target>\r
-       <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">\r
-               <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>\r
-               <startprofiler/>\r
-               <antcall target="run-applet"/>\r
-       </target>\r
-       <!--\r
-               ===============\r
-               JAVADOC SECTION\r
-               ===============\r
-       -->\r
-       <target depends="init" if="have.sources" name="-javadoc-build">\r
-               <mkdir dir="${dist.javadoc.dir}"/>\r
-               <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">\r
-                       <and>\r
-                               <isset property="endorsed.classpath.cmd.line.arg"/>\r
-                               <not>\r
-                                       <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>\r
-                               </not>\r
-                       </and>\r
-               </condition>\r
-               <condition else="" property="bug5101868workaround" value="*.java">\r
-                       <matches pattern="1\.[56](\..*)?" string="${java.version}"/>\r
-               </condition>\r
-               <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}">\r
-                       <classpath>\r
-                               <path path="${javac.classpath}"/>\r
-                       </classpath>\r
-                       <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">\r
-                               <filename name="**/*.java"/>\r
-                       </fileset>\r
-                       <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
-                               <include name="**/*.java"/>\r
-                               <exclude name="*.java"/>\r
-                       </fileset>\r
-                       <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>\r
-               </javadoc>\r
-               <copy todir="${dist.javadoc.dir}">\r
-                       <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">\r
-                               <filename name="**/doc-files/**"/>\r
-                       </fileset>\r
-                       <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
-                               <include name="**/doc-files/**"/>\r
-                       </fileset>\r
-               </copy>\r
-       </target>\r
-       <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">\r
-               <nbbrowse file="${dist.javadoc.dir}/index.html"/>\r
-       </target>\r
-       <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>\r
-       <!--\r
-               =========================\r
-               TEST COMPILATION SECTION\r
-               =========================\r
-       -->\r
-       <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">\r
-               <mkdir dir="${build.test.classes.dir}"/>\r
-       </target>\r
-       <target name="-pre-compile-test">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target if="do.depend.true" name="-compile-test-depend">\r
-               <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>\r
-       </target>\r
-       <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">\r
-               <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}"/>\r
-               <copy todir="${build.test.classes.dir}">\r
-                       <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
-               </copy>\r
-       </target>\r
-       <target name="-post-compile-test">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>\r
-       <target name="-pre-compile-test-single">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">\r
-               <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>\r
-               <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>\r
-               <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}"/>\r
-               <copy todir="${build.test.classes.dir}">\r
-                       <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
-               </copy>\r
-       </target>\r
-       <target name="-post-compile-test-single">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>\r
-       <!--\r
-               =======================\r
-               TEST EXECUTION SECTION\r
-               =======================\r
-       -->\r
-       <target depends="init" if="have.tests" name="-pre-test-run">\r
-               <mkdir dir="${build.test.results.dir}"/>\r
-       </target>\r
-       <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">\r
-               <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>\r
-       </target>\r
-       <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">\r
-               <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>\r
-       </target>\r
-       <target depends="init" if="have.tests" name="test-report"/>\r
-       <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>\r
-       <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>\r
-       <target depends="init" if="have.tests" name="-pre-test-run-single">\r
-               <mkdir dir="${build.test.results.dir}"/>\r
-       </target>\r
-       <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">\r
-               <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>\r
-               <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>\r
-       </target>\r
-       <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">\r
-               <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>\r
-       </target>\r
-       <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"/>\r
-       <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">\r
-               <fail unless="test.class">Must select some files in the IDE or set test.class</fail>\r
-               <fail unless="test.method">Must select some method in the IDE or set test.method</fail>\r
-               <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>\r
-       </target>\r
-       <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">\r
-               <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>\r
-       </target>\r
-       <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"/>\r
-       <!--\r
-               =======================\r
-               TEST DEBUGGING SECTION\r
-               =======================\r
-       -->\r
-       <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">\r
-               <fail unless="test.class">Must select one file in the IDE or set test.class</fail>\r
-               <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>\r
-       </target>\r
-       <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">\r
-               <fail unless="test.class">Must select one file in the IDE or set test.class</fail>\r
-               <fail unless="test.method">Must select some method in the IDE or set test.method</fail>\r
-               <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>\r
-       </target>\r
-       <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">\r
-               <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>\r
-       </target>\r
-       <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>\r
-       <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>\r
-       <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">\r
-               <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>\r
-       </target>\r
-       <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>\r
-       <!--\r
-               =========================\r
-               APPLET EXECUTION SECTION\r
-               =========================\r
-       -->\r
-       <target depends="init,compile-single" name="run-applet">\r
-               <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>\r
-               <j2seproject1:java classname="sun.applet.AppletViewer">\r
-                       <customize>\r
-                               <arg value="${applet.url}"/>\r
-                       </customize>\r
-               </j2seproject1:java>\r
-       </target>\r
-       <!--\r
-               =========================\r
-               APPLET DEBUGGING  SECTION\r
-               =========================\r
-       -->\r
-       <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">\r
-               <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>\r
-               <j2seproject3:debug classname="sun.applet.AppletViewer">\r
-                       <customize>\r
-                               <arg value="${applet.url}"/>\r
-                       </customize>\r
-               </j2seproject3:debug>\r
-       </target>\r
-       <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>\r
-       <!--\r
-               ===============\r
-               CLEANUP SECTION\r
-               ===============\r
-       -->\r
-       <target name="-deps-clean-init" unless="built-clean.properties">\r
-               <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>\r
-               <delete file="${built-clean.properties}" quiet="true"/>\r
-       </target>\r
-       <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">\r
-               <echo level="warn" message="Cycle detected: Addressbook was already built"/>\r
-       </target>\r
-       <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">\r
-               <mkdir dir="${build.dir}"/>\r
-               <touch file="${built-clean.properties}" verbose="false"/>\r
-               <property file="${built-clean.properties}" prefix="already.built.clean."/>\r
-               <antcall target="-warn-already-built-clean"/>\r
-               <propertyfile file="${built-clean.properties}">\r
-                       <entry key="${basedir}" value=""/>\r
-               </propertyfile>\r
-               <antcall target="-maybe-call-dep">\r
-                       <param name="call.built.properties" value="${built-clean.properties}"/>\r
-                       <param name="call.target" value="clean"/>\r
-                       <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>\r
-                       <param name="transfer.not.archive.disabled" value="true"/>\r
-               </antcall>\r
-       </target>\r
-       <target depends="init" name="-do-clean">\r
-               <delete dir="${build.dir}"/>\r
-               <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>\r
-       </target>\r
-       <target name="-post-clean">\r
-               <!-- Empty placeholder for easier customization. -->\r
-               <!-- You can override this target in the ../build.xml file. -->\r
-       </target>\r
-       <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>\r
-       <target name="-check-call-dep">\r
-               <property file="${call.built.properties}" prefix="already.built."/>\r
-               <condition property="should.call.dep">\r
-                       <and>\r
-                               <not>\r
-                                       <isset property="already.built.${call.subproject}"/>\r
-                               </not>\r
-                               <available file="${call.script}"/>\r
-                       </and>\r
-               </condition>\r
-       </target>\r
-       <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">\r
-               <ant antfile="${call.script}" inheritall="false" target="${call.target}">\r
-                       <propertyset>\r
-                               <propertyref prefix="transfer."/>\r
-                               <mapper from="transfer.*" to="*" type="glob"/>\r
-                       </propertyset>\r
-               </ant>\r
-       </target>\r
-</project>\r
+<?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="addressbook-swing-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="addressbook-swing" 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 addressbook-swing -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: addressbook-swing 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>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.addressbook-lib}" name="call.subproject"/>
+            <param location="${project.addressbook-lib}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
+    </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: addressbook-swing 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>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.addressbook-lib}" name="call.subproject"/>
+            <param location="${project.addressbook-lib}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
+    </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>
index 00bdd790955a5bdfe0531cd6687aa9447475a852..0e4e36958a9a6993f0f17fdeb9f851cdbfbc584e 100644 (file)
@@ -3,6 +3,6 @@ build.xml.script.CRC32=9bef99a6
 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=b3f3ee43
-nbproject/build-impl.xml.script.CRC32=96150614
+nbproject/build-impl.xml.data.CRC32=a2ef3a71
+nbproject/build-impl.xml.script.CRC32=16a7d17c
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
index 763f1ceb193625d0a80807c57475f1960f44bf7d..df04d256b496dec52e55651601cb35d6ebc269bb 100644 (file)
@@ -35,6 +35,8 @@ file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
 file.reference.jcore-swing.jar=lib/jcore-swing.jar
 file.reference.jcore.jar=lib/jcore.jar
+file.reference.jcountry-core.jar=lib/jcountry-core.jar
+file.reference.jphone-core.jar=lib/jphone-core.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
@@ -43,6 +45,8 @@ javac.classpath=\
     ${file.reference.jcore.jar}:\
     ${file.reference.jcore-swing.jar}:\
     ${file.reference.jcore-logger-lib.jar}:\
+    ${file.reference.jcountry-core.jar}:\
+    ${file.reference.jphone-core.jar}:\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jcontacts-business-core.jar}:\
     ${reference.addressbook-lib.jar}:\
@@ -107,5 +111,7 @@ source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.reference.jcore-swing.jar=../jcore-swing/src
 source.reference.jcore.jar=../jcore/src
+source.reference.jcountry-core.jar=../jcountry-core/src/
+source.reference.jphone-core.jar=../jphone-core/src/
 src.dir=src
 test.src.dir=test
index 6ba2092d4a3f34cbf084115daa62fc6b69e410e7..9183d1bd48f9ff91dac5b0c5fa8add9e5291c83b 100644 (file)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-       <type>org.netbeans.modules.java.j2seproject</type>
-       <configuration>
-               <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-                       <name>addressbook-swing</name>
-                       <source-roots>
-                               <root id="src.dir"/>
-                       </source-roots>
-                       <test-roots>
-                               <root id="test.src.dir"/>
-                       </test-roots>
-               </data>
-               <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-                       <definitions>.\lib\nblibraries.properties</definitions>
-               </libraries>
-               <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-                       <reference>
-                               <foreign-project>addressbook-lib</foreign-project>
-                               <artifact-type>jar</artifact-type>
-                               <script>build.xml</script>
-                               <target>jar</target>
-                               <clean-target>clean</clean-target>
-                               <id>jar</id>
-                       </reference>
-               </references>
-       </configuration>
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>addressbook-swing</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>.\lib\nblibraries.properties</definitions>
+        </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>addressbook-lib</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
+    </configuration>
 </project>
index 5cdc0683be58bdc4bd6c7f638bb601c6d566168c..4f640bea4dd3321af0628632b001ac996d89cd41 100644 (file)
@@ -38,6 +38,10 @@ import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException;
 import org.mxchange.jcore.application.Application;
 import org.mxchange.jcore.exceptions.MenuInitializationException;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
+import org.mxchange.jcountry.data.Country;
+import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 
 /**
  * A client for the console
@@ -82,7 +86,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                }
 
                // Simple display ...
-               this.outputMessage(MessageFormat.format("Strasse, PLZ Ort, Land: {0}\n{1} {2}\n{3}", contact.getStreet(), contact.getZipCode(), contact.getCity(), contact.getCountryCode()));
+               this.outputMessage(MessageFormat.format("Strasse, PLZ Ort, Land: {0}\n{1} {2}\n{3}", contact.getStreet(), contact.getZipCode(), contact.getCity(), contact.getCountry()));
 
                // Trace message
                this.getLogger().logTrace("EXIT!"); //NOI18N
@@ -157,13 +161,13 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                String city = manager.enterOwnCity();
 
                // Get country code
-               String countryCode = manager.enterOwnCountryCode();
+               Country country = manager.enterOwnCountryCode();
 
                // Update address data
                contact.setStreet(streetNumber);
                contact.setZipCode(zipCode);
                contact.setCity(city);
-               contact.setCountryCode(countryCode);
+               contact.setCountry(country);
 
                // Trace message
                this.getLogger().logTrace("EXIT!"); //NOI18N
@@ -228,13 +232,13 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                ContactFacade manager = (ContactFacade) this.getFacade();
 
                // Phone number
-               String phoneNumber = manager.enterOwnPhoneNumber();
+               DialableLandLineNumber phoneNumber = manager.enterOwnPhoneNumber();
 
                // Phone number
-               String cellphonePhoneNumber = manager.enterOwnCellNumber();
+               DialableCellphoneNumber cellphonePhoneNumber = manager.enterOwnCellNumber();
 
                // Fax number
-               String faxNumber = manager.enterOwnFaxNumber();
+               DialableFaxNumber faxNumber = manager.enterOwnFaxNumber();
 
                // Email address
                String email = manager.enterOwnEmailAddress();
index c6c41b58ea2132fd1f178c231506d05e4c3fba27..c1c03468e319698de415c34c2db96626cfc89132 100644 (file)
@@ -850,7 +850,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra
        }
 
        /**
-        * Initialize other dialogs (e.g. "Add contact")
+        * Initialize other dialogs (example: "Add contact")
         */
        private void initOtherDialogs () {
                // Trace message
index 9aabe4dacf55e62d682b3e6eb9dd745aa023604d..b6635e613a36ca68e394b7529fee46872b4d7a0b 100644 (file)
@@ -34,6 +34,10 @@ import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
 import org.mxchange.jcore.facade.BaseFacade;
 import org.mxchange.jcoreeelogger.beans.local.logger.Log;
 import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
+import org.mxchange.jcountry.data.Country;
+import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 
 /**
  * A facade for contacts.
@@ -314,7 +318,7 @@ public class AddressbookContactFacade extends BaseFacade implements ContactFacad
        }
 
        @Override
-       public String enterOwnCellNumber () {
+       public DialableCellphoneNumber enterOwnCellNumber () {
                // Trace message
                this.getLogger().logTrace("CALLED!"); //NOI18N
 
@@ -358,7 +362,7 @@ public class AddressbookContactFacade extends BaseFacade implements ContactFacad
        }
 
        @Override
-       public String enterOwnCountryCode () {
+       public Country enterOwnCountryCode () {
                // Trace message
                this.getLogger().logTrace("CALLED!"); //NOI18N
 
@@ -391,7 +395,7 @@ public class AddressbookContactFacade extends BaseFacade implements ContactFacad
        }
 
        @Override
-       public String enterOwnFaxNumber () {
+       public DialableFaxNumber enterOwnFaxNumber () {
                // Trace message
                this.getLogger().logTrace("CALLED!"); //NOI18N
 
@@ -424,7 +428,7 @@ public class AddressbookContactFacade extends BaseFacade implements ContactFacad
        }
 
        @Override
-       public String enterOwnPhoneNumber () {
+       public DialableLandLineNumber enterOwnPhoneNumber () {
                // Trace message
                this.getLogger().logTrace("CALLED!"); //NOI18N
 
@@ -457,7 +461,7 @@ public class AddressbookContactFacade extends BaseFacade implements ContactFacad
        }
 
        @Override
-       public final int getColumnCount () {
+       public int getColumnCount () {
                assert (this.columnNames instanceof List) : "this.columnNames is not initialized"; //NOI18N
 
                return this.columnNames.size();
index c0dc2ddec063c0fdb3577afe2de19b0ac83eca76..1e93bf4d5997e70f893fec31fcf1d6c1c8948e10 100644 (file)
@@ -21,6 +21,10 @@ import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException;
 import org.mxchange.jcore.facade.Facade;
+import org.mxchange.jcountry.data.Country;
+import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 
 /**
  * An interface for addressbook contact manager
@@ -107,7 +111,7 @@ public interface ContactFacade extends Facade {
         * <p>
         * @return Cellphone number
         */
-       public String enterOwnCellNumber ();
+       public DialableCellphoneNumber enterOwnCellNumber ();
 
        /**
         * Allows the user to enter own city name.
@@ -135,7 +139,7 @@ public interface ContactFacade extends Facade {
         * <p>
         * @return Country code
         */
-       public String enterOwnCountryCode ();
+       public Country enterOwnCountryCode ();
 
        /**
         * Allows the user to enter own email address.
@@ -156,7 +160,7 @@ public interface ContactFacade extends Facade {
         * <p>
         * @return Fax number
         */
-       public String enterOwnFaxNumber ();
+       public DialableFaxNumber enterOwnFaxNumber ();
 
        /**
         * Allows the user to enter own surname.
@@ -177,7 +181,7 @@ public interface ContactFacade extends Facade {
         * <p>
         * @return Phone number
         */
-       public String enterOwnPhoneNumber ();
+       public DialableLandLineNumber enterOwnPhoneNumber ();
 
        /**
         * Allows the user to enter own street and house number.