Index: /applications/editors/josm/plugins/00_plugin_dir_template/build.xml
===================================================================
--- /applications/editors/josm/plugins/00_plugin_dir_template/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/00_plugin_dir_template/build.xml	(revision 30416)
@@ -17,5 +17,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/ColumbusCSV/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/ColumbusCSV/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
+++ /applications/editors/josm/plugins/ColumbusCSV/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/ColumbusCSV/build.xml
===================================================================
--- /applications/editors/josm/plugins/ColumbusCSV/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/ColumbusCSV/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
 	<property name="commit.message" value="Commit message"/>
     <!-- Enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 	
 	<!-- Plugin meta data -->
Index: /applications/editors/josm/plugins/CommandLine/.classpath
===================================================================
--- /applications/editors/josm/plugins/CommandLine/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/CommandLine/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/CommandLine/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/CommandLine/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/CommandLine/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/CommandLine/build.xml
===================================================================
--- /applications/editors/josm/plugins/CommandLine/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/CommandLine/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="JOSM/CommandLine: fix exception after JOSM update"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6906"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/CommandLine/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/CommandLine/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/CommandLine/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/Create_grid_of_ways/.classpath
===================================================================
--- /applications/editors/josm/plugins/Create_grid_of_ways/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/Create_grid_of_ways/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/Create_grid_of_ways/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/Create_grid_of_ways/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/Create_grid_of_ways/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/Create_grid_of_ways/build.xml
===================================================================
--- /applications/editors/josm/plugins/Create_grid_of_ways/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/Create_grid_of_ways/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/Create_grid_of_ways/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/Create_grid_of_ways/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/Create_grid_of_ways/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/DirectDownload/.classpath
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/DirectDownload/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/DirectDownload/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/DirectDownload/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/DirectDownload/build.xml
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/DirectDownload/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6421"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/DirectUpload/.classpath
===================================================================
--- /applications/editors/josm/plugins/DirectUpload/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/DirectUpload/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/DirectUpload/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/DirectUpload/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/DirectUpload/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/DirectUpload/build.xml
===================================================================
--- /applications/editors/josm/plugins/DirectUpload/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/DirectUpload/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6340"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/ElevationProfile/.classpath
===================================================================
--- /applications/editors/josm/plugins/ElevationProfile/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/ElevationProfile/.classpath	(revision 30416)
@@ -4,5 +4,5 @@
 	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/ElevationProfile/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/ElevationProfile/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/ElevationProfile/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/ElevationProfile/build.xml
===================================================================
--- /applications/editors/josm/plugins/ElevationProfile/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/ElevationProfile/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm_elevationprofile]"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/FastDraw/.classpath
===================================================================
--- /applications/editors/josm/plugins/FastDraw/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/FastDraw/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/FastDraw/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/FastDraw/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/FastDraw/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,6 +6,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -89,3 +89,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/FastDraw/build.xml
===================================================================
--- /applications/editors/josm/plugins/FastDraw/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/FastDraw/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="JOSM/FastDraw: line stroke and point size customization"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/FastDraw/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/FastDraw/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/FastDraw/nbproject/project.xml	(revision 30416)
@@ -62,5 +62,5 @@
                 <classpath mode="compile">../../core/src</classpath>
                 <built-to>../../dist/FastDraw.jar</built-to>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/FixAddresses/.classpath
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/FixAddresses/.classpath	(revision 30416)
@@ -4,5 +4,5 @@
 	<classpathentry kind="src" path="images/dialogs"/>
 	<classpathentry excluding="dialogs/" kind="src" path="images"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/FixAddresses/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm_fixadresses]: Fixes #josm8336"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/FixAddresses/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/FixAddresses/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/.classpath
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Initial version."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <!-- Configure these properties (replace "..." accordingly).
          See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/nbproject/project.xml	(revision 30416)
@@ -61,5 +61,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/ImportImagePlugin/.classpath
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/ImportImagePlugin/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-GeoTools"/>
Index: /applications/editors/josm/plugins/ImportImagePlugin/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/ImportImagePlugin/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/ImportImagePlugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/ImportImagePlugin/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
 	<property name="commit.message" value="use consistent plugin name (don't mix up the words)" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="6162" />
+	<property name="plugin.main.version" value="7001" />
 
     <property name="plugin.author" value="Christoph Beekmans, Fabian Kowitz, Anna Robaszkiewicz, Oliver Kuhn, Martin Ulitzny"/>
Index: /applications/editors/josm/plugins/ImportImagePlugin/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/ImportImagePlugin/nbproject/project.xml	(revision 30416)
@@ -61,5 +61,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src;../jts/lib/jts-1.13.jar;../log4j/lib/log4j-1.2.17.jar;../geotools/lib/commons-beanutils-1.7.0.jar;../geotools/lib/commons-pool-1.5.4.jar;../geotools/lib/gt-api-9.3.jar;../geotools/lib/gt-coverage-9.3.jar;../geotools/lib/gt-data-9.3.jar;../geotools/lib/gt-epsg-extension-9.3.jar;../geotools/lib/gt-epsg-hsql-9.3.jar;../geotools/lib/gt-geotiff-9.3.jar;../geotools/lib/gt-main-9.3.jar;../geotools/lib/gt-metadata-9.3.jar;../geotools/lib/gt-opengis-9.3.jar;../geotools/lib/gt-referencing-9.3.jar;../geotools/lib/gt-shapefile-9.3.jar;../geotools/lib/hsqldb-1.8.0.7.jar;../geotools/lib/imageio-ext-tiff-1.1.7.jar;../geotools/lib/imageio-ext-utilities-1.1.7.jar;../geotools/lib/jai_codec-1.1.3.jar;../geotools/lib/jai_core-1.1.3.jar;../geotools/lib/jai_imageio-1.1.jar;../geotools/lib/jdom-1.0.jar;../geotools/lib/jsr-275-1.0-beta-2.jar;../geotools/lib/jt-contour-1.3.0.jar;../geotools/lib/jt-rangelookup-1.3.0.jar;../geotools/lib/jt-utils-1.3.0.jar;../geotools/lib/jt-vectorbinarize-1.3.0.jar;../geotools/lib/jt-vectorize-1.3.0.jar;../geotools/lib/jt-zonalstats-1.3.0.jar;../geotools/lib/vecmath-1.3.2.jar</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/NanoLog/build.xml
===================================================================
--- /applications/editors/josm/plugins/NanoLog/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/NanoLog/build.xml	(revision 30416)
@@ -1,36 +1,8 @@
 <?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="NanoLog" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="NanoLog"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4800"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
       ************************************************
