[jeotrans~svn:17] testing my SVN...it's fucking annoying.

[smsiebe@kenai.com]

Project:    jeotrans
Repository: svn
Revision:   17
Author:     smsiebe
Date:       2010-09-29 15:09:45 UTC
Link:       

Log Message:
------------
testing my SVN...it's fucking annoying.


Revisions:
----------
17


Modified Paths:
---------------
trunk/test/org/jeotrans/coordinate/UTMTest.java
trunk/nbproject/genfiles.properties
trunk/src/org/jeotrans/coordinate/PolarStereographic.java
trunk/src/org/jeotrans/coordinate/UPS.java
trunk/src/org/jeotrans/coordinate/MGRS.java
trunk/nbproject/build-impl.xml
trunk/src/org/jscience/geography/coordinates/crs/MgrsCRS.java
trunk/test/org/jeotrans/coordinate/MGRSTest.java
trunk/src/org/jeotrans/coordinate/UTM.java
trunk/src/org/jscience/geography/coordinates/crs/UtmCRS.java
trunk/src/org/jeotrans/coordinate/TransverseMercator.java
trunk/test/org/jscience/geography/coordinates/crs/ConversionUtilTest.java


Added Paths:
------------
trunk/src/org/jeotrans/util/ConversionUtil.java
trunk/src/org/jeotrans/util


Diffs:
------
Index: 
trunk/test/org/jscience/geography/coordinates/crs/ConversionUtilTest.java
===================================================================
--- trunk/test/org/jscience/geography/coordinates/crs/ConversionUtilTest.java 
  (revision 16)
+++ trunk/test/org/jscience/geography/coordinates/crs/ConversionUtilTest.java 
  (revision 17)
@@ -23,6 +23,7 @@
  */
 package org.jscience.geography.coordinates.crs;
 
+import org.jeotrans.util.ConversionUtil;
 import javax.measure.unit.NonSI;
 import org.jscience.geography.coordinates.LatLong;
 import org.junit.Test;
Index: trunk/test/org/jeotrans/coordinate/UTMTest.java
===================================================================
--- trunk/test/org/jeotrans/coordinate/UTMTest.java     (revision 16)
+++ trunk/test/org/jeotrans/coordinate/UTMTest.java     (revision 17)
@@ -28,7 +28,7 @@
 import javax.measure.unit.NonSI;
 import javax.measure.unit.SI;
 import org.jscience.geography.coordinates.LatLong;
-import org.jscience.geography.coordinates.crs.ConversionUtil;
+import org.jeotrans.util.ConversionUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
Index: trunk/test/org/jeotrans/coordinate/MGRSTest.java
===================================================================
--- trunk/test/org/jeotrans/coordinate/MGRSTest.java    (revision 16)
+++ trunk/test/org/jeotrans/coordinate/MGRSTest.java    (revision 17)
@@ -30,7 +30,7 @@
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 import org.jscience.geography.coordinates.LatLong;
-import org.jscience.geography.coordinates.crs.ConversionUtil;
+import org.jeotrans.util.ConversionUtil;
 import org.jscience.geography.coordinates.crs.MgrsCRS;
 import org.jscience.geography.coordinates.crs.ProjectedCRS;
 import org.junit.AfterClass;
Index: trunk/nbproject/genfiles.properties
===================================================================
--- trunk/nbproject/genfiles.properties (revision 16)
+++ trunk/nbproject/genfiles.properties (revision 17)
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=df324b1c
 build.xml.script.CRC32=39220cfc
-build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45
+build.xml.stylesheet.CRC32=28e38971@1.38.1.45
 # 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=df324b1c
-nbproject/build-impl.xml.script.CRC32=281e5ed1
-nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45
+nbproject/build-impl.xml.script.CRC32=6bcfc68e
+nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45
Index: trunk/nbproject/build-impl.xml
===================================================================
--- trunk/nbproject/build-impl.xml      (revision 16)
+++ trunk/nbproject/build-impl.xml      (revision 17)
@@ -80,6 +80,7 @@
     </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"/>
