Index: applications/editors/josm/plugins/validator/build.xml
===================================================================
--- applications/editors/josm/plugins/validator/build.xml	(revision 18418)
+++ applications/editors/josm/plugins/validator/build.xml	(revision 18425)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="An OSM data validator. It checks for problems in data, and provides fixes for the common ones. Spellcheck integrated for tag names."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Validator"/>
-                <attribute name="Plugin-Mainversion" value="2355"/>
+                <attribute name="Plugin-Mainversion" value="2388"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java	(revision 18418)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java	(revision 18425)
@@ -10,19 +10,20 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.QuadBuckets;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.QuadBuckets.BBox;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.QuadBuckets;
 import org.openstreetmap.josm.plugins.validator.PreferenceEditor;
 import org.openstreetmap.josm.plugins.validator.Severity;
@@ -74,13 +75,6 @@
         this.ds = Main.main.getCurrentDataSet();
         this.ds_area = ds.getDataSourceArea();
-        // This is temporary until we get proper
-        // reindexing in the dataset code.
-        ArrayList<Node> ntmp = new ArrayList<Node>(ds.nodes);
-        ds.nodes.clear();
-        ds.nodes.addAll(ntmp);
-        ArrayList<Way> wtmp = new ArrayList<Way>(ds.ways);
-        ds.ways.clear();
-        ds.ways.addAll(wtmp);
-    }
+        this.ds.reindexAll();
+        }
 
     @Override
@@ -306,7 +300,6 @@
             // overlap a bit and can return duplicate nodes.
             nearbyNodeCache = null;
-            nodecache = ds.nodes;
             List<LatLon> bounds = this.getBounds(dist);
-            List<Node> found_nodes = nodecache.search(bounds.get(0), bounds.get(1));
+            List<Node> found_nodes = ds.searchNodes(new BBox(bounds.get(0), bounds.get(1)));
             if (found_nodes == null)
                 return Collections.emptySet();
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java	(revision 18418)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java	(revision 18425)
@@ -58,5 +58,5 @@
                 }
             }
-            for (Way w : Main.main.getCurrentDataSet().ways) {
+            for (Way w : Main.main.getCurrentDataSet().getWays()) {
                 visit(w);
             }
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java	(revision 18418)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java	(revision 18425)
@@ -117,5 +117,5 @@
         super.startTest(monitor);
         multipolygonways = new LinkedList<Way>();
-        for (final Relation r : Main.main.getCurrentDataSet().relations)
+        for (Relation r : Main.main.getCurrentDataSet().getRelations())
         {
             if(r.isUsable() && "multipolygon".equals(r.get("type")))