@@ -43,6 +15,6 @@
     <property name="plugin.dist.dir" value="../../dist"/>
     <!--property name="plugin.dist.dir"        value="/Users/Zverik/AppData/Roaming/JOSM/plugins"/-->
-    <property name="ant.build.javac.target" value="1.6"/>
-    <property name="ant.build.javac.source" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
+    <property name="ant.build.javac.source" value="1.7"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     <!--
Index: /applications/editors/josm/plugins/OpeningHoursEditor/.classpath
===================================================================
--- /applications/editors/josm/plugins/OpeningHoursEditor/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/OpeningHoursEditor/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/OpeningHoursEditor/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/OpeningHoursEditor/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/OpeningHoursEditor/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,6 +6,10 @@
 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.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 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
@@ -16,4 +20,5 @@
 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
@@ -102,2 +107,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/OpeningHoursEditor/build.xml
===================================================================
--- /applications/editors/josm/plugins/OpeningHoursEditor/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/OpeningHoursEditor/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="fixed main version"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 	
     <property name="plugin.author" value="Falko Thomale"/>
@@ -23,5 +23,5 @@
             <arg value="${javacc.home}/javacc.jar"/>
             <arg value="javacc"/>
-            <arg value="-JDK_VERSION=1.6"/>
+            <arg value="-JDK_VERSION=1.7"/>
             <arg value="-GRAMMAR_ENCODING=UTF-8"/>
             <arg value="-UNICODE_INPUT"/>
Index: /applications/editors/josm/plugins/OpeningHoursEditor/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/OpeningHoursEditor/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/OpeningHoursEditor/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/OsmInspectorPlugin/.classpath
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 30416)
@@ -10,5 +10,5 @@
 	<classpathentry kind="lib" path="lib/gt-render-8.0.jar"/>
 	<classpathentry kind="lib" path="lib/jts-1.12.jar"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="lib" path="lib/gt-wfs-8.0.jar"/>
 	<classpathentry kind="lib" path="lib/gt-epsg-extension-8.0.jar"/>
Index: /applications/editors/josm/plugins/OsmInspectorPlugin/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/OsmInspectorPlugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Nikhil Shirahatti"/>
Index: /applications/editors/josm/plugins/addrinterpolation/.classpath
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/addrinterpolation/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<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 30415)
+++ /applications/editors/josm/plugins/addrinterpolation/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,10 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+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.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/addrinterpolation/build.xml
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Impoved Icon"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6340"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/addrinterpolation/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/addrinterpolation/nbproject/project.xml	(revision 30416)
@@ -61,5 +61,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/alignways/.classpath
===================================================================
--- /applications/editors/josm/plugins/alignways/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/alignways/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/JOSM"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="lib" path="lib"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
Index: /applications/editors/josm/plugins/alignways/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/alignways/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/alignways/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/alignways/build.xml
===================================================================
--- /applications/editors/josm/plugins/alignways/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/alignways/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="AlignWays: moved to Shift-Spacebar due to shortcut confilcts with core. A is too overloaded"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
         ************************************************ ** should not be
@@ -15,5 +15,5 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
Index: /applications/editors/josm/plugins/alignways/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/alignways/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/alignways/nbproject/project.xml	(revision 30416)
@@ -71,10 +71,10 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src;lib</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>test/unit</package-root>
                 <unit-tests/>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/build-common.xml
===================================================================
--- /applications/editors/josm/plugins/build-common.xml	(revision 30415)
+++ /applications/editors/josm/plugins/build-common.xml	(revision 30416)
@@ -19,6 +19,6 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir"        value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.6"/>
-    <property name="ant.build.javac.source" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
+    <property name="ant.build.javac.source" value="1.7"/>
     <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
 
Index: /applications/editors/josm/plugins/buildings_tools/.classpath
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/buildings_tools/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,5 +93,5 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
Index: /applications/editors/josm/plugins/buildings_tools/build.xml
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/buildings_tools/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="BuildingTools: update to current JOSM"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6309"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/buildings_tools/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/buildings_tools/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/cadastre-fr/.classpath
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/cadastre-fr/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-GeoTools"/>
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 30415)
+++ /applications/editors/josm/plugins/cadastre-fr/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -107,3 +107,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/cadastre-fr/build.xml
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed constructor for Plugin"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/canvec_helper/.classpath
===================================================================
--- /applications/editors/josm/plugins/canvec_helper/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/canvec_helper/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/canvec_helper/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/canvec_helper/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/canvec_helper/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/canvec_helper/build.xml
===================================================================
--- /applications/editors/josm/plugins/canvec_helper/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/canvec_helper/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="JOSM/Canvec_helper: fixed a crash caused by osm directory being renamed to OSM"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/canvec_helper/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/canvec_helper/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/canvec_helper/nbproject/project.xml	(revision 30416)
@@ -61,5 +61,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/colorscheme/.classpath
===================================================================
--- /applications/editors/josm/plugins/colorscheme/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/colorscheme/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<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 30415)
+++ /applications/editors/josm/plugins/colorscheme/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/colorscheme/build.xml
===================================================================
--- /applications/editors/josm/plugins/colorscheme/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/colorscheme/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Uses new constructor for Plugin"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Christof Dallermassl"/>
Index: /applications/editors/josm/plugins/czechaddress/.classpath
===================================================================
--- /applications/editors/josm/plugins/czechaddress/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/czechaddress/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/czechaddress/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/czechaddress/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/czechaddress/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- /applications/editors/josm/plugins/czechaddress/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/czechaddress/build.xml	(revision 30416)
@@ -6,5 +6,5 @@
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     <property name="plugin.manifest" value="${plugin.build.dir}/org/openstreetmap/josm/plugins/czechaddress/MANIFEST.MF"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <target name="clean" description="Removes all build files and the plugins's jar">
         <delete dir="${plugin.build.dir}"/>
@@ -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="6162"/>
+            <attribute name="Plugin-Mainversion" value="7001"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>
Index: /applications/editors/josm/plugins/czechaddress/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/czechaddress/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/czechaddress/nbproject/project.xml	(revision 30416)
@@ -87,10 +87,10 @@
                 <built-to>build</built-to>
                 <javadoc-built-to>doc</javadoc-built-to>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>tests</package-root>
                 <unit-tests/>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/dataimport/.classpath
===================================================================
--- /applications/editors/josm/plugins/dataimport/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/dataimport/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsr173-1.0_api.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl.jar"/>
Index: /applications/editors/josm/plugins/dataimport/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/dataimport/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/dataimport/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/dataimport/build.xml
===================================================================
--- /applications/editors/josm/plugins/dataimport/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/dataimport/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
       ************************************************
