Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java	(revision 5193)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java	(revision 5194)
@@ -9,5 +9,5 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.NodePair;
+import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.plugins.validator.Severity;
 import org.openstreetmap.josm.plugins.validator.Test;
@@ -23,5 +23,5 @@
 {
 	/** Bag of all way segments */
-	Bag<NodePair, OsmPrimitive> nodePairs;
+	Bag<Pair<Node,Node>, OsmPrimitive> nodePairs;
 	
 	/**
@@ -40,5 +40,5 @@
 	public void startTest() 
 	{
-		nodePairs = new Bag<NodePair, OsmPrimitive>(1000);
+		nodePairs = new Bag<Pair<Node,Node>, OsmPrimitive>(1000);
 	}
 
@@ -66,7 +66,7 @@
 			}
 			if (n.hashCode() > lastN.hashCode()) {
-				nodePairs.add(new NodePair(lastN, n), w);
+				nodePairs.add(new Pair<Node,Node>(lastN, n), w);
 			} else {
-				nodePairs.add(new NodePair(n, lastN), w);
+				nodePairs.add(new Pair<Node,Node>(n, lastN), w);
 			}
 			lastN = n;