Index: applications/editors/josm/plugins/DirectUpload/LICENSE
===================================================================
--- applications/editors/josm/plugins/DirectUpload/LICENSE	(revision 12778)
+++ applications/editors/josm/plugins/DirectUpload/LICENSE	(revision 12780)
@@ -1,12 +1,12 @@
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+            GNU GENERAL PUBLIC LICENSE
+               Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                Preamble
 
   The licenses for most software are designed to take away your
@@ -59,5 +59,5 @@
 
 
-		    GNU GENERAL PUBLIC LICENSE
+            GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -261,5 +261,5 @@
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
@@ -283,8 +283,8 @@
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-
-	    How to Apply These Terms to Your New Programs
+             END OF TERMS AND CONDITIONS
+
+
+        How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
Index: applications/editors/josm/plugins/DirectUpload/README
===================================================================
--- applications/editors/josm/plugins/DirectUpload/README	(revision 12778)
+++ applications/editors/josm/plugins/DirectUpload/README	(revision 12780)
@@ -1,3 +1,3 @@
-Directly uploads GPX from active layer in JOSM to OpenStreetMap Server. 
+Directly uploads GPX from active layer in JOSM to OpenStreetMap Server.
 This currently uses OSM Api 0.5.
 
Index: applications/editors/josm/plugins/DirectUpload/build.xml
===================================================================
--- applications/editors/josm/plugins/DirectUpload/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/DirectUpload/build.xml	(revision 12780)
@@ -1,69 +1,56 @@
 <project name="DirectUpload" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <!-- point to your JOSM directory -->
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}"/>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" destdir="build" debug="true" encoding="UTF-8">
-      <compilerarg value="-Xlint:deprecation"/>
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-
-  <target name="dist" depends="clean, compile">
-    <copy todir="build/images">
-      <fileset dir="images"/>
-    </copy>
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-
-        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.DirectUpload.UploadDataGuiPlugin" />
-	<attribute name="Plugin-Description" value="Uploads GPS traces to openstreetmap.org" />
-	<attribute name="Plugin-Author" value="Subhodip Biswas :subhodipbiswas@gmail.com" />
-	<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Mainversion" value="1180"/>
-	<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- clean target -->
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
-  </target>
-
-  <target name="test" depends="install">
-    <java jar="${josm}" fork="true">
-    </java>
-  </target>
-	
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+<!-- point to your JOSM directory -->
+    <property name="josm" location="../../core/dist/josm-custom.jar" />
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" destdir="build" debug="true" encoding="UTF-8">
+            <compilerarg value="-Xlint:deprecation"/>
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist" depends="clean, compile">
+        <copy todir="build/images">
+            <fileset dir="images"/>
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.DirectUpload.UploadDataGuiPlugin" />
+                <attribute name="Plugin-Description" value="Uploads GPS traces to openstreetmap.org" />
+                <attribute name="Plugin-Author" value="Subhodip Biswas :subhodipbiswas@gmail.com" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+            </manifest>
+        </jar>
+    </target>
+<!-- clean target -->
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
+    </target>
+    <target name="test" depends="install">
+        <java jar="${josm}" fork="true"></java>
+    </target>
 </project>
Index: applications/editors/josm/plugins/DirectUpload/nbproject/build-impl.xml
===================================================================
--- applications/editors/josm/plugins/DirectUpload/nbproject/build-impl.xml	(revision 12778)
+++ applications/editors/josm/plugins/DirectUpload/nbproject/build-impl.xml	(revision 12780)
@@ -22,7 +22,7 @@
 <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="DirectUpload-impl">
     <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
+    <!--
                 ======================
-                INITIALIZATION SECTION 
+                INITIALIZATION SECTION
                 ======================
             -->
Index: applications/editors/josm/plugins/agpifoj/README
===================================================================
--- applications/editors/josm/plugins/agpifoj/README	(revision 12778)
+++ applications/editors/josm/plugins/agpifoj/README	(revision 12780)
@@ -3,28 +3,28 @@
 FEATURES
 
-- Access by a new menu item in the 'File' menu. This menu loads pictures and 
+- Access by a new menu item in the 'File' menu. This menu loads pictures and
   makes a new layer from them in the map view.
-- Displays the images in a ToggleDialog (so it appears as a panel on the right 
-  of the screen and can be shown/hidden with a click on a button of the left 
+- Displays the images in a ToggleDialog (so it appears as a panel on the right
+  of the screen and can be shown/hidden with a click on a button of the left
   toolbar. It can be set in a separate window by clicking the sticky button)
 - Loads geotag data from exif or correlate pictures with GPS tracks.
-- Displays the pictures as a little camera icon in the map view (this improves 
+- Displays the pictures as a little camera icon in the map view (this improves
   the speed of loading large sets of pictures). The selected picture appears in
-  red. 
-- Easy zoom in/out of the image with the mouse wheel. Hability to move the 
-  image by clicking and/or dragging on it with mouse left button, or to select 
+  red.
+- Easy zoom in/out of the image with the mouse wheel. Hability to move the
+  image by clicking and/or dragging on it with mouse left button, or to select
   the part of the image to zoom in by dragging the right button.
-- Displays the altitude and speed of the photo when available from the GPS 
+- Displays the altitude and speed of the photo when available from the GPS
   track.
-- Hability to synchronize a same set of photos with many GPS tracks (choose 
-  item 'Correlate to GPX' in the contextual menu of the layer). If a  picture 
-  set and a GPS track were badly time-synchronized, just load again the same 
+- Hability to synchronize a same set of photos with many GPS tracks (choose
+  item 'Correlate to GPX' in the contextual menu of the layer). If a  picture
+  set and a GPS track were badly time-synchronized, just load again the same
   GPX track on the layer, by specifying a different offset and/or timezone.
 - Adds a viewport to the left toolbar : with all these plug-ins that add buttons
-  to that toolbar, some of them became inaccessible. This adds some little 
+  to that toolbar, some of them became inaccessible. This adds some little
   arrows on top and bottom of the toolbar.
 
-NOTE 
-For the user who used to use the 'Import images' option on GPS layers, the 
+NOTE
+For the user who used to use the 'Import images' option on GPS layers, the
 timezone is the opposite : it is greater than 0 when going to the east of
 Greenwich Meridian.
@@ -32,10 +32,10 @@
 INSTALL
 
-To install, put the agpifoj.jar in the JOSM plugin directory. Then in JOSM, 
-select the menu Edit / Preferences and the plugins tab. Check the agpifoj 
-plugin check-box, and restart JOSM. You'll seee the AgPiFoj menu item in 
+To install, put the agpifoj.jar in the JOSM plugin directory. Then in JOSM,
+select the menu Edit / Preferences and the plugins tab. Check the agpifoj
+plugin check-box, and restart JOSM. You'll seee the AgPiFoj menu item in
 the 'File' menu.
 
-BUILD 
+BUILD
 
 The source code is in the agpifoj.jar : unzip it.
@@ -48,7 +48,7 @@
 CONTRIBUTION
 
-I got inspiration and some code from the Geotagged plugin (by Rob Neild) 
-and the core JOSM source code (by Immanuel Scholz and others). This plugin is 
-delivered under the GPL licence terms. It also uses the jpeg metadata 
+I got inspiration and some code from the Geotagged plugin (by Rob Neild)
+and the core JOSM source code (by Immanuel Scholz and others). This plugin is
+delivered under the GPL licence terms. It also uses the jpeg metadata
 extraction code is from Drew Noakes (bundled with Josm).
 
Index: applications/editors/josm/plugins/agpifoj/build.xml
===================================================================
--- applications/editors/josm/plugins/agpifoj/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/agpifoj/build.xml	(revision 12780)
@@ -1,76 +1,65 @@
 <project name="agpifoj" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"   value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"             location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir" value="build"/>
-  <property name="plugin.dist.dir"  value="../../dist"/>
-  <property name="plugin.name"      value="${ant.project.name}"/>
-  <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="dist" depends="compile">
-    <copy todir="build">
-      <fileset dir=".">
-        <include name="CHANGELOG"/>
-        <include name="LICENSE"/>
-        <include name="README" />
-      </fileset>
-    </copy>
-
-    <!-- images -->
-    <copy todir="build/images">
-      <fileset dir="images" />
-    </copy>
-
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.agpifoj.AgpifojPlugin" />
-        <attribute name="Plugin-Description" value="An other geotag plugin for josm. Correlates pictures with GPS tracks, or import Exif geotagged pictures." />
-        <attribute name="Plugin-Early" value="false" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Mainversion" value="1180"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" destdir="build">
-      <compilerarg value="-Xlint:deprecation"/>
-    </javac>
-  </target>
-
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}" />
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"             location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist" depends="compile">
+        <copy todir="build">
+            <fileset dir=".">
+                <include name="CHANGELOG"/>
+                <include name="LICENSE"/>
+                <include name="README" />
+            </fileset>
+        </copy>
+<!-- images -->
+        <copy todir="build/images">
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.agpifoj.AgpifojPlugin" />
+                <attribute name="Plugin-Description" value="An other geotag plugin for josm. Correlates pictures with GPS tracks, or import Exif geotagged pictures." />
+                <attribute name="Plugin-Early" value="false" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" destdir="build">
+            <compilerarg value="-Xlint:deprecation"/>
+        </javac>
+    </target>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}" />
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/build.xml
===================================================================
--- applications/editors/josm/plugins/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/build.xml	(revision 12780)
@@ -1,83 +1,69 @@
 <project name="josm-plugins" default="build" basedir=".">
