Index: applications/editors/josm/plugins/mapdust/build.xml
===================================================================
--- applications/editors/josm/plugins/mapdust/build.xml	(revision 25839)
+++ applications/editors/josm/plugins/mapdust/build.xml	(revision 26174)
@@ -1,172 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <project name="mapdust" default="dist" basedir=".">
-
-	<!-- properties -->
-	<property name="commit.message" value="MapDust bug reporter plugin" />
-	<property name="plugin.main.version" value="3835" />
-	<property name="josm" location="../../core/dist/josm-custom.jar"/>
-	<property name="plugin.build.dir" value="build/classes" />
-	<property name="apidoc.dir" value="build/doc" />
-	<property name="plugin.src.dir" value="src" />
-	<property name="plugin.lib.dir" value="lib" />
-	<property name="plugin.dist.dir" value="../../dist" />
-	<property name="ant.build.javac.target" value="1.5" />
-	<property name="plugin.dist.dir" value="../../dist" />
-	<property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar" />
-
-	<!-- classpath -->
-	<path id="classpath">
-		<fileset dir="${plugin.lib.dir}" includes="**/*.jar" />
-		<pathelement path="${josm}"/>
-	</path>
-
-	<!-- clean the build -->
-	<target name="clean">
-		<delete dir="${plugin.build.dir}" />
-		<delete file="${plugin.jar}" />
-	</target>
-
-	<!-- initialize the build -->
-	<target name="init" depends="clean">
-		<mkdir dir="${plugin.build.dir}" />
-	</target>
-
-	<!-- compiles the sources -->
-	<target name="compile" depends="init">
-		<echo message="compiling sources for  ${plugin.jar} ... " />
-		<javac srcdir="src" classpathref="classpath" debug="true" 
-			destdir="${plugin.build.dir}" includeantruntime="true" target="1.5"
-			source="1.5">
-			<compilerarg value="-Xlint:deprecation" />
-			<compilerarg value="-Xlint:unchecked" />
-		</javac>
-	</target>
-
-	<!-- creates the javadocs -->
-	<target name="javadoc">
-		<mkdir dir="${apidoc.dir}" />
-		<javadoc destdir="${apidoc.dir}" source="1.6" classpathref="classpath" 
-			windowtitle="MapDust plugin API">
-			<link href="http://java.sun.com/javase/6/docs/api/" />
-			<link href="http://docs.jboss.org/hibernate/stable/core/api/" />
-			<packageset dir="${plugin.src.dir}">
-			</packageset>
-		</javadoc>
-
-	</target>
-
-	<!-- revision -->
-	<target name="revision">
-		<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" />
-	</target>
-
-	<!-- creates the .jar file of the plugin -->
-	<target name="dist" depends="compile,revision">
-		<echo message="creating ${ant.project.name}.jar ... " />
-		<copy todir="${plugin.build.dir}">
-			<fileset dir="conf" />
-		</copy>
-		<copy todir="${plugin.build.dir}/images">
-			<fileset dir="images" />
-		</copy>
-		<copy todir="${plugin.build.dir}">
-			<fileset dir=".">
-				<include name="README" />
-				<include name="LICENSE" />
-			</fileset>
-		</copy>
-		<jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-			<zipfileset src="lib/gson-1.5.jar" includes="**/*.class" />
-			<manifest>
-				<attribute name="Author" value="Beata Jancso" />
-				<attribute name="Plugin-Class" 
-					value="org.openstreetmap.josm.plugins.mapdust.MapdustPlugin" />
-				<attribute name="Plugin-Date" value="${version.entry.commit.date}" />
-				<attribute name="Plugin-Description" 
-					value="The MapDust Plug-In shows the MapDust bug reports on 
-					the map. You can create, close,invalidate, re-open and comment 
-					bug reports by using this plugin." />
-				<attribute name="Plugin-Link" 
-					value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/MapDust" />
-				<attribute name="Plugin-Mainversion" 
-					value="${plugin.main.version}" />
-				<attribute name="Plugin-Version" 
-					value="${version.entry.commit.revision}" />
-				<attribute name="Plugin-Icon" 
-					value="images/dialogs/mapdust_icon25.png" />
-			</manifest>
-		</jar>
-	</target>
-
-	<!-- installs the plugin  -->
-	<target name="install" depends="dist">
-		<property environment="env" />
-		<condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" 
-			else="${user.home}/.josm/plugins">
-			<and>
-				<os family="windows" />
-			</and>
-		</condition>
-		<copy file="${plugin.jar}" todir="${josm.plugins.dir}" />
-	</target>
-
-	<!-- displays the information about the core josm -->
-	<target name="core-info">
-		<exec append="false" output="core.info.xml" executable="svn" 
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="info" />
-			<arg value="--xml" />
-			<arg value="../../core" />
-		</exec>
-		<xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" 
-			collapseAttributes="true" />
-		<echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
-		<echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
-		<delete file="core.info.xml" />
-	</target>
-
-	<!-- commits the current sources -->
-	<target name="commit-current">
-		<echo>Commiting the plugin source with message '${commit.message}' ...</echo>
-		<exec append="true" output="svn.log" executable="svn" 
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="commit" />
-			<arg value="-m '${commit.message}'" />
-			<arg value="." />
-		</exec>
-	</target>
-
-	<!-- updates the plugin -->
-	<target name="update-current">
-		<echo>Updating plugin source ...</echo>
-		<exec append="true" output="svn.log" executable="svn" 
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="up" />
-			<arg value="." />
-		</exec>
-		<echo>Updating ${plugin.jar} ...</echo>
-		<exec append="true" output="svn.log" executable="svn" 
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="up" />
-			<arg value="../dist/${plugin.jar}" />
-		</exec>
-	</target>
-
-	<!-- commit the .jar of the plugin -->
-	<target name="commit-dist">
-		<echo>
+    <!-- properties -->
+    <property name="commit.message" value="MapDust bug reporter plugin"/>
+    <property name="plugin.main.version" value="3835"/>
+    <property name="josm" location="../../core/dist/josm-custom.jar"/>
+    <property name="plugin.build.dir" value="build/classes"/>
+    <property name="apidoc.dir" value="build/doc"/>
+    <property name="plugin.src.dir" value="src"/>
+    <property name="plugin.lib.dir" value="lib"/>
+    <property name="plugin.dist.dir" value="../../dist"/>
+    <property name="ant.build.javac.target" value="1.5"/>
+    <property name="plugin.dist.dir" value="../../dist"/>
+    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+    <!-- classpath -->
+    <path id="classpath">
+        <fileset dir="${plugin.lib.dir}" includes="**/*.jar"/>
+        <pathelement path="${josm}"/>
+    </path>
+    <!-- clean the build -->
+    <target name="clean">
+        <delete dir="${plugin.build.dir}"/>
+        <delete file="${plugin.jar}"/>
+    </target>
+    <!-- initialize the build -->
+    <target name="init" depends="clean">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <!-- compiles the sources -->
+    <target name="compile" depends="init">
+        <echo message="compiling sources for  ${plugin.jar} ... "/>
+        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}" includeantruntime="true" target="1.5" source="1.5">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
+        </javac>
+    </target>
+    <!-- creates the javadocs -->
+    <target name="javadoc">
+        <mkdir dir="${apidoc.dir}"/>
+        <javadoc destdir="${apidoc.dir}" source="1.6" classpathref="classpath" windowtitle="MapDust plugin API">
+            <link href="http://java.sun.com/javase/6/docs/api/"/>
+            <link href="http://docs.jboss.org/hibernate/stable/core/api/"/>
+            <packageset dir="${plugin.src.dir}">
+            </packageset>
+        </javadoc>
+    </target>
+    <!-- revision -->
+    <target name="revision">
+        <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"/>
+    </target>
+    <!-- creates the .jar file of the plugin -->
+    <target name="dist" depends="compile,revision">
+        <echo message="creating ${ant.project.name}.jar ... "/>
+        <copy todir="${plugin.build.dir}">
+            <fileset dir="conf"/>
+        </copy>
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images"/>
+        </copy>
+        <copy todir="${plugin.build.dir}/data">
+            <fileset dir="data"/>
+        </copy>
+        <copy todir="${plugin.build.dir}">
+            <fileset dir=".">
+                <include name="README"/>
+                <include name="LICENSE"/>
+            </fileset>
+        </copy>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <zipfileset src="lib/gson-1.5.jar" includes="**/*.class"/>
+            <manifest>
+                <attribute name="Author" value="Beata Jancso"/>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.mapdust.MapdustPlugin"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Description" value="The MapDust Plug-In shows the MapDust bug reports on       the map. You can create, close,invalidate, re-open and comment       bug reports by using this plugin."/>
+                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/MapDust"/>
+                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Icon" value="images/dialogs/mapdust_icon25.png"/>
+            </manifest>
+        </jar>
+    </target>
+    <!-- installs the plugin  -->
+    <target name="install" depends="dist">
+        <property environment="env"/>
+        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+            <and>
+                <os family="windows"/>
+            </and>
+        </condition>
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
+    <!-- displays the information about the core josm -->
+    <target name="core-info">
+        <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="../../core"/>
+        </exec>
+        <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+        <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+        <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+        <delete file="core.info.xml"/>
+    </target>
+    <!-- commits the current sources -->
+    <target name="commit-current">
+        <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="commit"/>
+            <arg value="-m '${commit.message}'"/>
+            <arg value="."/>
+        </exec>
+    </target>
+    <!-- updates the plugin -->
+    <target name="update-current">
+        <echo>Updating plugin source ...</echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="up"/>
+            <arg value="."/>
+        </exec>
+        <echo>Updating ${plugin.jar} ...</echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="up"/>
+            <arg value="../dist/${plugin.jar}"/>
+        </exec>
+    </target>
+    <!-- commit the .jar of the plugin -->
+    <target name="commit-dist">
+        <echo>
     ***** Properties of published ${plugin.jar} *****
     Commit message    : '${commit.message}'                    
