Index: applications/editors/josm/plugins/ElevationProfile/.classpath
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/.classpath	(revision 30123)
+++ applications/editors/josm/plugins/ElevationProfile/.classpath	(revision 30124)
@@ -4,6 +4,6 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="JOSM_HOME"/>
+	<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"/>
 </classpath>
Index: applications/editors/josm/plugins/ElevationProfile/.externalToolBuilders/ElevationProfile.launch
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/.externalToolBuilders/ElevationProfile.launch	(revision 30123)
+++ applications/editors/josm/plugins/ElevationProfile/.externalToolBuilders/ElevationProfile.launch	(revision 30124)
@@ -5,13 +5,13 @@
 <booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/ElevationProfile/build.xml"/>
+<listEntry value="/JOSM-ElevationProfile"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ElevationProfile"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM-ElevationProfile"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/ElevationProfile/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
Index: applications/editors/josm/plugins/ElevationProfile/.externalToolBuilders/ElevationProfileAnt.launch
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/.externalToolBuilders/ElevationProfileAnt.launch	(revision 30123)
+++ applications/editors/josm/plugins/ElevationProfile/.externalToolBuilders/ElevationProfileAnt.launch	(revision 30124)
@@ -4,13 +4,13 @@
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/ElevationProfile/build.xml"/>
+<listEntry value="/JOSM-ElevationProfile"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ElevationProfile"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM-ElevationProfile"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/ElevationProfile/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
Index: applications/editors/josm/plugins/ElevationProfile/.project
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/.project	(revision 30123)
+++ applications/editors/josm/plugins/ElevationProfile/.project	(revision 30124)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ElevationProfile</name>
+	<name>JOSM-ElevationProfile</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/FixAddresses/.classpath
===================================================================
--- applications/editors/josm/plugins/FixAddresses/.classpath	(revision 30123)
+++ applications/editors/josm/plugins/FixAddresses/.classpath	(revision 30124)
@@ -4,6 +4,6 @@
 	<classpathentry kind="src" path="images/dialogs"/>
 	<classpathentry excluding="dialogs/" kind="src" path="images"/>
-	<classpathentry kind="lib" path="C:/Users/Olli/Java/Josm-svn/core/dist/6187/josm-latest.jar" sourcepath="C:/Users/Olli/Java/Josm-svn/core/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/>
+	<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"/>
 </classpath>
Index: applications/editors/josm/plugins/FixAddresses/.externalToolBuilders/JOSM-Ant.launch
===================================================================
--- applications/editors/josm/plugins/FixAddresses/.externalToolBuilders/JOSM-Ant.launch	(revision 30123)
+++ applications/editors/josm/plugins/FixAddresses/.externalToolBuilders/JOSM-Ant.launch	(revision 30124)
@@ -4,13 +4,13 @@
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/FixAddresses/build.xml"/>
+<listEntry value="/JOSM-FixAddresses"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="FixAddresses"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM-FixAddresses"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/FixAddresses/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
Index: applications/editors/josm/plugins/FixAddresses/.project
===================================================================
--- applications/editors/josm/plugins/FixAddresses/.project	(revision 30123)
+++ applications/editors/josm/plugins/FixAddresses/.project	(revision 30124)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>FixAddresses</name>
+	<name>JOSM-FixAddresses</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/cadastre-fr/.classpath
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/.classpath	(revision 30123)
+++ applications/editors/josm/plugins/cadastre-fr/.classpath	(revision 30124)
@@ -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 combineaccessrules="false" kind="src" path="/JOSM-GeoTools"/>
Index: applications/editors/josm/plugins/cadastre-fr/.project
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/.project	(revision 30123)
+++ applications/editors/josm/plugins/cadastre-fr/.project	(revision 30124)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>cadastre-fr</name>
+	<name>JOSM-cadastre-fr</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 30123)
+++ applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 30124)
@@ -1,2 +1,2 @@
 eclipse.preferences.version=1
-groovy.compiler.level=20
+groovy.compiler.level=21