-
-
-  <target name="compile_josm">
-    <ant dir="../core" target="dist" />
-  </target>
-
-  <target name="compile" depends="compile_josm">
-  </target>
-
-  <target name="build" depends="dist">
-  </target>
-
-  <target name="dist" depends="compile">
-    <mkdir dir="../dist"/>
-    <ant	dir="agpifoj"		antfile="build.xml"	target="dist"/>
-    <ant	dir="colorscheme"	antfile="build.xml"	target="dist"/>
-    <ant	dir="DirectUpload"	antfile="build.xml"	target="dist"/>
-    <ant	dir="globalsat"		antfile="build.xml"	target="dist"/>
-    <ant	dir="imagewaypoint"	antfile="build.xml"	target="dist"/>
-    <ant	dir="lakewalker"	antfile="build.xml"	target="dist"/>
-    <ant	dir="livegps"		antfile="build.xml"	target="dist"/>
-    <ant	dir="measurement"	antfile="build.xml"	target="dist"/>
-    <ant	dir="namefinder"	antfile="build.xml"	target="dist"/>
-    <ant	dir="nearclick"		antfile="build.xml"	target="dist"/>
-    <ant	dir="openvisible"	antfile="build.xml"     target="dist"/>
-    <ant	dir="osmarender"	antfile="build.xml"	target="dist"/>
-    <ant	dir="plastic_laf"	antfile="build.xml"	target="dist"/>
-    <ant	dir="pluginmanager"	antfile="build.xml"	target="dist"/> 
-    <ant	dir="remotecontrol"	antfile="build.xml"	target="dist"/> 
-    <ant	dir="slippymap"		antfile="build.xml"	target="dist"/>
-    <ant	dir="slippy_map_chooser"	antfile="build.xml"	target="dist"/>
-    <ant	dir="surveyor"		antfile="build.xml"     target="dist"/>
-    <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="dist"/>
-    <ant	dir="tcxplugin"		antfile="build.xml"	target="dist"/>
-    <ant	dir="utilsplugin"	antfile="build.xml"	target="dist"/>
-    <ant	dir="validator"		antfile="build.xml"	target="dist"/>
-    <ant	dir="waypoints"		antfile="build.xml"	target="dist"/>
-    <ant	dir="wmsplugin"		antfile="build.xml"	target="dist"/>
-  </target>
-
-  <target name="build_defect" depends="compile">
-    <ant	dir="duplicateway"	antfile="build.xml"	target="dist"/>
-    <ant	dir="grid"		antfile="build.xml"	target="dist"/>
-    <ant	dir="navigator"		antfile="build.xml"	target="dist"/>
-  </target>
-
-  <target name="clean">
-    <ant	dir="agpifoj"		antfile="build.xml"	target="clean"/>
-    <ant	dir="colorscheme"	antfile="build.xml"	target="clean"/>
-    <ant	dir="duplicateway"	antfile="build.xml"	target="clean"/>
-    <ant	dir="globalsat"		antfile="build.xml"	target="clean"/>
-    <ant	dir="grid"		antfile="build.xml"	target="clean"/>
-    <ant	dir="imagewaypoint"	antfile="build.xml"	target="clean"/>
-    <ant	dir="lakewalker"	antfile="build.xml"	target="clean"/>
-    <ant	dir="livegps"		antfile="build.xml"	target="clean"/>
-    <ant	dir="measurement"	antfile="build.xml"	target="clean"/>
-    <ant	dir="namefinder"	antfile="build.xml"	target="clean"/>
-    <ant	dir="navigator"		antfile="build.xml"	target="clean"/>
-    <ant	dir="nearclick"		antfile="build.xml"	target="clean"/>
-    <ant	dir="openvisible"	antfile="build.xml"	target="clean"/>
-    <ant	dir="osmarender"	antfile="build.xml"	target="clean"/>
-    <ant	dir="plastic_laf"	antfile="build.xml"	target="clean"/>
-    <ant	dir="pluginmanager"	antfile="build.xml"	target="clean"/>
-    <ant	dir="remotecontrol"	antfile="build.xml"	target="clean"/> 
-    <ant	dir="slippymap"		antfile="build.xml"	target="clean"/>
-    <ant	dir="slippy_map_chooser"	antfile="build.xml"	target="clean"/>
-    <ant	dir="surveyor"		antfile="build.xml"	target="clean"/>
-    <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="clean"/>
-    <ant	dir="tcxplugin"		antfile="build.xml"	target="clean"/>
-    <ant	dir="utilsplugin"	antfile="build.xml"	target="clean"/>
-    <ant	dir="validator"		antfile="build.xml"	target="clean"/>
-    <ant	dir="waypoints"		antfile="build.xml"	target="clean"/>
-    <ant	dir="wmsplugin"		antfile="build.xml"	target="clean"/>
-  </target>
-
-  <target name="clean_install">
-  </target>
-
-  <target name="install" depends="dist">
-  </target>
-
+    <target name="compile_josm">
+        <ant dir="../core" target="dist" />
+    </target>
+    <target name="compile" depends="compile_josm"></target>
+    <target name="build" depends="dist"></target>
+    <target name="dist" depends="compile">
+        <mkdir dir="../dist"/>
+        <ant antfile="build.xml" target="dist" dir="agpifoj"/>
+        <ant antfile="build.xml" target="dist" dir="colorscheme"/>
+        <ant antfile="build.xml" target="dist" dir="DirectUpload"/>
+        <ant antfile="build.xml" target="dist" dir="globalsat"/>
+        <ant antfile="build.xml" target="dist" dir="imagewaypoint"/>
+        <ant antfile="build.xml" target="dist" dir="lakewalker"/>
+        <ant antfile="build.xml" target="dist" dir="livegps"/>
+        <ant antfile="build.xml" target="dist" dir="measurement"/>
+        <ant antfile="build.xml" target="dist" dir="namefinder"/>
+        <ant antfile="build.xml" target="dist" dir="nearclick"/>
+        <ant antfile="build.xml" target="dist" dir="openvisible"/>
+        <ant antfile="build.xml" target="dist" dir="osmarender"/>
+        <ant antfile="build.xml" target="dist" dir="plastic_laf"/>
+        <ant antfile="build.xml" target="dist" dir="pluginmanager"/>
+        <ant antfile="build.xml" target="dist" dir="remotecontrol"/>
+        <ant antfile="build.xml" target="dist" dir="slippymap"/>
+        <ant antfile="build.xml" target="dist" dir="slippy_map_chooser"/>
+        <ant antfile="build.xml" target="dist" dir="surveyor"/>
+        <ant antfile="build.xml" target="dist" dir="tagging-preset-tester"/>
+        <ant antfile="build.xml" target="dist" dir="tcxplugin"/>
+        <ant antfile="build.xml" target="dist" dir="utilsplugin"/>
+        <ant antfile="build.xml" target="dist" dir="validator"/>
+        <ant antfile="build.xml" target="dist" dir="waypoints"/>
+        <ant antfile="build.xml" target="dist" dir="wmsplugin"/>
+    </target>
+    <target name="build_defect" depends="compile">
+        <ant antfile="build.xml" target="dist" dir="duplicateway"/>
+        <ant antfile="build.xml" target="dist" dir="grid"/>
+        <ant antfile="build.xml" target="dist" dir="navigator"/>
+    </target>
+    <target name="clean">
+        <ant antfile="build.xml" target="clean" dir="agpifoj"/>
+        <ant antfile="build.xml" target="clean" dir="colorscheme"/>
+        <ant antfile="build.xml" target="clean" dir="duplicateway"/>
+        <ant antfile="build.xml" target="clean" dir="globalsat"/>
+        <ant antfile="build.xml" target="clean" dir="grid"/>
+        <ant antfile="build.xml" target="clean" dir="imagewaypoint"/>
+        <ant antfile="build.xml" target="clean" dir="lakewalker"/>
+        <ant antfile="build.xml" target="clean" dir="livegps"/>
+        <ant antfile="build.xml" target="clean" dir="measurement"/>
+        <ant antfile="build.xml" target="clean" dir="namefinder"/>
+        <ant antfile="build.xml" target="clean" dir="navigator"/>
+        <ant antfile="build.xml" target="clean" dir="nearclick"/>
+        <ant antfile="build.xml" target="clean" dir="openvisible"/>
+        <ant antfile="build.xml" target="clean" dir="osmarender"/>
+        <ant antfile="build.xml" target="clean" dir="plastic_laf"/>
+        <ant antfile="build.xml" target="clean" dir="pluginmanager"/>
+        <ant antfile="build.xml" target="clean" dir="remotecontrol"/>
+        <ant antfile="build.xml" target="clean" dir="slippymap"/>
+        <ant antfile="build.xml" target="clean" dir="slippy_map_chooser"/>
+        <ant antfile="build.xml" target="clean" dir="surveyor"/>
+        <ant antfile="build.xml" target="clean" dir="tagging-preset-tester"/>
+        <ant antfile="build.xml" target="clean" dir="tcxplugin"/>
+        <ant antfile="build.xml" target="clean" dir="utilsplugin"/>
+        <ant antfile="build.xml" target="clean" dir="validator"/>
+        <ant antfile="build.xml" target="clean" dir="waypoints"/>
+        <ant antfile="build.xml" target="clean" dir="wmsplugin"/>
+    </target>
+    <target name="clean_install"></target>
+    <target name="install" depends="dist"></target>
 </project>
Index: applications/editors/josm/plugins/colorscheme/build.xml
===================================================================
--- applications/editors/josm/plugins/colorscheme/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/colorscheme/build.xml	(revision 12780)
@@ -1,89 +1,78 @@
 <project name="colorscheme" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-  
-  <property name="plugin.description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but true :-) (V${plugin.version})."/>
-  <property name="plugin.class" value="at.dallermassl.josm.plugin.colorscheme.ColorSchemePlugin"/>
-
-  <!-- update site meta data -->
-  <property name="plugin.site.file" value="josm-site.xml"/>
-  <property name="plugin.site.description" value="Josm's ColorScheme Plugin Update Site"/>
-  <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/colorscheme/"/>
-  <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/colorscheme/"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-  <target name="dist" depends="compile, site">
-    <echo message="creating ${plugin.jar}"/>
-    <!-- images -->
-    <!-- 
-	 <copy todir="${plugin.build.dir}/images">
-	   <fileset dir="src/images" />
-	 </copy>
-	 -->
-    <!-- copy configuration xml files -->
-    <copy todir="${plugin.build.dir}">
-      <fileset dir="src"> 
-        <include name="*.xml"/>
-      </fileset>
-    </copy>
-    
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <!-- create jar file -->
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-        <attribute name="Plugin-Class" value="${plugin.class}" />
-        <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Mainversion" value="1180"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <mkdir dir="${plugin.build.dir}"/>
-    <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-      <classpath>
-        <pathelement path="${josm.build.dir}/build"/>
-        <fileset dir="${josm.build.dir}/lib">
-          <include name="**/*.jar"/>
-        </fileset>
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
-  </target>
-
-  <target name="init">
-    <echo>java version: ${java.version}</echo>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.site.file}" />
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <!-- write site description for the given plugin so josm will accept it -->
-  <target name="site">
-    <echo message="creating site description in ${plugin.site.file}"/>
-    <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="plugin.description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but true :-) (V${plugin.version})."/>
+    <property name="plugin.class" value="at.dallermassl.josm.plugin.colorscheme.ColorSchemePlugin"/>
+<!-- update site meta data -->
+    <property name="plugin.site.file" value="josm-site.xml"/>
+    <property name="plugin.site.description" value="Josm's ColorScheme Plugin Update Site"/>
+    <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/colorscheme/"/>
+    <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/colorscheme/"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist" depends="compile, site">
+        <echo message="creating ${plugin.jar}"/>
+<!-- images -->
+<!--
+     <copy todir="${plugin.build.dir}/images">
+       <fileset dir="src/images" />
+     </copy>
+     -->
+<!-- copy configuration xml files -->
+        <copy todir="${plugin.build.dir}">
+            <fileset dir="src">
+                <include name="*.xml"/>
+            </fileset>
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+<!-- create jar file -->
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="${plugin.class}" />
+                <attribute name="Plugin-Description" value="${plugin.description}" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <mkdir dir="${plugin.build.dir}"/>
+        <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+            <classpath>
+                <pathelement path="${josm.build.dir}/build"/>
+                <fileset dir="${josm.build.dir}/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+            </classpath>
+        </javac>
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
+    </target>
+    <target name="init">
+        <echo>java version: ${java.version}</echo>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.site.file}" />
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+<!-- write site description for the given plugin so josm will accept it -->
+    <target name="site">
+        <echo message="creating site description in ${plugin.site.file}"/>
+        <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
   &lt;plugins>
   &lt;plugin id="${ant.project.name}" version="${plugin.version}">
@@ -94,10 +83,9 @@
   &lt;/plugins>
 </echo>
-</target>
-
+    </target>
 <!-- write site description for the given plugin (not implemented in JOSM as full version yet!) -->
-<target name="site-full-donotuse">
-  <echo message="creating site description in ${plugin.site.file}"/>
-  <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
+    <target name="site-full-donotuse">
+        <echo message="creating site description in ${plugin.site.file}"/>
+        <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
     &lt;site version="1.0">
     &lt;!-- meta data of site -->
@@ -120,15 +108,13 @@
 &lt;/site>
 </echo>
-</target>
-
+    </target>
 <!-- upload the site description and the jar file via ssh -->
-<target name="upload" depends="dist,site">
-  <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
-  <exec executable="scp">
-    <arg value="${plugin.jar}"/>
-    <arg value="${plugin.site.file}"/>
-    <arg value="${plugin.site.upload.target}"/>
-  </exec>
-</target>
-
+    <target name="upload" depends="dist,site">
+        <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
+        <exec executable="scp">
+            <arg value="${plugin.jar}"/>
+            <arg value="${plugin.site.file}"/>
+            <arg value="${plugin.site.upload.target}"/>
+        </exec>
+    </target>
 </project>
Index: applications/editors/josm/plugins/duplicateway/build.xml
===================================================================
--- applications/editors/josm/plugins/duplicateway/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/duplicateway/build.xml	(revision 12780)
@@ -1,58 +1,49 @@
 <project name="Duplicate-Way" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}"/>
-  </target>
-
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <mkdir dir="build"></mkdir>
-    <mkdir dir="${plugin.build.dir}/images"></mkdir>
-    <copy todir="build">
-      <fileset dir="${plugin.build.dir}" casesensitive="yes">
-    	<filename name="**/*.class"/>
-      </fileset>
-    </copy>
-    <copy todir="${plugin.build.dir}/images">
-      <fileset dir="images" casesensitive="yes">
-    	<filename name="**/*.png"/>
-      </fileset>
-    </copy>
-    <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-  <target name="dist" depends="compile">
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.duplicateway.DuplicateWayPlugin" />
-        <attribute name="Plugin-Description" value="Duplicate Ways with an offset" />
-        <attribute name="Plugin-Version" value="0.1"/>
-        <attribute name="Author" value="Brent Easton &lt;b.easton@uws.edu.au>"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
-  </target>
-
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="build"></mkdir>
+        <mkdir dir="${plugin.build.dir}/images"></mkdir>
+        <copy todir="build">
+            <fileset dir="${plugin.build.dir}" casesensitive="yes">
+                <filename name="**/*.class"/>
+            </fileset>
+        </copy>
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images" casesensitive="yes">
+                <filename name="**/*.png"/>
+            </fileset>
+        </copy>
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist" depends="compile">
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.duplicateway.DuplicateWayPlugin" />
+                <attribute name="Plugin-Description" value="Duplicate Ways with an offset" />
+                <attribute name="Plugin-Version" value="0.1"/>
+                <attribute name="Author" value="Brent Easton &lt;b.easton@uws.edu.au>"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/globalsat/build.xml
===================================================================
--- applications/editors/josm/plugins/globalsat/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/globalsat/build.xml	(revision 12780)
@@ -1,77 +1,66 @@
 <project name="globalsat" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"   value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"             location="../../core/dist/josm-custom.jar" />
-  <property name="RXTX"             location="./libs/RXTXcomm.jar" />
-  <property name="plugin.build.dir" value="build"/>
-  <property name="plugin.dist.dir"  value="../../dist"/>
-  <property name="plugin.name"      value="${ant.project.name}"/>
-  <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <path id="classpath">
-    <fileset id="RXTX" file="${RXTX}"/>
-    <fileset file="${josm}"/>
-  </path>
-
-  <target name="dist" depends="compile">
-    <unjar dest="build">
-      <fileset refid="RXTX" />
-    </unjar>
-    <!-- images -->
-    <copy todir="build/images">
-      <fileset dir="images" />
-    </copy>
-
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.globalsat.GlobalsatPlugin" />
-        <attribute name="Plugin-Description" value="Provide a dialog to read stored tracks from a Globalsat DG100 datalogger into a GPX-layer. Depends on installed rxtx library." />
-        <attribute name="Plugin-Author" value="ramack@raphael-mack.de" />
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Mainversion" value="1180"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpathref="classpath" destdir="build">
-      <compilerarg value="-Xlint:deprecation"/>
-    </javac>
-  </target>
-
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}" />
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"             location="../../core/dist/josm-custom.jar" />
+    <property name="RXTX"             location="./libs/RXTXcomm.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <path id="classpath">
+        <fileset id="RXTX" file="${RXTX}"/>
+        <fileset file="${josm}"/>
+    </path>
+    <target name="dist" depends="compile">
+        <unjar dest="build">
+            <fileset refid="RXTX" />
+        </unjar>
+<!-- images -->
+        <copy todir="build/images">
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.globalsat.GlobalsatPlugin" />
+                <attribute name="Plugin-Description" value="Provide a dialog to read stored tracks from a Globalsat DG100 datalogger into a GPX-layer. Depends on installed rxtx library." />
+                <attribute name="Plugin-Author" value="ramack@raphael-mack.de" />
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1180"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpathref="classpath" destdir="build">
+            <compilerarg value="-Xlint:deprecation"/>
+        </javac>
+    </target>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}" />
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/grid/build.xml
===================================================================
--- applications/editors/josm/plugins/grid/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/grid/build.xml	(revision 12780)
@@ -1,52 +1,41 @@
 <project name="grid" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-  
