Index: applications/editors/josm/plugins/routing/build.xml
===================================================================
--- applications/editors/josm/plugins/routing/build.xml	(revision 28254)
+++ applications/editors/josm/plugins/routing/build.xml	(revision 28288)
@@ -26,42 +26,38 @@
 -->
 <project name="routing" default="dist" basedir=".">
+
+    <!-- enter the SVN commit message -->
     <property name="commit.message" value="added one-way support in roundabouts"/>
+    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="4980"/>
-    <!-- Define some properties -->
-    <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="libdir" location="lib"/>
-    <property name="jgrapht" value="${libdir}/jgrapht-jdk1.5.jar"/>
-    <property name="log4j" value="${libdir}/log4j-1.2.15.jar"/>
-    <property name="ant.build.javac.target" value="1.5"/>
-    <!-- Some initializations for several other targets -->
-    <target name="init">
-        <mkdir dir="${plugin.dist.dir}"/>
-        <mkdir dir="${plugin.build.dir}"/>
-    </target>
-    <!-- Compile sources -->
-    <target name="compile" depends="init" description="Compile sources">
-        <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
+
+    <!--
+    **********************************************************
+    ** include targets that all plugins have in common
+    **********************************************************
+    -->
+    <import file="../build-common.xml"/>
+
+    <!-- classpath -->
+    <path id="classpath">
+        <fileset dir="${plugin.lib.dir}" includes="**/*.jar"/>
+        <pathelement path="${josm}"/>
+    </path>
+    <!--
+    **********************************************************
+    ** compile - complies the source tree
+    ** Overrides the target from build-common.xml
+    **********************************************************
+    -->
+    <target name="compile" depends="init">
+        <echo message="compiling sources for ${plugin.jar} ..."/>
+        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
-            <classpath>
-                <pathelement location="${josm}"/>
-                <pathelement location="${jgrapht}"/>
-                <pathelement location="${log4j}"/>
-            </classpath>
         </javac>
     </target>
+
     <!-- Generate distribution -->
     <target name="dist" depends="compile,revision" description="Generate distribution">
-        <unjar dest="${plugin.build.dir}" src="${jgrapht}"/>
-        <unjar dest="${plugin.build.dir}" src="${log4j}"/>
-        <copy todir="${plugin.build.dir}/">
-            <fileset dir="resources">
-                <include name="*.xml"/>
-            </fileset>
-        </copy>
         <copy todir="${plugin.build.dir}/images">
             <fileset dir="images"/>
@@ -70,5 +66,18 @@
             <fileset dir="data"/>
         </copy>
+        <copy todir="${plugin.build.dir}/">
+            <fileset dir="resources">
+                <include name="*.xml"/>
+            </fileset>
+        </copy>
         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+        <!--
+        ************************************************
+        ** configure these properties. Most of them will be copied to the plugins
+        ** manifest file. Property values will also show up in the list available
+        ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
+        **
+        ************************************************
+        -->
             <manifest>
                 <attribute name="Author" value="Jose Vidal &lt;vidalfree@gmail.com&gt;, Juangui Jordán &lt;juangui@gmail.com&gt;, Hassan S &lt;hassan.sabirin@gmail.com&gt;"/>
@@ -82,121 +91,7 @@
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
+            <zipfileset src="${plugin.lib.dir}/jgrapht-jdk1.5.jar"/>
+            <zipfileset src="${plugin.lib.dir}/log4j-1.2.15.jar"/>
         </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/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java
===================================================================
--- applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java	(revision 28254)
+++ applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java	(revision 28288)
@@ -52,6 +52,6 @@
 public class RoutingDialog extends ToggleDialog {
 
-	private final DefaultListModel<String> model;
-	private JList<String> jList = null;
+	private final DefaultListModel model;
+	private JList jList = null;
 	private JScrollPane jScrollPane = null;
 
@@ -64,5 +64,5 @@
 		super(tr("Routing"), "routing", tr("Open a list of routing nodes"),
 				Shortcut.registerShortcut("subwindow:routing", tr("Toggle: {0}", tr("Routing")), KeyEvent.VK_R, Shortcut.ALT_CTRL_SHIFT), 150);
-		model = new DefaultListModel<String>();
+		model = new DefaultListModel();
 		createLayout(getJScrollPane(), false, null);
 	}
@@ -88,7 +88,7 @@
 	 * @return javax.swing.JList
 	 */
-	private JList<String> getJList() {
+	private JList getJList() {
 		if (jList == null) {
-			jList = new JList<String>();
+			jList = new JList();
 			jList.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
 			jList.setModel(model);
Index: applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java
===================================================================
--- applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java	(revision 28254)
+++ applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java	(revision 28288)
@@ -110,5 +110,5 @@
 				JPanel p = new JPanel(new GridBagLayout());
 				p.add(new JLabel(tr("Weight")), GBC.std().insets(0, 0, 5, 0));
-				JComboBox<String> key = new JComboBox<String>();
+				JComboBox key = new JComboBox();
 				for (OsmWayTypes pk : OsmWayTypes.values())
 					key.addItem(pk.getTag());