@@ -14,5 +14,5 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
Index: /applications/editors/josm/plugins/download_along/.classpath
===================================================================
--- /applications/editors/josm/plugins/download_along/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/download_along/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/download_along/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/download_along/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/download_along/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/download_along/build.xml
===================================================================
--- /applications/editors/josm/plugins/download_along/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/download_along/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6317"/>
+    <property name="plugin.main.version" value="7001"/>
 
 	<!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/download_along/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/download_along/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/download_along/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/editgpx/.classpath
===================================================================
--- /applications/editors/josm/plugins/editgpx/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/editgpx/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry excluding="src/" including="images/" kind="src" path=""/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/editgpx/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/editgpx/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/editgpx/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,6 +6,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -89,5 +89,5 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
Index: /applications/editors/josm/plugins/editgpx/build.xml
===================================================================
--- /applications/editors/josm/plugins/editgpx/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/editgpx/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed constructor signature of plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/epci-fr/.classpath
===================================================================
--- /applications/editors/josm/plugins/epci-fr/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/epci-fr/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/epci-fr/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/epci-fr/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
+++ /applications/editors/josm/plugins/epci-fr/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+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.7
Index: /applications/editors/josm/plugins/epci-fr/build.xml
===================================================================
--- /applications/editors/josm/plugins/epci-fr/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/epci-fr/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/ext_tools/.classpath
===================================================================
--- /applications/editors/josm/plugins/ext_tools/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/ext_tools/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
Index: /applications/editors/josm/plugins/ext_tools/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/ext_tools/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/ext_tools/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/ext_tools/build.xml
===================================================================
--- /applications/editors/josm/plugins/ext_tools/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/ext_tools/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="ExtTools: help shortcut paser, rebuild"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6340"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
       ************************************************
@@ -14,5 +14,5 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
Index: /applications/editors/josm/plugins/geochat/.classpath
===================================================================
--- /applications/editors/josm/plugins/geochat/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/geochat/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/geochat/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/geochat/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/geochat/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/geochat/build.xml
===================================================================
--- /applications/editors/josm/plugins/geochat/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/geochat/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="[josm_geochat] copypaste from keyboard, font size advanced parameters"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6756"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>
Index: /applications/editors/josm/plugins/geotools/.classpath
===================================================================
--- /applications/editors/josm/plugins/geotools/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/geotools/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
Index: /applications/editors/josm/plugins/geotools/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/geotools/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/geotools/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/geotools/build.xml
===================================================================
--- /applications/editors/josm/plugins/geotools/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/geotools/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5236"/>
+    <property name="plugin.main.version" value="7001"/>
 	
     <property name="plugin.author" value="Don-vip"/>
Index: /applications/editors/josm/plugins/globalsat/.classpath
===================================================================
--- /applications/editors/josm/plugins/globalsat/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/globalsat/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="libs/RXTXcomm.jar"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/globalsat/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/globalsat/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/globalsat/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/globalsat/build.xml
===================================================================
--- /applications/editors/josm/plugins/globalsat/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/globalsat/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed constructor signature of plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
       ************************************************
@@ -13,5 +13,5 @@
     <property name="plugin.build.dir" value="build"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="RXTX" location="./libs/RXTXcomm.jar"/>
     <target name="init">
Index: /applications/editors/josm/plugins/gpsblam/build.xml
===================================================================
--- /applications/editors/josm/plugins/gpsblam/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/gpsblam/build.xml	(revision 30416)
@@ -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="gpsblam" default="dist" basedir=".">
 
@@ -33,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!--
Index: /applications/editors/josm/plugins/gpxfilter/.classpath
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/gpxfilter/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/gpxfilter/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/gpxfilter/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/gpxfilter/build.xml
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/gpxfilter/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="GPXFilter: moved to Alt-Shift-X"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Upliner"/>
Index: /applications/editors/josm/plugins/gpxfilter/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/gpxfilter/nbproject/project.xml	(revision 30416)
@@ -61,5 +61,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/graphview/.classpath
===================================================================
--- /applications/editors/josm/plugins/graphview/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/graphview/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<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 30415)
+++ /applications/editors/josm/plugins/graphview/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/graphview/build.xml
===================================================================
--- /applications/editors/josm/plugins/graphview/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/graphview/build.xml	(revision 30416)
@@ -2,5 +2,5 @@
 <project name="graphview" default="dist" basedir=".">
     <property name="commit.message" value="option to change graph colors; closes ticket 5523 in JOSM Trac"/>
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.build.dir" value="build"/>
@@ -8,5 +8,5 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
Index: /applications/editors/josm/plugins/imagery-xml-bounds/.classpath
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/imagery-xml-bounds/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/imagery-xml-bounds/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6968"/>
+    <property name="plugin.main.version" value="7001"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/imagery_offset_db/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagery_offset_db/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/imagery_offset_db/build.xml	(revision 30416)
@@ -1,15 +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
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="imagery_offset_db" default="dist" basedir=".">
 
@@ -17,5 +5,5 @@
     <property name="commit.message" value="Imagery Offset Database"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4666"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>
Index: /applications/editors/josm/plugins/imageryadjust/.classpath
===================================================================
--- /applications/editors/josm/plugins/imageryadjust/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/imageryadjust/.classpath	(revision 30416)
@@ -4,5 +4,5 @@
 	<classpathentry including="images/" kind="src" path=""/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
Index: /applications/editors/josm/plugins/imageryadjust/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/imageryadjust/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/imageryadjust/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,6 +6,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -89,3 +89,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/imageryadjust/build.xml
===================================================================
--- /applications/editors/josm/plugins/imageryadjust/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/imageryadjust/build.xml	(revision 30416)
@@ -2,5 +2,5 @@
 <project name="imageryadjust" default="dist" basedir=".">
     <property name="commit.message" value="ImageryAdjust: Adjust while holding shortcut key"/>
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Upliner"/>
Index: /applications/editors/josm/plugins/imagerycache/.classpath
===================================================================
--- /applications/editors/josm/plugins/imagerycache/.classpath	(revision 30416)
+++ /applications/editors/josm/plugins/imagerycache/.classpath	(revision 30416)
@@ -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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
Index: /applications/editors/josm/plugins/imagerycache/.project
===================================================================
--- /applications/editors/josm/plugins/imagerycache/.project	(revision 30416)
+++ /applications/editors/josm/plugins/imagerycache/.project	(revision 30416)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-imagerycache</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/imagerycache/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/imagerycache/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
+++ /applications/editors/josm/plugins/imagerycache/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/imagerycache/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagerycache/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/imagerycache/build.xml	(revision 30416)
@@ -1,15 +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
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="ImageryCache" default="dist" basedir=".">
 
