Index: applications/editors/josm/plugins/ElevationProfile/josm-ElevationProfile.launch
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/josm-ElevationProfile.launch	(revision 29852)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ElevationProfile"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/FastDraw/.project
===================================================================
--- applications/editors/josm/plugins/FastDraw/.project	(revision 29852)
+++ applications/editors/josm/plugins/FastDraw/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>josm-FastDraw</name>
+	<name>JOSM-FastDraw</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/HouseNumberTaggingTool/.project
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/.project	(revision 29852)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>HouseNumberTaggingTool</name>
+	<name>JOSM-HouseNumberTaggingTool</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/OpeningHoursEditor/.project
===================================================================
--- applications/editors/josm/plugins/OpeningHoursEditor/.project	(revision 29852)
+++ applications/editors/josm/plugins/OpeningHoursEditor/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OpeningHoursEditor</name>
+	<name>JOSM-OpeningHoursEditor</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/OsmInspectorPlugin/.classpath
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 29853)
@@ -10,6 +10,5 @@
 	<classpathentry kind="lib" path="lib/gt-render-8.0.jar"/>
 	<classpathentry kind="lib" path="lib/jts-1.12.jar"/>
-	<classpathentry kind="lib" path="/JOSM/dist/josm-custom.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="lib/gt-wfs-8.0.jar"/>
 	<classpathentry kind="lib" path="lib/gt-epsg-extension-8.0.jar"/>
@@ -17,4 +16,5 @@
 	<classpathentry kind="lib" path="lib/gt-metadata-8.0.jar"/>
 	<classpathentry kind="lib" path="lib/gt-coverage-8.0.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: applications/editors/josm/plugins/OsmInspectorPlugin/.project
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/.project	(revision 29852)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OsmInspectorPlugin</name>
+	<name>JOSM-OsmInspectorPlugin</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/OsmInspectorPlugin/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -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/OsmInspectorPlugin/OsmInspectorPlugin.launch
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/OsmInspectorPlugin.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="OsmInspectorPlugin"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/OsmInspectorPlugin/core.info.xml
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/core.info.xml	(revision 29852)
+++ 	(revision )
@@ -1,3 +1,0 @@
-<?xml version="1.0"?>
-<info>
-svn: '../..' is not a working copy
Index: applications/editors/josm/plugins/OsmInspectorPlugin/josm-OsmInspectorPlugin.launch
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/josm-OsmInspectorPlugin.launch	(revision 29852)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="OsmInspectorPlugin"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2000m"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/addrinterpolation/.classpath
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/addrinterpolation/.classpath	(revision 29853)
@@ -2,5 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
+	<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/addrinterpolation/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/addrinterpolation/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -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/alignways/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/alignways/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/alignways/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -0,0 +1,11 @@
+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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+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/cadastre-fr/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/.settings/org.eclipse.jdt.core.prefs	(revision 29852)
+++ applications/editors/josm/plugins/cadastre-fr/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -1,4 +1,8 @@
-#Thu Mar 04 08:24:37 CET 2010
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -8,5 +12,98 @@
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
Index: applications/editors/josm/plugins/colorscheme/.classpath
===================================================================
--- applications/editors/josm/plugins/colorscheme/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/colorscheme/.classpath	(revision 29853)
@@ -2,5 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
+	<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/colorscheme/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/colorscheme/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/colorscheme/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -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/dataimport/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/dataimport/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/dataimport/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -0,0 +1,11 @@
+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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+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/download_along/.classpath
===================================================================
--- applications/editors/josm/plugins/download_along/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/download_along/.classpath	(revision 29853)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build"/>
 </classpath>