-  
-  <!-- point to your JOSM directory -->
-  <property name="josm" location="${josm.build.dir}/dist/josm-custom.jar" />
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="init">
-    <mkdir dir="build"></mkdir>
-    <mkdir dir="dist"></mkdir>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-  <target name="dist" depends="compile">
-    <copy todir="build/images" >
-      <fileset dir="images" />
-    </copy>
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-	<attribute name="Plugin-Class" value="grid.GridPlugin" />
-	<attribute name="Plugin-Description" value="Provide a background layer that displays a map grid" />
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
-  </target>
-
-
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+<!-- point to your JOSM directory -->
+    <property name="josm" location="${josm.build.dir}/dist/josm-custom.jar" />
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="build"></mkdir>
+        <mkdir dir="dist"></mkdir>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist" depends="compile">
+        <copy todir="build/images" >
+            <fileset dir="images" />
+        </copy>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="grid.GridPlugin" />
+                <attribute name="Plugin-Description" value="Provide a background layer that displays a map grid" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 12780)
@@ -1,55 +1,48 @@
 <project name="imagewaypoint" default="dist" basedir=".">
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-	<target name="dist" depends="compile">
-
-		<copy todir="build/images">
-			<fileset dir="images" />
-		</copy>
-
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-
-		<delete file="${plugin.jar}"/>
-		<jar destfile="${plugin.jar}" basedir="build">
-			<manifest>
-				<attribute name="Plugin-Class" value="org.insignificant.josm.plugins.imagewaypoint.ImageWayPointPlugin" />
-				<attribute name="Plugin-Description" value="An other geotag plugin for josm. Correlates pictures with GPS tracks if the image name is sorted in the GPX trkpt tag." />
-				<attribute name="Plugin-Early" value="false" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Mainversion" value="1180" />
-			</manifest>
-		</jar>
-	</target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
-      <compilerarg value="-Xlint:deprecation"/>
-      <compilerarg value="-Xlint:unchecked"/>
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-	<target name="init">
-		<mkdir dir="build" />
-	</target>
-
-	<target name="clean">
-		<delete dir="build" />
-	</target>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <target name="dist" depends="compile">
+        <copy todir="build/images">
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <delete file="${plugin.jar}"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.insignificant.josm.plugins.imagewaypoint.ImageWayPointPlugin" />
+                <attribute name="Plugin-Description" value="An other geotag plugin for josm. Correlates pictures with GPS tracks if the image name is sorted in the GPX trkpt tag." />
+                <attribute name="Plugin-Early" value="false" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Mainversion" value="1180" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="init">
+        <mkdir dir="build" />
+    </target>
+    <target name="clean">
+        <delete dir="build" />
+    </target>
 </project>
Index: applications/editors/josm/plugins/lakewalker/build.xml
===================================================================
--- applications/editors/josm/plugins/lakewalker/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/lakewalker/build.xml	(revision 12780)
@@ -1,81 +1,71 @@
 <project name="lakewalker" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-  
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}"/>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <mkdir dir="build"></mkdir>
-    <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
-	  <include name="**/*.java" />
-	</javac>
-    <mkdir dir="build/images"></mkdir>
-    <copy todir="build">
-      <fileset dir="${plugin.build.dir}" casesensitive="yes">
-    	<filename name="**/*.class"/>
-      </fileset>
-    </copy>
-    <copy todir="build/images">
-      <fileset dir="images" casesensitive="yes">
-    	<filename name="**/*.png"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="dist" depends="compile">
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerPlugin" />
-        <attribute name="Plugin-Description" value="Interface to Lakewalker module" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Mainversion" value="1180"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Author" value="Brent Easton &lt;b.easton@uws.edu.au>, Jason Reid &lt;jrreid@ucalgary.ca>"/>
-        <attribute name="Main-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerApp"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  	<mkdir dir="${josm.plugins.dir}/Lakewalker/IR1"></mkdir>
-	<mkdir dir="${josm.plugins.dir}/Lakewalker/IR2"></mkdir>
-	<mkdir dir="${josm.plugins.dir}/Lakewalker/IR3"></mkdir>
-  </target>
-
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="josm" location="../../core/dist/josm-custom.jar" />
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="build"></mkdir>
+        <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
+            <include name="**/*.java" />
+        </javac>
+        <mkdir dir="build/images"></mkdir>
+        <copy todir="build">
+            <fileset dir="${plugin.build.dir}" casesensitive="yes">
+                <filename name="**/*.class"/>
+            </fileset>
+        </copy>
+        <copy todir="build/images">
+            <fileset dir="images" casesensitive="yes">
+                <filename name="**/*.png"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="dist" depends="compile">
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerPlugin" />
+                <attribute name="Plugin-Description" value="Interface to Lakewalker module" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Author" value="Brent Easton &lt;b.easton@uws.edu.au>, Jason Reid &lt;jrreid@ucalgary.ca>"/>
+                <attribute name="Main-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerApp"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+        <mkdir dir="${josm.plugins.dir}/Lakewalker/IR1"></mkdir>
+        <mkdir dir="${josm.plugins.dir}/Lakewalker/IR2"></mkdir>
+        <mkdir dir="${josm.plugins.dir}/Lakewalker/IR3"></mkdir>
+    </target>
 </project>
Index: applications/editors/josm/plugins/livegps/README
===================================================================
--- applications/editors/josm/plugins/livegps/README	(revision 12778)
+++ applications/editors/josm/plugins/livegps/README	(revision 12780)
@@ -14,4 +14,4 @@
   running the gpsd
 
-Some problems exist! 
+Some problems exist!
 
Index: applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- applications/editors/josm/plugins/livegps/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/livegps/build.xml	(revision 12780)
@@ -1,92 +1,80 @@
 <project name="livegps" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <!--<property name="josm.build.dir"	value="../../JOSM/"/> -->
-  <property name="josm.build.dir"	value="../../core/"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-  
-  <property name="plugin.jar" value="../../dist/${plugin.name}.jar"/>
-  <property name="livegpsplugin.jar" value="${josm.home.dir}/plugins/livegps.jar"/>
-  
-  <!-- plugin meta data (enter new version number if anything changed!) -->
-  <property name="plugin.description" value="Allow live GPS feed from a gpsd server (V${plugin.version})."/>
-  <property name="plugin.stage" value="50"/>
-  <property name="plugin.class" value="livegps.LiveGpsPlugin"/>
-  
-  <!-- update site meta data -->
-  <property name="plugin.site.file" value="josm-site.xml"/>
-  <property name="plugin.site.description" value="Josm's LiveGps Update Site"/>
-  <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/livegps/"/>
-  <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/livegps/"/>
-  
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}"/>
-  </target>
-
-  <target name="dist" depends="compile">
-    <!-- images -->
-    <copy todir="${plugin.build.dir}/images">
-      <fileset dir="images" />
-    </copy>  	
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-
-    <!-- create jar file -->
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-        <attribute name="Plugin-Class" value="${plugin.class}" />
-        <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Mainversion" value="1180" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <!--attribute name="Plugin-Dependencies" value="org.eigenheimstrasse.josm" /-->
-        <attribute name="Plugin-Stage" value="${plugin.stage}" />
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <javac srcdir="livegps" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-      <compilerarg value="-Xlint:deprecation"/>
-      <classpath>
-        <pathelement path="${josm.build.dir}/build"/>
-        <fileset dir="${josm.build.dir}/lib">
-          <include name="../core/build/josm.jar"/>
-          <include name="**/*.jar"/>
-        </fileset>
-        <pathelement location="${plugin.jar}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  	<copy file="liveGPS.conf" todir="${josm.plugins.dir}/livegps/" />
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+<!--<property name="josm.build.dir"   value="../../JOSM/"/> -->
+    <property name="josm.build.dir"   value="../../core/"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="plugin.jar" value="../../dist/${plugin.name}.jar"/>
+    <property name="livegpsplugin.jar" value="${josm.home.dir}/plugins/livegps.jar"/>
+<!-- plugin meta data (enter new version number if anything changed!) -->
+    <property name="plugin.description" value="Allow live GPS feed from a gpsd server (V${plugin.version})."/>
+    <property name="plugin.stage" value="50"/>
+    <property name="plugin.class" value="livegps.LiveGpsPlugin"/>
+<!-- update site meta data -->
+    <property name="plugin.site.file" value="josm-site.xml"/>
+    <property name="plugin.site.description" value="Josm's LiveGps Update Site"/>
+    <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/livegps/"/>
+    <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/livegps/"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <target name="dist" depends="compile">
+<!-- images -->
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+<!-- create jar file -->
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="${plugin.class}" />
+                <attribute name="Plugin-Description" value="${plugin.description}" />
+                <attribute name="Plugin-Mainversion" value="1180" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+<!--attribute name="Plugin-Dependencies" value="org.eigenheimstrasse.josm" /-->
+                <attribute name="Plugin-Stage" value="${plugin.stage}" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <javac srcdir="livegps" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+            <compilerarg value="-Xlint:deprecation"/>
+            <classpath>
+                <pathelement path="${josm.build.dir}/build"/>
+                <fileset dir="${josm.build.dir}/lib">
+                    <include name="../core/build/josm.jar"/>
+                    <include name="**/*.jar"/>
+                </fileset>
+                <pathelement location="${plugin.jar}"/>
+            </classpath>
+        </javac>
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+        <copy file="liveGPS.conf" todir="${josm.plugins.dir}/livegps/" />
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
 </project>
Index: applications/editors/josm/plugins/measurement/build.xml
===================================================================
--- applications/editors/josm/plugins/measurement/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/measurement/build.xml	(revision 12780)
@@ -1,68 +1,58 @@
 <project name="measurement" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"   value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"             location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir" value="build"/>
-  <property name="plugin.dist.dir"  value="../../dist"/>
-  <property name="plugin.name"      value="${ant.project.name}"/>
-  <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="dist" depends="compile">
-    <!-- images -->
-    <copy todir="build/images">
-      <fileset dir="images" />
-    </copy>
-
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin" />
-        <attribute name="Plugin-Description" value="Provide a measurement dialog and a layer to measure length and angle of segments and create measurement paths (which also can be imported from a gps layer)" />
-        <attribute name="Plugin-Author" value="mail@raphael-mack.de" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Mainversion" value="1180" />
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" destdir="build">
-      <compilerarg value="-Xlint:deprecation"/>
-    </javac>
-  </target>
-
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}" />
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"             location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist" depends="compile">
+<!-- images -->
+        <copy todir="build/images">
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin" />
+                <attribute name="Plugin-Description" value="Provide a measurement dialog and a layer to measure length and angle of segments and create measurement paths (which also can be imported from a gps layer)" />
+                <attribute name="Plugin-Author" value="mail@raphael-mack.de" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Mainversion" value="1180" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" destdir="build">
+            <compilerarg value="-Xlint:deprecation"/>
+        </javac>
+    </target>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}" />
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/namefinder/README
===================================================================
--- applications/editors/josm/plugins/namefinder/README	(revision 12778)
+++ applications/editors/josm/plugins/namefinder/README	(revision 12780)
@@ -1,4 +1,4 @@
 A very simple implementation of a Name Finder that will
-add a "place" tab to the download dialog and connect to 
+add a "place" tab to the download dialog and connect to
 David Earl's name finder service to get results.
 
Index: applications/editors/josm/plugins/namefinder/build.xml
===================================================================
--- applications/editors/josm/plugins/namefinder/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/namefinder/build.xml	(revision 12780)
@@ -1,66 +1,57 @@
 <project name="namefinder" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-  <!-- init target -->
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}" />
-  </target>
-  
-  <!-- clean target -->
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-  
-  <!-- compile target -->
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="namefinder" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-      <classpath>
-        <pathelement path="${josm.build.dir}/build"/>
-        <pathelement path="${josm.build.dir}/src"/>
-        <fileset dir="${josm.build.dir}/lib">
-          <include name="**/*.jar"/>
-        </fileset>
-      </classpath>
-    </javac>
-  </target>
-  
-  <!-- dist target - create jar file -->
-  <target name="dist" depends="compile">
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-        <attribute name="Plugin-Class" value="namefinder.NameFinderPlugin" />
-        <attribute name="Plugin-Description" value="Allows selection of download areas by name, using an external service" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Mainversion" value="1180" />
-      </manifest>
-    </jar>
-  </target>
-  
-  <!-- install target - copy jar file to plugin destination -->
-  <target name="install" depends="dist">
-    <copy file="../../dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" />
-  </target>
-  
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+<!-- init target -->
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}" />
+    </target>
+<!-- clean target -->
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+<!-- compile target -->
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="namefinder" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+            <classpath>
+                <pathelement path="${josm.build.dir}/build"/>
+                <pathelement path="${josm.build.dir}/src"/>
+                <fileset dir="${josm.build.dir}/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+            </classpath>
+        </javac>
+    </target>
+<!-- dist target - create jar file -->
+    <target name="dist" depends="compile">
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="namefinder.NameFinderPlugin" />
+                <attribute name="Plugin-Description" value="Allows selection of download areas by name, using an external service" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Mainversion" value="1180" />
+            </manifest>
+        </jar>
+    </target>
+<!-- install target - copy jar file to plugin destination -->
+    <target name="install" depends="dist">
+        <copy file="../../dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" />
+    </target>
 </project>