@@ -17,5 +5,5 @@
     <property name="commit.message" value="[JOSM_ImageryCache]: correct database cleaning, at last"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5779"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/imagerycache/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/imagerycache/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/imagerycache/nbproject/project.xml	(revision 30416)
@@ -65,5 +65,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/imagewaypoint/.classpath
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/imagewaypoint/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm/ImageWayPoint] move opening to File/Open"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/imagewaypoint/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/imagewaypoint/nbproject/project.xml	(revision 30416)
@@ -61,5 +61,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/importvec/.classpath
===================================================================
--- /applications/editors/josm/plugins/importvec/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/importvec/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/importvec/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/importvec/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/importvec/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/importvec/build.xml
===================================================================
--- /applications/editors/josm/plugins/importvec/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/importvec/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Remove the action, add importing SVG to File/Open"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Upliner"/>
Index: /applications/editors/josm/plugins/importvec/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/importvec/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/importvec/nbproject/project.xml	(revision 30416)
@@ -61,5 +61,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/infomode/build.xml
===================================================================
--- /applications/editors/josm/plugins/infomode/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/infomode/build.xml	(revision 30416)
@@ -1,36 +1,8 @@
 <?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="InfoMode" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="InfoMode : for shortcurt parser"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5035"/>
+    <property name="plugin.main.version" value="7001"/>
     <!-- should not be necessary to change the following properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
@@ -39,5 +11,5 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
Index: /applications/editors/josm/plugins/infomode/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/infomode/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/infomode/nbproject/project.xml	(revision 30416)
@@ -75,5 +75,5 @@
                 <classpath mode="compile">../../core/src</classpath>
                 <built-to>../../dist/InfoMode.jar</built-to>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/irsrectify/build.xml
===================================================================
--- /applications/editors/josm/plugins/irsrectify/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/irsrectify/build.xml	(revision 30416)
@@ -1,36 +1,8 @@
 <?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="irsrectify" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="irsrectify shortcut confilct"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4980"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
       ************************************************
@@ -42,5 +14,5 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
Index: /applications/editors/josm/plugins/jts/.classpath
===================================================================
--- /applications/editors/josm/plugins/jts/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/jts/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry exported="true" kind="lib" path="lib/jts-1.13.jar"/>
Index: /applications/editors/josm/plugins/jts/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/jts/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/jts/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/jts/build.xml
===================================================================
--- /applications/editors/josm/plugins/jts/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/jts/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <property name="plugin.author" value="Josh Doe &lt;josh@joshdoe.com&gt;"/>
Index: /applications/editors/josm/plugins/junctionchecking/.classpath
===================================================================
--- /applications/editors/josm/plugins/junctionchecking/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/junctionchecking/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry including="images/|resources/" kind="src" path=""/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/junctionchecking/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/junctionchecking/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/junctionchecking/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/junctionchecking/build.xml
===================================================================
--- /applications/editors/josm/plugins/junctionchecking/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/junctionchecking/build.xml	(revision 30416)
@@ -3,5 +3,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/lakewalker/.classpath
===================================================================
--- /applications/editors/josm/plugins/lakewalker/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/lakewalker/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/lakewalker/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/lakewalker/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/lakewalker/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/lakewalker/build.xml
===================================================================
--- /applications/editors/josm/plugins/lakewalker/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/lakewalker/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/lakewalker/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/lakewalker/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/lakewalker/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/livegps/.classpath
===================================================================
--- /applications/editors/josm/plugins/livegps/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/livegps/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/livegps/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/livegps/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/livegps/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- /applications/editors/josm/plugins/livegps/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/livegps/build.xml	(revision 30416)
@@ -2,5 +2,5 @@
 <project name="livegps" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="6756"/>
+    <property name="plugin.main.version" value="7001"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/livegps/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/livegps/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/livegps/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/log4j/.classpath
===================================================================
--- /applications/editors/josm/plugins/log4j/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/log4j/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
Index: /applications/editors/josm/plugins/log4j/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/log4j/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/log4j/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/log4j/build.xml
===================================================================
--- /applications/editors/josm/plugins/log4j/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/log4j/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5236"/>
+    <property name="plugin.main.version" value="7001"/>
 
 	<!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/mapdust/.classpath
===================================================================
--- /applications/editors/josm/plugins/mapdust/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/mapdust/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry including="conf/|images/" kind="src" path=""/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="lib" path="lib/gson-1.5.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
Index: /applications/editors/josm/plugins/mapdust/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/mapdust/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/mapdust/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,8 +1,7 @@
-#Sat Nov 13 11:09:26 EET 2010
 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.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -10,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/mapdust/build.xml
===================================================================
--- /applications/editors/josm/plugins/mapdust/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/mapdust/build.xml	(revision 30416)
@@ -3,5 +3,5 @@
     <!-- properties -->
     <property name="commit.message" value="MapDust bug reporter plugin"/>
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="apidoc.dir" value="doc"/>
@@ -42,6 +42,6 @@
     <target name="javadoc">
         <mkdir dir="${apidoc.dir}"/>
-        <javadoc destdir="${apidoc.dir}" source="1.6" classpathref="classpath" windowtitle="MapDust plugin API">
-            <link href="http://java.sun.com/javase/6/docs/api/"/>
+        <javadoc destdir="${apidoc.dir}" source="1.7" classpathref="classpath" windowtitle="MapDust plugin API">
+            <link href="http://java.sun.com/javase/7/docs/api/"/>
             <link href="http://docs.jboss.org/hibernate/stable/core/api/"/>
             <packageset dir="${plugin.src.dir}">
Index: /applications/editors/josm/plugins/measurement/.classpath
===================================================================
--- /applications/editors/josm/plugins/measurement/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/measurement/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry including="images/" kind="src" path=""/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/measurement/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/measurement/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/measurement/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/measurement/build.xml
===================================================================
--- /applications/editors/josm/plugins/measurement/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/measurement/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="recompile dure to core change"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6992"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/merge-overlap/.classpath
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/merge-overlap/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/merge-overlap/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/merge-overlap/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/merge-overlap/build.xml
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/merge-overlap/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="MergeOverlap: help shortcut parser, rebuild"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6340"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/merge-overlap/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/merge-overlap/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/michigan_left/.classpath
===================================================================
--- /applications/editors/josm/plugins/michigan_left/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/michigan_left/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
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 30415)
+++ /applications/editors/josm/plugins/michigan_left/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/michigan_left/build.xml
===================================================================
--- /applications/editors/josm/plugins/michigan_left/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/michigan_left/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     	
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/michigan_left/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/michigan_left/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/michigan_left/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/mirrored_download/.classpath
===================================================================
--- /applications/editors/josm/plugins/mirrored_download/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/mirrored_download/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/mirrored_download/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/mirrored_download/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/mirrored_download/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/mirrored_download/build.xml
===================================================================
--- /applications/editors/josm/plugins/mirrored_download/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/mirrored_download/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value=""/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6589"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/namemanager/.classpath
===================================================================
--- /applications/editors/josm/plugins/namemanager/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/namemanager/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="resources"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/namemanager/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/namemanager/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/namemanager/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/namemanager/build.xml
===================================================================
--- /applications/editors/josm/plugins/namemanager/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/namemanager/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="..."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/namemanager/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/namemanager/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/namemanager/nbproject/project.xml	(revision 30416)
@@ -56,5 +56,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/native-password-manager/build.xml
===================================================================
--- /applications/editors/josm/plugins/native-password-manager/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/native-password-manager/build.xml	(revision 30416)
@@ -1,31 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** Maintaining versions
-** ====================
-** see README.template
-**
-** Usage
-** =====
-** To build it run
-**
-**    > ant
-** or
-**    > ant clean 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="native_password_manager" default="dist" basedir=".">
 