Index: applications/editors/josm/plugins/editgpx/josm-editgpx.launch
===================================================================
--- applications/editors/josm/plugins/editgpx/josm-editgpx.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="editgpx_svn"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/epci-fr/.classpath
===================================================================
--- applications/editors/josm/plugins/epci-fr/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/epci-fr/.classpath	(revision 29853)
@@ -2,5 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_29"/>
+	<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/ext_tools/.project
===================================================================
--- applications/editors/josm/plugins/ext_tools/.project	(revision 29852)
+++ applications/editors/josm/plugins/ext_tools/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ext_tools</name>
+	<name>JOSM-ext_tools</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/geochat/.classpath
===================================================================
--- applications/editors/josm/plugins/geochat/.classpath	(revision 29853)
+++ applications/editors/josm/plugins/geochat/.classpath	(revision 29853)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: applications/editors/josm/plugins/geochat/.project
===================================================================
--- applications/editors/josm/plugins/geochat/.project	(revision 29853)
+++ applications/editors/josm/plugins/geochat/.project	(revision 29853)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-geochat</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
Index: applications/editors/josm/plugins/globalsat/.project
===================================================================
--- applications/editors/josm/plugins/globalsat/.project	(revision 29852)
+++ applications/editors/josm/plugins/globalsat/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>globalsat</name>
+	<name>JOSM-globalsat</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/gpxfilter/.project
===================================================================
--- applications/editors/josm/plugins/gpxfilter/.project	(revision 29852)
+++ applications/editors/josm/plugins/gpxfilter/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>gpxfilter</name>
+	<name>JOSM-gpxfilter</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/graphview/.classpath
===================================================================
--- applications/editors/josm/plugins/graphview/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/graphview/.classpath	(revision 29853)
@@ -2,5 +2,5 @@
 <classpath>
 	<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="build"/>
Index: applications/editors/josm/plugins/graphview/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/graphview/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/graphview/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -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/junctionchecking/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/junctionchecking/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/junctionchecking/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -0,0 +1,11 @@
+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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+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/junctionchecking/josm-junctionchecking.launch
===================================================================
--- applications/editors/josm/plugins/junctionchecking/josm-junctionchecking.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM-junctionchecking"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/lakewalker/.project
===================================================================
--- applications/editors/josm/plugins/lakewalker/.project	(revision 29852)
+++ applications/editors/josm/plugins/lakewalker/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>josm-lakewalker</name>
+	<name>JOSM-lakewalker</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/livegps/.project
===================================================================
--- applications/editors/josm/plugins/livegps/.project	(revision 29852)
+++ applications/editors/josm/plugins/livegps/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>livegps</name>
+	<name>JOSM-livegps</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/livegps/josm-livegps.launch
===================================================================
--- applications/editors/josm/plugins/livegps/josm-livegps.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="livegps"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/log4j/build.xml
===================================================================
--- applications/editors/josm/plugins/log4j/build.xml	(revision 29852)
+++ applications/editors/josm/plugins/log4j/build.xml	(revision 29853)
@@ -1,31 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is a template build file for a JOSM  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="log4j" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
@@ -42,5 +14,5 @@
     <!--<property name="plugin.icon" value="..."/>-->
     <!--<property name="plugin.link" value="..."/>-->
-    <!--<property name="plugin.early" value="..."/>-->
+    <property name="plugin.early" value="true"/>
     <!--<property name="plugin.requires" value="..."/>-->
     <property name="plugin.stage" value="5"/>
Index: applications/editors/josm/plugins/mapdust/josm-mapdust.launch
===================================================================
--- applications/editors/josm/plugins/mapdust/josm-mapdust.launch	(revision 29852)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="mapdust"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2000m"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/mapdust/mapdust.launch
===================================================================
--- applications/editors/josm/plugins/mapdust/mapdust.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="mapdust"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/measurement/josm-measurement.launch
===================================================================
--- applications/editors/josm/plugins/measurement/josm-measurement.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM-Measurement"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/michigan_left/.classpath
===================================================================
--- applications/editors/josm/plugins/michigan_left/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/michigan_left/.classpath	(revision 29853)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/core"/>
-	<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="bin"/>
 </classpath>
