diff options
| author | kitfox | 2008-02-11 04:49:23 +0100 |
|---|---|---|
| committer | kitfox | 2008-02-11 04:49:23 +0100 |
| commit | 1c591f20fce3ad83e43d26b7a9bee83167f98bf8 (patch) | |
| tree | 1e7a7db0d8b47f3da400b385538ca4072430cad6 | |
| parent | Quick hack to allow 'currentColor' to be parsed (diff) | |
| download | svg-salamander-core-1c591f20fce3ad83e43d26b7a9bee83167f98bf8.tar.gz svg-salamander-core-1c591f20fce3ad83e43d26b7a9bee83167f98bf8.tar.xz svg-salamander-core-1c591f20fce3ad83e43d26b7a9bee83167f98bf8.zip | |
Changed InputStream readers to handle European characters. Reorganised build process
git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@49 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b
| -rwxr-xr-x | build.xml | 371 | ||||
| -rw-r--r-- | hotspot.log | 25 | ||||
| -rw-r--r-- | lib/library/ant.jar | bin | 999966 -> 0 bytes | |||
| -rwxr-xr-x | lib/library/javacc.jar | bin | 378781 -> 0 bytes | |||
| -rwxr-xr-x | lib/library/junit.jar | bin | 121070 -> 0 bytes | |||
| -rwxr-xr-x | manifest.mf | 14 | ||||
| -rwxr-xr-x | nbproject/build-impl.xml | 671 | ||||
| -rwxr-xr-x | nbproject/genfiles.properties | 8 | ||||
| -rwxr-xr-x | nbproject/private/private.xml | 4 | ||||
| -rwxr-xr-x | nbproject/project.properties | 78 | ||||
| -rwxr-xr-x | nbproject/project.xml | 246 | ||||
| -rw-r--r-- | src/main/java/com/kitfox/svg/SVGUniverse.java | 26 |
12 files changed, 894 insertions, 549 deletions
@@ -1,281 +1,116 @@ <?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="all" name="svg-salamander-core">
- <description>
- Java 2D graphics pipeline inspired by SVG
- </description>
-
- <import file="../build-NBUtil.xml"/>
-
- <target name="all" depends="build,release" description="Build jars, obfuscate and sign."/>
- <target name="build" depends="compile-test" description="Build jars."/>
-
- <target name="init">
- <tstamp/>
-
- <property name="build.dir" location="build"/>
- <property name="www.dir" location="../www"/>
- <property name="gen.main.src.dir" location="${build.dir}/gen/src/main/java"/>
- <property name="gen.main.res.dir" location="${build.dir}/gen/src/main/res"/>
- <property name="classes.main.dir" location="${build.dir}/classes/main"/>
- <property name="classes.test.dir" location="${build.dir}/classes/test"/>
- <property name="src.main.dir" location="src/main/java"/>
- <property name="src.test.dir" location="src/test/java"/>
-
- <property name="res.main.dir" location="src/main/res"/>
- <property name="res.test.dir" location="src/test/res"/>
- <property name="jar.dir" location="${build.dir}/jar"/>
- <property name="manifest.file" location="manifest.mf"/>
- <property name="project.name" value="${ant.project.name}"/>
- <property name="project.title" value="SVG Salamander"/>
- <property name="version" value="1"/>
- <property name="project.jar" location="${jar.dir}/${project.name}.jar"/>
- <property name="project.complete.jar" value="${jar.dir}/svgSalamander.jar"/>
- <property name="project.tiny.jar" value="${www.dir}/binaries/svgSalamander-tiny.jar"/>
- <property name="project.www.jar" value="${www.dir}/binaries/svgSalamander.jar"/>
-
- <property name="project.debug.mainClass" value="com.kitfox.svg.app.MainFrame"/>
- <property name="project.debug.jvm" location="C:\bin\jdk1.6.0\fastdebug/bin/java"/>
- <property name="project.run.mainClass" value="com.kitfox.svg.app.MainFrame"/>
- <property name="project.run.jvm" location="C:\bin\jdk1.6.0\fastdebug/bin/java"/>
-
- <property name="javadoc.dir" location="${build.dir}/javadoc"/>
- <property name="javadoc.zip" location="${www.localDir}/doc/javadoc.zip"/>
-
- <property name="javacc.home" location="lib/library"/>
- <property name="animtime.jjtree" location="${src.main.dir}/com/kitfox/svg/animation/AnimTimeParser.jjt"/>
- <property name="animtime.outdir" location="${gen.main.src.dir}/com/kitfox/svg/animation/parser"/>
-
- <property name="key.user" value="kitfox"/>
- <property name="key.password" value="anonymous"/>
- <property name="key.location" location="tempKeystore"/>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<project name="svg-salamander-core" default="default" basedir=".">
+ <description>Builds, tests, and runs the project svg-salamander-core.</description>
+ <import file="nbproject/build-impl.xml"/>
+ <!--
+
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
+
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
+ -pre-compile-single: called before javac compilation of single file
+ -post-compile-single: called after javac compilation of single file
+ -pre-compile-test: called before javac compilation of JUnit tests
+ -post-compile-test: called after javac compilation of JUnit tests
+ -pre-compile-test-single: called before javac compilation of single JUnit test
+ -post-compile-test-single: called after javac compilation of single JUunit test
+ -pre-jar: called before JAR building
+ -post-jar: called after JAR building
+ -post-clean: called after cleaning build products
+
+ (Targets beginning with '-' are not intended to be called on their own.)
+
+ Example of inserting an obfuscator after compilation could look like this:
+
+ <target name="-post-compile">
+ <obfuscate>
+ <fileset dir="${build.classes.dir}"/>
+ </obfuscate>
+ </target>
+
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
+
+
+ Another way to customize the build is by overriding existing main targets.
+ The targets of interest are:
+
+ -init-macrodef-javac: defines macro for javac compilation
+ -init-macrodef-junit: defines macro for junit execution
+ -init-macrodef-debug: defines macro for class debugging
+ -init-macrodef-java: defines macro for class execution
+ -do-jar-with-manifest: JAR building (if you are using a manifest)
+ -do-jar-without-manifest: JAR building (if you are not using a manifest)
+ run: execution of project
+ -javadoc-build: Javadoc generation
+ test-report: JUnit report generation
+
+ An example of overriding the target for project execution could look like this:
+
+ <target name="run" depends="svg-salamander-core-impl.jar">
+ <exec dir="bin" executable="launcher.exe">
+ <arg file="${dist.jar}"/>
+ </exec>
+ </target>
+
+ Notice that the overridden target depends on the jar target and not only on
+ the compile target as the regular run target does. Again, for a list of available
+ properties which you can use, check the target you are overriding in the
+ nbproject/build-impl.xml file.
+
+ -->
+
+ <property name="javacc.home" location="../libraries"/>
+ <property name="gen.main.src.dir" location="src/gen/java"/>
+ <property name="gen.main.res.dir" location="src/gen/res"/>
+ <property name="animtime.jjtree" location="src/main/java/com/kitfox/svg/animation/AnimTimeParser.jjt"/>
+ <property name="animtime.outdir" location="${gen.main.src.dir}/com/kitfox/svg/animation/parser"/>
+ <property name="key.user" value="kitfox"/>
+ <property name="key.password" value="anonymous"/>
+ <property name="key.location" location="tempKeystore"/>
+ <property name="www.dir" location="../www"/>
+ <property name="project.www.jar" value="${www.dir}/binaries/svgSalamander.jar"/>
+ <property name="project.tiny.jar" value="${www.dir}/binaries/svgSalamander-tiny.jar"/>
- <path id="lib.include">
- <pathelement path="${netbeans.home}/modules/org-jdesktop-layout.jar"/>
- <fileset dir="lib/include">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <path id="lib.library">
- <!--pathelement path="C:\Program Files\Java\jdk1.6.0\lib\tools.jar"/-->
- <fileset dir="lib/library">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <path id="path.sourcepath">
- <pathelement path="${gen.main.src.dir}"/>
- <pathelement path="${src.main.dir}"/>
- <!--pathelement path="${src.test.dir}"/-->
- </path>
-
- <path id="path.sourcepath.debug">
- <path refid="path.sourcepath"/>
- </path>
-
- <path id="path.classpath">
- <path refid="lib.include"/>
- <path refid="lib.library"/>
-
- <pathelement path="${gen.main.res.dir}"/>
- <pathelement path="${res.main.dir}"/>
- <pathelement path="${res.test.dir}"/>
- </path>
- </target>
-
- <target name="prepareBuild" depends="init" description="Create empty directories necessary for building">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${classes.main.dir}"/>
- <mkdir dir="${classes.test.dir}"/>
- <mkdir dir="${jar.dir}"/>
- <mkdir dir="${gen.main.src.dir}"/>
- <mkdir dir="${gen.main.res.dir}"/>
- </target>
-
- <target name="genData" depends="init,prepareBuild" description="Generate parsers from javacc files.">
+ <target name="-pre-compile">
<mkdir dir="${animtime.outdir}"/>
<!--jjtree target="${animtime.jjtree}" javacchome="${javacc.home}" outputdirectory="${animtime.outdir}" outputfile="${animtime.outfile}"/-->
<jjtree target="${animtime.jjtree}" javacchome="${javacc.home}" outputdirectory="${animtime.outdir}"/>
<javacc target="${animtime.outdir}/AnimTimeParser.jj" javacchome="${javacc.home}" outputdirectory="${animtime.outdir}"/>
</target>
- <target name="compile" depends="init,prepareBuild,genData" description="Compile source">
- <javac debug="true" destdir="${classes.main.dir}" source="1.4" target="1.4">
- <compilerarg value="-Xlint:all,-unchecked,-serial"/>
- <src path="${src.main.dir}"/>
- <src path="${gen.main.src.dir}"/>
- <classpath>
- <path refid="path.classpath"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile-test" depends="jar">
- <javac debug="true" destdir="${classes.test.dir}" srcdir="${src.test.dir}">
- <compilerarg value="-Xlint:all,-unchecked,-serial"/>
- <classpath>
- <path refid="path.classpath"/>
- <pathelement path="${classes.main.dir}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="run" depends="compile">
- <java classname="${project.run.mainClass}" fork="true">
- <jvmarg value="-ea"/>
- <!--jvmarg value="-Djogl.verbose"/-->
- <!--jvmarg value="-Xmx256M"/-->
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/>
- <classpath>
- <pathelement location="${classes.main.dir}"/>
- <path refid="path.classpath"/>
- </classpath>
- </java>
- </target>
-
- <target name="runJar" depends="init">
- <java jar="${project.jar}" fork="true">
- </java>
- </target>
-
- <target name="jar" depends="init,compile">
-
- <jar compress="true" jarfile="${project.jar}">
- <manifest>
- <attribute name="Main-Class" value="${project.run.mainClass}"/>
- <attribute name="Built-By" value="${user.name}"/>
- <section name="common">
- <attribute name="Specification-Title" value="${project.title}"/>
- <attribute name="Specification-Version" value="${version}"/>
- <attribute name="Specification-Vendor" value="Kitfox"/>
- <attribute name="Implementation-Title" value="${project.name}"/>
- <attribute name="Implementation-Version" value="Version ${version}, Date ${TODAY}"/>
- <attribute name="Implementation-Vendor" value="Mark McKay, mark@kitfox.com"/>
- </section>
- </manifest>
-
- <fileset dir="${classes.main.dir}">
- <include name="**/*.class"/>
- </fileset>
- <fileset dir="${res.main.dir}">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${gen.main.res.dir}">
- <include name="**/*"/>
- </fileset>
- </jar>
+ <target name="-post-clean">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${gen.main.src.dir}" includes="**/*"/>
+ </delete>
</target>
-
- <target name="release" depends="init,jar,generateKey" description="Obfuscates and sign jar, copies result to binaries directory.">
- <xslt in="${res.main.dir}/xml/about.xml" style="${res.main.dir}/xml/about.xsl" out="${res.main.dir}/res/help/about/about.html" force="true"/>
- <!--
- <replace file="${res.dir}/res/help/about/about.html" token="<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">"/>
- -->
- <replace file="${res.main.dir}/res/help/about/about.html" token="; charset=ISO-8859-1"/>
-
- <jar compress="true" jarfile="${project.complete.jar}" manifest="${manifest.file}">
- <manifest>
- <attribute name="Main-Class" value="${project.run.mainClass}"/>
- <!--attribute name="Class-Path" value="kitfoxUtilities.jar"/-->
- <attribute name="Built-By" value="${user.name}"/>
- <section name="common">
- <attribute name="Specification-Title" value="SVG Salamander Utilities"/>
- <attribute name="Specification-Version" value="${version}"/>
- <attribute name="Specification-Vendor" value="Kitfox - Mark McKay"/>
- <attribute name="Implementation-Title" value="SVG Salamander"/>
- <attribute name="Implementation-Version" value="Version ${version}, Date ${TODAY}"/>
- <attribute name="Implementation-Vendor" value="Kitfox - Mark McKay"/>
- </section>
- <section name="com/kitfox/svg/SVGUniverse.class">
- <attribute name="Java-Bean" value="true"/>
- </section>
- <section name="com/kitfox/svg/app/beans/SVGIcon.class">
- <attribute name="Java-Bean" value="true"/>
- </section>
- <section name="com/kitfox/svg/app/beans/SVGPanel.class">
- <attribute name="Java-Bean" value="true"/>
- </section>
- <section name="com/kitfox/svg/app/beans/ProportionalLayoutPanel.class">
- <attribute name="Java-Bean" value="true"/>
- </section>
- </manifest>
-
- <fileset dir="${classes.main.dir}">
- <include name="**/*.class"/>
- </fileset>
- <fileset dir=".">
- <include name="lgpl.txt"/>
- <include name="readme.txt"/>
- </fileset>
- <fileset dir="${res.main.dir}">
- <include name="res/**"/>
- </fileset>
- </jar>
-
- <jar compress="true" jarfile="${project.tiny.jar}">
- <manifest>
- <attribute name="Main-Class" value="${project.run.mainClass}"/>
- <!--attribute name="Class-Path" value="kitfoxUtilities.jar"/-->
- <attribute name="Built-By" value="${user.name}"/>
- <section name="common">
- <attribute name="Specification-Title" value="SVG Salamander Utilities"/>
- <attribute name="Specification-Version" value="${version}"/>
- <attribute name="Specification-Vendor" value="Kitfox - Mark McKay"/>
- <attribute name="Implementation-Title" value="SVG Salamander"/>
- <attribute name="Implementation-Version" value="Version ${version}, Date ${TODAY}"/>
- <attribute name="Implementation-Vendor" value="Kitfox - Mark McKay"/>
- </section>
- <section name="com/kitfox/svg/SVGUniverse.class">
- <attribute name="Java-Bean" value="true"/>
- </section>
- <section name="com/kitfox/svg/app/beans/SVGIcon.class">
- <attribute name="Java-Bean" value="true"/>
- </section>
- <section name="com/kitfox/svg/app/beans/SVGPanel.class">
- <attribute name="Java-Bean" value="true"/>
- </section>
- <section name="com/kitfox/svg/app/beans/ProportionalLayoutPanel.class">
- <attribute name="Java-Bean" value="true"/>
- </section>
- </manifest>
-
- <fileset dir="${classes.main.dir}">
- <include name="**/*.class"/>
- </fileset>
- <fileset dir=".">
- <include name="lgpl.txt"/>
- <include name="readme.txt"/>
- </fileset>
- </jar>
-
- <!--
- Signing a jar depends upon you having a keystore to sign the jar
- with. If you have an existing keystore, update the key.user,
- key.password and key.location properties to reflect your key entry.
- If you don't have a keystore, you can create a default keystore for
- the purposes for signing this file by running the generateKey task
- in this ant file.
- -->
- <antcall target="generateKey"/>
- <signjar jar="${project.complete.jar}" alias="${key.user}" storepass="${key.password}" keystore="${key.location}"/>
+
+ <target name="-post-jar">
+ <delete file="${key.location}"/>
+ <genkey alias="${key.user}" storepass="${key.password}" keystore="${key.location}" validity="1000" verbose="true">
+ <dname>
+ <param name="CN" value="Mark McKay, mark@kitfox.com"/>
+ <param name="OU" value="kitfox.com"/>
+ <param name="O" value="kitfox"/>
+ <param name="L" value="Toronto"/>
+ <param name="S" value="Ontario"/>
+ <param name="C" value="CA"/>
+ </dname>
+ </genkey>
- <copy file="${project.complete.jar}" toFile="${project.www.jar}"/>
+ <signjar jar="${dist.jar}" alias="${key.user}" storepass="${key.password}" keystore="${key.location}"/>
- <copy file="${javadoc.zip}" toFile="${javadoc.www.zip}" failonerror="false"/>
- </target>
-
- <target name="clean" depends="init" description="Clean all build products.">
- <delete dir="${build.dir}"/>
- <delete dir="${javadoc.dir}"/>
- <delete file="${project.obfuscated.jar}"/>
-
- <!--
- <delete>
- <fileset dir="${src.main.dir}">
- <include name="**/*.class"/>
- </fileset>
- </delete>
- -->
+ <copy file="${dist.jar}" toFile="${project.www.jar}"/>
+ <copy file="${dist.jar}" toFile="${project.tiny.jar}"/>
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
</target>
-
+
</project>
diff --git a/hotspot.log b/hotspot.log deleted file mode 100644 index ce1ff2f..0000000 --- a/hotspot.log +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?>
-<hotspot_log version='160 1' process='3344' time_ms='1184734480014'>
-<vm_version>
-<name>
-Java HotSpot(TM) Client VM
-</name>
-<release>
-1.6.0-rc-fastdebug-b99-debug
-</release>
-<info>
-Java HotSpot(TM) Client VM (1.6.0-rc-fastdebug-b99) for windows-x86, built on Sep 15 2006 02:26:51 by "java_re" with unknown MS VC++:1310
-</info>
-</vm_version>
-<vm_arguments>
-<args>
--Xdebug -Xnoagent -Djava.compiler=none -Xrunjdwp:transport=dt_socket,address=localhost:4663
-</args>
-<command>
-com.kitfox.svg.zip.ZipTestMain
-</command>
-<launcher>
-SUN_STANDARD
-</launcher>
-</vm_arguments>
-<tty>
diff --git a/lib/library/ant.jar b/lib/library/ant.jar Binary files differdeleted file mode 100644 index 3a67607..0000000 --- a/lib/library/ant.jar +++ /dev/null diff --git a/lib/library/javacc.jar b/lib/library/javacc.jar Binary files differdeleted file mode 100755 index 5506008..0000000 --- a/lib/library/javacc.jar +++ /dev/null diff --git a/lib/library/junit.jar b/lib/library/junit.jar Binary files differdeleted file mode 100755 index 674d71e..0000000 --- a/lib/library/junit.jar +++ /dev/null diff --git a/manifest.mf b/manifest.mf deleted file mode 100755 index 9960bbc..0000000 --- a/manifest.mf +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0Beta3
-Created-By: 1.6.0-b105 (Sun Microsystems Inc.)
-Main-Class: com.kitfox.Main
-Built-By: kitfox
-
-Name: common
-Specification-Title: SVG Salamander
-Specification-Version: 1
-Specification-Vendor: Kitfox
-Implementation-Title: svg-salamander-core
-Implementation-Version: Version 1, Date May 29 2007
-Implementation-Vendor: Mark McKay, mark@kitfox.com
-
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml new file mode 100755 index 0000000..1bf7540 --- /dev/null +++ b/nbproject/build-impl.xml @@ -0,0 +1,671 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT ***
+*** EDIT ../build.xml INSTEAD ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+ - initialization
+ - compilation
+ - jar
+ - execution
+ - debugging
+ - javadoc
+ - junit compilation
+ - junit execution
+ - junit debugging
+ - applet
+ - cleanup
+
+ -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="svg-salamander-core-impl">
+ <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 depends="-pre-init,-init-private" name="-init-libraries">
+ <property location="..\libraries\nblibraries.properties" name="libraries.1.path"/>
+ <dirname file="${libraries.1.path}" property="libraries.1.dir.nativedirsep"/>
+ <pathconvert dirsep="/" property="libraries.1.dir">
+ <path path="${libraries.1.dir.nativedirsep}"/>
+ </pathconvert>
+ <basename file="${libraries.1.path}" property="libraries.1.basename" suffix=".properties"/>
+ <touch file="${libraries.1.dir}/${libraries.1.basename}-private.properties"/>
+ <loadproperties srcfile="${libraries.1.dir}/${libraries.1.basename}-private.properties">
+ <filterchain>
+ <replacestring from="$${base}" to="${libraries.1.dir}"/>
+ </filterchain>
+ </loadproperties>
+ <loadproperties srcfile="${libraries.1.path}">
+ <filterchain>
+ <replacestring from="$${base}" to="${libraries.1.dir}"/>
+ </filterchain>
+ </loadproperties>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
+ <property file="${user.properties.file}"/>
+ <!-- The two properties below are usually overridden -->
+ <!-- by the active platform. Just a fallback. -->
+ <property name="default.javac.source" value="1.4"/>
+ <property name="default.javac.target" value="1.4"/>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
+ <property file="nbproject/configs/${config}.properties"/>
+ <property file="nbproject/project.properties"/>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+ <available file="${manifest.file}" property="manifest.available"/>
+ <condition property="manifest.available+main.class">
+ <and>
+ <isset property="manifest.available"/>
+ <isset property="main.class"/>
+ <not>
+ <equals arg1="${main.class}" arg2="" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="manifest.available+main.class+mkdist.available">
+ <and>
+ <istrue value="${manifest.available+main.class}"/>
+ <isset property="libs.CopyLibs.classpath"/>
+ </and>
+ </condition>
+ <condition property="have.tests">
+ <or>
+ <available file="${test.src.dir}"/>
+ <available file="${test.res.dir}"/>
+ </or>
+ </condition>
+ <condition property="have.sources">
+ <or>
+ <available file="${src.dir}"/>
+ <available file="${src.java.dir}"/>
+ <available file="${src.res.dir}"/>
+ <available file="${res.dir}"/>
+ </or>
+ </condition>
+ <condition property="netbeans.home+have.tests">
+ <and>
+ <isset property="netbeans.home"/>
+ <isset property="have.tests"/>
+ </and>
+ </condition>
+ <condition property="no.javadoc.preview">
+ <and>
+ <isset property="javadoc.preview"/>
+ <isfalse value="${javadoc.preview}"/>
+ </and>
+ </condition>
+ <property name="run.jvmargs" value=""/>
+ <property name="javac.compilerargs" value=""/>
+ <property name="work.dir" value="${basedir}"/>
+ <condition property="no.deps">
+ <and>
+ <istrue value="${no.dependencies}"/>
+ </and>
+ </condition>
+ <property name="javac.debug" value="true"/>
+ <property name="javadoc.preview" value="true"/>
+ <property name="application.args" value=""/>
+ <property name="source.encoding" value="${file.encoding}"/>
+ <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>
+ <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
+ <and>
+ <isset property="jaxws.endorsed.dir"/>
+ <available file="nbproject/jaxws-build.xml"/>
+ </and>
+ </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="src.java.dir">Must set src.java.dir</fail>
+ <fail unless="src.res.dir">Must set src.res.dir</fail>
+ <fail unless="res.dir">Must set res.dir</fail>
+ <fail unless="test.src.dir">Must set test.src.dir</fail>
+ <fail unless="test.res.dir">Must set test.res.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 name="-init-macrodef-javac">
+ <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}" name="srcdir"/>
+ <attribute default="${build.classes.dir}" name="destdir"/>
+ <attribute default="${javac.classpath}" name="classpath"/>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="${javac.debug}" name="debug"/>
+ <attribute default="" name="sourcepath"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
+ <classpath>
+ <path path="@{classpath}"/>
+ </classpath>
+ <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
+ <customize/>
+ </javac>
+ </sequential>
+ </macrodef>
+ <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${src.dir}:${src.java.dir}:${src.res.dir}:${res.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="," property="javac.includes.binary">
+ <path>
+ <filelist dir="@{destdir}" files="${javac.includes}"/>
+ </path>
+ <globmapper from="*.java" to="*.class"/>
+ </pathconvert>
+ <delete>
+ <files includes="${javac.includes.binary}"/>
+ </delete>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-macrodef-junit">
+ <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <sequential>
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
+ <batchtest todir="${build.test.results.dir}">
+ <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
+ <fileset dir="${test.res.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <path path="${run.test.classpath}"/>
+ </classpath>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="xml"/>
+ <jvmarg line="${run.jvmargs}"/>
+ </junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target 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="dt_socket">
+ <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.includes}*.class"/>
+ </nbjpdareload>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-debug-args">
+ <property name="version-output" value="java version "${ant.java.version}"/>
+ <condition property="have-jdk-older-than-1.4">
+ <or>
+ <contains string="${version-output}" substring="java version "1.0"/>
+ <contains string="${version-output}" substring="java version "1.1"/>
+ <contains string="${version-output}" substring="java version "1.2"/>
+ <contains string="${version-output}" substring="java version "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>
+ </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="${debug-args-line}"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+ <jvmarg line="${run.jvmargs}"/>
+ <classpath>
+ <path path="@{classpath}"/>
+ </classpath>
+ <syspropertyset>
+ <propertyref prefix="run-sys-prop."/>
+ <mapper from="run-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <customize/>
+ </java>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-macrodef-java">
+ <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+ <attribute default="${main.class}" name="classname"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <java classname="@{classname}" dir="${work.dir}" fork="true">
+ <jvmarg line="${run.jvmargs}"/>
+ <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 name="-init-presetdef-jar">
+ <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+ <jar compress="${jar.compress}" jarfile="${dist.jar}">
+ <j2seproject1:fileset dir="${build.classes.dir}"/>
+ </jar>
+ </presetdef>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
+ <!--
+ ===================
+ COMPILATION SECTION
+ ===================
+ -->
+ <target depends="init" name="deps-jar" unless="no.deps"/>
+ <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">
+ <j2seproject3:depend/>
+ </target>
+ <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
+ <j2seproject3:javac/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${src.java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${src.res.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${res.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ </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,-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="" includes="${javac.includes}" sourcepath="${src.dir}:${src.java.dir}:${src.res.dir}:${res.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,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+ <!--
+ ====================
+ JAR BUILDING SECTION
+ ====================
+ -->
+ <target depends="init" name="-pre-pre-jar">
+ <dirname file="${dist.jar}" property="dist.jar.dir"/>
+ <mkdir dir="${dist.jar.dir}"/>
+ </target>
+ <target name="-pre-jar">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
+ <j2seproject1:jar/>
+ </target>
+ <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+ <j2seproject1:jar manifest="${manifest.file}"/>
+ </target>
+ <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+ <j2seproject1:jar manifest="${manifest.file}">
+ <j2seproject1:manifest>
+ <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+ </j2seproject1:manifest>
+ </j2seproject1:jar>
+ <echo>To run this application from the command line without Ant, try:</echo>
+ <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+ <property location="${dist.jar}" name="dist.jar.resolved"/>
+ <pathconvert property="run.classpath.with.dist.jar">
+ <path path="${run.classpath}"/>
+ <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+ </pathconvert>
+ <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+ </target>
+ <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
+ <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+ <pathconvert property="run.classpath.without.build.classes.dir">
+ <path path="${run.classpath}"/>
+ <map from="${build.classes.dir.resolved}" to=""/>
+ </pathconvert>
+ <pathconvert pathsep=" " property="jar.classpath">
+ <path path="${run.classpath.without.build.classes.dir}"/>
+ <chainedmapper>
+ <flattenmapper/>
+ <globmapper from="*" to="lib/*"/>
+ </chainedmapper>
+ </pathconvert>
+ <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+ <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+ <fileset dir="${build.classes.dir}"/>
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}"/>
+ <attribute name="Class-Path" value="${jar.classpath}"/>
+ </manifest>
+ </copylibs>
+ <echo>To run this application from the command line without Ant, try:</echo>
+ <property location="${dist.jar}" name="dist.jar.resolved"/>
+ <echo>java -jar "${dist.jar.resolved}"</echo>
+ </target>
+ <target name="-post-jar">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+ <!--
+ =================
+ 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,-do-not-recompile,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>
+ <!--
+ =================
+ DEBUGGING SECTION
+ =================
+ -->
+ <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+ <j2seproject1:nbjpdastart 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,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+ <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"/>
+ <!--
+ ===============
+ JAVADOC SECTION
+ ===============
+ -->
+ <target depends="init" name="-javadoc-build">
+ <mkdir dir="${dist.javadoc.dir}"/>
+ <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+ <classpath>
+ <path path="${javac.classpath}"/>
+ </classpath>
+ <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
+ <fileset dir="${src.java.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
+ <fileset dir="${src.res.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
+ <fileset dir="${res.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
+ </javadoc>
+ </target>
+ <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+ <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+ </target>
+ <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+ <!--
+ =========================
+ JUNIT COMPILATION SECTION
+ =========================
+ -->
+ <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+ <mkdir dir="${build.test.classes.dir}"/>
+ </target>
+ <target name="-pre-compile-test">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target if="do.depend.true" name="-compile-test-depend">
+ <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}:${test.res.dir}"/>
+ </target>
+ <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+ <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}:${test.res.dir}"/>
+ <copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${test.res.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,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 classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}:${test.res.dir}" srcdir="${test.src.dir}:${test.res.dir}"/>
+ <copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${test.res.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ </copy>
+ </target>
+ <target name="-post-compile-test-single">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+ <!--
+ =======================
+ JUNIT EXECUTION SECTION
+ =======================
+ -->
+ <target depends="init" if="have.tests" name="-pre-test-run">
+ <mkdir dir="${build.test.results.dir}"/>
+ </target>
+ <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+ <j2seproject3:junit testincludes="**/*Test.java"/>
+ </target>
+ <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+ <fail if="tests.failed">Some tests failed; see details above.</fail>
+ </target>
+ <target depends="init" if="have.tests" name="test-report"/>
+ <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+ <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+ <target depends="init" if="have.tests" name="-pre-test-run-single">
+ <mkdir dir="${build.test.results.dir}"/>
+ </target>
+ <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+ <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+ <j2seproject3:junit excludes="" includes="${test.includes}"/>
+ </target>
+ <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+ <fail if="tests.failed">Some tests failed; see details above.</fail>
+ </target>
+ <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+ <!--
+ =======================
+ JUNIT DEBUGGING SECTION
+ =======================
+ -->
+ <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+ <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+ <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+ <delete file="${test.report.file}"/>
+ <mkdir dir="${build.test.results.dir}"/>
+ <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+ <customize>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <arg value="${test.class}"/>
+ <arg value="showoutput=true"/>
+ <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+ <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+ </customize>
+ </j2seproject3:debug>
+ </target>
+ <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+ <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+ </target>
+ <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+ <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+ <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+ </target>
+ <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+ <!--
+ =========================
+ APPLET EXECUTION SECTION
+ =========================
+ -->
+ <target depends="init,compile-single" name="run-applet">
+ <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+ <j2seproject1:java classname="sun.applet.AppletViewer">
+ <customize>
+ <arg value="${applet.url}"/>
+ </customize>
+ </j2seproject1:java>
+ </target>
+ <!--
+ =========================
+ APPLET DEBUGGING SECTION
+ =========================
+ -->
+ <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+ <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+ <j2seproject3:debug classname="sun.applet.AppletViewer">
+ <customize>
+ <arg value="${applet.url}"/>
+ </customize>
+ </j2seproject3:debug>
+ </target>
+ <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+ <!--
+ ===============
+ CLEANUP SECTION
+ ===============
+ -->
+ <target depends="init" name="deps-clean" unless="no.deps"/>
+ <target depends="init" name="-do-clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}"/>
+ </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"/>
+</project>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties new file mode 100755 index 0000000..345b3d4 --- /dev/null +++ b/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=16a7c89c
+build.xml.script.CRC32=91ddbaab
+build.xml.stylesheet.CRC32=be360661
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=f852a4d9
+nbproject/build-impl.xml.script.CRC32=7235f0eb
+nbproject/build-impl.xml.stylesheet.CRC32=e327d66c
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml deleted file mode 100755 index cc2c0e5..0000000 --- a/nbproject/private/private.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties new file mode 100755 index 0000000..5bb10d9 --- /dev/null +++ b/nbproject/project.properties @@ -0,0 +1,78 @@ +application.title=svg-salamander-core
+application.vendor=kitfox
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+debug.classpath=\
+ ${run.classpath}
+debug.test.classpath=\
+ ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/svg-salamander-core.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+excludes=
+file.reference.ant.jar=..\\libraries\\ant.jar
+file.reference.javacc.jar=..\\libraries\\javacc.jar
+file.reference.main-java=src/main/java
+file.reference.main-res=src/main/res
+file.reference.test-java=src/test/java
+file.reference.test-res=src/test/res
+includes=**
+jar.compress=true
+javac.classpath=\
+ ${file.reference.ant.jar}:\
+ ${file.reference.javacc.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.source=1.4
+javac.target=1.4
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}:\
+ ${libs.junit.classpath}:\
+ ${libs.junit_4.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+jnlp.codebase.type=user
+jnlp.codebase.user=https://svgsalamander.dev.java.net/binaries/
+jnlp.enabled=false
+jnlp.offline-allowed=true
+jnlp.signed=true
+main.class=com.kitfox.svg.app.SVGPlayer
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+res.dir=${file.reference.main-res}
+run.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+ ${javac.test.classpath}:\
+ ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=${file.reference.main-java}
+src.java.dir=src\\gen\\java
+src.res.dir=src\\gen\\res
+test.res.dir=${file.reference.test-res}
+test.src.dir=${file.reference.test-java}
diff --git a/nbproject/project.xml b/nbproject/project.xml index 349af95..289b995 100755 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,235 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
+ <type>org.netbeans.modules.java.j2seproject</type>
<configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
+ <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>svg-salamander-core</name>
- <properties>
- <property name="src.main.dir">src/main/java</property>
- <property name="src.test.dir">src/test/java</property>
- </properties>
- <folders>
- <source-folder>
- <label>src\main\java</label>
- <type>java</type>
- <location>src/main/java</location>
- </source-folder>
- <source-folder>
- <label>src\main\res</label>
- <type>java</type>
- <location>src/main/res</location>
- </source-folder>
- <source-folder>
- <label>src\test\java</label>
- <type>java</type>
- <location>src/test/java</location>
- </source-folder>
- <source-folder>
- <label>src\test\res</label>
- <type>java</type>
- <location>src/test/res</location>
- </source-folder>
- <source-folder>
- <label>..\www</label>
- <type>java</type>
- <location>../www</location>
- </source-folder>
- <source-folder>
- <label>..\www</label>
- <location>../www</location>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>build</target>
- </action>
- <action name="clean">
- <target>clean</target>
- </action>
- <action name="javadoc">
- <target>javadoc</target>
- </action>
- <action name="run">
- <target>run</target>
- </action>
- <action name="test">
- <target>checkintest</target>
- </action>
- <action name="rebuild">
- <target>clean</target>
- <target>build</target>
- </action>
- <action name="debug">
- <target>debug</target>
- </action>
- <action name="compile.single">
- <target>compile-selected-files</target>
- <context>
- <property>files</property>
- <folder>${src.main.dir}</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <target>compile-selected-files-test</target>
- <context>
- <property>files</property>
- <folder>${src.test.dir}</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="run.single">
- <target>run-selected-files</target>
- <context>
- <property>classname</property>
- <folder>${src.main.dir}</folder>
- <pattern>\.java$</pattern>
- <format>java-name</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- <action name="run.single">
- <target>run-selected-files-test</target>
- <context>
- <property>classname</property>
- <folder>${src.test.dir}</folder>
- <pattern>\.java$</pattern>
- <format>java-name</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- <action name="debug.single">
- <target>debug-selected-files</target>
- <context>
- <property>classname</property>
- <folder>${src.main.dir}</folder>
- <pattern>\.java$</pattern>
- <format>java-name</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- <action name="debug.single">
- <target>debug-selected-files-test</target>
- <context>
- <property>classname</property>
- <folder>${src.test.dir}</folder>
- <pattern>\.java$</pattern>
- <format>java-name</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- <action name="debug.fix">
- <target>debug-fix</target>
- <context>
- <property>fix.file</property>
- <folder>${src.main.dir}</folder>
- <pattern>\.java$</pattern>
- <format>relative-path-noext</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- <action name="test.single">
- <target>test-selected-files</target>
- <context>
- <property>classname</property>
- <folder>${src.main.dir}</folder>
- <pattern>\.java$</pattern>
- <format>java-name</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- </ide-actions>
- <export>
- <type>jar</type>
- <location>build/jar/svg-salamander-core.jar</location>
- <build-target>build</build-target>
- </export>
- <view>
- <items>
- <source-folder style="packages">
- <label>src\main\java</label>
- <location>src/main/java</location>
- </source-folder>
- <source-folder style="packages">
- <label>src\main\res</label>
- <location>src/main/res</location>
- </source-folder>
- <source-folder style="packages">
- <label>src\test\java</label>
- <location>src/test/java</location>
- </source-folder>
- <source-folder style="packages">
- <label>src\test\res</label>
- <location>src/test/res</location>
- </source-folder>
- <source-folder style="packages">
- <label>..\www</label>
- <location>../www</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="clean"/>
- <ide-action name="javadoc"/>
- <ide-action name="run"/>
- <ide-action name="debug"/>
- <ide-action name="test"/>
- <ide-action name="rebuild"/>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
- <compilation-unit>
- <package-root>src/main/java</package-root>
- <classpath mode="compile">lib/library/javacc.jar;lib/library/junit.jar</classpath>
- <built-to>build/jar/svg-salamander-core.jar</built-to>
- <source-level>1.5</source-level>
- </compilation-unit>
- <compilation-unit>
- <package-root>src/main/res</package-root>
- <source-level>1.5</source-level>
- </compilation-unit>
- <compilation-unit>
- <package-root>src/test/java</package-root>
- <unit-tests/>
- <classpath mode="compile">lib/library/javacc.jar;lib/library/junit.jar;build/jar/svg-salamander-core.jar</classpath>
- <source-level>1.5</source-level>
- </compilation-unit>
- <compilation-unit>
- <package-root>src/test/res</package-root>
- <unit-tests/>
- <source-level>1.5</source-level>
- </compilation-unit>
- <compilation-unit>
- <package-root>../www</package-root>
- <unit-tests/>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
+ <minimum-ant-version>1.6.5</minimum-ant-version>
+ <source-roots>
+ <root id="src.dir"/>
+ <root id="src.java.dir" name="Generated Source"/>
+ <root id="src.res.dir"/>
+ <root id="res.dir"/>
+ </source-roots>
+ <test-roots>
+ <root id="test.src.dir"/>
+ <root id="test.res.dir"/>
+ </test-roots>
+ </data>
+ <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+ <definitions>..\libraries\nblibraries.properties</definitions>
+ </libraries>
</configuration>
</project>
diff --git a/src/main/java/com/kitfox/svg/SVGUniverse.java b/src/main/java/com/kitfox/svg/SVGUniverse.java index 13c8988..c6b3e58 100644 --- a/src/main/java/com/kitfox/svg/SVGUniverse.java +++ b/src/main/java/com/kitfox/svg/SVGUniverse.java @@ -317,8 +317,15 @@ public class SVGUniverse implements Serializable return null;
}
-
- private InputStreamReader createDocumentReader(InputStream is) throws IOException
+ /**
+ * Wraps input stream in a BufferedInputStream. If it is detected that this
+ * input stream is GZIPped, also wraps in a GZIPInputStream for inflation.
+ *
+ * @param is Raw input stream
+ * @return Uncompressed stream of SVG data
+ * @throws java.io.IOException
+ */
+ private InputStream createDocumentInputStream(InputStream is) throws IOException
{
BufferedInputStream bin = new BufferedInputStream(is);
bin.mark(2);
@@ -330,12 +337,12 @@ public class SVGUniverse implements Serializable if ((b1 << 8 | b0) == GZIPInputStream.GZIP_MAGIC)
{
GZIPInputStream iis = new GZIPInputStream(bin);
- return new InputStreamReader(iis);
+ return iis;
}
else
{
//Plain text
- return new InputStreamReader(bin);
+ return bin;
}
}
@@ -360,7 +367,7 @@ public class SVGUniverse implements Serializable if (loadedDocs.containsKey(uri) && !forceLoad) return uri;
InputStream is = docRoot.openStream();
- return loadSVG(uri, createDocumentReader(is));
+ return loadSVG(uri, new InputSource(createDocumentInputStream(is)));
}
catch (Throwable t)
{
@@ -378,7 +385,7 @@ public class SVGUniverse implements Serializable public URI loadSVG(InputStream is, String name, boolean forceLoad) throws IOException
{
- return loadSVG(createDocumentReader(is), name, forceLoad);
+ return loadSVG(createDocumentInputStream(is), name, forceLoad);
}
public URI loadSVG(Reader reader, String name)
@@ -422,7 +429,7 @@ public class SVGUniverse implements Serializable if (uri == null) return null;
if (loadedDocs.containsKey(uri) && !forceLoad) return uri;
- return loadSVG(uri, reader);
+ return loadSVG(uri, new InputSource(reader));
}
/**
@@ -448,7 +455,8 @@ public class SVGUniverse implements Serializable }
- protected URI loadSVG(URI xmlBase, Reader is)
+// protected URI loadSVG(URI xmlBase, InputStream is)
+ protected URI loadSVG(URI xmlBase, InputSource is)
{
// Use an instance of ourselves as the SAX event handler
SVGLoader handler = new SVGLoader(xmlBase, this, verbose);
@@ -479,7 +487,7 @@ public class SVGUniverse implements Serializable }
);
reader.setContentHandler(handler);
- reader.parse(new InputSource(new BufferedReader(is)));
+ reader.parse(is);
// SAXParser saxParser = factory.newSAXParser();
// saxParser.parse(new InputSource(new BufferedReader(is)), handler);
|