@@ -33,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5422"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!--
Index: /applications/editors/josm/plugins/nearclick/.classpath
===================================================================
--- /applications/editors/josm/plugins/nearclick/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/nearclick/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
Index: /applications/editors/josm/plugins/nearclick/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/nearclick/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/nearclick/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/nearclick/build.xml
===================================================================
--- /applications/editors/josm/plugins/nearclick/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/nearclick/build.xml	(revision 30416)
@@ -4,10 +4,10 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <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="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
Index: /applications/editors/josm/plugins/no_more_mapping/build.xml
===================================================================
--- /applications/editors/josm/plugins/no_more_mapping/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/no_more_mapping/build.xml	(revision 30416)
@@ -1,31 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is a template build file for the PBF 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="no_more_mapping" default="dist" basedir=".">
 
@@ -33,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4000"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!--
Index: /applications/editors/josm/plugins/opendata/.classpath
===================================================================
--- /applications/editors/josm/plugins/opendata/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/.classpath	(revision 30416)
@@ -15,5 +15,5 @@
 	<classpathentry kind="src" path="modules/fr.toulouse/resources"/>
 	<classpathentry kind="src" path="util"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-utilsplugin2"/>
Index: /applications/editors/josm/plugins/opendata/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/opendata/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -79,5 +79,5 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
Index: /applications/editors/josm/plugins/opendata/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/build.xml	(revision 30416)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="6412"/>
+    <property name="plugin.main.version" value="7001"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>
Index: /applications/editors/josm/plugins/opendata/modules/00_module_dir_template/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/00_module_dir_template/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/00_module_dir_template/build.xml	(revision 30416)
@@ -32,6 +32,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/modules/be.bruxelles/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/be.bruxelles/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/be.bruxelles/build.xml	(revision 30416)
@@ -9,6 +9,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/modules/be.datagovbe/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/be.datagovbe/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/be.datagovbe/build.xml	(revision 30416)
@@ -9,6 +9,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/modules/fr.cg41/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.cg41/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/fr.cg41/build.xml	(revision 30416)
@@ -9,6 +9,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/build.xml	(revision 30416)
@@ -9,6 +9,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/modules/fr.lemans/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.lemans/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/fr.lemans/build.xml	(revision 30416)
@@ -9,6 +9,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/modules/fr.paca/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.paca/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/fr.paca/build.xml	(revision 30416)
@@ -9,6 +9,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/modules/fr.paris/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.paris/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/fr.paris/build.xml	(revision 30416)
@@ -11,6 +11,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/modules/fr.sncf/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.sncf/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/fr.sncf/build.xml	(revision 30416)
@@ -9,6 +9,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/build.xml	(revision 30416)
@@ -10,6 +10,6 @@
     <property name="module.build.dir" value="build"/>
     <property name="module.src.dir" value="src"/>
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <!-- this is the directory where the module jar is copied to -->
     <property name="module.dist.dir" value="../../dist"/>
Index: /applications/editors/josm/plugins/opendata/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/opendata/nbproject/project.xml	(revision 30416)
@@ -94,17 +94,17 @@
                 <package-root>includes</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>modules/fr.toulouse/src</package-root>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>src</package-root>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>util</package-root>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/openstreetbugs/.classpath
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/openstreetbugs/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/openstreetbugs/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/openstreetbugs/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,6 +6,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -89,5 +89,5 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
Index: /applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 30416)
@@ -2,10 +2,10 @@
 <project name="openstreetbugs" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <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="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
Index: /applications/editors/josm/plugins/openvisible/.classpath
===================================================================
--- /applications/editors/josm/plugins/openvisible/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/openvisible/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/openvisible/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/openvisible/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/openvisible/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/openvisible/build.xml
===================================================================
--- /applications/editors/josm/plugins/openvisible/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/openvisible/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class; updated build.xml"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
       ************************************************
@@ -13,5 +13,5 @@
     <property name="plugin.build.dir" value="build"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
Index: /applications/editors/josm/plugins/openvisible/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/openvisible/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/openvisible/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/osmarender/.classpath
===================================================================
--- /applications/editors/josm/plugins/osmarender/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/osmarender/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/osmarender/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/osmarender/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/osmarender/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/osmarender/build.xml
===================================================================
--- /applications/editors/josm/plugins/osmarender/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/osmarender/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Fixed #4360 - osmarender plugin does not load"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="stylesheets" location="./stylesheets"/>
Index: /applications/editors/josm/plugins/pbf/.classpath
===================================================================
--- /applications/editors/josm/plugins/pbf/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/pbf/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="gen"/>
 	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/pbf/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/pbf/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/pbf/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+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
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/pbf/build.xml
===================================================================
--- /applications/editors/josm/plugins/pbf/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/pbf/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/pdfimport/.classpath
===================================================================
--- /applications/editors/josm/plugins/pdfimport/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/pdfimport/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="resources"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="lib" path="lib/pdfbox.jar" sourcepath="D:/Projects/Community/OSM/josm/pdfimport/pdfbox-1.3.1/pdfbox/src/main/java"/>
Index: /applications/editors/josm/plugins/pdfimport/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/pdfimport/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/pdfimport/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/pdfimport/build.xml
===================================================================
--- /applications/editors/josm/plugins/pdfimport/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/pdfimport/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Initial pdfimport version"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/pdfimport/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/pdfimport/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/pdfimport/nbproject/project.xml	(revision 30416)
@@ -61,5 +61,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/photo_geotagging/.classpath
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/photo_geotagging/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/photo_geotagging/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/photo_geotagging/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/photo_geotagging/build.xml
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="write elevation to EXIF (see josm #7710)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6450"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Paul Hartmann"/>
Index: /applications/editors/josm/plugins/photoadjust/build.xml
===================================================================
--- /applications/editors/josm/plugins/photoadjust/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/photoadjust/build.xml	(revision 30416)
@@ -1,12 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is the build file for a JOSM photoadjust plugin.
-** Based on template revision 29839.
-**
-** Usage
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="photoadjust" default="dist" basedir=".">
 