Index: applications/editors/josm/plugins/michigan_left/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/michigan_left/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/michigan_left/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -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/namemanager/.project
===================================================================
--- applications/editors/josm/plugins/namemanager/.project	(revision 29852)
+++ applications/editors/josm/plugins/namemanager/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>namemanager</name>
+	<name>JOSM-namemanager</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/nearclick/.project
===================================================================
--- applications/editors/josm/plugins/nearclick/.project	(revision 29852)
+++ applications/editors/josm/plugins/nearclick/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>nearclick</name>
+	<name>JOSM-nearclick</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/opendata/.classpath
===================================================================
--- applications/editors/josm/plugins/opendata/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/opendata/.classpath	(revision 29853)
@@ -17,5 +17,5 @@
 	<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-utilsplugin2"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-utilsplugin2"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-GeoTools"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
Index: applications/editors/josm/plugins/openstreetbugs/josm-osb.launch
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/josm-osb.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM OSB"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/osmarender/josm-osmarender.launch
===================================================================
--- applications/editors/josm/plugins/osmarender/josm-osmarender.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="osmarender"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/pdfimport/JOSM-pdfimport.launch
===================================================================
--- applications/editors/josm/plugins/pdfimport/JOSM-pdfimport.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM-pdfimport"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/photo_geotagging/.project
===================================================================
--- applications/editors/josm/plugins/photo_geotagging/.project	(revision 29852)
+++ applications/editors/josm/plugins/photo_geotagging/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>photo_geotaging</name>
+	<name>JOSM-photo_geotaging</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/photo_geotagging/photo_geotaging.launch
===================================================================
--- applications/editors/josm/plugins/photo_geotagging/photo_geotaging.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="photo_geotaging"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/plastic_laf/.classpath
===================================================================
--- applications/editors/josm/plugins/plastic_laf/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/plastic_laf/.classpath	(revision 29853)
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
-	<classpathentry kind="lib" path="/home/jirka/osm/josm/plugins/plastic_laf/lib/looks-2.2.1.jar"/>
+	<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="lib" path="lib/looks-2.2.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: applications/editors/josm/plugins/plastic_laf/.project
===================================================================
--- applications/editors/josm/plugins/plastic_laf/.project	(revision 29852)
+++ applications/editors/josm/plugins/plastic_laf/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>plastic_laf</name>
+	<name>JOSM-plastic_laf</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/plastic_laf/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/plastic_laf/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/plastic_laf/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -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/reltoolbox/.settings/org.eclipse.core.resources.prefs
===================================================================
--- applications/editors/josm/plugins/reltoolbox/.settings/org.eclipse.core.resources.prefs	(revision 29852)
+++ applications/editors/josm/plugins/reltoolbox/.settings/org.eclipse.core.resources.prefs	(revision 29853)
@@ -2,2 +2,3 @@
 encoding//src/relcontext/actions=UTF-8
 encoding//src/relcontext/actions/TheRing.java=UTF-8
+encoding/TODO=UTF-8
Index: applications/editors/josm/plugins/roadsigns/.classpath
===================================================================
--- applications/editors/josm/plugins/roadsigns/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/roadsigns/.classpath	(revision 29853)
@@ -2,5 +2,5 @@
 <classpath>
 	<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/roadsigns/.project