-
Index: applications/editors/josm/plugins/navigator/build.xml
===================================================================
--- applications/editors/josm/plugins/navigator/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/navigator/build.xml	(revision 12780)
@@ -1,93 +1,80 @@
 <project name="navigator" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-  
-  <!-- plugin meta data (enter new version number if anything changed!) -->
-  <property name="plugin.version" value="0.3.1"/>
-  <property name="plugin.description" value="Provides navigation/autorouting functionality (V${plugin.version})."/>
-  <property name="plugin.stage" value="50"/>
-  <property name="plugin.class" value="at.dallermassl.josm.plugin.navigator.NavigatorPlugin"/>
-  
-  <!-- update site meta data -->
-  <property name="plugin.site.file" value="josm-site.xml"/>
-  <property name="plugin.site.description" value="Josm's Surveyor Update Site"/>
-  <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/${ant.project.name}/"/>
-  <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/${ant.project.name}/"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-
-  <target name="dist" depends="compile,site">
-    <!-- images -->
-    <copy todir="${plugin.build.dir}/images">
-      <fileset dir="src/images" />
-    </copy>
-    <!-- copy configuration xml files 
-	 <copy todir="${plugin.build.dir}">
-	   <fileset dir="src"> 
-	     <include name="*.xml"/>
-  	   </fileset>
-	 </copy>
-	 -->
-    
-    <!-- create jar file -->
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-        <attribute name="Plugin-Class" value="${plugin.class}" />
-        <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Version" value="${plugin.version}" />
-        <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5" />
-        <attribute name="Plugin-Stage" value="${plugin.stage}" />
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <mkdir dir="${plugin.build.dir}"/>
-
-    <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-      <classpath>
-	<pathelement path="${josm.build.dir}/build"/>
-	<fileset dir="${josm.build.dir}/lib">
-	  <include name="**/*.jar"/>
-	</fileset>
-        <fileset dir="lib">
-          <include name="**/*.jar"/>
-        </fileset>
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
-    <copy todir="${josm.home.dir}/plugins">
-      <fileset dir="lib">
-        <include name="**/*.jar"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="init">
-    <echo>java version: ${java.version}</echo>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete dir="${plugin.site.file}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <!-- write site description for the given plugin so josm will accept it -->
-  <target name="site">
-    <echo message="creating site description in ${plugin.site.file}"/>
-    <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+<!-- plugin meta data (enter new version number if anything changed!) -->
+    <property name="plugin.version" value="0.3.1"/>
+    <property name="plugin.description" value="Provides navigation/autorouting functionality (V${plugin.version})."/>
+    <property name="plugin.stage" value="50"/>
+    <property name="plugin.class" value="at.dallermassl.josm.plugin.navigator.NavigatorPlugin"/>
+<!-- update site meta data -->
+    <property name="plugin.site.file" value="josm-site.xml"/>
+    <property name="plugin.site.description" value="Josm's Surveyor Update Site"/>
+    <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/${ant.project.name}/"/>
+    <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/${ant.project.name}/"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist" depends="compile,site">
+<!-- images -->
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="src/images" />
+        </copy>
+<!-- copy configuration xml files
+     <copy todir="${plugin.build.dir}">
+       <fileset dir="src">
+         <include name="*.xml"/>
+       </fileset>
+     </copy>
+     -->
+<!-- create jar file -->
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="${plugin.class}" />
+                <attribute name="Plugin-Description" value="${plugin.description}" />
+                <attribute name="Plugin-Version" value="${plugin.version}" />
+                <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5" />
+                <attribute name="Plugin-Stage" value="${plugin.stage}" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="${plugin.build.dir}"/>
+        <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+            <classpath>
+                <pathelement path="${josm.build.dir}/build"/>
+                <fileset dir="${josm.build.dir}/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+                <fileset dir="lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+            </classpath>
+        </javac>
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
+        <copy todir="${josm.home.dir}/plugins">
+            <fileset dir="lib">
+                <include name="**/*.jar"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="init">
+        <echo>java version: ${java.version}</echo>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete dir="${plugin.site.file}" />
+        <delete file="${plugin.jar}" />
+    </target>
+<!-- write site description for the given plugin so josm will accept it -->
+    <target name="site">
+        <echo message="creating site description in ${plugin.site.file}"/>
+        <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
   &lt;plugins>
   &lt;plugin id="${ant.project.name}" version="${plugin.version}">
@@ -98,10 +85,9 @@
   &lt;/plugins>
 </echo>
-</target>
-
+    </target>
 <!-- write site description for the given plugin (not implemented in JOSM as full version yet!) -->
-<target name="site-full-donotuse">
-  <echo message="creating site description in ${plugin.site.file}"/>
-  <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
+    <target name="site-full-donotuse">
+        <echo message="creating site description in ${plugin.site.file}"/>
+        <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
     &lt;site version="1.0">
     &lt;!-- meta data of site -->
@@ -124,16 +110,13 @@
 &lt;/site>
 </echo>
-</target>
-
-
+    </target>
 <!-- upload the site description and the jar file via ssh -->
-<target name="upload" depends="dist,site">
-  <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
-  <exec executable="scp">
-    <arg value="${plugin.jar}"/>
-    <arg value="${plugin.site.file}"/>
-    <arg value="${plugin.site.upload.target}"/>
-  </exec>
-</target>
-
+    <target name="upload" depends="dist,site">
+        <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
+        <exec executable="scp">
+            <arg value="${plugin.jar}"/>
+            <arg value="${plugin.site.file}"/>
+            <arg value="${plugin.site.upload.target}"/>
+        </exec>
+    </target>
 </project>
Index: applications/editors/josm/plugins/nearclick/build.xml
===================================================================
--- applications/editors/josm/plugins/nearclick/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/nearclick/build.xml	(revision 12780)
@@ -1,74 +1,61 @@
 <project name="nearclick" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <!-- There's no josm.jar in the svn, so point "josm" to a local copy of your JOSM binary -->
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
-  <!--<property name="josm" location="../josm/josm-latest.jar" ></property>-->
-  
-  <!-- target directory to place the plugin in -->
-  <!-- Windows has a different home directory scheme then unix/linux -->
-  <!-- I don't know an automatic way to find it with ant :-(, if you know, please fix -->
-  <!--<property name="plugins" location="${user.home}/.josm/plugins" ></property>-->
-  <property name="plugins" location="${user.home}/Application Data/JOSM/plugins" ></property>
-
-  <!-- you should not need to modify anything below this! -->
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-
-  <target name="init">
-    <mkdir dir="build"></mkdir>
-    <mkdir dir="dist"></mkdir>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" target="1.5" classpath="${josm}" destdir="build" debug="true">
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-  <target name="dist" depends="compile">
-    <!-- define the version of the jar file -->
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-	<!-- delete intermediate file -->
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-	<attribute name="Plugin-Class" value="nearclick.NearClickPlugin" />
-	<attribute name="Plugin-Description" value="Simulates a click when you do a small and short drag. This is usefull for tablet pens, when you have problems just clicking the tablet without the mouse moving (general Java - tablet problem)." />
-	<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Mainversion" value="1180" />
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-  
-  <target name="clean_install">
-    <delete file="${plugins}/nearclick.jar" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${plugins}"/>
-  </target>
-
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+<!-- There's no josm.jar in the svn, so point "josm" to a local copy of your JOSM binary -->
+    <property name="josm" location="../../core/dist/josm-custom.jar" />
+<!--<property name="josm" location="../josm/josm-latest.jar" ></property>-->
+<!-- target directory to place the plugin in -->
+<!-- Windows has a different home directory scheme then unix/linux -->
+<!-- I don't know an automatic way to find it with ant :-(, if you know, please fix -->
+<!--<property name="plugins" location="${user.home}/.josm/plugins" ></property>-->
+    <property name="plugins" location="${user.home}/Application Data/JOSM/plugins" ></property>
+<!-- you should not need to modify anything below this! -->
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="build"></mkdir>
+        <mkdir dir="dist"></mkdir>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" target="1.5" classpath="${josm}" destdir="build" debug="true">
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist" depends="compile">
+<!-- define the version of the jar file -->
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+<!-- delete intermediate file -->
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="nearclick.NearClickPlugin" />
+                <attribute name="Plugin-Description" value="Simulates a click when you do a small and short drag. This is usefull for tablet pens, when you have problems just clicking the tablet without the mouse moving (general Java - tablet problem)." />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Mainversion" value="1180" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="clean_install">
+        <delete file="${plugins}/nearclick.jar" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${plugins}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/openlayers/README
===================================================================
--- applications/editors/josm/plugins/openlayers/README	(revision 12778)
+++ applications/editors/josm/plugins/openlayers/README	(revision 12780)
@@ -3,10 +3,10 @@
 This plugin is a proof of concept, and so it is at a very first stage.
 
-What it does: 
+What it does:
     * It downloads a Yahoo satellite background image of the current view port (well, sort of)
 
 What it does NOT:
     * Everything else :-)
- 
+
 What needs to be done:
     * Fix positions
Index: applications/editors/josm/plugins/openlayers/build.xml
===================================================================
--- applications/editors/josm/plugins/openlayers/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/openlayers/build.xml	(revision 12780)
@@ -1,83 +1,72 @@
 <project name="openlayers" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			    location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <!-- All jar files needed -->
-  <fileset id="required_libs" dir="lib">
-    <include name="cobra.jar"/>
-    <include name="js.jar"/>
-    <include name="ehcache-1.4.1.jar"/>
-    <include name="backport-util-concurrent-3.0.jar"/> <!-- needed by ehcache -->
-    <include name="commons-logging-1.0.4.jar"/> <!--needed by ehcache -->
-  </fileset>
-
-  <target name="init">
-    <mkdir dir="build"></mkdir>
-    <mkdir dir="dist"></mkdir>
-  </target>
-	
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" debug="true" destdir="build">
-        <classpath>
-            <path path="../../core/dist/josm-custom.jar"/>
-            <fileset refid="required_libs"/>
-        </classpath>
-    </javac>
-  </target>
-	
-  <target name="dist" depends="compile">
-	<!-- jars -->
-  	<!-- TODO: instead of adding library code to the plugin jar, JOSM should 
-  	     have some kind of library dir loaded in the classpath -->
-	<unjar dest="build">
-		<fileset refid="required_libs" />
-	</unjar>
-
-  	<!-- images -->
-    <copy todir="build/images">
-      <fileset dir="images" />
-    </copy>
-  	
-  	<!--resources -->
-    <copy todir="build/resources">
-      <fileset dir="resources" />
-    </copy>
-    
-    <!-- create josm-custom.jar -->
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.openLayers.OpenLayersPlugin" />
-        <attribute name="Plugin-Description" value="Displays an OpenLayers background image" />
-        <attribute name="Class-Path" value="cobra.jar js.jar ehcache-1.4.1.jar commons-logging-1.0.4.jar backport-util-concurrent-3.0.jar" />
-      </manifest>
-    </jar>
-  </target>
-  
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-  
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
-
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"             location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+<!-- All jar files needed -->
+    <fileset id="required_libs" dir="lib">
+        <include name="cobra.jar"/>
+        <include name="js.jar"/>
+        <include name="ehcache-1.4.1.jar"/>
+        <include name="backport-util-concurrent-3.0.jar"/>
+<!-- needed by ehcache -->
+        <include name="commons-logging-1.0.4.jar"/>
+<!--needed by ehcache -->
+    </fileset>
+    <target name="init">
+        <mkdir dir="build"></mkdir>
+        <mkdir dir="dist"></mkdir>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" debug="true" destdir="build">
+            <classpath>
+                <path path="../../core/dist/josm-custom.jar"/>
+                <fileset refid="required_libs"/>
+            </classpath>
+        </javac>
+    </target>
+    <target name="dist" depends="compile">
+<!-- jars -->
+<!-- TODO: instead of adding library code to the plugin jar, JOSM should
+         have some kind of library dir loaded in the classpath -->
+        <unjar dest="build">
+            <fileset refid="required_libs" />
+        </unjar>
+<!-- images -->
+        <copy todir="build/images">
+            <fileset dir="images" />
+        </copy>
+<!--resources -->
+        <copy todir="build/resources">
+            <fileset dir="resources" />
+        </copy>
+<!-- create josm-custom.jar -->
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.openLayers.OpenLayersPlugin" />
+                <attribute name="Plugin-Description" value="Displays an OpenLayers background image" />
+                <attribute name="Class-Path" value="cobra.jar js.jar ehcache-1.4.1.jar commons-logging-1.0.4.jar backport-util-concurrent-3.0.jar" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/openlayers/resources/ehcache.xml
===================================================================
--- applications/editors/josm/plugins/openlayers/resources/ehcache.xml	(revision 12778)
+++ applications/editors/josm/plugins/openlayers/resources/ehcache.xml	(revision 12780)
@@ -5,5 +5,5 @@
     ==========================
     An ehcache.xml corresponds to a single CacheManager.
