Index: /applications/editors/josm/plugins/nearclick/build.xml
===================================================================
--- /applications/editors/josm/plugins/nearclick/build.xml	(revision 19457)
+++ /applications/editors/josm/plugins/nearclick/build.xml	(revision 19458)
@@ -1,53 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+** This is the build file for the nearclick plugin.
+**
+** Maintaining versions
+** ====================
+** see README.template
+**
+** Usage
+** =====
+** To build it run
+**
+**    > ant  dist
+**
+** To install the generated plugin locally (in you default plugin directory) run
+**
+**    > ant  install
+**
+** The generated plugin jar is not automatically available in JOSMs plugin configuration
+** dialog. You have to check it in first.
+**
+** Use the ant target 'publish' to check in the plugin and make it available to other
+** JOSM users:
+**    set the properties commit.message and plugin.main.version
+** and run
+**    > ant  publish
+**
+**
+-->
 <project name="nearclick" default="dist" basedir=".">
-    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
-    <property name="plugin.dist.dir"        value="../../dist"/>
-    <property name="plugin.build.dir"       value="build"/>
-    <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.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}" debug="true" destdir="${plugin.build.dir}">
-            <compilerarg value="-Xlint:deprecation"/>
-            <compilerarg value="-Xlint:unchecked"/>
-        </javac>
-    </target>
-    <target name="dist" depends="compile,revision">
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-            <manifest>
-                <attribute name="Author" value="Imi, David Earl"/>
-                <attribute name="Plugin-Class" value="nearclick.NearClickPlugin"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Simulates a click when you do a small and short drag. This is useful for tablet pens, when you have problems just clicking the tablet without the mouse moving (general Java - tablet problem)."/>
-                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Nearclick"/>
-                <attribute name="Plugin-Mainversion" value="1465"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-            </manifest>
-        </jar>
-    </target>
-    <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>
-    <target name="clean">
-        <delete dir="${plugin.build.dir}"/>
-        <delete file="${plugin.jar}"/>
-    </target>
-    <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>
+
+	<!-- enter the SVN commit message -->
+	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
+	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
+	<property name="plugin.main.version" value="2830" />
+
+
+	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
+	<property name="plugin.dist.dir"        value="../../dist"/>
+	<property name="plugin.build.dir"       value="build"/>
+	<property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.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}" debug="true" destdir="${plugin.build.dir}">
+			<compilerarg value="-Xlint:deprecation"/>
+			<compilerarg value="-Xlint:unchecked"/>
+		</javac>
+	</target>
+	<target name="dist" depends="compile,revision">
+		<jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+			<manifest>
+				<attribute name="Author" value="Imi, David Earl"/>
+				<attribute name="Plugin-Class" value="nearclick.NearClickPlugin"/>
+				<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+				<attribute name="Plugin-Description" value="Simulates a click when you do a small and short drag. This is useful for tablet pens, when you have problems just clicking the tablet without the mouse moving (general Java - tablet problem)."/>
+				<attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Nearclick"/>
+				<attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+				<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+			</manifest>
+		</jar>
+	</target>
+	<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>
+	<target name="clean">
+		<delete dir="${plugin.build.dir}"/>
+		<delete file="${plugin.jar}"/>
+	</target>
+	<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>
+
+	<!--
+	************************** Publishing the plugin *********************************** 
+	-->
+	<!--
+		** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+		** property ${coreversion.info.entry.revision}
+		**
+		-->
+	<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 source tree for this plugin
+		-->
+	<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 (svn up) the source tree for this 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>
+
+	<!--
+		** commits the plugin.jar 
+		-->
+	<target name="commit-dist">
+		<echo>
+	***** Properties of published ${plugin.jar} *****
+	Commit message    : '${commit.message}'					
+	Plugin-Mainversion: ${plugin.main.version}
+	JOSM build version: ${coreversion.info.entry.revision}
+	Plugin-Version    : ${version.entry.commit.revision}
+	***** / Properties of published ${plugin.jar} *****					
+						
+	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>
+
+	<target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+	</target>
 </project>