===================================================================
--- applications/editors/josm/plugins/roadsigns/.project	(revision 29852)
+++ applications/editors/josm/plugins/roadsigns/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>roadsigns</name>
+	<name>JOSM-roadsigns</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/routes/.project
===================================================================
--- applications/editors/josm/plugins/routes/.project	(revision 29852)
+++ applications/editors/josm/plugins/routes/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>josm-routes</name>
+	<name>JOSM-routes</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/routes/josm-routes.launch
===================================================================
--- applications/editors/josm/plugins/routes/josm-routes.launch	(revision 29852)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="josm-routes"/>
-</launchConfiguration>
Index: applications/editors/josm/plugins/simplifyarea/.project
===================================================================
--- applications/editors/josm/plugins/simplifyarea/.project	(revision 29852)
+++ applications/editors/josm/plugins/simplifyarea/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>SimplifyAreaJosmPlugin</name>
+	<name>JOSM-SimplifyArea</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/surveyor/.classpath
===================================================================
--- applications/editors/josm/plugins/surveyor/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/surveyor/.classpath	(revision 29853)
@@ -4,5 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/livegps"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-livegps"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: applications/editors/josm/plugins/surveyor/.project
===================================================================
--- applications/editors/josm/plugins/surveyor/.project	(revision 29852)
+++ applications/editors/josm/plugins/surveyor/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>josm-plugin-surveyor</name>
+	<name>JOSM-plugin-surveyor</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/tageditor/.project
===================================================================
--- applications/editors/josm/plugins/tageditor/.project	(revision 29852)
+++ applications/editors/josm/plugins/tageditor/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tageditor</name>
+	<name>JOSM-tageditor</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 29852)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 29853)
@@ -264,5 +264,5 @@
                     )
             ).applySafe(this);
-        } else if (!visible && isShowing()){
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }
Index: applications/editors/josm/plugins/tracer/.project
===================================================================
--- applications/editors/josm/plugins/tracer/.project	(revision 29852)
+++ applications/editors/josm/plugins/tracer/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tracer</name>
+	<name>JOSM-tracer</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/turnlanes/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/turnlanes/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/turnlanes/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -0,0 +1,11 @@
+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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+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/turnrestrictions/.classpath
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/.classpath	(revision 29852)
+++ applications/editors/josm/plugins/turnrestrictions/.classpath	(revision 29853)
@@ -6,7 +6,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="/JOSM/dist/josm-custom.jar" sourcepath="/JOSM/src"/>
-	<classpathentry kind="lib" path="/JOSM/test/build" sourcepath="/JOSM/test/functional"/>
 	<classpathentry kind="lib" path="test/config"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
Index: applications/editors/josm/plugins/turnrestrictions/.project
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/.project	(revision 29852)
+++ applications/editors/josm/plugins/turnrestrictions/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>turnrestrictions</name>
+	<name>JOSM-turnrestrictions</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -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/turnrestrictions/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 29853)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+groovy.compiler.level=20
Index: applications/editors/josm/plugins/utilsplugin2/.project
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/.project	(revision 29852)
+++ applications/editors/josm/plugins/utilsplugin2/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>josm-utilsplugin2</name>
+	<name>JOSM-utilsplugin2</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/waydownloader/.project
===================================================================
--- applications/editors/josm/plugins/waydownloader/.project	(revision 29852)
+++ applications/editors/josm/plugins/waydownloader/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>waydownloader</name>
+	<name>JOSM-waydownloader</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/waypoint_search/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/waypoint_search/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
+++ applications/editors/josm/plugins/waypoint_search/.settings/org.eclipse.jdt.core.prefs	(revision 29853)
@@ -0,0 +1,11 @@
+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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+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/wayselector/.project
===================================================================
--- applications/editors/josm/plugins/wayselector/.project	(revision 29852)
+++ applications/editors/josm/plugins/wayselector/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jOSM-wayselector</name>
+	<name>JOSM-wayselector</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/wikipedia/.classpath
===================================================================
--- applications/editors/josm/plugins/wikipedia/.classpath	(revision 29853)
+++ applications/editors/josm/plugins/wikipedia/.classpath	(revision 29853)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: applications/editors/josm/plugins/wikipedia/.project
===================================================================
--- applications/editors/josm/plugins/wikipedia/.project	(revision 29853)
+++ applications/editors/josm/plugins/wikipedia/.project	(revision 29853)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-wikipedia</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
Index: applications/editors/josm/plugins/wms-turbo-challenge2/.project
===================================================================
--- applications/editors/josm/plugins/wms-turbo-challenge2/.project	(revision 29852)
+++ applications/editors/josm/plugins/wms-turbo-challenge2/.project	(revision 29853)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>wms-turbo-challenge2</name>
+	<name>JOSM-wms-turbo-challenge2</name>
 	<comment></comment>
 	<projects>