Index: /applications/editors/josm/plugins/waydownloader/build.xml
===================================================================
--- /applications/editors/josm/plugins/waydownloader/build.xml	(revision 19044)
+++ /applications/editors/josm/plugins/waydownloader/build.xml	(revision 19045)
@@ -22,68 +22,68 @@
 -->
 <project name="waydownloader" default="dist" basedir=".">
-	
+
 	<!-- 
       ** update before publishing 
 	-->
-	<property name="commit.message" value="Publishing: various fixes and improvements, see 18613" />		
-	<property name="plugin.main.version" value="2578" />
-	
-	
-    <!--
+	<property name="commit.message" value="Update to JOSM 2616" />
+	<property name="plugin.main.version" value="2616" />
+
+
+	<!--
       ************************************************
       ** should not be necessary to change the following properties
      -->
-    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
-    <property name="plugin.build.dir"       value="build"/>
-    <property name="plugin.src.dir"         value="src"/>
-    <!-- this is the directory where the plugin jar is copied to -->
-    <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"/>
-
-    <!--
+	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
+	<property name="plugin.build.dir"       value="build"/>
+	<property name="plugin.src.dir"         value="src"/>
+	<!-- this is the directory where the plugin jar is copied to -->
+	<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"/>
+
+	<!--
     **********************************************************
     ** init - initializes the build
     **********************************************************
     -->
-    <target name="init">
-        <mkdir dir="${plugin.build.dir}"/>
-    </target>
-
-    <!--
+	<target name="init">
+		<mkdir dir="${plugin.build.dir}"/>
+	</target>
+
+	<!--
     **********************************************************
     ** compile - complies the source tree
     **********************************************************
     -->
-    <target name="compile" depends="init">
-        <echo message="compiling sources for  ${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="compile" depends="init">
+		<echo message="compiling sources for  ${plugin.jar} ... "/>
+		<javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+			<compilerarg value="-Xlint:deprecation"/>
+			<compilerarg value="-Xlint:unchecked"/>
+		</javac>
+	</target>
+
+	<!--
     **********************************************************
     ** dist - creates the plugin jar
     **********************************************************
     -->
-    <target name="dist" depends="compile,revision">
-        <echo message="creating ${plugin.jar} ... "/>
-        <copy todir="${plugin.build.dir}/resources">
-            <fileset dir="resources"/>
-        </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}">
-    <!--
+	<target name="dist" depends="compile,revision">
+		<echo message="creating ${plugin.jar} ... "/>
+		<copy todir="${plugin.build.dir}/resources">
+			<fileset dir="resources"/>
+		</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}">
+			<!--
         ************************************************
         ** configure these properties. Most of them will be copied to the plugins
@@ -93,17 +93,17 @@
         ************************************************
     -->
-            <manifest>
-                <attribute name="Author" value="Harry Wood"/>
-                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.waydownloader.WayDownloaderPlugin"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Easy downloading along a long set of interconnected ways"/>
-                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WayDownloaderPlugin"/>
-                <attribute name="Plugin-Mainversion" value="2401"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <!--
+			<manifest>
+				<attribute name="Author" value="Harry Wood"/>
+				<attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.waydownloader.WayDownloaderPlugin"/>
+				<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+				<attribute name="Plugin-Description" value="Easy downloading along a long set of interconnected ways"/>
+				<attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WayDownloaderPlugin"/>
+				<attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+				<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<!--
     **********************************************************
     ** revision - extracts the current revision number for the
@@ -112,99 +112,99 @@
     **********************************************************
     -->
-    <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="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>
+
+	<!--
     **********************************************************
     ** clean - clean up the build environment
     **********************************************************
     -->
-    <target name="clean">
-        <delete dir="${plugin.build.dir}"/>
-        <delete file="${plugin.jar}"/>
-    </target>
-
-    <!--
+	<target name="clean">
+		<delete dir="${plugin.build.dir}"/>
+		<delete file="${plugin.jar}"/>
+	</target>
+
+	<!--
     **********************************************************
     ** install - install the plugin in your local JOSM installation
     **********************************************************
     -->
-    <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>
-	
-	
+	<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="-m '${commit.message}'"/>
-			    				<arg value="commit"/>
-			                    <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>
+	-->
+	<!--
+	** 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="-m '${commit.message}'"/>
+			<arg value="commit"/>
+			<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}'					
@@ -215,14 +215,36 @@
 						
 	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>
-					
-			<target name="publish" depends="core-info,commit-current,update-current,clean,dist,commit-dist">
-			</target>	
+	</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 for 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/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java
===================================================================
--- /applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java	(revision 19044)
+++ /applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java	(revision 19045)
@@ -92,8 +92,8 @@
         public void actionPerformed(ActionEvent e) {
             selectedNode = null;
-            Collection<OsmPrimitive> selection = Main.main.getCurrentDataSet().getSelectedNodes();
+            Collection<Node> selection = Main.main.getCurrentDataSet().getSelectedNodes();
             if (selection.size()==0) {
-                selection = Main.main.getCurrentDataSet().getSelectedWays();
-                if (!workFromWaySelection(selection)) {
+                Collection<Way> selWays = Main.main.getCurrentDataSet().getSelectedWays();
+                if (!workFromWaySelection(selWays)) {
                     showWarningMessage(tr("<html>Neither a node nor a way with an endpoint outside of the<br>current download areas is selected.<br>Select a node on the start or end of a way or an entire way first.</html>"));
                     return;
@@ -302,5 +302,5 @@
      * return true if this worked
      */
-    private boolean workFromWaySelection(Collection<OsmPrimitive> selection) {
+    private boolean workFromWaySelection(Collection<? extends OsmPrimitive> selection) {
         if (selection.size() != 1)
             return false;