Index: applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- applications/editors/josm/plugins/FixAddresses/build.xml	(revision 29660)
+++ applications/editors/josm/plugins/FixAddresses/build.xml	(revision 29661)
@@ -4,5 +4,5 @@
 	<property name="commit.message" value="fix compile error (core changes)"/>
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5886"/>
+    <property name="plugin.main.version" value="6010"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 29660)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 29661)
@@ -533,5 +533,5 @@
 			for (OsmPrimitive osmPrimitive : osmData) {
 				if (osmPrimitive.isUsable()) {
-					osmPrimitive.visit(this);
+					osmPrimitive.accept(this);
 				}
 			}
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 29660)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 29661)
@@ -177,5 +177,5 @@
 							break;
 						}
-						way.visit(guesser);						
+						way.accept(guesser);						
 					}
 					
@@ -197,5 +197,5 @@
 							break;
 						}
-						node.visit(guesser);						
+						node.accept(guesser);						
 					}
 					
Index: applications/editors/josm/plugins/czechaddress/.classpath
===================================================================
--- applications/editors/josm/plugins/czechaddress/.classpath	(revision 29660)
+++ applications/editors/josm/plugins/czechaddress/.classpath	(revision 29661)
@@ -3,5 +3,5 @@
 	<classpathentry excluding="src/" including="images/**" kind="src" path=""/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- applications/editors/josm/plugins/czechaddress/build.xml	(revision 29660)
+++ applications/editors/josm/plugins/czechaddress/build.xml	(revision 29661)
@@ -33,5 +33,5 @@
             <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/CS:JOSM/Plugins/CzechAddress"/>
             <attribute name="Plugin-Icon" value="images/preferences/czech_flag.png"/>
-            <attribute name="Plugin-Mainversion" value="4980"/>
+            <attribute name="Plugin-Mainversion" value="6010"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java	(revision 29660)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java	(revision 29661)
@@ -92,7 +92,7 @@
         for (OsmPrimitive op : dataSet.allPrimitives()) {
             if (op instanceof Node) {
-                ((Node) op).visit(visitor);
+                ((Node) op).accept(visitor);
             } else if (op instanceof Way) {
-                ((Way) op).visit(visitor);
+                ((Way) op).accept(visitor);
             }
         }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java	(revision 29660)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java	(revision 29661)
@@ -55,5 +55,5 @@
 
         BoundingXYVisitor visitor = new BoundingXYVisitor();
-        way.visit(visitor);
+        way.accept(visitor);
 
         Node addrNode = new Node(visitor.getBounds().getCenter());
Index: applications/editors/josm/plugins/public_transport/.classpath
===================================================================
--- applications/editors/josm/plugins/public_transport/.classpath	(revision 29660)
+++ applications/editors/josm/plugins/public_transport/.classpath	(revision 29661)
@@ -2,5 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: applications/editors/josm/plugins/public_transport/.project
===================================================================
--- applications/editors/josm/plugins/public_transport/.project	(revision 29660)
+++ applications/editors/josm/plugins/public_transport/.project	(revision 29661)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>public_transport</name>
+	<name>JOSM-public_transport</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/public_transport/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/public_transport/.settings/org.eclipse.jdt.core.prefs	(revision 29661)
+++ applications/editors/josm/plugins/public_transport/.settings/org.eclipse.jdt.core.prefs	(revision 29661)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Index: applications/editors/josm/plugins/public_transport/README.template
===================================================================
--- applications/editors/josm/plugins/public_transport/README.template	(revision 29660)
+++ 	(revision )
@@ -1,75 +1,0 @@
-README 
-======
-
-This is a template project structure for a JOSM plugin.
-
-Layout
-======
-+--- src                                source of your plugin
-  |- images                             images your plugin needs
-  |- resources                          resources your plugin needs
-
-  LICENSE                               license file 
-  README                                README for your plugin
-  
-  README.template                       this file 
-  
-  
-Build
-=====  
-A JOSM plugin is built as a single jar. We use ant to build.
-
-See build.xml in this directory and update the plugin specific properties in the
-configuration section.
-  
-
-Maintaining versions
-====================
-There are two versions maintained with each plugin:
-   1) the main version
-      You have to manually set the plugins main version in the build script.
-      Set the property plugin.main.version in build.xml accordingly. 
-
-   2) the build version
-      The build version is unique for every build of the plugin. It is equal
-      to the SVN revision of your plugin directory. 
-
- Both the main version and the build version are included in properties of the plugins
- manifest:
-    Plugin-Version      the build version
-    Plugin-Mainversion  the main version
-
- JOSM automatically detects whether a plugin needs to be upgraded. It compares the build
- version of the currently installed plugin jar with the build version of the plugin jar in 
- the SVN. The main version is irrelevant for this process.  
- 
- Making your plugin available to JOSM users
- ===========================================
- When a plugin jar is checked into SVN a script updates the plugins list on the JOSM wiki:
-   http://josm.openstreetmap.de/wiki/Plugins
- JOSM retrieves the list of available plugins and their build versions from this list.
-
-            commit      publish               read
-                       meta data              meta data 
-      Build  ==>  SVN  =======>  JOSM Wiki   <======= JOSM 
-                   ^ 
-                   ==================================
-                            fetch current plugin jar 
- 
- Note that you have to manually publish (commit) your plugin jar. There is no nightly build
- in place. Everything else (pulishing meta data, updating plugins in the client) is then handled 
- by automatic processes. 
-
-See also
-========
-* Developing Plugins 
-  http://josm.openstreetmap.de/wiki/DevelopingPlugins
-  
-* List of JOSM Plugins
-  http://josm.openstreetmap.de/wiki/Plugins
-  
-  
- 
-     
-
- 
Index: applications/editors/josm/plugins/public_transport/build.xml
===================================================================
--- applications/editors/josm/plugins/public_transport/build.xml	(revision 29660)
+++ applications/editors/josm/plugins/public_transport/build.xml	(revision 29661)
@@ -1,135 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** 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.
-**
--->
 <project name="public_transport" default="dist" basedir=".">
