Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/FixTask.java
===================================================================
--- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/FixTask.java	(revision 32426)
+++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/FixTask.java	(revision 32427)
@@ -73,5 +73,5 @@
 				@Override
 				public void run() {
-					Main.main.getCurrentDataSet().beginUpdate();
+					Main.getLayerManager().getEditDataSet().beginUpdate();
 				}
 			});
@@ -89,5 +89,5 @@
 					@Override
 					public void run() {
-						Main.main.getCurrentDataSet().endUpdate();
+						Main.getLayerManager().getEditDataSet().endUpdate();
 					}
 				});
@@ -100,5 +100,5 @@
 					Main.map.repaint();
 					// tree.resetErrors();
-					Main.main.getCurrentDataSet().fireSelectionChanged();
+					Main.getLayerManager().getEditDataSet().fireSelectionChanged();
 				}
 			});
Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/DirectionTest.java
===================================================================
--- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/DirectionTest.java	(revision 32426)
+++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/DirectionTest.java	(revision 32427)
@@ -4,4 +4,5 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
@@ -122,8 +123,8 @@
 
 		if (testError.getTester().getClass().equals(DirectionTest.class) && testError.isFixable()) {
-			List<OsmPrimitive> primitives = (List<OsmPrimitive>) testError.getPrimitives();
-			Relation originalRelation = (Relation) primitives.get(0);
-			List<OsmPrimitive> highlightedList = (List<OsmPrimitive>) testError.getHighlighted();
-			Way wayToRemove = (Way) highlightedList.get(0);
+		    Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+			Relation originalRelation = (Relation) primitives.iterator().next();
+			Collection<?> highlightedList = testError.getHighlighted();
+			Way wayToRemove = (Way) highlightedList.iterator().next();
 
 			Relation modifiedRelation = new Relation(originalRelation);
Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTest.java
===================================================================
--- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTest.java	(revision 32426)
+++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTest.java	(revision 32427)
@@ -5,6 +5,4 @@
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.command.ChangeCommand;
Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssitantValidatorTest.java
===================================================================
--- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssitantValidatorTest.java	(revision 32426)
+++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssitantValidatorTest.java	(revision 32427)
@@ -4,9 +4,9 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
@@ -288,8 +288,8 @@
 		}
 
-		List<OsmPrimitive> primitives = (List<OsmPrimitive>) testError.getPrimitives();
-		Relation originalRelation = (Relation) primitives.get(0);
-		List<OsmPrimitive> highlighted = (List<OsmPrimitive>) testError.getHighlighted();
-		Way wayToRemove = (Way) highlighted.get(0);
+		Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+		Relation originalRelation = (Relation) primitives.iterator().next();
+		Collection<?> highlighted = testError.getHighlighted();
+		Way wayToRemove = (Way) highlighted.iterator().next();
 
 		Relation modifiedRelation = new Relation(originalRelation);
@@ -344,6 +344,6 @@
 		}
 
-		List<OsmPrimitive> primitives = (List<OsmPrimitive>) testError.getPrimitives();
-		Relation originalRelation = (Relation) primitives.get(0);
+		Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+		Relation originalRelation = (Relation) primitives.iterator().next();
 
 		// separate ways from stops (because otherwise the order of
Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTest.java
===================================================================
--- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTest.java	(revision 32426)
+++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTest.java	(revision 32427)
@@ -4,4 +4,5 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
@@ -135,8 +136,8 @@
 
 		if (testError.getTester().getClass().equals(RoadTypeTest.class) && testError.isFixable()) {
-			List<OsmPrimitive> primitives = (List<OsmPrimitive>) testError.getPrimitives();
-			Relation originalRelation = (Relation) primitives.get(0);
-			List<OsmPrimitive> highlighted = (List<OsmPrimitive>) testError.getHighlighted();
-			Way wayToRemove = (Way) highlighted.get(0);
+			Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+			Relation originalRelation = (Relation) primitives.iterator().next();
+			Collection<?> highlighted = testError.getHighlighted();
+			Way wayToRemove = (Way) highlighted.iterator().next();
 
 			Relation modifiedRelation = new Relation(originalRelation);
Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java
===================================================================
--- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java	(revision 32426)
+++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java	(revision 32427)
@@ -5,6 +5,4 @@
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;