Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/ImportUtils.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/ImportUtils.java	(revision 32505)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/ImportUtils.java	(revision 32506)
@@ -19,31 +19,31 @@
 
 public class ImportUtils {
-	
-	private ImportUtils() {
-		// private constructor for utils classes
-	}
+    
+    private ImportUtils() {
+        // private constructor for utils classes
+    }
 
-	public static DataSet importOsmFile(File file, String layerName) {
+    public static DataSet importOsmFile(File file, String layerName) {
 
-		OsmImporter importer = new OsmImporter();
-		ProgressMonitor progressMonitor = NullProgressMonitor.INSTANCE;
+        OsmImporter importer = new OsmImporter();
+        ProgressMonitor progressMonitor = NullProgressMonitor.INSTANCE;
 
-		try {
-			InputStream in = new FileInputStream(file);
-			OsmImporterData oid = importer.loadLayer(in, file, layerName, progressMonitor);
-			OsmDataLayer layer = oid.getLayer();
-			return layer.data;
+        try {
+            InputStream in = new FileInputStream(file);
+            OsmImporterData oid = importer.loadLayer(in, file, layerName, progressMonitor);
+            OsmDataLayer layer = oid.getLayer();
+            return layer.data;
 
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IllegalDataException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-		return null;
+        } catch (FileNotFoundException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IllegalDataException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        
+        return null;
 
-	}
+    }
 
 
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/RouteRepresentationTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/RouteRepresentationTest.java	(revision 32505)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/RouteRepresentationTest.java	(revision 32506)
@@ -21,226 +21,226 @@
  */
 public class RouteRepresentationTest extends AbstractTest {
-	
-	@Test
-	public void correctRouteTest() {
-		
-		/*-
-		 * Create a [correct] route which has:
-		 * stop1 (stop_position)
-		 * way1 (Way)
-		 * stop2(platform, Way)
-		 * way2 (Way)
-		 * stop3 (stop_area)
-		 * way3 (Relation that consists of Ways only)
-		 * stop4 (stop_position)
-		 * stop4 (platform, Node)
-		 * way4 (Way)
-		 * stop5 (platform_exit_only, Relation)
-		 * 
-		 */
-		
-		ArrayList<RelationMember> members = new ArrayList<>();
-		
-		// Create stops:
-		Node n1 = new Node(); 
-		n1.put("name", "Stop1");
-		RelationMember rm1 = new RelationMember("stop", n1);
-		members.add(rm1);
-		Way w1 = new Way();
-		w1.put("name", "Stop2");
-		w1.put("highway", "platform");
-		RelationMember rm2 = new RelationMember("platform", w1);
-		members.add(rm2);
-		Relation r1 = new Relation();
-		r1.put("name", "Stop3");
-		RelationMember rm3 = new RelationMember("stop_area", r1);
-		members.add(rm3);
-		Node n2 = new Node();
-		n2.put("name", "Stop4");
-		RelationMember rm4 = new RelationMember("stop", n2);
-		members.add(rm4);
-		Node n3 = new Node();
-		n3.put("name", "Stop4");
-		RelationMember rm5 = new RelationMember("platform", n3);
-		members.add(rm5);
-		Relation r2 = new Relation();
-		r2.put("name", "Stop5");
-		r2.put("highway", "platform_exit_only");
-		RelationMember rm6 = new RelationMember("platform_exit_only", r2);
-		members.add(rm6);
-				
-		// Create ways:
-		Way w2 = new Way();
-		RelationMember rm7 = new RelationMember("", w2);
-		members.add(rm7);
-		Way w3 = new Way();
-		RelationMember rm8 = new RelationMember("", w3);
-		members.add(rm8);
-		Relation r3 = new Relation(); // nested relation
-		Way w4 = new Way();
-		Way w5 = new Way();
-		Way w6 = new Way();
-		r3.addMember(new RelationMember("", w4));
-		r3.addMember(new RelationMember("", w5));
-		r3.addMember(new RelationMember("", w6));
-		RelationMember rm9 = new RelationMember("", r3);
-		members.add(rm9);
-		Way w7 = new Way();
-		RelationMember rm10 = new RelationMember("", w7);
-		members.add(rm10);
-		
-
-		
-		Relation route = new Relation();
-		route.setMembers(members);
-		
-		PTRouteDataManager manager = new PTRouteDataManager(route);
-	
-		assertEquals(manager.getPTStopCount(), 5);
-		assertEquals(manager.getPTWayCount(), 4);
-		
-	}
-	
-	@Test
-	public void nestedRelationTest() {
-		
-		// Same as above, but the nested Relation has a Node (only ways are allowed)
-		
-		ArrayList<RelationMember> members = new ArrayList<>();
-		
-		// Create stops:
-		Node n1 = new Node(); 
-		n1.put("name", "Stop1");
-		RelationMember rm1 = new RelationMember("stop", n1);
-		members.add(rm1);
-		Way w1 = new Way();
-		w1.put("name", "Stop2");
-		w1.put("highway", "platform");
-		RelationMember rm2 = new RelationMember("platform", w1);
-		members.add(rm2);
-		Relation r1 = new Relation();
-		r1.put("name", "Stop3");
-		RelationMember rm3 = new RelationMember("stop_area", r1);
-		members.add(rm3);
-		Node n2 = new Node();
-		n2.put("name", "Stop4");
-		RelationMember rm4 = new RelationMember("stop", n2);
-		members.add(rm4);
-		Node n3 = new Node();
-		n3.put("name", "Stop4");
-		RelationMember rm5 = new RelationMember("platform", n3);
-		members.add(rm5);
-		Relation r2 = new Relation();
-		r2.put("name", "Stop5");
-		r2.put("highway", "platform_exit_only");
-		RelationMember rm6 = new RelationMember("platform_exit_only", r2);
-		members.add(rm6);
-				
-		// Create ways:
-		Way w2 = new Way();
-		RelationMember rm7 = new RelationMember("", w2);
-		members.add(rm7);
-		Way w3 = new Way();
-		RelationMember rm8 = new RelationMember("", w3);
-		members.add(rm8);
-		Relation r3 = new Relation(); // nested relation
-		Way w4 = new Way();
-		Node wrongNode = new Node(); // CHANGED COMPARED TO PREVIOUS TEST
-		Way w6 = new Way();
-		r3.addMember(new RelationMember("", w4));
-		r3.addMember(new RelationMember("platform", wrongNode));
-		r3.addMember(new RelationMember("", w6));
-		RelationMember rm9 = new RelationMember("", r3);
-		members.add(rm9);
-		Way w7 = new Way();
-		RelationMember rm10 = new RelationMember("", w7);
-		members.add(rm10);
-		
-		
-		Relation route = new Relation();
-		route.setMembers(members);
-		
-		boolean thrown = false;
-		String message = "";
-		try {
-			PTRouteDataManager manager = new PTRouteDataManager(route);
-		} catch(IllegalArgumentException e) {
-			thrown = true;
-			message = e.getMessage();
-		}
-		
-		assertTrue(thrown);
-		assertEquals(message, "A route relation member of OsmPrimitiveType.RELATION can only have ways as members");
-		
-	}
-	
-	
-	@Test
-	public void multipleStopElementTest() {
-		
-		// Same as correctRouteTest(), but 
-		
-		ArrayList<RelationMember> members = new ArrayList<>();
-		
-		// Create stops:
-		Node n1 = new Node(); 
-		n1.put("name", "Stop1");
-		RelationMember rm1 = new RelationMember("stop", n1);
-		members.add(rm1);
-		Way w1 = new Way();
-		w1.put("name", "Stop2");
-		w1.put("highway", "platform");
-		RelationMember rm2 = new RelationMember("platform", w1);
-		members.add(rm2);
-		Relation r1 = new Relation();
-		r1.put("name", "Stop3");
-		RelationMember rm3 = new RelationMember("stop_area", r1);
-		members.add(rm3);
-		Node n2 = new Node();
-		n2.put("name", "Stop4");
-		RelationMember rm4 = new RelationMember("stop", n2);
-		members.add(rm4);
-		Node n3 = new Node();
-		n3.put("name", "Stop4");
-		RelationMember rm5 = new RelationMember("platform", n3);
-		members.add(rm5);
-		Relation r2 = new Relation();
-		r2.put("name", "Stop5");
-		r2.put("highway", "platform_exit_only");
-		RelationMember rm6 = new RelationMember("platform_exit_only", r2);
-		members.add(rm6);
-				
-		// Create ways:
-		Way w2 = new Way();
-		RelationMember rm7 = new RelationMember("", w2);
-		members.add(rm7);
-		Way w3 = new Way();
-		RelationMember rm8 = new RelationMember("", w3);
-		members.add(rm8);
-		Relation r3 = new Relation(); // nested relation
-		Way w4 = new Way();
-		Way w5 = new Way();
-		Way w6 = new Way();
-		r3.addMember(new RelationMember("", w4));
-		r3.addMember(new RelationMember("", w5));
-		r3.addMember(new RelationMember("", w6));
-		RelationMember rm9 = new RelationMember("", r3);
-		members.add(rm9);
-		Way w7 = new Way();
-		RelationMember rm10 = new RelationMember("", w7);
-		members.add(rm10);
-		
-
-		
-		Relation route = new Relation();
-		route.setMembers(members);
-		
-		PTRouteDataManager manager = new PTRouteDataManager(route);
-	
-		assertEquals(manager.getPTStopCount(), 5);
-		assertEquals(manager.getPTWayCount(), 4);
-		
-	}
-	
+    
+    @Test
+    public void correctRouteTest() {
+        
+        /*-
+         * Create a [correct] route which has:
+         * stop1 (stop_position)
+         * way1 (Way)
+         * stop2(platform, Way)
+         * way2 (Way)
+         * stop3 (stop_area)
+         * way3 (Relation that consists of Ways only)
+         * stop4 (stop_position)
+         * stop4 (platform, Node)
+         * way4 (Way)
+         * stop5 (platform_exit_only, Relation)
+         * 
+         */
+        
+        ArrayList<RelationMember> members = new ArrayList<>();
+        
+        // Create stops:
+        Node n1 = new Node(); 
+        n1.put("name", "Stop1");
+        RelationMember rm1 = new RelationMember("stop", n1);
+        members.add(rm1);
+        Way w1 = new Way();
+        w1.put("name", "Stop2");
+        w1.put("highway", "platform");
+        RelationMember rm2 = new RelationMember("platform", w1);
+        members.add(rm2);
+        Relation r1 = new Relation();
+        r1.put("name", "Stop3");
+        RelationMember rm3 = new RelationMember("stop_area", r1);
+        members.add(rm3);
+        Node n2 = new Node();
+        n2.put("name", "Stop4");
+        RelationMember rm4 = new RelationMember("stop", n2);
+        members.add(rm4);
+        Node n3 = new Node();
+        n3.put("name", "Stop4");
+        RelationMember rm5 = new RelationMember("platform", n3);
+        members.add(rm5);
+        Relation r2 = new Relation();
+        r2.put("name", "Stop5");
+        r2.put("highway", "platform_exit_only");
+        RelationMember rm6 = new RelationMember("platform_exit_only", r2);
+        members.add(rm6);
+                
+        // Create ways:
+        Way w2 = new Way();
+        RelationMember rm7 = new RelationMember("", w2);
+        members.add(rm7);
+        Way w3 = new Way();
+        RelationMember rm8 = new RelationMember("", w3);
+        members.add(rm8);
+        Relation r3 = new Relation(); // nested relation
+        Way w4 = new Way();
+        Way w5 = new Way();
+        Way w6 = new Way();
+        r3.addMember(new RelationMember("", w4));
+        r3.addMember(new RelationMember("", w5));
+        r3.addMember(new RelationMember("", w6));
+        RelationMember rm9 = new RelationMember("", r3);
+        members.add(rm9);
+        Way w7 = new Way();
+        RelationMember rm10 = new RelationMember("", w7);
+        members.add(rm10);
+        
+
+        
+        Relation route = new Relation();
+        route.setMembers(members);
+        
+        PTRouteDataManager manager = new PTRouteDataManager(route);
+    
+        assertEquals(manager.getPTStopCount(), 5);
+        assertEquals(manager.getPTWayCount(), 4);
+        
+    }
+    
+    @Test
+    public void nestedRelationTest() {
+        
+        // Same as above, but the nested Relation has a Node (only ways are allowed)
+        
+        ArrayList<RelationMember> members = new ArrayList<>();
+        
+        // Create stops:
+        Node n1 = new Node(); 
+        n1.put("name", "Stop1");
+        RelationMember rm1 = new RelationMember("stop", n1);
+        members.add(rm1);
+        Way w1 = new Way();
+        w1.put("name", "Stop2");
+        w1.put("highway", "platform");
+        RelationMember rm2 = new RelationMember("platform", w1);
+        members.add(rm2);
+        Relation r1 = new Relation();
+        r1.put("name", "Stop3");
+        RelationMember rm3 = new RelationMember("stop_area", r1);
+        members.add(rm3);
+        Node n2 = new Node();
+        n2.put("name", "Stop4");
+        RelationMember rm4 = new RelationMember("stop", n2);
+        members.add(rm4);
+        Node n3 = new Node();
+        n3.put("name", "Stop4");
+        RelationMember rm5 = new RelationMember("platform", n3);
+        members.add(rm5);
+        Relation r2 = new Relation();
+        r2.put("name", "Stop5");
+        r2.put("highway", "platform_exit_only");
+        RelationMember rm6 = new RelationMember("platform_exit_only", r2);
+        members.add(rm6);
+                
+        // Create ways:
+        Way w2 = new Way();
+        RelationMember rm7 = new RelationMember("", w2);
+        members.add(rm7);
+        Way w3 = new Way();
+        RelationMember rm8 = new RelationMember("", w3);
+        members.add(rm8);
+        Relation r3 = new Relation(); // nested relation
+        Way w4 = new Way();
+        Node wrongNode = new Node(); // CHANGED COMPARED TO PREVIOUS TEST
+        Way w6 = new Way();
+        r3.addMember(new RelationMember("", w4));
+        r3.addMember(new RelationMember("platform", wrongNode));
+        r3.addMember(new RelationMember("", w6));
+        RelationMember rm9 = new RelationMember("", r3);
+        members.add(rm9);
+        Way w7 = new Way();
+        RelationMember rm10 = new RelationMember("", w7);
+        members.add(rm10);
+        
+        
+        Relation route = new Relation();
+        route.setMembers(members);
+        
+        boolean thrown = false;
+        String message = "";
+        try {
+            /*PTRouteDataManager manager =*/ new PTRouteDataManager(route);
+        } catch(IllegalArgumentException e) {
+            thrown = true;
+            message = e.getMessage();
+        }
+        
+        assertTrue(thrown);
+        assertEquals(message, "A route relation member of OsmPrimitiveType.RELATION can only have ways as members");
+        
+    }
+    
+    
+    @Test
+    public void multipleStopElementTest() {
+        
+        // Same as correctRouteTest(), but 
+        
+        ArrayList<RelationMember> members = new ArrayList<>();
+        
+        // Create stops:
+        Node n1 = new Node(); 
+        n1.put("name", "Stop1");
+        RelationMember rm1 = new RelationMember("stop", n1);
+        members.add(rm1);
+        Way w1 = new Way();
+        w1.put("name", "Stop2");
+        w1.put("highway", "platform");
+        RelationMember rm2 = new RelationMember("platform", w1);
+        members.add(rm2);
+        Relation r1 = new Relation();
+        r1.put("name", "Stop3");
+        RelationMember rm3 = new RelationMember("stop_area", r1);
+        members.add(rm3);
+        Node n2 = new Node();
+        n2.put("name", "Stop4");
+        RelationMember rm4 = new RelationMember("stop", n2);
+        members.add(rm4);
+        Node n3 = new Node();
+        n3.put("name", "Stop4");
+        RelationMember rm5 = new RelationMember("platform", n3);
+        members.add(rm5);
+        Relation r2 = new Relation();
+        r2.put("name", "Stop5");
+        r2.put("highway", "platform_exit_only");
+        RelationMember rm6 = new RelationMember("platform_exit_only", r2);
+        members.add(rm6);
+                
+        // Create ways:
+        Way w2 = new Way();
+        RelationMember rm7 = new RelationMember("", w2);
+        members.add(rm7);
+        Way w3 = new Way();
+        RelationMember rm8 = new RelationMember("", w3);
+        members.add(rm8);
+        Relation r3 = new Relation(); // nested relation
+        Way w4 = new Way();
+        Way w5 = new Way();
+        Way w6 = new Way();
+        r3.addMember(new RelationMember("", w4));
+        r3.addMember(new RelationMember("", w5));
+        r3.addMember(new RelationMember("", w6));
+        RelationMember rm9 = new RelationMember("", r3);
+        members.add(rm9);
+        Way w7 = new Way();
+        RelationMember rm10 = new RelationMember("", w7);
+        members.add(rm10);
+        
+
+        
+        Relation route = new Relation();
+        route.setMembers(members);
+        
+        PTRouteDataManager manager = new PTRouteDataManager(route);
+    
+        assertEquals(manager.getPTStopCount(), 5);
+        assertEquals(manager.getPTWayCount(), 4);
+        
+    }
+    
 
 }
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java	(revision 32505)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java	(revision 32506)
@@ -16,56 +16,56 @@
 
 public class DirecionTestTest extends AbstractTest {
-	
-	@Test
-	public void test() {
-		// this file has:
-		// Way 
-		
-		
-		File file = new File(AbstractTest.PATH_TO_ROUNDABOUT_ONEWAY);
-		DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
-		
-		Relation route = null;
-		for (Relation r: ds.getRelations()) {
-			if (r.hasKey("route")) {
-				route = r;
-			}
-		}
-		
-		assertEquals(route.getMembersCount(), 213);
-				
-		DirectionTest directionTest = new DirectionTest();
-		for (Relation r: ds.getRelations()) {
-			directionTest.visit(r);
-		}
-		
-		List<TestError> errors = directionTest.getErrors();
-		assertEquals(errors.size(), 1);
-		int onewayErrorCaught = 0;
-		int roundaboutErrorCaught = 0;
-		for (TestError e: errors ) {
-			if (e.getCode() == DirectionTest.ERROR_CODE_DIRECTION) {
-				onewayErrorCaught++;
-			}
-		}
-		
-		assertEquals(onewayErrorCaught, 1);
-		
-		// fix the direction errors:
-		
-		boolean detectedErrorsAreCorrect = true;
-		for (TestError e: errors) {
-			if (e.getCode() == DirectionTest.ERROR_CODE_DIRECTION) {
-				List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
-				if (highlighted.get(0).getId() != 26130630 && highlighted.get(0).getId() != 151278290)  {
-					detectedErrorsAreCorrect = false;
-				}
-			}
-		}
-		
-		assertTrue(detectedErrorsAreCorrect);
-		
-	
-	}
+    
+    @Test
+    public void test() {
+        // this file has:
+        // Way 
+        
+        
+        File file = new File(AbstractTest.PATH_TO_ROUNDABOUT_ONEWAY);
+        DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
+        
+        Relation route = null;
+        for (Relation r: ds.getRelations()) {
+            if (r.hasKey("route")) {
+                route = r;
+            }
+        }
+        
+        assertEquals(route.getMembersCount(), 213);
+                
+        DirectionTest directionTest = new DirectionTest();
+        for (Relation r: ds.getRelations()) {
+            directionTest.visit(r);
+        }
+        
+        List<TestError> errors = directionTest.getErrors();
+        assertEquals(errors.size(), 1);
+        int onewayErrorCaught = 0;
+        for (TestError e: errors ) {
+            if (e.getCode() == DirectionTest.ERROR_CODE_DIRECTION) {
+                onewayErrorCaught++;
+            }
+        }
+        
+        assertEquals(onewayErrorCaught, 1);
+        
+        // fix the direction errors:
+        
+        boolean detectedErrorsAreCorrect = true;
+        for (TestError e: errors) {
+            if (e.getCode() == DirectionTest.ERROR_CODE_DIRECTION) {
+                @SuppressWarnings("unchecked")
+                List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
+                if (highlighted.get(0).getId() != 26130630 && highlighted.get(0).getId() != 151278290)  {
+                    detectedErrorsAreCorrect = false;
+                }
+            }
+        }
+        
+        assertTrue(detectedErrorsAreCorrect);
+        
+    
+    }
 
 }
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTestTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTestTest.java	(revision 32505)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTestTest.java	(revision 32506)
@@ -15,69 +15,69 @@
 public class GapTestTest extends AbstractTest {
 
-	@Test
-	public void sortingTestBeforeFile() {
-		File file = new File(AbstractTest.PATH_TO_DL131_BEFORE);
-		DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
+    @Test
+    public void sortingTestBeforeFile() {
+        File file = new File(AbstractTest.PATH_TO_DL131_BEFORE);
+        DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
 
-		GapTest gapTest = new GapTest();
-		for (Relation r : ds.getRelations()) {
-			gapTest.visit(r);
-		}
+        GapTest gapTest = new GapTest();
+        for (Relation r : ds.getRelations()) {
+            gapTest.visit(r);
+        }
 
-		List<TestError> errors = gapTest.getErrors();
+        List<TestError> errors = gapTest.getErrors();
 
-		assertEquals(errors.size(), 1);
-		assertEquals(errors.iterator().next().getCode(), GapTest.ERROR_CODE_SORTING);
-		assertEquals(errors.iterator().next().getTester().getClass().getName(), GapTest.class.getName());
-	}
+        assertEquals(errors.size(), 1);
+        assertEquals(errors.iterator().next().getCode(), GapTest.ERROR_CODE_SORTING);
+        assertEquals(errors.iterator().next().getTester().getClass().getName(), GapTest.class.getName());
+    }
 
-	@Test
-	public void sortingTestAfterFile() {
-		File file = new File(AbstractTest.PATH_TO_DL131_AFTER);
-		DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
+    @Test
+    public void sortingTestAfterFile() {
+        File file = new File(AbstractTest.PATH_TO_DL131_AFTER);
+        DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
 
-		GapTest gapTest = new GapTest();
-		for (Relation r : ds.getRelations()) {
-			gapTest.visit(r);
-		}
+        GapTest gapTest = new GapTest();
+        for (Relation r : ds.getRelations()) {
+            gapTest.visit(r);
+        }
 
-		List<TestError> errors = gapTest.getErrors();
+        List<TestError> errors = gapTest.getErrors();
 
-		assertEquals(errors.size(), 0);
-	}
+        assertEquals(errors.size(), 0);
+    }
 
-	// TODO: this test will only pass after the functionality for recognizing
-	// and closing the gap is implemented.
-//	@Test
-//	public void overshootTestBeforeFile() {
-//		File file = new File(AbstractTest.PATH_TO_DL286_BEFORE);
-//		DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
+    // TODO: this test will only pass after the functionality for recognizing
+    // and closing the gap is implemented.
+//    @Test
+//    public void overshootTestBeforeFile() {
+//        File file = new File(AbstractTest.PATH_TO_DL286_BEFORE);
+//        DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
 //
-//		GapTest gapTest = new GapTest();
-//		for (Relation r : ds.getRelations()) {
-//			gapTest.visit(r);
-//		}
+//        GapTest gapTest = new GapTest();
+//        for (Relation r : ds.getRelations()) {
+//            gapTest.visit(r);
+//        }
 //
-//		List<TestError> errors = gapTest.getErrors();
+//        List<TestError> errors = gapTest.getErrors();
 //
-//		assertEquals(errors.size(), 1);
-//		assertEquals(errors.get(0).getCode(), GapTest.ERROR_CODE_OVERSHOOT);
+//        assertEquals(errors.size(), 1);
+//        assertEquals(errors.get(0).getCode(), GapTest.ERROR_CODE_OVERSHOOT);
 //
-//	}
+//    }
 
-	@Test
-	public void overshootTestAfterFile() {
-		File file = new File(AbstractTest.PATH_TO_DL286_AFTER);
-		DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
+    @Test
+    public void overshootTestAfterFile() {
+        File file = new File(AbstractTest.PATH_TO_DL286_AFTER);
+        DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
 
-		GapTest gapTest = new GapTest();
-		for (Relation r : ds.getRelations()) {
-			gapTest.visit(r);
-		}
+        GapTest gapTest = new GapTest();
+        for (Relation r : ds.getRelations()) {
+            gapTest.visit(r);
+        }
 
-		List<TestError> errors = gapTest.getErrors();
+        List<TestError> errors = gapTest.getErrors();
 
-		assertEquals(errors.size(), 0);
-	}
+        assertEquals(errors.size(), 0);
+    }
 
 }
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java	(revision 32505)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java	(revision 32506)
@@ -14,19 +14,19 @@
 
 public class PlatformAsWayTest extends AbstractTest{
-	
-	@Test
-	public void sortingTest() {
-		File file = new File(AbstractTest.PATH_TO_PLATFORM_AS_WAY);
-		DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
-		
-		GapTest gapTest = new GapTest();
-		for (Relation r: ds.getRelations()) {
-			gapTest.visit(r);
-		}
-		
-		List<TestError> errors = gapTest.getErrors();
-		
-		assertEquals(errors.size(), 0);
-	}
+    
+    @Test
+    public void sortingTest() {
+        File file = new File(AbstractTest.PATH_TO_PLATFORM_AS_WAY);
+        DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
+        
+        GapTest gapTest = new GapTest();
+        for (Relation r: ds.getRelations()) {
+            gapTest.visit(r);
+        }
+        
+        List<TestError> errors = gapTest.getErrors();
+        
+        assertEquals(errors.size(), 0);
+    }
 
 }
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformsFirstTestTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformsFirstTestTest.java	(revision 32505)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformsFirstTestTest.java	(revision 32506)
@@ -15,32 +15,32 @@
 public class PlatformsFirstTestTest extends AbstractTest {
 
-	@Test
-	public void testBeforeFile() {
-		DataSet ds = ImportUtils.importOsmFile(new File(AbstractTest.PATH_TO_DL131_BEFORE), "testLayer");
-		
-		PlatformsFirstTest pf = new PlatformsFirstTest();
-		for (Relation r: ds.getRelations()) {
-			pf.visit(r);
-		}
-		List<TestError> errors = pf.getErrors();
+    @Test
+    public void testBeforeFile() {
+        DataSet ds = ImportUtils.importOsmFile(new File(AbstractTest.PATH_TO_DL131_BEFORE), "testLayer");
+        
+        PlatformsFirstTest pf = new PlatformsFirstTest();
+        for (Relation r: ds.getRelations()) {
+            pf.visit(r);
+        }
+        List<TestError> errors = pf.getErrors();
 
-		assertEquals(errors.size(), 1);
-		assertEquals(errors.iterator().next().getCode(), PlatformsFirstTest.ERROR_CODE); 
-		assertEquals(errors.iterator().next().getTester().getClass().getName(), PlatformsFirstTest.class.getName());
-	
-	}
-	
-	@Test
-	public void testAfterFile() {
-		DataSet ds = ImportUtils.importOsmFile(new File(AbstractTest.PATH_TO_DL131_AFTER), "testLayer");
-		
-		PlatformsFirstTest pf = new PlatformsFirstTest();
-		for (Relation r: ds.getRelations()) {
-			pf.visit(r);
-		}
-		List<TestError> errors = pf.getErrors();
-		assertEquals(errors.size(), 0);
-		
-		
-	}
+        assertEquals(errors.size(), 1);
+        assertEquals(errors.iterator().next().getCode(), PlatformsFirstTest.ERROR_CODE); 
+        assertEquals(errors.iterator().next().getTester().getClass().getName(), PlatformsFirstTest.class.getName());
+    
+    }
+    
+    @Test
+    public void testAfterFile() {
+        DataSet ds = ImportUtils.importOsmFile(new File(AbstractTest.PATH_TO_DL131_AFTER), "testLayer");
+        
+        PlatformsFirstTest pf = new PlatformsFirstTest();
+        for (Relation r: ds.getRelations()) {
+            pf.visit(r);
+        }
+        List<TestError> errors = pf.getErrors();
+        assertEquals(errors.size(), 0);
+        
+        
+    }
 }
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java	(revision 32505)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java	(revision 32506)
@@ -17,26 +17,27 @@
 
 public class RoadTypeTestTest extends AbstractTest {
-	
-	@Test
-	public void test() {
-		
-		File file = new File(AbstractTest.PATH_TO_ROAD_TYPE_ERROR);
-		DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
-		
-		RoadTypeTest roadTypeTest = new RoadTypeTest();
-		for (Relation r: ds.getRelations()) {
-			roadTypeTest.visit(r);
-		}
-		
-		List<TestError> errors = roadTypeTest.getErrors();
-		assertEquals(errors.size(), 2);
-		
-		for (TestError e: errors) {
-			assertEquals(e.getCode(), RoadTypeTest.ERROR_CODE_ROAD_TYPE);
-			List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
-			Way way = (Way) highlighted.get(0);
-			assertTrue(way.getId() == 8169083 || way.getId() == 8034569);
-		}
-	}
+    
+    @Test
+    public void test() {
+        
+        File file = new File(AbstractTest.PATH_TO_ROAD_TYPE_ERROR);
+        DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
+        
+        RoadTypeTest roadTypeTest = new RoadTypeTest();
+        for (Relation r: ds.getRelations()) {
+            roadTypeTest.visit(r);
+        }
+        
+        List<TestError> errors = roadTypeTest.getErrors();
+        assertEquals(errors.size(), 2);
+        
+        for (TestError e: errors) {
+            assertEquals(e.getCode(), RoadTypeTest.ERROR_CODE_ROAD_TYPE);
+            @SuppressWarnings("unchecked")
+            List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
+            Way way = (Way) highlighted.get(0);
+            assertTrue(way.getId() == 8169083 || way.getId() == 8034569);
+        }
+    }