-    
+
     See instructions below or the ehcache schema (ehcache.xsd) on how to configure.
 
@@ -170,7 +170,7 @@
     Sets the maximum number of objects that will be created in memory
 
-	maxElementsOnDisk:
+    maxElementsOnDisk:
     Sets the maximum number of objects that will be maintained in the DiskStore
-	The default value is zero, meaning unlimited.
+    The default value is zero, meaning unlimited.
 
     eternal:
@@ -211,5 +211,5 @@
     Each spool buffer is used only by its cache. If you get OutOfMemory errors consider
     lowering this value. To improve DiskStore performance consider increasing it. Trace level
-    logging in the DiskStore will show if put back ups are occurring. 
+    logging in the DiskStore will show if put back ups are occurring.
 
     memoryStoreEvictionPolicy:
@@ -468,5 +468,5 @@
     </cache>
 
-    
+
 
 
Index: applications/editors/josm/plugins/openlayers/resources/yahoo.html
===================================================================
--- applications/editors/josm/plugins/openlayers/resources/yahoo.html	(revision 12778)
+++ applications/editors/josm/plugins/openlayers/resources/yahoo.html	(revision 12780)
@@ -1,5 +1,5 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-   	<!-- The map can not be set to 100%. It hangs -->
+    <!-- The map can not be set to 100%. It hangs -->
     <style type="text/css">
         #map {
@@ -11,29 +11,29 @@
     <script type="text/javascript" src="http://www.openlayers.org/api/OpenLayers.js"></script>
     <script type="text/javascript">
-    	// There seems to be a problem with this function and the Java JS engine, as the computed style 
-    	// does not have the function getPropertyValue.
-		OpenLayers.Element.getStyle =  function(element, style) {
-	        element = OpenLayers.Util.getElement(element);
-	        var value = element.style[OpenLayers.String.camelize(style)];
-	        if (!value) {
-	            if (document.defaultView && 
-	                document.defaultView.getComputedStyle && false) {
-	                
-	                var css = document.defaultView.getComputedStyle(element, null);
-	                value = css ? css.getPropertyValue(style) : null;
-	            } else if (element.currentStyle) {
-	                value = element.currentStyle[OpenLayers.String.camelize(style)];
-	            }
-	        }
-	    
-	        var positions = ['left', 'top', 'right', 'bottom'];
-	        if (window.opera &&
-	            (OpenLayers.Util.indexOf(positions,style) != -1) &&
-	            (OpenLayers.Element.getStyle(element, 'position') == 'static')) { 
-	            value = 'auto';
-	        }
-	    
-	        return value == 'auto' ? null : value;
-	    }
+        // There seems to be a problem with this function and the Java JS engine, as the computed style
+        // does not have the function getPropertyValue.
+        OpenLayers.Element.getStyle =  function(element, style) {
+            element = OpenLayers.Util.getElement(element);
+            var value = element.style[OpenLayers.String.camelize(style)];
+            if (!value) {
+                if (document.defaultView &&
+                    document.defaultView.getComputedStyle && false) {
+
+                    var css = document.defaultView.getComputedStyle(element, null);
+                    value = css ? css.getPropertyValue(style) : null;
+                } else if (element.currentStyle) {
+                    value = element.currentStyle[OpenLayers.String.camelize(style)];
+                }
+            }
+
+            var positions = ['left', 'top', 'right', 'bottom'];
+            if (window.opera &&
+                (OpenLayers.Util.indexOf(positions,style) != -1) &&
+                (OpenLayers.Element.getStyle(element, 'position') == 'static')) {
+                value = 'auto';
+            }
+
+            return value == 'auto' ? null : value;
+        }
     </script>
     <script type="text/javascript">
@@ -56,16 +56,16 @@
             var mapDiv = document.getElementById("map");
             if( !mapDiv ) return;
-            
+
             mapDiv.style.width = width;
             mapDiv.style.height = height;
-            
+
             if( map )
                 map.updateSize();
         }
-        
+
         function zoomMapToExtent(left, bottom, right, top)
         {
             if( !map ) return;
-            
+
             map.zoomToExtent( new OpenLayers.Bounds(left, bottom, right, top) );
             var extent = map.getExtent();
@@ -78,5 +78,5 @@
     </script>
   </head>
-  
+
   <body onload="init()" style="overflow:hidden; margin: 0; padding: 0;">
     <div id="overlay" style="background:white;opacity:0.5;z-index:10;">
Index: applications/editors/josm/plugins/openstreetbugs/LICENSE.txt
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/LICENSE.txt	(revision 12778)
+++ applications/editors/josm/plugins/openstreetbugs/LICENSE.txt	(revision 12780)
@@ -7,9 +7,9 @@
 1. Redistributions of source code must retain the above copyright notice,
    this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
    and/or other materials provided with the distribution.
-3. Neither the name of the project nor the names of its 
-   contributors may be used to endorse or promote products derived from this 
+3. Neither the name of the project nor the names of its
+   contributors may be used to endorse or promote products derived from this
    software without specific prior written permission.
 
Index: applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 12780)
@@ -1,95 +1,78 @@
 <project name="openstreetbugs" default="dist" basedir=".">
-
-        <!-- the path to JOSM source code (project directory) -->
-	<property name="josm.base.dir" value="../../core" />
-
-	<property name="josm.dist.dir" value="../../dist" />
-
-	<!--a osm file, which will be loaded, when running the test target -->
-	<property name="osmfile" value="/tmp/hoe.osm" />
-
-	<!-- compilation properties -->
-	<property name="josm.build.dir" value="${josm.base.dir}/build" />
-	<property name="josm.home.dir" value="${user.home}/.josm" />
-	<property name="josm" location="${josm.base.dir}/dist/josm-custom.jar" />
-	<property name="lib.dir" value="lib" />
-	<property name="plugin.build.dir" value="build" />
-	<property name="plugin.name" value="${ant.project.name}" />
-	<property name="plugin.jar" value="${plugin.build.dir}/${plugin.name}.jar" />
-
-	<property name="ant.build.javac.target" value="1.5" />
-
-	<target name="init">
-		<mkdir dir="${plugin.build.dir}" />
-	</target>
-
-	<target name="compile" depends="init">
-		<echo message="creating ${plugin.jar}" />
-		<javac srcdir="src" classpath="${josm}" destdir="${plugin.build.dir}" debug="true">
-			<include name="**/*.java" />
-		</javac>
-	</target>
-
-	<target name="dist" depends="clean, compile">
-
-		<!-- copy images to jar -->
-		<copy todir="${plugin.build.dir}/images">
-			<fileset dir="images" />
-		</copy>
-
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-		<!-- create the jar file -->
-		<jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-			<manifest>
-				<attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.osb.OsbPlugin" />
-				<attribute name="Plugin-Description" value="Imports issues from OpenStreetBugs" />
-				<attribute name="Plugin-Date" value="${version.entry.commit.date}" />
-				<attribute name="Plugin-Version" value="${version.entry.commit.revision}" />
-				<attribute name="Plugin-Mainversion" value="1180"/>
-				<attribute name="Author" value="Henrik Niehaus" />
-			</manifest>
-		</jar>
-
-		<copy todir="${josm.dist.dir}" file="${plugin.jar}" />
-	</target>
-
-	<!-- clean target -->
-	<target name="clean">
-		<delete dir="build" />
-	</target>
-
-	<target name="install" depends="dist">
-		<condition property="isWindows">
-			<os family="windows" />
-		</condition>
-		<condition property="isUnix">
-			<os family="unix" />
-		</condition>
-		<antcall target="install_win" />
-		<antcall target="install_linux" />
-	</target>
-
-	<target name="install_win" if="isWindows">
-		<property environment="env"/>
-		<copy file="${plugin.jar}" todir="${env.APPDATA}/JOSM/plugins" />
-	</target>
-
-	<target name="install_linux" if="isUnix">
-		<copy file="${plugin.jar}" todir="${user.home}/.josm/plugins" />
-	</target>
-
-	<target name="test" depends="install">
-		<java jar="${josm}" fork="true">
-			<arg value="${osmfile}" />
-			<jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7777" />
-		</java>
-	</target>
-
+<!-- the path to JOSM source code (project directory) -->
+    <property name="josm.base.dir" value="../../core" />
+    <property name="josm.dist.dir" value="../../dist" />
+<!--a osm file, which will be loaded, when running the test target -->
+    <property name="osmfile" value="/tmp/hoe.osm" />
+<!-- compilation properties -->
+    <property name="josm.build.dir" value="${josm.base.dir}/build" />
+    <property name="josm.home.dir" value="${user.home}/.josm" />
+    <property name="josm" location="${josm.base.dir}/dist/josm-custom.jar" />
+    <property name="lib.dir" value="lib" />
+    <property name="plugin.build.dir" value="build" />
+    <property name="plugin.name" value="${ant.project.name}" />
+    <property name="plugin.jar" value="${plugin.build.dir}/${plugin.name}.jar" />
+    <property name="ant.build.javac.target" value="1.5" />
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}" />
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}" />
+        <javac srcdir="src" classpath="${josm}" destdir="${plugin.build.dir}" debug="true">
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist" depends="clean, compile">
+<!-- copy images to jar -->
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+<!-- create the jar file -->
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.osb.OsbPlugin" />
+                <attribute name="Plugin-Description" value="Imports issues from OpenStreetBugs" />
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}" />
+                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Author" value="Henrik Niehaus" />
+            </manifest>
+        </jar>
+        <copy todir="${josm.dist.dir}" file="${plugin.jar}" />
+    </target>
+<!-- clean target -->
+    <target name="clean">
+        <delete dir="build" />
+    </target>
+    <target name="install" depends="dist">
+        <condition property="isWindows">
+            <os family="windows" />
+        </condition>
+        <condition property="isUnix">
+            <os family="unix" />
+        </condition>
+        <antcall target="install_win" />
+        <antcall target="install_linux" />
+    </target>
+    <target name="install_win" if="isWindows">
+        <property environment="env"/>
+        <copy file="${plugin.jar}" todir="${env.APPDATA}/JOSM/plugins" />
+    </target>
+    <target name="install_linux" if="isUnix">
+        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins" />
+    </target>
+    <target name="test" depends="install">
+        <java jar="${josm}" fork="true">
+            <arg value="${osmfile}" />
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7777" />
+        </java>
+    </target>
 </project>
Index: applications/editors/josm/plugins/openvisible/build.xml
===================================================================
--- applications/editors/josm/plugins/openvisible/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/openvisible/build.xml	(revision 12780)
@@ -1,107 +1,94 @@
 <project name="openvisible" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir" value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="plugin.build.dir" value="build"/>
-  <property name="plugin.dist.dir" value="../../dist"/>
-  <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
-  
-  <property name="plugin.description" value="Allows opening gpx/osm files that intersect the currently visible screen area (V${plugin.version})."/>
-  <property name="plugin.stage" value="50"/>
-  <property name="plugin.class" value="at.dallermassl.josm.plugin.openvisible.OpenVisiblePlugin"/>
-  
-  <!-- update site meta data -->
-  <property name="plugin.site.file" value="josm-site.xml"/>
-  <property name="plugin.site.description" value="Josm's OpenVisible Update Site"/>
-  <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/${ant.project.name}/"/>
-  <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/${ant.project.name}/"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-
-  <target name="dist" depends="compile,site">
-    <!-- images -->
-    <copy todir="${plugin.build.dir}/images">
-      <fileset dir="images" />
-    </copy>
-    <!-- copy configuration xml files 
-	 <copy todir="${plugin.build.dir}">
-	   <fileset dir="src"> 
-	     <include name="*.xml"/>
-  	   </fileset>
-	 </copy>
-	 -->
-    
-    <mkdir dir="${plugin.dist.dir}"/>
-    
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <!-- create jar file -->
-    <jar destfile="${plugin.dist.dir}/${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-        <attribute name="Plugin-Class" value="${plugin.class}" />
-        <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Mainversion" value="1180" />
-        <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5" />
-        <attribute name="Plugin-Stage" value="${plugin.stage}" />
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <mkdir dir="${plugin.build.dir}"/>
-    <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-      <classpath>
-	<pathelement path="${josm.build.dir}/build"/>
-	<fileset dir="${josm.build.dir}/lib">
-	  <include name="**/*.jar"/>
-	</fileset>
-        <!--
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir" value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir" value="../../dist"/>
+    <property name="plugin.name" value="${ant.project.name}"/>
+    <property name="plugin.jar" value="${plugin.name}.jar"/>
+    <property name="plugin.description" value="Allows opening gpx/osm files that intersect the currently visible screen area (V${plugin.version})."/>
+    <property name="plugin.stage" value="50"/>
+    <property name="plugin.class" value="at.dallermassl.josm.plugin.openvisible.OpenVisiblePlugin"/>
+<!-- update site meta data -->
+    <property name="plugin.site.file" value="josm-site.xml"/>
+    <property name="plugin.site.description" value="Josm's OpenVisible Update Site"/>
+    <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/${ant.project.name}/"/>
+    <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/${ant.project.name}/"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist" depends="compile,site">
+<!-- images -->
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images" />
+        </copy>
+<!-- copy configuration xml files
+     <copy todir="${plugin.build.dir}">
+       <fileset dir="src">
+         <include name="*.xml"/>
+       </fileset>
+     </copy>
+     -->
+        <mkdir dir="${plugin.dist.dir}"/>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+<!-- create jar file -->
+        <jar destfile="${plugin.dist.dir}/${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="${plugin.class}" />
+                <attribute name="Plugin-Description" value="${plugin.description}" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Mainversion" value="1180" />
+                <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5" />
+                <attribute name="Plugin-Stage" value="${plugin.stage}" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="${plugin.build.dir}"/>
+        <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+            <classpath>
+                <pathelement path="${josm.build.dir}/build"/>
+                <fileset dir="${josm.build.dir}/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+<!--
             <fileset dir="lib">
               <include name="**/*.jar"/>
             </fileset>
             -->
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.dist.dir}/${plugin.jar}" todir="${josm.plugins.dir}"/>
-    <!--
-	<copy todir="${josm.home.dir}/plugins">
-    	  <fileset dir="lib">
+            </classpath>
+        </javac>
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.dist.dir}/${plugin.jar}" todir="${josm.plugins.dir}"/>
+<!--
+    <copy todir="${josm.home.dir}/plugins">
+          <fileset dir="lib">
             <include name="**/*.jar"/>
