Index: /applications/editors/josm/plugins/graphview/build.xml
===================================================================
--- /applications/editors/josm/plugins/graphview/build.xml	(revision 18414)
+++ /applications/editors/josm/plugins/graphview/build.xml	(revision 18415)
@@ -57,5 +57,5 @@
                 <attribute name="Plugin-Description" value="Visualizes routing information as a routing graph."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Graphview"/>
-                <attribute name="Plugin-Mainversion" value="2082"/>
+                <attribute name="Plugin-Mainversion" value="2381"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java
===================================================================
--- /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java	(revision 18414)
+++ /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java	(revision 18415)
@@ -50,13 +50,13 @@
 
 	public Iterable<Node> getNodes() {
-		return new FilteredOsmPrimitiveIterable<Node>(Main.main.getCurrentDataSet().nodes);
+		return new FilteredOsmPrimitiveIterable<Node>(Main.main.getCurrentDataSet().getNodes());
 	}
 
 	public Iterable<Relation> getRelations() {
-		return new FilteredRelationIterable(Main.main.getCurrentDataSet().relations);
+		return new FilteredRelationIterable(Main.main.getCurrentDataSet().getRelations());
 	}
 
 	public Iterable<Way> getWays() {
-		return new FilteredOsmPrimitiveIterable<Way>(Main.main.getCurrentDataSet().ways);
+		return new FilteredOsmPrimitiveIterable<Way>(Main.main.getCurrentDataSet().getWays());
 	}
 
Index: /applications/editors/josm/plugins/multipoly/.classpath
===================================================================
--- /applications/editors/josm/plugins/multipoly/.classpath	(revision 18415)
+++ /applications/editors/josm/plugins/multipoly/.classpath	(revision 18415)
@@ -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 6"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: /applications/editors/josm/plugins/multipoly/.project
===================================================================
--- /applications/editors/josm/plugins/multipoly/.project	(revision 18415)
+++ /applications/editors/josm/plugins/multipoly/.project	(revision 18415)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-multipoly</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/multipoly/build.xml
===================================================================
--- /applications/editors/josm/plugins/multipoly/build.xml	(revision 18414)
+++ /applications/editors/josm/plugins/multipoly/build.xml	(revision 18415)
@@ -47,5 +47,5 @@
     <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
     <attribute name="Plugin-Link" value="http://svn.openstreetmap.org/applications/editors/josm/plugins/multipoly/"/>
-    <attribute name="Plugin-Mainversion" value="2267"/>
+    <attribute name="Plugin-Mainversion" value="2381"/>
    </manifest>
   </jar>
Index: /applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyAction.java
===================================================================
--- /applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyAction.java	(revision 18414)
+++ /applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyAction.java	(revision 18415)
@@ -4,24 +4,36 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.*;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.*;
-import org.openstreetmap.josm.tools.*;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
  * Create multipolygon from selected ways automatically.
- * 
+ *
  * New relation with type=multipolygon is created
- * 
+ *
  * If one or more of ways is already in relation with type=multipolygon or the way os not closed,
  * then error is reported and no relation is created
- * 
+ *
  * The "inner" and "outer" roles are guessed automatically.
  * First, bbox is calculated for each way. then the largest area is assumed to be outside
@@ -39,5 +51,5 @@
   setEnabled(true);
  }
- 
+
  /**
   * The action button has been clicked
@@ -48,5 +60,5 @@
   // Get all ways in some type=multipolygon relation
   HashSet<OsmPrimitive> relationsInMulti = new HashSet<OsmPrimitive>();
-  for (Relation r : Main.main.getCurrentDataSet().relations) {
+  for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
    if (!r.isUsable()) continue;
    if (r.get("type")!="multipolygon") continue;
@@ -60,5 +72,5 @@
 
   //List of selected ways
-  List<Way> selectedWays = new ArrayList<Way>();;
+  List<Way> selectedWays = new ArrayList<Way>();
   //Area of largest way (in square degrees)
   double maxarea=0;
@@ -118,5 +130,5 @@
   rel.put("type","multipolygon");
   //Add ways to it
-  for (int i=0;i<selectedWays.size();i++) { 
+  for (int i=0;i<selectedWays.size();i++) {
    Way s=selectedWays.get(i);
    String xrole="inner";
Index: /applications/editors/josm/plugins/routing/.classpath
===================================================================
--- /applications/editors/josm/plugins/routing/.classpath	(revision 18415)
+++ /applications/editors/josm/plugins/routing/.classpath	(revision 18415)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="lib/jgrapht-jdk1.5.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
Index: /applications/editors/josm/plugins/routing/.project
===================================================================
--- /applications/editors/josm/plugins/routing/.project	(revision 18415)
+++ /applications/editors/josm/plugins/routing/.project	(revision 18415)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-routing</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/routing/build.xml
===================================================================
--- /applications/editors/josm/plugins/routing/build.xml	(revision 18414)
+++ /applications/editors/josm/plugins/routing/build.xml	(revision 18415)
@@ -44,5 +44,5 @@
                 <attribute name="Plugin-Description" value="Provides routing capabilities."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
-                <attribute name="Plugin-Mainversion" value="2323"/>
+                <attribute name="Plugin-Mainversion" value="2381"/>
                 <attribute name="Plugin-Stage" value="50"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java	(revision 18414)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java	(revision 18415)
@@ -130,5 +130,5 @@
         rgDelegator.setRouteType(this.routeType);
         // iterate all ways and segments for all nodes:
-        for (Way way : data.ways) {
+        for (Way way : data.getWays()) {
             if (way != null && !way.isDeleted() && this.isvalidWay(way)) {
                 Node from = null;
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java	(revision 18414)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java	(revision 18415)
@@ -133,5 +133,5 @@
         Node nearest = null;
         double minDist = 0;
-        for (Way w : dataLayer.data.ways) {
+        for (Way w : dataLayer.data.getWays()) {
             if (w.isDeleted() || w.incomplete || w.get("highway")==null) continue;
             for (Node n : w.getNodes()) {
Index: /applications/editors/josm/plugins/utilsplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 18414)
+++ /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 18415)
@@ -25,5 +25,5 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Several utilities that make your life easier: e.g. simplify way, join areas, jump to position."/>
-                <attribute name="Plugin-Mainversion" value="2355"/>
+                <attribute name="Plugin-Mainversion" value="2381"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/utilsplugin/josm-utilsplugin.launch
===================================================================
--- /applications/editors/josm/plugins/utilsplugin/josm-utilsplugin.launch	(revision 18415)
+++ /applications/editors/josm/plugins/utilsplugin/josm-utilsplugin.launch	(revision 18415)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM-utilsplugin"/>
+</launchConfiguration>
Index: /applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java
===================================================================
--- /applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java	(revision 18414)
+++ /applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java	(revision 18415)
@@ -443,5 +443,5 @@
     private ArrayList<RelationRole> removeFromRelations(OsmPrimitive osm) {
         ArrayList<RelationRole> result = new ArrayList<RelationRole>();
-        for (Relation r : Main.main.getCurrentDataSet().relations) {
+        for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
             if (r.isDeleted() || r.incomplete) continue;
             for (RelationMember rm : r.getMembers()) {