@@ -178,42 +148,34 @@
     Now commiting ${plugin.jar} ...
     </echo>
-		<exec append="true" output="svn.log" executable="svn" 
-			failifexecutionfails="false">
-			<env key="LANG" value="C" />
-			<arg value="-m '${commit.message}'" />
-			<arg value="commit" />
-			<arg value="${plugin.jar}" />
-		</exec>
-	</target>
-
-	<!-- ** make sure svn is present as a command line tool ** -->
-	<target name="ensure-svn-present">
-		<exec append="true" output="svn.log" executable="svn"
-			failifexecutionfails="false" failonerror="false" 
-			resultproperty="svn.exit.code">
-			<env key="LANG" value="C" />
-			<arg value="--version" />
-		</exec>
-		<fail message="Fatal: command 'svn --version' failed. Please make sure 
-			svn is installed on your system.">
-			<!-- return code not set at all? Most likely svn isn't installed -->
-			<condition>
-				<not>
-					<isset property="svn.exit.code" />
-				</not>
-			</condition>
-		</fail>
-		<fail message="Fatal: command 'svn --version' failed. Please make sure 
-			a working copy of svn is installed on your system.">
-			<!-- error code from SVN? Most likely svn is not what we are looking on this system -->
-			<condition>
-				<isfailure code="${svn.exit.code}" />
-			</condition>
-		</fail>
-	</target>
-
-	<!-- publish the plugin -->
-	<target name="publish" depends="ensure-svn-present,core-info,commit-current,
-		update-current,clean,dist,commit-dist">
-	</target>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="-m '${commit.message}'"/>
+            <arg value="commit"/>
+            <arg value="${plugin.jar}"/>
+        </exec>
+    </target>
+    <!-- ** make sure svn is present as a command line tool ** -->
+    <target name="ensure-svn-present">
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+            <env key="LANG" value="C"/>
+            <arg value="--version"/>
+        </exec>
+        <fail message="Fatal: command 'svn --version' failed. Please make sure     svn is installed on your system.">
+            <!-- return code not set at all? Most likely svn isn't installed -->
+            <condition>
+                <not>
+                    <isset property="svn.exit.code"/>
+                </not>
+            </condition>
+        </fail>
+        <fail message="Fatal: command 'svn --version' failed. Please make sure     a working copy of svn is installed on your system.">
+            <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+            <condition>
+                <isfailure code="${svn.exit.code}"/>
+            </condition>
+        </fail>
+    </target>
+    <!-- publish the plugin -->
+    <target name="publish" depends="ensure-svn-present,core-info,commit-current,   update-current,clean,dist,commit-dist">
+    </target>
 </project>