Index: /applications/editors/josm/plugins/nearclick/src/nearclick/NearClickPlugin.java
===================================================================
--- /applications/editors/josm/plugins/nearclick/src/nearclick/NearClickPlugin.java	(revision 19457)
+++ /applications/editors/josm/plugins/nearclick/src/nearclick/NearClickPlugin.java	(revision 19458)
@@ -9,53 +9,56 @@
 import java.awt.event.MouseEvent;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.PluginInformation;
 
 public class NearClickPlugin implements AWTEventListener {
 
-    private int mouseDownX = -1;
-    private int mouseDownY = -1;
-    private long mouseDownTime = -1;
-    private int radiussquared = 49;
-    private int delay = 250;
+	private int mouseDownX = -1;
+	private int mouseDownY = -1;
+	private long mouseDownTime = -1;
+	private int radiussquared = 49;
+	private int delay = 250;
 
-    public NearClickPlugin() {
-        Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK);
-    try {
-        int radius = Integer.parseInt(Main.pref.get("nearclick.radius", "7"));
-        radiussquared = radius * radius;
-        delay = Integer.parseInt(Main.pref.get("nearclick.delay", "250"));
-    } catch (NumberFormatException ex) {
-        delay = 250;
-        radiussquared = 7 * 7;
-    }
-    }
+	public NearClickPlugin(PluginInformation info) {
+		Toolkit.getDefaultToolkit().addAWTEventListener(this,
+				AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK);
+		try {
+			int radius = Integer.parseInt(Main.pref
+					.get("nearclick.radius", "7"));
+			radiussquared = radius * radius;
+			delay = Integer.parseInt(Main.pref.get("nearclick.delay", "250"));
+		} catch (NumberFormatException ex) {
+			delay = 250;
+			radiussquared = 7 * 7;
+		}
+	}
 
-    public void eventDispatched(AWTEvent event) {
-        if (event instanceof MouseEvent) {
-            MouseEvent e = (MouseEvent)event;
-            if ( e.getButton() != MouseEvent.BUTTON1 )
-                return;
-        int xdiff = e.getPoint().x - mouseDownX;
-        int ydiff = e.getPoint().y - mouseDownY;
-        
-            if (e.getID() == MouseEvent.MOUSE_RELEASED) {
-                if ( e.getWhen() - mouseDownTime < delay &&
-             ( e.getPoint().x != mouseDownX ||
-               e.getPoint().y != mouseDownY) &&
-             xdiff * xdiff + ydiff * ydiff < radiussquared
-           ) {
-                    try {
-                        Robot r = new Robot(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice());
-                        r.mousePress(MouseEvent.BUTTON1_MASK);
-                        r.mouseRelease(MouseEvent.BUTTON1_MASK);
-                    } catch (AWTException e1) {
-                    }
-                }                
-            }
-            if (e.getID() == MouseEvent.MOUSE_PRESSED) {
-                mouseDownX = e.getPoint().x;
-                mouseDownY = e.getPoint().y;
-                mouseDownTime = e.getWhen();            
-            }
-        }
-    }
+	public void eventDispatched(AWTEvent event) {
+		if (event instanceof MouseEvent) {
+			MouseEvent e = (MouseEvent) event;
+			if (e.getButton() != MouseEvent.BUTTON1)
+				return;
+			int xdiff = e.getPoint().x - mouseDownX;
+			int ydiff = e.getPoint().y - mouseDownY;
+
+			if (e.getID() == MouseEvent.MOUSE_RELEASED) {
+				if (e.getWhen() - mouseDownTime < delay
+						&& (e.getPoint().x != mouseDownX || e.getPoint().y != mouseDownY)
+						&& xdiff * xdiff + ydiff * ydiff < radiussquared) {
+					try {
+						Robot r = new Robot(GraphicsEnvironment
+								.getLocalGraphicsEnvironment()
+								.getDefaultScreenDevice());
+						r.mousePress(MouseEvent.BUTTON1_MASK);
+						r.mouseRelease(MouseEvent.BUTTON1_MASK);
+					} catch (AWTException e1) {
+					}
+				}
+			}
+			if (e.getID() == MouseEvent.MOUSE_PRESSED) {
+				mouseDownX = e.getPoint().x;
+				mouseDownY = e.getPoint().y;
+				mouseDownTime = e.getWhen();
+			}
+		}
+	}
 }