@@ -14,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6392"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/piclayer/.classpath
===================================================================
--- /applications/editors/josm/plugins/piclayer/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/piclayer/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/piclayer/build.xml
===================================================================
--- /applications/editors/josm/plugins/piclayer/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/piclayer/build.xml	(revision 30416)
@@ -3,5 +3,5 @@
     <property name="commit.message" value="[josm/PicLayer] - disable menu items by default"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/piclayer/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/piclayer/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/piclayer/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/plastic_laf/.classpath
===================================================================
--- /applications/editors/josm/plugins/plastic_laf/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/plastic_laf/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="lib" path="lib/looks-2.2.1.jar"/>
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 30415)
+++ /applications/editors/josm/plugins/plastic_laf/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/plastic_laf/build.xml
===================================================================
--- /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 30416)
@@ -4,10 +4,10 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <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="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="looks" value="lib/looks-2.2.1.jar"/>
     <target name="init">
Index: /applications/editors/josm/plugins/pointInfo/build.xml
===================================================================
--- /applications/editors/josm/plugins/pointInfo/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/pointInfo/build.xml	(revision 30416)
@@ -1,15 +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
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="pointInfo" default="dist" basedir=".">
 
@@ -17,10 +5,7 @@
     <property name="commit.message" value="PointInfo: Add more external links, nicer icons."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6238"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
-
-
-
          See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
     -->
Index: /applications/editors/josm/plugins/poly/.classpath
===================================================================
--- /applications/editors/josm/plugins/poly/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/poly/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/poly/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/poly/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/poly/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/poly/build.xml
===================================================================
--- /applications/editors/josm/plugins/poly/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/poly/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/print/.classpath
===================================================================
--- /applications/editors/josm/plugins/print/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/print/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/print/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/print/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/print/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,6 +6,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -89,3 +89,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/print/build.xml
===================================================================
--- /applications/editors/josm/plugins/print/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/print/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Added a field to specify the map scale."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6992"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Kai Pastor"/>
Index: /applications/editors/josm/plugins/proj4j/.classpath
===================================================================
--- /applications/editors/josm/plugins/proj4j/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/proj4j/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/proj4j/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/proj4j/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/proj4j/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/proj4j/build.xml
===================================================================
--- /applications/editors/josm/plugins/proj4j/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/proj4j/build.xml	(revision 30416)
@@ -8,5 +8,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
       ************************************************
@@ -18,5 +18,5 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
Index: /applications/editors/josm/plugins/public_transport/.classpath
===================================================================
--- /applications/editors/josm/plugins/public_transport/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/public_transport/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
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 30415)
+++ /applications/editors/josm/plugins/public_transport/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/public_transport/build.xml
===================================================================
--- /applications/editors/josm/plugins/public_transport/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/public_transport/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6169"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>
Index: /applications/editors/josm/plugins/reltoolbox/.classpath
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/reltoolbox/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/reltoolbox/.settings/org.eclipse.core.resources.prefs
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/.settings/org.eclipse.core.resources.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/reltoolbox/.settings/org.eclipse.core.resources.prefs	(revision 30416)
@@ -3,2 +3,3 @@
 encoding//src/relcontext/actions/TheRing.java=UTF-8
 encoding/TODO=UTF-8
+encoding/src=UTF-8
Index: /applications/editors/josm/plugins/reltoolbox/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/reltoolbox/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,6 +6,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -89,3 +89,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/reltoolbox/build.xml
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/reltoolbox/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="RelToolbox: make natural sort for relation and find relation lists"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6721"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>
Index: /applications/editors/josm/plugins/reverter/.classpath
===================================================================
--- /applications/editors/josm/plugins/reverter/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/reverter/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/reverter/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/reverter/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/reverter/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/reverter/build.xml
===================================================================
--- /applications/editors/josm/plugins/reverter/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/reverter/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6906"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/reverter/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/reverter/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/reverter/nbproject/project.xml	(revision 30416)
@@ -76,5 +76,5 @@
                 <classpath mode="compile">${project.dir}/../../core/dist/josm-custom.jar</classpath>
                 <built-to>${project.dir}/../../dist/reverter.jar</built-to>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/roadsigns/.classpath
===================================================================
--- /applications/editors/josm/plugins/roadsigns/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/roadsigns/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/roadsigns/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/roadsigns/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/roadsigns/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/roadsigns/build.xml
===================================================================
--- /applications/editors/josm/plugins/roadsigns/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/roadsigns/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="preset maintenance (Fahrradstraße)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6906"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!--
Index: /applications/editors/josm/plugins/routes/.classpath
===================================================================
--- /applications/editors/josm/plugins/routes/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/routes/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="lib" path="lib/jaxb-api.jar"/>
Index: /applications/editors/josm/plugins/routes/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/routes/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/routes/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/routes/build.xml
===================================================================
--- /applications/editors/josm/plugins/routes/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/routes/build.xml	(revision 30416)
@@ -2,10 +2,10 @@
 <project name="routes" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <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="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
Index: /applications/editors/josm/plugins/routing/.classpath
===================================================================
--- /applications/editors/josm/plugins/routing/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/routing/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="lib/jgrapht-jdk1.5.jar"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-log4j"/>
Index: /applications/editors/josm/plugins/routing/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/routing/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/routing/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/routing/build.xml
===================================================================
--- /applications/editors/josm/plugins/routing/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/routing/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <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="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!--
Index: /applications/editors/josm/plugins/sds/.classpath
===================================================================
--- /applications/editors/josm/plugins/sds/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/sds/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/sds/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/sds/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/sds/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/sds/build.xml
===================================================================
--- /applications/editors/josm/plugins/sds/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/sds/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value=""/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!--
Index: /applications/editors/josm/plugins/simplifyarea/.classpath
===================================================================
--- /applications/editors/josm/plugins/simplifyarea/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/simplifyarea/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/simplifyarea/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/simplifyarea/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/simplifyarea/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,8 +1,7 @@
-#Wed Jan 12 07:52:11 CET 2011
 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.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -10,5 +9,5 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