+        <available file="${application.splash}" 
property="splashscreen.available"/>
         <condition property="main.class.available">
             <and>
                 <isset property="main.class"/>
@@ -108,24 +109,41 @@
                 <isset property="do.mkdist"/>
             </and>
         </condition>
-        <condition property="manifest.available+mkdist.available">
+        <condition 
property="manifest.available+main.class+mkdist.available+splashscreen.available">
             <and>
-                <istrue value="${manifest.available}"/>
-                <isset property="do.mkdist"/>
+                <istrue 
value="${manifest.available+main.class+mkdist.available}"/>
+                <istrue value="${splashscreen.available}"/>
             </and>
         </condition>
-        <condition property="manifest.available-mkdist.available">
-            <or>
-                <istrue value="${manifest.available}"/>
-                <isset property="do.mkdist"/>
-            </or>
+        <condition property="do.archive">
+            <not>
+                <istrue value="${jar.archive.disabled}"/>
+            </not>
         </condition>
-        <condition property="manifest.available+main.class-mkdist.available">
-            <or>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class">
+            <and>
                 <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </or>
+                <istrue value="${do.archive}"/>
+            </and>
         </condition>
+        <condition 
property="do.archive+manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue 
value="${manifest.available+main.class+mkdist.available}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition 
property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
+            <and>
+                <istrue 
value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
         <condition property="have.tests">
             <or>
                 <available file="${test.src.dir}"/>
@@ -181,6 +199,8 @@
             <length length="0" string="${endorsed.classpath}" 
when="greater"/>
         </condition>
         <property name="javac.fork" value="false"/>
+        <property name="jar.index" value="false"/>
+        <available file="${meta.inf.dir}/persistence.xml" 
property="has.persistence.xml"/>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -207,11 +227,13 @@
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-javac">
+    <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"/>
@@ -221,6 +243,7 @@
             <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">
@@ -232,10 +255,51 @@
                     </classpath>
                     <compilerarg line="${endorsed.classpath.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.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"/>
@@ -383,14 +447,65 @@
             </sequential>
         </macrodef>
     </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" 
uri="http://www.netbeans.org/ns/j2se-project/3";>
+            <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/>
+                        <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}" index="${jar.index}" 
jarfile="${dist.jar}" manifest="${manifest.file}" 
runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}"/>
+                    <manifest>
+                        <attribute name="Class-Path" 
value="${jar.classpath}"/>
+                        <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}" jarfile="${dist.jar}">
+            <jar compress="${jar.compress}" index="${jar.index}" 
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"/>
+    <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-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline"
 name="init"/>
     <!--
                 ===================
                 COMPILATION SECTION
@@ -434,12 +549,18 @@
         </pathconvert>
         <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
     </target>
-    <target 
depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" 
if="have.sources" name="-do-compile">
+    <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"/>
+        </copy>
+    </target>
     <target name="-post-compile">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
@@ -472,13 +593,13 @@
         <!-- 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-mkdist.available">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" 
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-mkdist.available">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" 
if="do.archive+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">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" 
if="do.archive+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}"/>
@@ -493,78 +614,35 @@
         </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>
+    <target 
depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" 
if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available"
 name="-do-jar-with-libraries-and-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"/>
+        <j2seproject3:copylibs>
+            <customize>
                 <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
+                <attribute name="SplashScreen-Image" 
value="META-INF/${splashscreen.basename}"/>
+            </customize>
+        </j2seproject3: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 depends="init,compile,-pre-pre-jar,-pre-jar" 
if="manifest.available+mkdist.available" 
name="-do-jar-with-libraries-without-mainclass" unless="main.class.available">
-        <property location="${build.classes.dir}" 
name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef 
classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" 
classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" 
manifest="${manifest.file}" 
runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
+    <target 
depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" 
if="do.archive+manifest.available+main.class+mkdist.available" 
name="-do-jar-with-libraries" unless="splashscreen.available">
+        <j2seproject3:copylibs>
+            <customize>
+                <attribute name="Main-Class" value="${main.class}"/>
+            </customize>
+        </j2seproject3: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 depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" 
name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
-        <property location="${build.classes.dir}" 
name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef 
classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" 
classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" 
runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-    </target>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target 
depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-mainclass,-do-jar-with-libraries-without-manifest,-post-jar"
 description="Build JAR." name="jar"/>