-    	  </fileset>
-	</copy>
-  	-->
-  </target>
-
-  <target name="init">
-    <echo>java version: ${java.version}</echo>
-  </target>
-
-  <!-- write site description for the given plugin so josm will accept it -->
-  <target name="site">
-    <echo message="creating site description in ${plugin.site.file}"/>
-    <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
+          </fileset>
+    </copy>
+    -->
+    </target>
+    <target name="init">
+        <echo>java version: ${java.version}</echo>
+    </target>
+<!-- write site description for the given plugin so josm will accept it -->
+    <target name="site">
+        <echo message="creating site description in ${plugin.site.file}"/>
+        <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
   &lt;plugins>
   &lt;plugin id="${ant.project.name}" version="${plugin.version}">
@@ -112,10 +99,9 @@
   &lt;/plugins>
 </echo>
-</target>
-
+    </target>
 <!-- write site description for the given plugin (not implemented in JOSM as full version yet!) -->
-<target name="site-full-donotuse">
-  <echo message="creating site description in ${plugin.site.file}"/>
-  <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
+    <target name="site-full-donotuse">
+        <echo message="creating site description in ${plugin.site.file}"/>
+        <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
     &lt;site version="1.0">
     &lt;!-- meta data of site -->
@@ -138,22 +124,18 @@
 &lt;/site>
 </echo>
-</target>
-
-
+    </target>
 <!-- upload the site description and the jar file via ssh -->
-<target name="upload" depends="dist,site">
-  <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
-  <exec executable="scp">
-    <arg value="${plugin.dist.dir}/${plugin.jar}"/>
-    <arg value="${plugin.site.file}"/>
-    <arg value="${plugin.site.upload.target}"/>
-  </exec>
-</target>
-
-<target name="clean">
-  <delete dir="${plugin.build.dir}" />
-  <delete dir="${plugin.site.file}" />
-  <delete file="${plugin.dist.dir}/${plugin.jar}" />
-</target>
-
+    <target name="upload" depends="dist,site">
+        <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
+        <exec executable="scp">
+            <arg value="${plugin.dist.dir}/${plugin.jar}"/>
+            <arg value="${plugin.site.file}"/>
+            <arg value="${plugin.site.upload.target}"/>
+        </exec>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete dir="${plugin.site.file}" />
+        <delete file="${plugin.dist.dir}/${plugin.jar}" />
+    </target>
 </project>
Index: applications/editors/josm/plugins/osmarender/build.xml
===================================================================
--- applications/editors/josm/plugins/osmarender/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/osmarender/build.xml	(revision 12780)
@@ -1,66 +1,58 @@
 <project name="osmarender" default="install" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
-  <property name="stylesheets" location="./stylesheets" />
-  <property name="xslt" location="./xslt" />
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="compile">
-    <echo message="creating ${plugin.jar}"/>
-    <mkdir dir="${plugin.build.dir}"></mkdir>
-    <mkdir dir="${plugin.dist.dir}"></mkdir>
-    <javac srcdir="src" debug="true" classpath="${josm}" destdir="${plugin.build.dir}">
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-  <target name="dist"  depends="compile">
-    <copy todir="${plugin.build.dir}" file="${xslt}/osmarender.xsl"/>
-    <copy tofile="${plugin.build.dir}/osm-map-features.xml"
-	  file="${stylesheets}/osm-map-features-z17.xml"/>
-    <exec append="false" output="REVISION" executable="perl" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="../getrevision.pl"/>
-      <arg value="xslt"/>
-      <arg value="stylesheets"/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-	<attribute name="Plugin-Class" value="OsmarenderPlugin" />
-	<attribute name="Plugin-Description" value="Launches FireFox to display the current visible screen as a nice SVG image" />
-	<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-	<attribute name="Plugin-Mainversion" value="1180"/>
-	<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="compile,dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>  
-
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="josm" location="../../core/dist/josm-custom.jar" />
+    <property name="stylesheets" location="./stylesheets" />
+    <property name="xslt" location="./xslt" />
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="compile">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="${plugin.build.dir}"></mkdir>
+        <mkdir dir="${plugin.dist.dir}"></mkdir>
+        <javac srcdir="src" debug="true" classpath="${josm}" destdir="${plugin.build.dir}">
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist"  depends="compile">
+        <copy todir="${plugin.build.dir}" file="${xslt}/osmarender.xsl"/>
+        <copy tofile="${plugin.build.dir}/osm-map-features.xml"
+      file="${stylesheets}/osm-map-features-z17.xml"/>
+        <exec append="false" output="REVISION" executable="perl" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="../getrevision.pl"/>
+            <arg value="xslt"/>
+            <arg value="stylesheets"/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="OsmarenderPlugin" />
+                <attribute name="Plugin-Description" value="Launches FireFox to display the current visible screen as a nice SVG image" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="compile,dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/plastic_laf/build.xml
===================================================================
--- applications/editors/josm/plugins/plastic_laf/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/plastic_laf/build.xml	(revision 12780)
@@ -1,48 +1,43 @@
- <project name="plastic_laf" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="dist">
-    <echo message="creating ${plugin.jar}"/>
-   <mkdir dir="dist"></mkdir>
-    <unjar dest="${plugin.build.dir}" src="lib/looks-2.0.4.jar" />
-    <javac srcdir="src" destdir="${plugin.build.dir}">
-      <include name="**/*.java" />
-    </javac>
-    <!-- define the version of the jar file -->
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-	<!-- delete intermediate file -->
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-	<attribute name="Plugin-Class" value="plastic_laf.Plugin" />
-	<attribute name="Plugin-Description" value="The great JGoodies Plastic Look and Feel" />
-	<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-	<attribute name="Plugin-Early" value="true" />
-        <attribute name="Plugin-Mainversion" value="1180" />
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
+<project name="plastic_laf" default="dist" basedir=".">
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="dist"></mkdir>
+        <unjar dest="${plugin.build.dir}" src="lib/looks-2.0.4.jar" />
+        <javac srcdir="src" destdir="${plugin.build.dir}">
+            <include name="**/*.java" />
+        </javac>
+<!-- define the version of the jar file -->
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+<!-- delete intermediate file -->
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="plastic_laf.Plugin" />
+                <attribute name="Plugin-Description" value="The great JGoodies Plastic Look and Feel" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Early" value="true" />
+                <attribute name="Plugin-Mainversion" value="1180" />
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
 </project>
Index: applications/editors/josm/plugins/pluginmanager/build.xml
===================================================================
--- applications/editors/josm/plugins/pluginmanager/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/pluginmanager/build.xml	(revision 12780)
@@ -1,97 +1,84 @@
 <project name="pluginmanager" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir" value="../../core"/>
-  <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="bin"/>
-  <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
-  
-  <property name="plugin.description" value="Manage plugins and provide update mechanism (V${plugin.version})."/>
-  <property name="plugin.class" value="at.dallermassl.josm.plugin.pluginmanager.PluginManagerPlugin"/>
-
-  <!-- update site meta data -->
-  <property name="plugin.site.file" value="josm-site.xml"/>
-  <property name="plugin.site.description" value="Josm's PluginManager Update Site"/>
-  <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/pluginmanager/"/>
-  <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/pluginmanager/"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-
-  <target name="dist" depends="compile, site">
-    <!-- images -->
-    <!-- 
-	 <copy todir="${plugin.build.dir}/images">
-	   <fileset dir="src/images" />
-	 </copy>
-	 -->
-    <!-- copy configuration xml files -->
-    <copy todir="${plugin.build.dir}">
-      <fileset dir="src"> 
-	<include name="*.xml"/>
-      </fileset>
-    </copy>
-    
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <!-- create jar file -->
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-        <attribute name="Plugin-Class" value="${plugin.class}" />
-        <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Mainversion" value="1180" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <mkdir dir="${plugin.build.dir}"/>
-    <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-      <classpath>
-	<pathelement path="${josm.build.dir}/build"/>
-	<fileset dir="${josm.build.dir}/lib">
-	  <include name="**/*.jar"/>
-	</fileset>
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
-  </target>
-
-  <target name="init">
-    <echo>java version: ${java.version}</echo>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete dir="${plugin.site.file}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <!-- write site description for the given plugin -->
-  <target name="site">
-    <echo message="creating site description in ${plugin.site.file}"/>
-    <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+<!-- compilation properties -->
+    <property name="josm.build.dir" value="../../core"/>
+    <property name="josm.home.dir" value="${user.home}/.josm"/>
+    <property name="plugin.build.dir" value="bin"/>
+    <property name="plugin.name" value="${ant.project.name}"/>
+    <property name="plugin.jar" value="${plugin.name}.jar"/>
+    <property name="plugin.description" value="Manage plugins and provide update mechanism (V${plugin.version})."/>
+    <property name="plugin.class" value="at.dallermassl.josm.plugin.pluginmanager.PluginManagerPlugin"/>
+<!-- update site meta data -->
+    <property name="plugin.site.file" value="josm-site.xml"/>
+    <property name="plugin.site.description" value="Josm's PluginManager Update Site"/>
+    <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/pluginmanager/"/>
+    <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/pluginmanager/"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist" depends="compile, site">
+<!-- images -->
+<!--
+     <copy todir="${plugin.build.dir}/images">
+       <fileset dir="src/images" />
+     </copy>
+     -->
+<!-- copy configuration xml files -->
+        <copy todir="${plugin.build.dir}">
+            <fileset dir="src">
+                <include name="*.xml"/>
+            </fileset>
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+<!-- create jar file -->
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="${plugin.class}" />
+                <attribute name="Plugin-Description" value="${plugin.description}" />
+                <attribute name="Plugin-Mainversion" value="1180" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="${plugin.build.dir}"/>
+        <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+            <classpath>
+                <pathelement path="${josm.build.dir}/build"/>
+                <fileset dir="${josm.build.dir}/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+            </classpath>
+        </javac>
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
+    </target>
+    <target name="init">
+        <echo>java version: ${java.version}</echo>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete dir="${plugin.site.file}" />
+        <delete file="${plugin.jar}" />
+    </target>
+<!-- write site description for the given plugin -->
+    <target name="site">
+        <echo message="creating site description in ${plugin.site.file}"/>
+        <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
       &lt;site version="1.0">
       &lt;!-- meta data of site -->
@@ -114,15 +101,13 @@
   &lt;/site>
 </echo>
-</target>
-
+    </target>
 <!-- upload the site description and the jar file via ssh -->
-<target name="upload" depends="dist,site">
-  <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
-  <exec executable="scp">
-    <arg value="${plugin.jar}"/>
-    <arg value="${plugin.site.file}"/>
-    <arg value="${plugin.site.upload.target}"/>
-  </exec>
-</target>
-
+    <target name="upload" depends="dist,site">
+        <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
+        <exec executable="scp">
+            <arg value="${plugin.jar}"/>
+            <arg value="${plugin.site.file}"/>
+            <arg value="${plugin.site.upload.target}"/>
+        </exec>
+    </target>
 </project>
Index: applications/editors/josm/plugins/pluginmanager/site/josm-site.xml
===================================================================
--- applications/editors/josm/plugins/pluginmanager/site/josm-site.xml	(revision 12778)
+++ applications/editors/josm/plugins/pluginmanager/site/josm-site.xml	(revision 12780)
@@ -3,6 +3,6 @@
   <!-- meta data of site -->
   <site-info>
-	  <site-name>Update Site of Christof Dallermassl</site-name>
-	  <site-url>http://www.tegmento.org/~cdaller/josm/</site-url>
+      <site-name>Update Site of Christof Dallermassl</site-name>
+      <site-url>http://www.tegmento.org/~cdaller/josm/</site-url>
   </site-info>
 
@@ -14,3 +14,3 @@
     <site ref="http://www.tegmento.org/~cdaller/josm/colorscheme/"/>
   </sites>
-</site> 
+</site>
Index: applications/editors/josm/plugins/remotecontrol/README
===================================================================
--- applications/editors/josm/plugins/remotecontrol/README	(revision 12778)
+++ applications/editors/josm/plugins/remotecontrol/README	(revision 12780)
@@ -1,5 +1,5 @@
-A plugin for JOSM that listens for commands on a TCP port (8111). 
-It can be used to tell JOSM to zoom to an area and download data. 
-Details are found on the Wiki page, 
+A plugin for JOSM that listens for commands on a TCP port (8111).
+It can be used to tell JOSM to zoom to an area and download data.
+Details are found on the Wiki page,
 
 http://wiki.openstreetmap.org/index.php/JOSM/Plugins/RemoteControl
