Index: applications/editors/josm/plugins/addrinterpolation/.classpath
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/.classpath	(revision 18413)
+++ applications/editors/josm/plugins/addrinterpolation/.classpath	(revision 18413)
@@ -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/JDK 5"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: applications/editors/josm/plugins/addrinterpolation/.project
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/.project	(revision 18413)
+++ applications/editors/josm/plugins/addrinterpolation/.project	(revision 18413)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-addrinterpolation</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/addrinterpolation/build.xml
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 18410)
+++ applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 18413)
@@ -91,5 +91,5 @@
                 <attribute name="Plugin-Description" value="Group common Address Interpolation inputs in a single dialog,"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AddrInterpolation"/>
-                <attribute name="Plugin-Mainversion" value="2350"/>
+                <attribute name="Plugin-Mainversion" value="2381"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 18410)
+++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 18413)
@@ -57,5 +57,5 @@
 
 /**
- * 
+ *
  */
 
@@ -516,5 +516,5 @@
 		DataSet currentDataSet = Main.main.getCurrentDataSet();
 		if (currentDataSet != null) {
-			for (Relation relation : currentDataSet.relations) {
+			for (Relation relation : currentDataSet.getRelations()) {
 
 				String relationType = relation.get("type");
Index: applications/editors/josm/plugins/cadastre-fr/build.xml
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 18410)
+++ applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 18413)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="A special handler for the French land registry WMS server."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/Cadastre"/>
-                <attribute name="Plugin-Mainversion" value="2327"/>
+                <attribute name="Plugin-Mainversion" value="2381"/>
                 <attribute name="Plugin-Stage" value="60"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java	(revision 18410)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java	(revision 18413)
@@ -110,5 +110,5 @@
                 Node nodeToAdd = new Node(Main.proj.eastNorth2latlon(eastNorth));
                 // check if new node is not already created by another new path
-                Node nearestNewNode = checkNearestNode(nodeToAdd, svgDataSet.nodes);
+                Node nearestNewNode = checkNearestNode(nodeToAdd, svgDataSet.getNodes());
                 if (nearestNewNode == nodeToAdd)
                     svgDataSet.addPrimitive(nearestNewNode);
@@ -128,12 +128,12 @@
 
         // simplify ways and check if we can reuse existing OSM nodes
-        for (Way wayToAdd : svgDataSet.ways)
+        for (Way wayToAdd : svgDataSet.getWays())
             new SimplifyWay().simplifyWay(wayToAdd, svgDataSet, 0.5);
         // check if the new way or its nodes is already in OSM layer
-        for (Node n : svgDataSet.nodes) {
-            Node nearestNewNode = checkNearestNode(n, Main.main.getCurrentDataSet().nodes);
+        for (Node n : svgDataSet.getNodes()) {
+            Node nearestNewNode = checkNearestNode(n, Main.main.getCurrentDataSet().getNodes());
             if (nearestNewNode != n) {
                 // replace the SVG node by the OSM node
-                for (Way w : svgDataSet.ways) {
+                for (Way w : svgDataSet.getWays()) {
                     int replaced = 0;
                     for (Node node : w.getNodes())
@@ -151,8 +151,8 @@
 
         Collection<Command> cmds = new LinkedList<Command>();
-        for (Node node : svgDataSet.nodes)
+        for (Node node : svgDataSet.getNodes())
             if (!node.isDeleted())
                 cmds.add(new AddCommand(node));
-        for (Way way : svgDataSet.ways)
+        for (Way way : svgDataSet.getWays())
             if (!way.isDeleted())
                 cmds.add(new AddCommand(way));
Index: applications/editors/josm/plugins/colorscheme/.classpath
===================================================================
--- applications/editors/josm/plugins/colorscheme/.classpath	(revision 18413)
+++ applications/editors/josm/plugins/colorscheme/.classpath	(revision 18413)
@@ -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/JDK 5"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
Index: applications/editors/josm/plugins/colorscheme/.project
===================================================================
--- applications/editors/josm/plugins/colorscheme/.project	(revision 18413)
+++ applications/editors/josm/plugins/colorscheme/.project	(revision 18413)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-colorscheme</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/czechaddress/build.xml
===================================================================
--- applications/editors/josm/plugins/czechaddress/build.xml	(revision 18410)
+++ applications/editors/josm/plugins/czechaddress/build.xml	(revision 18413)
@@ -52,5 +52,5 @@
             <attribute name="Plugin-Description" value="Creating and handling address nodes and buildings within Czech Republic."/>
             <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/Cz:JOSM/Plugins/CzechAddress"/>
-            <attribute name="Plugin-Mainversion" value="2323"/>
+            <attribute name="Plugin-Mainversion" value="2381"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 18410)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 18413)
@@ -124,5 +124,5 @@
         }
 
-        for (Relation relation : Main.main.getCurrentDataSet().relations)
+        for (Relation relation : Main.main.getCurrentDataSet().getRelations())
             for (RelationMember areaMember : relation.getMembers())
                 if (area.equals(areaMember.getMember()))