-    <property name="josm.basedir" location="../.."/>
-    <property name="plugin.main.version" value="5679"/>
-    <!--
-      ************************************************
-      ** should not be necessary to change the following properties
-     -->
-    <property name="josm" location="${josm.basedir}/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="${josm.basedir}/dist"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
-    <property name="plugin.dist.dir" value="${josm.basedir}/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>
-    <!--
-    **********************************************************
-    ** 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>
-    <!--
-    **********************************************************
-    ** dist - creates the plugin jar
-    **********************************************************
-    -->
-    <target name="dist" depends="compile,revision">
-        <echo message="creating ${ant.project.name}.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}/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}">
-            <!--
-        ************************************************
-        ** 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="Roland M. Olbricht"/>
-                <attribute name="Plugin-Class" value="public_transport.PublicTransportPlugin"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="This plugin simplifies the mapping and editing of public transport routes."/>
-                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/public_transport"/>
-                <attribute name="Plugin-Mainversion" value="4980"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-            </manifest>
-        </jar>
-    </target>
-    <!--
-    **********************************************************
-    ** revision - extracts the current revision number for the
-    **    file build.number and stores it in the XML property
-    **    version.*
-    **********************************************************
-    -->
-    <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>
-    <!--
-    **********************************************************
-    ** 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>
+
+    <!-- enter the SVN commit message -->
+    <property name="commit.message" value="Commit message"/>
+    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
+    <property name="plugin.main.version" value="6010"/>
+
+    <property name="plugin.author" value="Roland M. Olbricht"/>
+    <property name="plugin.class" value="public_transport.PublicTransportPlugin"/>
+    <property name="plugin.description" value="This plugin simplifies the mapping and editing of public transport routes."/>
+    <!-- <property name="plugin.icon" value=""/> -->
+    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/public_transport"/>
+
+    <!-- ** include targets that all plugins have in common ** -->
+    <import file="../build-common.xml"/>
 </project>
Index: applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java	(revision 29660)
+++ applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java	(revision 29661)
@@ -346,5 +346,5 @@
       int j = consideredLines.elementAt(i);
       if (nodes.elementAt(j) != null)
-        nodes.elementAt(j).visit(box);
+        nodes.elementAt(j).accept(box);
     }
     if (box.getBounds() == null)
Index: applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 29660)
+++ applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 29661)
@@ -1222,5 +1222,5 @@
           if ((itineraryTable.isRowSelected(i)) && (itineraryData.ways.elementAt(i) != null))
           {
-            itineraryData.ways.elementAt(i).visit(box);
+            itineraryData.ways.elementAt(i).accept(box);
           }
         }
@@ -1232,5 +1232,5 @@
           if (itineraryData.ways.elementAt(i) != null)
           {
-            itineraryData.ways.elementAt(i).visit(box);
+            itineraryData.ways.elementAt(i).accept(box);
           }
         }
@@ -1508,5 +1508,5 @@
           if (stoplistTable.isRowSelected(i))
           {
-            stoplistData.nodes.elementAt(i).visit(box);
+            stoplistData.nodes.elementAt(i).accept(box);
           }
         }
@@ -1516,5 +1516,5 @@
         for (int i = 0; i < stoplistData.getRowCount(); ++i)
         {
-          stoplistData.nodes.elementAt(i).visit(box);
+          stoplistData.nodes.elementAt(i).accept(box);
         }
       }
Index: applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 29660)
+++ applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 29661)
@@ -376,5 +376,5 @@
       int j = consideredLines.elementAt(i);
       if (nodes.elementAt(j) != null)
-        nodes.elementAt(j).visit(box);
+        nodes.elementAt(j).accept(box);
     }
     if (box.getBounds() == null)