Index: applications/editors/josm/plugins/remotecontrol/build.xml
===================================================================
--- applications/editors/josm/plugins/remotecontrol/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/remotecontrol/build.xml	(revision 12780)
@@ -1,62 +1,53 @@
 <project name="remotecontrol" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}"/>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-  <target name="dist" depends="compile">
-    <copy todir="${plugin.build.dir}/images">
-      <fileset dir="images"/>
-    </copy>
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-	<attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.remotecontrol.RemoteControlPlugin"/>
-	<attribute name="Plugin-Description" value="A plugin allowing other applications to send commands to JOSM." />
-	<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-	<attribute name="Plugin-Mainversion" value="1180"/>
-	<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-	<attribute name="Author" value="Frederik Ramm &lt;frederik@remote.org&gt;"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-  
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
-  </target>
-
-  <target name="test" depends="install">
-    <java jar="${josm}" fork="true"/>
-  </target>
-
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist" depends="compile">
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images"/>
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.remotecontrol.RemoteControlPlugin"/>
+                <attribute name="Plugin-Description" value="A plugin allowing other applications to send commands to JOSM." />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Author" value="Frederik Ramm &lt;frederik@remote.org&gt;"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
+    </target>
+    <target name="test" depends="install">
+        <java jar="${josm}" fork="true"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/slippy_map_chooser/build.xml
===================================================================
--- applications/editors/josm/plugins/slippy_map_chooser/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/slippy_map_chooser/build.xml	(revision 12780)
@@ -1,64 +1,55 @@
 <project name="slippy_map_chooser" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"   value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"             location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir" value="build"/>
-  <property name="plugin.dist.dir"  value="../../dist"/>
-  <property name="plugin.name"      value="${ant.project.name}"/>
-  <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="dist" depends="compile">
-    <!-- images -->
-    <copy todir="build/images">
-      <fileset dir="images" />
-    </copy>
-    <exec append="false" output="REVISION" executable="perl" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="../getrevision.pl"/>
-      <arg value="src_jmv"/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-
-    <jar destfile="${plugin.jar}" basedir="build">
-        <manifest>
-          <attribute name="Plugin-Class" value="SlippyMapChooserPlugin" />
-            <attribute name="Plugin-Description" value="Adds a new download dialog that allows to select the download rectangle on the slippy map. With this plugin it's possible to download ways and gpx logs without knowing the coordinates of the desired download rectangle - just navigate to the desired area by zooming and moving the slippy map, mark the area with a rectangle and click download. Works great together with the namefinder plugin!" />
-            <attribute name="Plugin-Author" value="slippy_map_chooser@freakmail.de" />
-            <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-            <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-            <attribute name="Plugin-Mainversion" value="1180" />
-        </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src;src_jmv" classpath="${josm}" destdir="build" debug="true"/>
-  </target>
-
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}" />
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"             location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist" depends="compile">
+<!-- images -->
+        <copy todir="build/images">
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="perl" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="../getrevision.pl"/>
+            <arg value="src_jmv"/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="SlippyMapChooserPlugin" />
+                <attribute name="Plugin-Description" value="Adds a new download dialog that allows to select the download rectangle on the slippy map. With this plugin it's possible to download ways and gpx logs without knowing the coordinates of the desired download rectangle - just navigate to the desired area by zooming and moving the slippy map, mark the area with a rectangle and click download. Works great together with the namefinder plugin!" />
+                <attribute name="Plugin-Author" value="slippy_map_chooser@freakmail.de" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Mainversion" value="1180" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src;src_jmv" classpath="${josm}" destdir="build" debug="true"/>
+    </target>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}" />
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/slippymap/build.xml
===================================================================
--- applications/editors/josm/plugins/slippymap/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/slippymap/build.xml	(revision 12780)
@@ -1,70 +1,58 @@
 <project name="slippymap" default="dist" basedir=".">
-
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-
-  <target name="dist" depends="compile">
-    <!-- images -->
-    <copy todir="build/images">
-      <fileset dir="images" />
-    </copy>
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    
-    <!-- create josm-custom.jar -->
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.slippymap.SlippyMapPlugin" />
-        <attribute name="Plugin-Description" value="Displays a slippy map tile grid, and tile status info" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Mainversion" value="1180"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="../../core/dist/josm-custom.jar" destdir="build">
-      <compilerarg value="-Xlint:deprecation"/>
-    </javac>
-  </target>
-  
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}" />
-  </target>
-  
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-  
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
-
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist" depends="compile">
+<!-- images -->
+        <copy todir="build/images">
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+<!-- create josm-custom.jar -->
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.slippymap.SlippyMapPlugin" />
+                <attribute name="Plugin-Description" value="Displays a slippy map tile grid, and tile status info" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="../../core/dist/josm-custom.jar" destdir="build">
+            <compilerarg value="-Xlint:deprecation"/>
+        </javac>
+    </target>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}" />
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- applications/editors/josm/plugins/surveyor/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/surveyor/build.xml	(revision 12780)
@@ -1,91 +1,78 @@
 <project name="surveyor" default="dist" basedir=".">
-  
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="livegpsplugin.jar" value="../../dist/livegps.jar"/>
-
-  <property name="plugin.description" value="Allow adding markers/nodes on current gps positions."/>
-  <property name="plugin.stage" value="60"/>
-  <property name="plugin.class" value="at.dallermassl.josm.plugin.surveyor.SurveyorPlugin"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-
-  <target name="dist" depends="compile">
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-
-    <!-- images -->
-    <copy todir="${plugin.build.dir}/">
-      <fileset dir="resources">
-	<include name="*.xml"/>
-	<include name="audio/*"/>
-      </fileset>
-    </copy>
-    
-    <!-- create jar file -->
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-        <attribute name="Plugin-Class" value="${plugin.class}" />
-        <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Stage" value="${plugin.stage}" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Mainversion" value="1180" />
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <mkdir dir="${plugin.build.dir}"/>
-    <copy todir="build/images" >
-      <fileset dir="images" />
-    </copy>
-    <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-      <compilerarg value="-Xlint:deprecation"/>
-      <compilerarg value="-Xlint:unchecked"/>
-      <classpath>
-	<pathelement path="${josm.build.dir}/build"/>
-	<fileset dir="${josm.build.dir}/lib">
-	  <include name="**/*.jar"/>
-	</fileset>
-	<pathelement location="${livegpsplugin.jar}"/>
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
-
-  <target name="init">
-    <echo>java version: ${java.version}</echo>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="livegpsplugin.jar" value="../../dist/livegps.jar"/>
+    <property name="plugin.description" value="Allow adding markers/nodes on current gps positions."/>
+    <property name="plugin.stage" value="60"/>
+    <property name="plugin.class" value="at.dallermassl.josm.plugin.surveyor.SurveyorPlugin"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="dist" depends="compile">
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+<!-- images -->
+        <copy todir="${plugin.build.dir}/">
+            <fileset dir="resources">
+                <include name="*.xml"/>
+                <include name="audio/*"/>
+            </fileset>
+        </copy>
+<!-- create jar file -->
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="${plugin.class}" />
+                <attribute name="Plugin-Description" value="${plugin.description}" />
+                <attribute name="Plugin-Stage" value="${plugin.stage}" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Mainversion" value="1180" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="${plugin.build.dir}"/>
+        <copy todir="build/images" >
+            <fileset dir="images" />
+        </copy>
+        <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
+            <classpath>
+                <pathelement path="${josm.build.dir}/build"/>
+                <fileset dir="${josm.build.dir}/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+                <pathelement location="${livegpsplugin.jar}"/>
+            </classpath>
+        </javac>
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
+    <target name="init">
+        <echo>java version: ${java.version}</echo>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
 </project>
Index: applications/editors/josm/plugins/surveyor/changelog.txt
===================================================================
--- applications/editors/josm/plugins/surveyor/changelog.txt	(revision 12778)
+++ applications/editors/josm/plugins/surveyor/changelog.txt	(revision 12780)
@@ -2,5 +2,5 @@
 
 2007-08-02: PlayAudioAction is able to read wav files from classpath and from urls
-            
+
             It also plays the audio file in the background, so the PlayAudioAction can
             be set as the first action without delaying the setting of the waypoint/nodes
Index: applications/editors/josm/plugins/surveyor/resources/surveyor.xml
===================================================================
--- applications/editors/josm/plugins/surveyor/resources/surveyor.xml	(revision 12778)
+++ applications/editors/josm/plugins/surveyor/resources/surveyor.xml	(revision 12780)
@@ -2,5 +2,5 @@
 <surveyor columns="4" width="1300" height="0">
   <!-- icons can either be absolute paths or relative paths to the .josm directory -->
-  <!-- action class: either fully qualified classnames or if not found, 
+  <!-- action class: either fully qualified classnames or if not found,
        package at.dallermassl.josm.plugin.surveyor.action is assumed -->
   <button label="Tunnel Start" hotkey="T" icon="tunnel">
@@ -90,5 +90,5 @@
     <action class="SetWaypointAction" params="Residential"/>
   </button>
-  <!-- 
+  <!--
   <button label="Test" hotkey="shift X">
     <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
Index: applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 12780)
@@ -1,50 +1,46 @@
 <project name="tagging-preset-tester" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="compile">
-    <echo message="creating ${plugin.jar}"/>
-    <mkdir dir="build"/>
-    <javac srcdir="src" destdir="build" classpath="../../core/dist/josm-custom.jar">
-      <compilerarg value="-Xlint:deprecation"/>
-    </javac>
-  </target>
-
-  <target name="dist" depends="compile">
-    <mkdir dir="dist"/>
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Description" value="Make the Tagging Preset Tester tool available in the help menu." />
-        <attribute name="Main-Class" value="org.openstreetmap.josm.plugins.taggingpresettester.TaggingPresetTester" />
-        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.taggingpresettester.TaggingPresetTesterAction" />
-        <attribute name="Plugin-Mainversion" value="1180" />
-      </manifest>
-      <fileset dir="."><include name="images/*"/></fileset>
-    </jar>
-  </target>
-  
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="compile">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="build"/>
+        <javac srcdir="src" destdir="build" classpath="../../core/dist/josm-custom.jar">
+            <compilerarg value="-Xlint:deprecation"/>
+        </javac>
+    </target>
+    <target name="dist" depends="compile">
+        <mkdir dir="dist"/>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Description" value="Make the Tagging Preset Tester tool available in the help menu." />
+                <attribute name="Main-Class" value="org.openstreetmap.josm.plugins.taggingpresettester.TaggingPresetTester" />
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.taggingpresettester.TaggingPresetTesterAction" />
+                <attribute name="Plugin-Mainversion" value="1180" />
+            </manifest>
+            <fileset dir=".">
+                <include name="images/*"/>
+            </fileset>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
 </project>
Index: applications/editors/josm/plugins/tcxplugin/build.xml
===================================================================
--- applications/editors/josm/plugins/tcxplugin/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/tcxplugin/build.xml	(revision 12780)
@@ -1,108 +1,90 @@
 <project name="tcx-support" default="dist" basedir=".">
-  
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="livegpsplugin.jar" value="../../dist/livegps.jar"/>
-  
-  <property name="plugin.description" value="Adds support for TCX files."/>
-  <property name="plugin.stage" value="100"/>
-  <property name="plugin.class" value="org.openstreetmap.josm.plugins.TcxPlugin"/>
-  
-  <!-- update site meta data -->
-  <property name="plugin.site.file" value="josm-site.xml"/>
-  <property name="plugin.site.description" value=""/>
-  <property name="plugin.site.url" value=""/>
-  <property name="plugin.site.upload.target" value=""/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-	<!-- All jar files necessary to run only JOSM (no tests) -->
-	<fileset id="josm_required_libs" dir="lib">
-	</fileset>
-	
-  
-  <target name="dist" depends="compile,site">
-	<!-- jars -->
-	<unjar dest="build">
-		<fileset refid="josm_required_libs" />
-	</unjar>
-	<!-- images -->
-	<copy todir="build/images">
-		<fileset dir="images" />
-	</copy>
-
-  	
-    
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <!-- create jar file -->
-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-      <manifest>
-        <attribute name="Plugin-Class" value="${plugin.class}" />
-        <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Stage" value="${plugin.stage}" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Mainversion" value="1180" />
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="livegpsplugin.jar" value="../../dist/livegps.jar"/>
+    <property name="plugin.description" value="Adds support for TCX files."/>
+    <property name="plugin.stage" value="100"/>
+    <property name="plugin.class" value="org.openstreetmap.josm.plugins.TcxPlugin"/>
+<!-- update site meta data -->
+    <property name="plugin.site.file" value="josm-site.xml"/>
+    <property name="plugin.site.description" value=""/>
+    <property name="plugin.site.url" value=""/>
+    <property name="plugin.site.upload.target" value=""/>
+    <property name="ant.build.javac.target" value="1.5"/>
+<!-- All jar files necessary to run only JOSM (no tests) -->
+    <fileset id="josm_required_libs" dir="lib"></fileset>
+    <target name="dist" depends="compile,site">
+<!-- jars -->
+        <unjar dest="build">
+            <fileset refid="josm_required_libs" />
+        </unjar>
+<!-- images -->
+        <copy todir="build/images">
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+<!-- create jar file -->
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Plugin-Class" value="${plugin.class}" />
+                <attribute name="Plugin-Description" value="${plugin.description}" />
+                <attribute name="Plugin-Stage" value="${plugin.stage}" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Mainversion" value="1180" />
 <!--        <attribute name="Class-Path" value="lib/jaxb-api.jar;lib/jaxb-impl.jar" />-->
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <mkdir dir="${plugin.build.dir}"/>
-    <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-      <classpath>
-		<pathelement path="${josm.build.dir}/build"/>
-		<fileset dir="${josm.build.dir}/lib">
-	  		<include name="**/*.jar"/>
-		</fileset>
-		<fileset dir="./lib">
-	  		<include name="**/*.jar"/>
-		</fileset>
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
-
-  <target name="init">
-    <echo>java version: ${java.version}</echo>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete dir="${plugin.site.file}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <!-- write site description for the given plugin so josm will accept it -->
-  <target name="site">
-    <echo message="creating site description in ${plugin.site.file}"/>
-    <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
+            </manifest>
+        </jar>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <mkdir dir="${plugin.build.dir}"/>
+        <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+            <classpath>
+                <pathelement path="${josm.build.dir}/build"/>
+                <fileset dir="${josm.build.dir}/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+                <fileset dir="./lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+            </classpath>
+        </javac>
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
+    <target name="init">
+        <echo>java version: ${java.version}</echo>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete dir="${plugin.site.file}" />
+        <delete file="${plugin.jar}" />
+    </target>
+<!-- write site description for the given plugin so josm will accept it -->
+    <target name="site">
+        <echo message="creating site description in ${plugin.site.file}"/>
+        <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
   &lt;plugins>
   &lt;plugin id="${ant.project.name}" version="${plugin.version}">