@@ -89,7 +88,10 @@
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
Index: /applications/editors/josm/plugins/simplifyarea/build.xml
===================================================================
--- /applications/editors/josm/plugins/simplifyarea/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/simplifyarea/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Initial commit"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6317"/>
+    <property name="plugin.main.version" value="7001"/>
    	
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/simplifyarea/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/simplifyarea/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/simplifyarea/nbproject/project.xml	(revision 30416)
@@ -56,5 +56,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/smed/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/smed/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="New release"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/smed2/.classpath
===================================================================
--- /applications/editors/josm/plugins/smed2/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/smed2/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/smed2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/smed2/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/smed2/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/smed2/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed2/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/smed2/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="New release"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/smed2/js57toosm/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed2/js57toosm/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/smed2/js57toosm/build.xml	(revision 30416)
@@ -3,6 +3,6 @@
   <property name="build" location="build"/>
   <property name="jarfile" location="./js57toosm.jar"/>
-  <property name="ant.build.javac.target" value="1.6"/>
-  <property name="ant.build.javac.source" value="1.6"/>
+  <property name="ant.build.javac.target" value="1.7"/>
+  <property name="ant.build.javac.source" value="1.7"/>
     
   <target name="init">
Index: /applications/editors/josm/plugins/surveyor/.classpath
===================================================================
--- /applications/editors/josm/plugins/surveyor/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/surveyor/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-livegps"/>
Index: /applications/editors/josm/plugins/surveyor/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/surveyor/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/surveyor/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/surveyor/build.xml	(revision 30416)
@@ -7,5 +7,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
     <property name="livegpsplugin.jar" value="${plugin.dist.dir}/livegps.jar"/>
 
Index: /applications/editors/josm/plugins/surveyor2/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor2/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/surveyor2/build.xml	(revision 30416)
@@ -1,36 +1,8 @@
 <?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="surveyor2" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Surveyor 2"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
       ************************************************
@@ -43,6 +15,6 @@
     <property name="plugin.dist.dir" value="../../dist"/>
     <!--property name="plugin.dist.dir"        value="/Users/Zverik/AppData/Roaming/JOSM/plugins"/-->
-    <property name="ant.build.javac.target" value="1.6"/>
-    <property name="ant.build.javac.source" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
+    <property name="ant.build.javac.source" value="1.7"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     <!--
Index: /applications/editors/josm/plugins/tag2link/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/tag2link/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/tag2link/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,5 +9,5 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
Index: /applications/editors/josm/plugins/tag2link/build.xml
===================================================================
--- /applications/editors/josm/plugins/tag2link/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/tag2link/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Don-vip &amp; FrViPofm"/>
Index: /applications/editors/josm/plugins/tageditor/.classpath
===================================================================
--- /applications/editors/josm/plugins/tageditor/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/tageditor/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/tageditor/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/tageditor/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/tageditor/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -8,6 +8,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -94,3 +94,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- /applications/editors/josm/plugins/tageditor/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/tageditor/build.xml	(revision 30416)
@@ -2,5 +2,5 @@
 <project name="tageditor" default="dist" basedir=".">
     <property name="commit.message" value="Tageditor:  help shortcut parser, rebuild"/>
-    <property name="plugin.main.version" value="6437"/>
+    <property name="plugin.main.version" value="7001"/>
     
 	<property name="plugin.author" value="Karl Guggisberg"/>
Index: /applications/editors/josm/plugins/tagging-preset-tester/.classpath
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/tagging-preset-tester/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry including="images/" kind="src" path=""/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/tagging-preset-tester/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/tagging-preset-tester/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 30416)
@@ -2,10 +2,10 @@
 <project name="tagging-preset-tester" default="dist" basedir=".">
     <property name="commit.message" value="[josm_tagging_preset_tester] #josm8853: listen for list selection, support standalone mode (ant run)"/>
-    <property name="plugin.main.version" value="6738"/>
+    <property name="plugin.main.version" value="7001"/>
     <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="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
Index: /applications/editors/josm/plugins/tagging-preset-tester/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/tagging-preset-tester/nbproject/project.xml	(revision 30416)
@@ -70,5 +70,5 @@
                 <classpath mode="compile">../../core/src</classpath>
                 <built-to>../../dist/tagging-preset-tester.jar</built-to>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/terracer/.classpath
===================================================================
--- /applications/editors/josm/plugins/terracer/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/terracer/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/terracer/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/terracer/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/terracer/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/terracer/build.xml
===================================================================
--- /applications/editors/josm/plugins/terracer/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/terracer/build.xml	(revision 30416)
@@ -2,5 +2,5 @@
 <project name="terracer" default="dist" basedir=".">
     <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/>
-    <property name="plugin.main.version" value="6397"/>
+    <property name="plugin.main.version" value="7001"/>
     <property name="plugin.author" value="Matt Amos"/>
     <property name="plugin.class" value="terracer.TerracerPlugin"/>
Index: /applications/editors/josm/plugins/terracer/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/terracer/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/terracer/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/touchscreenhelper/build.xml
===================================================================
--- /applications/editors/josm/plugins/touchscreenhelper/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/touchscreenhelper/build.xml	(revision 30416)
@@ -1,36 +1,8 @@
 <?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="touchscreenhelper" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="JOSM/touchscreenhelper: Added T shortcut, hold T to activate temporarily"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="7001"/>
     <property name="plugin.author" value="glebius@glebius.int.ru"/>
     <property name="plugin.class" value="touchscreenhelper.TouchScreenHelperPlugin"/>
Index: /applications/editors/josm/plugins/touchscreenhelper/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/touchscreenhelper/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/touchscreenhelper/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/tracer/.classpath
===================================================================
--- /applications/editors/josm/plugins/tracer/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/tracer/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/tracer/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/tracer/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/tracer/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/tracer/build.xml
===================================================================
--- /applications/editors/josm/plugins/tracer/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/tracer/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="adapt to latest josm (getNodePairs changed)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Jan Bilak, Petr Dlouhý"/>
Index: /applications/editors/josm/plugins/tracer/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/tracer/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/tracer/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/tracer2/build.xml
===================================================================
--- /applications/editors/josm/plugins/tracer2/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/tracer2/build.xml	(revision 30416)
@@ -1,15 +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
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="Tracer2" default="dist" basedir=".">
 
@@ -17,5 +5,5 @@
     <property name="commit.message" value="Add link to wiki"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6340"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/tracer2/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/tracer2/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/tracer2/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/trustosm/build.xml
===================================================================
--- /applications/editors/josm/plugins/trustosm/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/trustosm/build.xml	(revision 30416)
@@ -1,36 +1,8 @@
 <?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="trustosm" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="New plugin for digital signing osm data"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6088"/>
+    <property name="plugin.main.version" value="7001"/>
     <!--
       ************************************************