+    <target 
depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar"
 description="Build JAR." name="jar"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -634,7 +712,7 @@
                 JAVADOC SECTION
                 ===============
             -->
-    <target depends="init" name="-javadoc-build">
+    <target depends="init" if="have.sources" 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>
@@ -647,6 +725,14 @@
                 <include name="**/*.java"/>
             </fileset>
         </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"/>
@@ -668,7 +754,7 @@
         <j2seproject3:depend classpath="${javac.test.classpath}" 
destdir="${build.test.classes.dir}" srcdir="${test.src.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}"/>
+        <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>
@@ -685,7 +771,7 @@
     <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}" srcdir="${test.src.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>
Index: trunk/src/org/jscience/geography/coordinates/crs/ConversionUtil.java
===================================================================
--- trunk/src/org/jscience/geography/coordinates/crs/ConversionUtil.java      
  (revision 16)
+++ trunk/src/org/jscience/geography/coordinates/crs/ConversionUtil.java      
  (revision 17)
@@ -1,161 +0,0 @@
-/*
- *  The MIT License
- *
- *  Copyright 2010 Steve Siebert.
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a 
copy
- *  of this software and associated documentation files (the "Software"), to 
deal
- *  in the Software without restriction, including without limitation the 
rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included 
in
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
- */
-
-package org.jscience.geography.coordinates.crs;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import javax.measure.converter.ConversionException;
-import javax.measure.converter.UnitConverter;
-import javax.measure.quantity.Angle;
-import javax.measure.unit.NonSI;
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
-import org.jscience.geography.coordinates.LatLong;
-
-/**
- *
- * @author Steve Siebert
- */
-public class ConversionUtil {
-
-    static private double NORTH_POLAR_MIN = 84.0;
-    static private double SOUTH_POLAR_MIN = -80.0;
-
-    /**
-     * Convert latitude value to latitude zone character.  This methods
-     * expects the latitude to be non-polar
-     * 
-     * @param latitude
-     * @param unit
-     * @return
-     */
-    public static char getLatitudeZone (double latitude, Unit<Angle> unit)
-    {
-        if (unit != NonSI.DEGREE_ANGLE)
-        {
-            UnitConverter toDegree = unit.getConverterTo(NonSI.DEGREE_ANGLE);
-            latitude = toDegree.convert(latitude);
-        }
-        int degreesLatitude = (int) latitude;
-        if (degreesLatitude > NORTH_POLAR_MIN || degreesLatitude < 
SOUTH_POLAR_MIN)
-        {
-            throw new ConversionException("Unable to determine latitude" +
-                    " zone, polar regions require longitude value to " +
-                    "determine code.");
-        }
-        char zone = (char) ((degreesLatitude + 80) / 8 + 'C');
-        if (zone > 'H') {
-            zone++;
-        }
-        if (zone > 'N') {
-            zone++;
-        }
-        if (zone > 'X') {
-            zone = 'X';
-        }
-        return zone;
-    }
-
-    /**
-     * Returns the UTM/UPS latitude zone identifier for the specified 
coordinates.
-     *
-     * @param latLong The coordinates.
-     * @return the latitude zone character.
-     */
-    public static char getLatitudeZone(final LatLong latLong) {
-        if (isNorthPolar(latLong)) {
-            if (latLong.longitudeValue(SI.RADIAN) < 0) {
-                return 'Y';
-            } else {
-                return 'Z';
-            }
-        }
-        if (isSouthPolar(latLong)) {
-            if (latLong.longitudeValue(SI.RADIAN) < 0) {
-                return 'A';
-            } else {
-                return 'B';
-            }
-        }
-        return getLatitudeZone(latLong.latitudeValue(NonSI.DEGREE_ANGLE), 
NonSI.DEGREE_ANGLE);
-    }
-
-    /**
-     * Returns true if the position indicated by the coordinates is
-     * north of the northern limit of the UTM grid (84 degrees).
-     *
-     * @param latLong The coordinates.
-     * @return True if the latitude is greater than 84 degrees.
-     */
-    public static boolean isNorthPolar(final LatLong latLong) {
-        return latLong.latitudeValue(NonSI.DEGREE_ANGLE) > NORTH_POLAR_MIN;
-    }
-
-    /**
-     * Returns true if the position indicated by the coordinates is
-     * south of the southern limit of the UTM grid (-80 degrees).
-     *
-     * @param latLong The coordinates.
-     * @return True if the latitude is less than -80 degrees.
-     */
-    public static boolean isSouthPolar(final LatLong latLong) {
-        return latLong.latitudeValue(NonSI.DEGREE_ANGLE) < SOUTH_POLAR_MIN;
-    }
-
-    /**
-     * Decimal scale rounding - always round half up (0-4 rounds down, 5-9 
rounds up)
-     *
-     * @param decdeg
-     * @param scale
-     * @return
-     */
-    public static double roundHalfUp(double decdeg, int scale) {
-        return BigDecimal.valueOf(decdeg).setScale(scale, 
RoundingMode.HALF_UP).doubleValue();
-    }
-
-    /**
-     * Round a decimal to an int - always round half up (0-4 rounds down, 
5-9 rounds up)
-     *
-     * NOTE: I didn't use Math.round() because it rounds down on .50
-     *
-     * @param decdeg
-     * @return
-     */
-    public static int roundHalfUp(double decdeg) {
-        return (int) BigDecimal.valueOf(decdeg).setScale(0, 
RoundingMode.HALF_UP).intValue();
-    }
-
-    /**
-     * simply truncate the decimal component of the double and return the
-     * integer (no rounding)
-     *
-     * @param d
-     * @return
-     */
-    public static int truncateDouble(double d) {
-        return (int) d;
-    }
-
-}
Index: trunk/src/org/jscience/geography/coordinates/crs/MgrsCRS.java
===================================================================
--- trunk/src/org/jscience/geography/coordinates/crs/MgrsCRS.java       
(revision 16)
+++ trunk/src/org/jscience/geography/coordinates/crs/MgrsCRS.java       
(revision 17)
@@ -23,6 +23,7 @@
  */
 package org.jscience.geography.coordinates.crs;
 
+import org.jeotrans.util.ConversionUtil;
 import javax.measure.Measure;
 import javax.measure.converter.ConversionException;
 import javax.measure.unit.NonSI;
Index: trunk/src/org/jscience/geography/coordinates/crs/UtmCRS.java
===================================================================
--- trunk/src/org/jscience/geography/coordinates/crs/UtmCRS.java        
(revision 16)
+++ trunk/src/org/jscience/geography/coordinates/crs/UtmCRS.java        
(revision 17)
@@ -23,6 +23,7 @@
  */
 package org.jscience.geography.coordinates.crs;
 
+import org.jeotrans.util.ConversionUtil;
 import javax.measure.Measure;
 import javax.measure.converter.ConversionException;
 import javax.measure.unit.NonSI;
Index: trunk/src/org/jeotrans/coordinate/UTM.java
===================================================================
--- trunk/src/org/jeotrans/coordinate/UTM.java  (revision 16)
+++ trunk/src/org/jeotrans/coordinate/UTM.java  (revision 17)
@@ -31,7 +31,7 @@
 import javolution.text.Text;
 import org.jscience.geography.coordinates.Coordinates;
 import org.jscience.geography.coordinates.LatLong;
-import org.jscience.geography.coordinates.crs.ConversionUtil;
+import org.jeotrans.util.ConversionUtil;
 import org.jscience.geography.coordinates.crs.CoordinatesConverter;
 import org.jscience.geography.coordinates.crs.ProjectedCRS;
 import org.jscience.geography.coordinates.crs.UtmCRS;
Index: trunk/src/org/jeotrans/coordinate/UPS.java
===================================================================
--- trunk/src/org/jeotrans/coordinate/UPS.java  (revision 16)
+++ trunk/src/org/jeotrans/coordinate/UPS.java  (revision 17)
@@ -30,7 +30,7 @@
 import javolution.text.Text;
 import org.jscience.geography.coordinates.Coordinates;
 import org.jscience.geography.coordinates.LatLong;
-import org.jscience.geography.coordinates.crs.ConversionUtil;
+import org.jeotrans.util.ConversionUtil;
 import org.jscience.geography.coordinates.crs.CoordinatesConverter;
 import org.jscience.geography.coordinates.crs.ProjectedCRS;
 import org.jscience.geography.coordinates.crs.UpsCRS;
Index: trunk/src/org/jeotrans/coordinate/MGRS.java
===================================================================
--- trunk/src/org/jeotrans/coordinate/MGRS.java (revision 16)
+++ trunk/src/org/jeotrans/coordinate/MGRS.java (revision 17)
@@ -32,7 +32,7 @@
 import javolution.text.TextBuilder;
 import org.jscience.geography.coordinates.Coordinates;
 import org.jscience.geography.coordinates.LatLong;
-import org.jscience.geography.coordinates.crs.ConversionUtil;
+import org.jeotrans.util.ConversionUtil;
 import org.jscience.geography.coordinates.crs.CoordinatesConverter;
 import org.jscience.geography.coordinates.crs.MgrsCRS;
 import org.jscience.geography.coordinates.crs.ProjectedCRS;
Index: trunk/src/org/jeotrans/coordinate/TransverseMercator.java
===================================================================
--- trunk/src/org/jeotrans/coordinate/TransverseMercator.java   (revision 16)
+++ trunk/src/org/jeotrans/coordinate/TransverseMercator.java   (revision 17)
@@ -30,7 +30,7 @@
 import javolution.text.Text;
 import org.jscience.geography.coordinates.Coordinates;
 import org.jscience.geography.coordinates.LatLong;
-import org.jscience.geography.coordinates.crs.ConversionUtil;
+import org.jeotrans.util.ConversionUtil;
 import org.jscience.geography.coordinates.crs.CoordinatesConverter;
 import org.jscience.geography.coordinates.crs.ProjectedCRS;
 import org.jscience.geography.coordinates.crs.TransverseMercatorCRS;
Index: trunk/src/org/jeotrans/coordinate/PolarStereographic.java
===================================================================
--- trunk/src/org/jeotrans/coordinate/PolarStereographic.java   (revision 16)
+++ trunk/src/org/jeotrans/coordinate/PolarStereographic.java   (revision 17)
@@ -31,7 +31,7 @@
 import javolution.text.Text;
 import org.jscience.geography.coordinates.Coordinates;
 import org.jscience.geography.coordinates.LatLong;
-import org.jscience.geography.coordinates.crs.ConversionUtil;
+import org.jeotrans.util.ConversionUtil;
 import org.jscience.geography.coordinates.crs.CoordinatesConverter;
 import org.jscience.geography.coordinates.crs.PolarStereographicCRS;
 import org.jscience.geography.coordinates.crs.ProjectedCRS;
Index: trunk/src/org/jeotrans/util/ConversionUtil.java
===================================================================
--- trunk/src/org/jeotrans/util/ConversionUtil.java     (revision 0)
+++ trunk/src/org/jeotrans/util/ConversionUtil.java     (revision 17)
@@ -0,0 +1,161 @@
+/*
+ *  The MIT License
+ *
+ *  Copyright 2010 Steve Siebert.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a 
copy
+ *  of this software and associated documentation files (the "Software"), to 
deal
+ *  in the Software without restriction, including without limitation the 
rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included 
in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+package org.jeotrans.util;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import javax.measure.converter.ConversionException;
+import javax.measure.converter.UnitConverter;
+import javax.measure.quantity.Angle;
+import javax.measure.unit.NonSI;
+import javax.measure.unit.SI;
+import javax.measure.unit.Unit;
+import org.jscience.geography.coordinates.LatLong;
+
+/**
+ *
+ * @author Steve Siebert
+ */
+public class ConversionUtil {
+
+    static private double NORTH_POLAR_MIN = 84.0;
+    static private double SOUTH_POLAR_MIN = -80.0;
+
+    /**
+     * Convert latitude value to latitude zone character.  This methods
+     * expects the latitude to be non-polar
+     * 
+     * @param latitude
+     * @param unit
+     * @return
+     */
+    public static char getLatitudeZone (double latitude, Unit<Angle> unit)
+    {
+        if (unit != NonSI.DEGREE_ANGLE)
+        {
+            UnitConverter toDegree = unit.getConverterTo(NonSI.DEGREE_ANGLE);
+            latitude = toDegree.convert(latitude);
+        }
+        int degreesLatitude = (int) latitude;
+        if (degreesLatitude > NORTH_POLAR_MIN || degreesLatitude < 
SOUTH_POLAR_MIN)
+        {
+            throw new ConversionException("Unable to determine latitude" +
+                    " zone, polar regions require longitude value to " +
+                    "determine code.");
+        }
+        char zone = (char) ((degreesLatitude + 80) / 8 + 'C');
+        if (zone > 'H') {
+            zone++;
+        }
+        if (zone > 'N') {
+            zone++;
+        }
+        if (zone > 'X') {
+            zone = 'X';
+        }
+        return zone;
+    }
+
+    /**
+     * Returns the UTM/UPS latitude zone identifier for the specified 
coordinates.
+     *
+     * @param latLong The coordinates.
+     * @return the latitude zone character.
+     */
+    public static char getLatitudeZone(final LatLong latLong) {
+        if (isNorthPolar(latLong)) {
+            if (latLong.longitudeValue(SI.RADIAN) < 0) {
+                return 'Y';
+            } else {
+                return 'Z';
+            }
+        }
+        if (isSouthPolar(latLong)) {
+            if (latLong.longitudeValue(SI.RADIAN) < 0) {
+                return 'A';
+            } else {
+                return 'B';
+            }
+        }
+        return getLatitudeZone(latLong.latitudeValue(NonSI.DEGREE_ANGLE), 
NonSI.DEGREE_ANGLE);
+    }
+
+    /**
+     * Returns true if the position indicated by the coordinates is
+     * north of the northern limit of the UTM grid (84 degrees).
+     *
+     * @param latLong The coordinates.
+     * @return True if the latitude is greater than 84 degrees.
+     */
+    public static boolean isNorthPolar(final LatLong latLong) {
+        return latLong.latitudeValue(NonSI.DEGREE_ANGLE) > NORTH_POLAR_MIN;
+    }
+
+    /**
+     * Returns true if the position indicated by the coordinates is
+     * south of the southern limit of the UTM grid (-80 degrees).
+     *
+     * @param latLong The coordinates.
+     * @return True if the latitude is less than -80 degrees.
+     */
+    public static boolean isSouthPolar(final LatLong latLong) {
+        return latLong.latitudeValue(NonSI.DEGREE_ANGLE) < SOUTH_POLAR_MIN;
+    }
+
+    /**
+     * Decimal scale rounding - always round half up (0-4 rounds down, 5-9 
rounds up)
+     *
+     * @param decdeg
+     * @param scale
+     * @return
+     */
+    public static double roundHalfUp(double decdeg, int scale) {
+        return BigDecimal.valueOf(decdeg).setScale(scale, 
RoundingMode.HALF_UP).doubleValue();
+    }
+
+    /**
+     * Round a decimal to an int - always round half up (0-4 rounds down, 
5-9 rounds up)
+     *
+     * NOTE: I didn't use Math.round() because it rounds down on .50
+     *
+     * @param decdeg
+     * @return
+     */
+    public static int roundHalfUp(double decdeg) {
+        return (int) BigDecimal.valueOf(decdeg).setScale(0, 
RoundingMode.HALF_UP).intValue();
+    }
+
+    /**
+     * simply truncate the decimal component of the double and return the
+     * integer (no rounding)
+     *
+     * @param d
+     * @return
+     */
+    public static int truncateDouble(double d) {
+        return (int) d;
+    }
+
+}