@@ -113,10 +95,9 @@
   &lt;/plugins>
 </echo>
-</target>
-
+    </target>
 <!-- write site description for the given plugin (not implemented in JOSM as full version yet!) -->
-<target name="site-full-donotuse">
-  <echo message="creating site description in ${plugin.site.file}"/>
-  <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
+    <target name="site-full-donotuse">
+        <echo message="creating site description in ${plugin.site.file}"/>
+        <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
     &lt;site version="1.0">
     &lt;!-- meta data of site -->
@@ -139,16 +120,13 @@
 &lt;/site>
 </echo>
-</target>
-
-
+    </target>
 <!-- upload the site description and the jar file via ssh -->
-<target name="upload" depends="dist,site">
-  <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
-  <exec executable="scp">
-    <arg value="${plugin.jar}"/>
-    <arg value="${plugin.site.file}"/>
-    <arg value="${plugin.site.upload.target}"/>
-  </exec>
-</target>
-
+    <target name="upload" depends="dist,site">
+        <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
+        <exec executable="scp">
+            <arg value="${plugin.jar}"/>
+            <arg value="${plugin.site.file}"/>
+            <arg value="${plugin.site.upload.target}"/>
+        </exec>
+    </target>
 </project>
Index: applications/editors/josm/plugins/utilsplugin/README
===================================================================
--- applications/editors/josm/plugins/utilsplugin/README	(revision 12778)
+++ applications/editors/josm/plugins/utilsplugin/README	(revision 12780)
@@ -2,5 +2,5 @@
 and has been mostly merged into josm.
 
-Some of the remaining parts are written by 
+Some of the remaining parts are written by
 Frederik Ramm <frederik@remote.org>.
 
Index: applications/editors/josm/plugins/utilsplugin/build.xml
===================================================================
--- applications/editors/josm/plugins/utilsplugin/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/utilsplugin/build.xml	(revision 12780)
@@ -1,66 +1,58 @@
 <project name="utilsplugin" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="init">
-    <mkdir dir="build"/>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
-       <compilerarg value="-Xlint:deprecation"/>
-     </javac>
-  </target>
-
-  <target name="dist" depends="clean, compile">
-    <copy todir="build/images">
-      <fileset dir="images"/>
-    </copy>
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-	<attribute name="Plugin-Class" value="UtilsPlugin.UtilsPlugin"/>
-	<attribute name="Plugin-Description" value="Useful JOSM utilities"/>
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Mainversion" value="1180"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-	<attribute name="Author"
-		   value="(originally) Martijn van Oosterhout &gt;kleptog@svana.org&gt;"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="build"/>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
+            <compilerarg value="-Xlint:deprecation"/>
+        </javac>
+    </target>
+    <target name="dist" depends="clean, compile">
+        <copy todir="build/images">
+            <fileset dir="images"/>
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="UtilsPlugin.UtilsPlugin"/>
+                <attribute name="Plugin-Description" value="Useful JOSM utilities"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Author"
+           value="(originally) Martijn van Oosterhout &gt;kleptog@svana.org&gt;"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/validator/build.xml
===================================================================
--- applications/editors/josm/plugins/validator/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/validator/build.xml	(revision 12780)
@@ -1,66 +1,55 @@
 <project name="validator" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <!-- point to your JOSM directory -->
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
-
-  <property name="ant.build.javac.target" value="1.5"/>
-  
-  <target name="init">
-    <mkdir dir="${plugin.build.dir}"/>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" destdir="build" debug="true" encoding="UTF-8">
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-  <target name="dist" depends="clean, compile">
-    <copy todir="build/images">
-      <fileset dir="images"/>
-    </copy>
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-	<attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
-	<attribute name="Plugin-Description" value="A OSM data validator"/>
-	<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Mainversion" value="1200"/>
-	<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-	<attribute name="Author" value="Francisco R. Santos"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- clean target -->
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
-  </target>
-
-  <target name="test" depends="install">
-    <java jar="${josm}" fork="true">
-    </java>
-  </target>
-
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+<!-- point to your JOSM directory -->
+    <property name="josm" location="../../core/dist/josm-custom.jar" />
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" destdir="build" debug="true" encoding="UTF-8">
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist" depends="clean, compile">
+        <copy todir="build/images">
+            <fileset dir="images"/>
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
+                <attribute name="Plugin-Description" value="A OSM data validator"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1200"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Author" value="Francisco R. Santos"/>
+            </manifest>
+        </jar>
+    </target>
+<!-- clean target -->
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
+    </target>
+    <target name="test" depends="install">
+        <java jar="${josm}" fork="true"></java>
+    </target>
 </project>
Index: applications/editors/josm/plugins/waypoints/build.xml
===================================================================
--- applications/editors/josm/plugins/waypoints/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/waypoints/build.xml	(revision 12780)
@@ -1,62 +1,51 @@
 <project name="waypoints" default="dist" basedir=".">
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <!-- point to your JOSM directory -->
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-
-
-  <target name="init">
-    <mkdir dir="build"></mkdir>
-    <mkdir dir="dist"></mkdir>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
-      <compilerarg value="-Xlint:deprecation"/>
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-  <target name="dist" depends="compile">
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-	<attribute name="Plugin-Class" value="waypoints.WaypointPlugin" />
-	<attribute name="Plugin-Description" value="Automatic conversion of waypoints in a GPX file to OSM nodes." />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Mainversion" value="1180" />
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- clean target -->
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-
-  <target name="install" depends="dist">
-    <copy file="dist/waypoints.jar" todir="${user.home}/.josm/plugins"/>
-  </target>
-
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.home.dir"    value="${user.home}/.josm"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+<!-- point to your JOSM directory -->
+    <property name="josm" location="../../core/dist/josm-custom.jar" />
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="build"></mkdir>
+        <mkdir dir="dist"></mkdir>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
+            <compilerarg value="-Xlint:deprecation"/>
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist" depends="compile">
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="waypoints.WaypointPlugin" />
+                <attribute name="Plugin-Description" value="Automatic conversion of waypoints in a GPX file to OSM nodes." />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Mainversion" value="1180" />
+            </manifest>
+        </jar>
+    </target>
+<!-- clean target -->
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="dist/waypoints.jar" todir="${user.home}/.josm/plugins"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/wmsplugin/README
===================================================================
--- applications/editors/josm/plugins/wmsplugin/README	(revision 12778)
+++ applications/editors/josm/plugins/wmsplugin/README	(revision 12780)
@@ -10,5 +10,5 @@
 
 This plugin has been created by tim <chippy2005@gmail.com>
-and has received major contributions from Frederik Ramm 
+and has received major contributions from Frederik Ramm
 <frederik@remote.org>. It is based on the "Landsat" plugin
 by Nick Whitelegg <Nick.Whitelegg@solent.ac.uk> and includes
Index: applications/editors/josm/plugins/wmsplugin/build.xml
===================================================================
--- applications/editors/josm/plugins/wmsplugin/build.xml	(revision 12778)
+++ applications/editors/josm/plugins/wmsplugin/build.xml	(revision 12780)
@@ -1,72 +1,62 @@
 <project name="wmsplugin" default="dist" basedir=".">
-
-  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
-  <property environment="env"/>
-  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
-    <and>
-      <os family="windows"/>
-    </and>
-  </condition>
-
-  <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
-  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
-  <property name="josm"			location="../../core/dist/josm-custom.jar" />
-  <property name="plugin.build.dir"	value="build"/>
-  <property name="plugin.dist.dir"	value="../../dist"/>
-  <property name="plugin.name"		value="${ant.project.name}"/>
-  <property name="plugin.jar"		value="../../dist/${plugin.name}.jar"/>
-
-  <property name="ant.build.javac.target" value="1.5"/>
-
-  <target name="init">
-    <mkdir dir="build"></mkdir>
-    <mkdir dir="dist"></mkdir>
-  </target>
-
-  <target name="compile" depends="init">
-    <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
-      <compilerarg value="-Xlint:deprecation"/>
-      <compilerarg value="-Xlint:unchecked"/>
-      <include name="**/*.java" />
-    </javac>
-  </target>
-
-  <target name="dist" depends="compile">
-    <copy todir="${plugin.build.dir}/resources">
-      <fileset dir="resources"/>
-    </copy>
-    <copy todir="build/images" >
-      <fileset dir="images" />
-    </copy>
-    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-      <env key="LANG" value="C"/>
-      <arg value="info"/>
-      <arg value="--xml"/>
-      <arg value="."/>
-    </exec>
-    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-    <delete file="REVISION"/>
-
-    <jar destfile="${plugin.jar}" basedir="build">
-      <manifest>
-        <attribute name="Plugin-Class" value="wmsplugin.WMSPlugin" />
-        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Description" value="Allows external WMS resources to be displayed." />
-        <attribute name="Plugin-Mainversion" value="1180" />
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete file="${plugin.jar}" />
-  </target>
-  
-  <target name="install" depends="dist">
-    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
-  </target>
-  
+<!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
+    <property environment="env"/>
+    <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+        <and>
+            <os family="windows"/>
+        </and>
+    </condition>
+<!-- compilation properties -->
+    <property name="josm.build.dir"   value="../../core"/>
+    <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+    <property name="josm"         location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.dist.dir"  value="../../dist"/>
+    <property name="plugin.name"      value="${ant.project.name}"/>
+    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <target name="init">
+        <mkdir dir="build"></mkdir>
+        <mkdir dir="dist"></mkdir>
+    </target>
+    <target name="compile" depends="init">
+        <echo message="creating ${plugin.jar}"/>
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
+            <include name="**/*.java" />
+        </javac>
+    </target>
+    <target name="dist" depends="compile">
+        <copy todir="${plugin.build.dir}/resources">
+            <fileset dir="resources"/>
+        </copy>
+        <copy todir="build/images" >
+            <fileset dir="images" />
+        </copy>
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+        <jar destfile="${plugin.jar}" basedir="build">
+            <manifest>
+                <attribute name="Plugin-Class" value="wmsplugin.WMSPlugin" />
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Description" value="Allows external WMS resources to be displayed." />
+                <attribute name="Plugin-Mainversion" value="1180" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="clean">
+        <delete dir="${plugin.build.dir}" />
+        <delete file="${plugin.jar}" />
+    </target>
+    <target name="install" depends="dist">
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
 </project>
Index: applications/editors/josm/plugins/wmsplugin/resources/ymap.html
===================================================================
--- applications/editors/josm/plugins/wmsplugin/resources/ymap.html	(revision 12778)
+++ applications/editors/josm/plugins/wmsplugin/resources/ymap.html	(revision 12780)
@@ -9,5 +9,5 @@
             url = url.substring(queryStringPos + 1);
             var variables = url.split ("&");
-            for (i = 0; i < variables.length; i++) 
+            for (i = 0; i < variables.length; i++)
             {
                 if( !variables[i] )
Index: applications/editors/josm/plugins/wmsplugin/src/readme.txt
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/readme.txt	(revision 12778)
+++ applications/editors/josm/plugins/wmsplugin/src/readme.txt	(revision 12780)
@@ -2,9 +2,9 @@
  Jcoord
  readme.txt
- 
+
  (c) 2006 Jonathan Stott
- 
+
  Created on 11-Feb-2006
- 
+
  1.0 - 11 Feb 2006
   - Initial version created from PHPcoord v2.2
@@ -14,5 +14,5 @@
 various co-ordinate systems and converting between them. Currently, OSGB
 (Ordnance Survey of Great Britain) grid references, UTM (Universal Transverse
-Mercator) references and latitude/longitude are supported. A function is 
+Mercator) references and latitude/longitude are supported. A function is
 also provided to find the surface distance between two points of latitude
 and longitude.