@@ -43,5 +15,5 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
Index: /applications/editors/josm/plugins/turnlanes/.classpath
===================================================================
--- /applications/editors/josm/plugins/turnlanes/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/turnlanes/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/turnlanes/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/turnlanes/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/turnlanes/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/turnlanes/build.xml
===================================================================
--- /applications/editors/josm/plugins/turnlanes/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/turnlanes/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="fix toolbar warnings - toolbar still does not work"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!--
Index: /applications/editors/josm/plugins/turnrestrictions/.classpath
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/turnrestrictions/.classpath	(revision 30416)
@@ -4,5 +4,5 @@
 	<classpathentry kind="src" path="test/src"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="test/config"/>
Index: /applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/turnrestrictions/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/turnrestrictions/build.xml
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/turnrestrictions/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Adapt to JOSM core change (DefaultNameFormatter)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6887"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="test.build.dir" value="test/build"/>
Index: /applications/editors/josm/plugins/undelete/.classpath
===================================================================
--- /applications/editors/josm/plugins/undelete/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/undelete/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/undelete/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/undelete/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/undelete/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/undelete/build.xml
===================================================================
--- /applications/editors/josm/plugins/undelete/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/undelete/build.xml	(revision 30416)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Nakor"/>
Index: /applications/editors/josm/plugins/utilsplugin2/.classpath
===================================================================
--- /applications/editors/josm/plugins/utilsplugin2/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/utilsplugin2/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/utilsplugin2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/utilsplugin2/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/utilsplugin2/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/utilsplugin2/build.xml
===================================================================
--- /applications/editors/josm/plugins/utilsplugin2/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/utilsplugin2/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="[josm_utilsplugin2]: search parents:/children:; multitagger: select, sync"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6317"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Kalle Lampila, Upliner, Zverik, akks, joshdoe and others"/>
Index: /applications/editors/josm/plugins/utilsplugin2/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/utilsplugin2/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/utilsplugin2/nbproject/project.xml	(revision 30416)
@@ -66,5 +66,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src;../../core/dist/josm-custom.jar</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/videomapping/.classpath
===================================================================
--- /applications/editors/josm/plugins/videomapping/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/videomapping/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry exported="true" kind="lib" path="lib/vlcj-2.1.0.jar" sourcepath="lib/vlcj-2.1.0-sources.jar">
 		<attributes>
Index: /applications/editors/josm/plugins/videomapping/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/videomapping/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/videomapping/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -6,7 +6,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/videomapping/build.xml
===================================================================
--- /applications/editors/josm/plugins/videomapping/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/videomapping/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="fix after JOSM update"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <!--
Index: /applications/editors/josm/plugins/videomapping/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/videomapping/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/videomapping/nbproject/project.xml	(revision 30416)
@@ -61,5 +61,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src;lib/jna-3.4.0.jar;lib/platform-3.4.0.jar;lib/vlcj-2.1.0-javadoc.jar;lib/vlcj-2.1.0-sources.jar;lib/vlcj-2.1.0.jar</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/walkingpapers/.classpath
===================================================================
--- /applications/editors/josm/plugins/walkingpapers/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/walkingpapers/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/walkingpapers/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/walkingpapers/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/walkingpapers/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -1,7 +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.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/walkingpapers/build.xml
===================================================================
--- /applications/editors/josm/plugins/walkingpapers/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/walkingpapers/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Frederik Ram"/>
Index: /applications/editors/josm/plugins/walkingpapers/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/walkingpapers/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/walkingpapers/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/waydownloader/.classpath
===================================================================
--- /applications/editors/josm/plugins/waydownloader/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/waydownloader/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/waydownloader/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/waydownloader/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/waydownloader/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/waydownloader/build.xml
===================================================================
--- /applications/editors/josm/plugins/waydownloader/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/waydownloader/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6203"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Harry Wood"/>
Index: /applications/editors/josm/plugins/waydownloader/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/waydownloader/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/waydownloader/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/waypoint_search/.classpath
===================================================================
--- /applications/editors/josm/plugins/waypoint_search/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/waypoint_search/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM">
 		<attributes>
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 30415)
+++ /applications/editors/josm/plugins/waypoint_search/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,7 +7,7 @@
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -97,3 +97,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/waypoint_search/build.xml
===================================================================
--- /applications/editors/josm/plugins/waypoint_search/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/waypoint_search/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="bugfix of search when layer is added"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Åsmund Realfsen - realfsen at gmx.net"/>
Index: /applications/editors/josm/plugins/wayselector/.classpath
===================================================================
--- /applications/editors/josm/plugins/wayselector/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/wayselector/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/wayselector/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/wayselector/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/wayselector/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/wayselector/build.xml
===================================================================
--- /applications/editors/josm/plugins/wayselector/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/wayselector/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="recompile due to core change"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Marko Mäkelä"/>
Index: /applications/editors/josm/plugins/wayselector/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/wayselector/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/wayselector/nbproject/project.xml	(revision 30416)
@@ -60,5 +60,5 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/wikipedia/.classpath
===================================================================
--- /applications/editors/josm/plugins/wikipedia/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/wikipedia/.classpath	(revision 30416)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: /applications/editors/josm/plugins/wikipedia/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/wikipedia/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/wikipedia/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/wikipedia/build.xml
===================================================================
--- /applications/editors/josm/plugins/wikipedia/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/wikipedia/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="simon04"/>
Index: /applications/editors/josm/plugins/wikipedia/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/wikipedia/nbproject/project.xml	(revision 30415)
+++ /applications/editors/josm/plugins/wikipedia/nbproject/project.xml	(revision 30416)
@@ -70,10 +70,10 @@
                 <package-root>src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>test</package-root>
                 <unit-tests/>
-                <source-level>1.6</source-level>
+                <source-level>1.7</source-level>
             </compilation-unit>
         </java-data>
Index: /applications/editors/josm/plugins/wms-turbo-challenge2/.classpath
===================================================================
--- /applications/editors/josm/plugins/wms-turbo-challenge2/.classpath	(revision 30415)
+++ /applications/editors/josm/plugins/wms-turbo-challenge2/.classpath	(revision 30416)
@@ -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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
Index: /applications/editors/josm/plugins/wms-turbo-challenge2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/wms-turbo-challenge2/.settings/org.eclipse.jdt.core.prefs	(revision 30415)
+++ /applications/editors/josm/plugins/wms-turbo-challenge2/.settings/org.eclipse.jdt.core.prefs	(revision 30416)
@@ -7,6 +7,6 @@
 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
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,3 +93,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/wms-turbo-challenge2/build.xml
===================================================================
--- /applications/editors/josm/plugins/wms-turbo-challenge2/build.xml	(revision 30415)
+++ /applications/editors/josm/plugins/wms-turbo-challenge2/build.xml	(revision 30416)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="7001"/>
 
     <property name="plugin.author" value="Andrzej Zaborowski"/>