Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java	(revision 33429)
@@ -123,5 +123,5 @@
     public static void addHighlightedRelation(Relation highlightedRelation) {
         highlightedRelations.add(highlightedRelation);
-        if(!editHighlightedRelationsMenu.isEnabled()) {
+        if (!editHighlightedRelationsMenu.isEnabled()) {
             SwingUtilities.invokeLater(() ->
             editHighlightedRelationsMenu.setEnabled(true));
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java	(revision 33429)
@@ -57,5 +57,5 @@
     private static Cursor getCursor() {
         Cursor cursor = ImageProvider.getCursor("crosshair", "bus");
-        if(cursor == null)
+        if (cursor == null)
             cursor = Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR);
         return cursor;
@@ -85,5 +85,5 @@
 
         Node n = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive::isUsable);
-        if(n != null) {
+        if (n != null) {
             newHighlights.add(n);
             newCurs = cursorJoinNode;
@@ -92,6 +92,6 @@
                     Main.map.mapView.getNearestWaySegments(e.getPoint(), OsmPrimitive::isSelectable);
 
-            if(!wss.isEmpty()) {
-                for(WaySegment ws : wss) {
+            if (!wss.isEmpty()) {
+                for (WaySegment ws : wss) {
                     newHighlights.add(ws.way);
                 }
@@ -124,5 +124,5 @@
         newStopPos.put("public_transport", "stop_position");
 
-        if(newNode) {
+        if (newNode) {
             Main.main.undoRedo.add(new AddCommand(newStopPos));
         } else {
@@ -134,5 +134,5 @@
 
         //join the node to the way only if the node is new
-        if(newNode) {
+        if (newNode) {
             JoinNodeWayAction joinNodeWayAction = JoinNodeWayAction.createJoinNodeToWayAction();
             joinNodeWayAction.actionPerformed(null);
@@ -145,5 +145,5 @@
 
     private void clearNodeTags(Node newStopPos) {
-        for(String key : newStopPos.keySet()) {
+        for (String key : newStopPos.keySet()) {
             newStopPos.put(key, null);
         }
@@ -152,15 +152,14 @@
 
     //turn off what has been highlighted on last mouse move and highlight what has to be highlighted now
-    private void updateHighlights()
-    {
-        if(oldHighlights.isEmpty() && newHighlights.isEmpty()) {
+    private void updateHighlights() {
+        if (oldHighlights.isEmpty() && newHighlights.isEmpty()) {
             return;
         }
 
-        for(OsmPrimitive osm : oldHighlights) {
+        for (OsmPrimitive osm : oldHighlights) {
             osm.setHighlighted(false);
         }
 
-        for(OsmPrimitive osm : newHighlights) {
+        for (OsmPrimitive osm : newHighlights) {
             osm.setHighlighted(true);
         }
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java	(revision 33429)
@@ -56,13 +56,13 @@
     private List<Way> getEdgeFromWay(Way initial, String modeOfTravel) {
         List<Way> edge = new ArrayList<>();
-        if(!isWaySuitableForMode(initial, modeOfTravel))
+        if (!isWaySuitableForMode(initial, modeOfTravel))
             return edge;
 
         Way curr = initial;
-        while(true) {
+        while (true) {
             List<Way> options = curr.firstNode(true).getParentWays();
             options.remove(curr);
             curr = chooseBestWay(options, modeOfTravel);
-            if(curr == null || edge.contains(curr))
+            if (curr == null || edge.contains(curr))
                 break;
             edge.add(curr);
@@ -70,9 +70,9 @@
 
         curr = initial;
-        while(true) {
+        while (true) {
             List<Way> options = curr.lastNode(true).getParentWays();
             options.remove(curr);
             curr = chooseBestWay(options, modeOfTravel);
-            if(curr == null || edge.contains(curr))
+            if (curr == null || edge.contains(curr))
                 break;
             edge.add(curr);
@@ -84,5 +84,5 @@
 
     private Boolean isWaySuitableForMode(Way toCheck, String modeOfTravel) {
-        if("bus".equals(modeOfTravel))
+        if ("bus".equals(modeOfTravel))
             return RouteUtils.isWaySuitableForBuses(toCheck);
 
@@ -95,17 +95,15 @@
     private Way chooseBestWay(List<Way> ways, String modeOfTravel) {
         ways.removeIf(w -> !isWaySuitableForMode(w, modeOfTravel));
-        if(ways.isEmpty())
+        if (ways.isEmpty())
             return null;
-        if(ways.size() == 1)
+        if (ways.size() == 1)
             return ways.get(0);
 
         Way theChoosenOne = null;
 
-        if("bus".equals(modeOfTravel))
-        {
+        if ("bus".equals(modeOfTravel)) {
 
         }
-        if("tram".equals(modeOfTravel))
-        {
+        if ("tram".equals(modeOfTravel)) {
 
         }
@@ -125,8 +123,7 @@
         DataSet ds = Main.getLayerManager().getEditLayer().data;
         Way initial = Main.map.mapView.getNearestWay(e.getPoint(), OsmPrimitive::isUsable);
-        if(initial != null){
+        if (initial != null) {
             ds.setSelected(getEdgeFromWay(initial, getModeOfTravel()));
-        }
-        else
+        } else
             ds.clearSelection();
     }
@@ -136,19 +133,20 @@
         super.mouseMoved(e);
 
-        for(Way way : highlighted)
+        for (Way way : highlighted) {
             way.setHighlighted(false);
+        }
         highlighted.clear();
 
         Way initial = Main.map.mapView.getNearestWay(e.getPoint(), OsmPrimitive::isUsable);
-        if(initial == null) {
+        if (initial == null) {
             Main.map.mapView.setCursor(selectionCursor);
-        }
-        else {
+        } else {
             Main.map.mapView.setCursor(waySelectCursor);
             highlighted.addAll(getEdgeFromWay(initial, getModeOfTravel()));
         }
 
-        for(Way way : highlighted)
+        for (Way way : highlighted) {
             way.setHighlighted(true);
+        }
     }
 
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EditHighlightedRelationsAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EditHighlightedRelationsAction.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EditHighlightedRelationsAction.java	(revision 33429)
@@ -39,5 +39,5 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        for(Relation relation : PTAssistantPlugin.getHighlightedRelations()) {
+        for (Relation relation : PTAssistantPlugin.getHighlightedRelations()) {
             RelationEditor editor = RelationEditor.getEditor(
                     Main.getLayerManager().getEditLayer(), relation, null);
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java	(revision 33429)
@@ -93,5 +93,5 @@
     private void continueAfterDownload(Way roundabout) {
         //make the roundabout round, if requested
-        if(Main.pref.getBoolean("pt_assistant.roundabout-splitter.alignalways") ||
+        if (Main.pref.getBoolean("pt_assistant.roundabout-splitter.alignalways") ||
                 JOptionPane.YES_OPTION == JOptionPane.showOptionDialog(Main.parent,
                 tr("Do you want to make the roundabout round?"), tr("Roundabout round"),
@@ -123,10 +123,10 @@
         List<Relation> parents = getPTRouteParents(roundabout);
         parents.removeIf(r -> !r.hasIncompleteMembers());
-        if(parents.isEmpty()) {
+        if (parents.isEmpty()) {
             continueAfterDownload(roundabout);
             return;
         }
 
-        Future <?>future = Main.worker.submit(new DownloadRelationMemberTask(
+        Future<?> future = Main.worker.submit(new DownloadRelationMemberTask(
             parents,
             DownloadSelectedIncompleteMembersAction.buildSetOfIncompleteMembers(parents),
@@ -166,18 +166,18 @@
             positions.forEach(i -> {
 
-                if(!changingRelation.containsKey(r))
+                if (!changingRelation.containsKey(r))
                     changingRelation.put(r, new Relation(r));
 
                 Relation c = changingRelation.get(r);
 
-                if(!memberOffset.containsKey(r))
+                if (!memberOffset.containsKey(r))
                     memberOffset.put(r, 0);
                 int offset = memberOffset.get(r);
 
-                Pair<Way, Way> entryExitWays= getEntryExitWays(c, i + offset);
+                Pair<Way, Way> entryExitWays = getEntryExitWays(c, i + offset);
                 Way entryWay = entryExitWays.a;
                 Way exitWay = entryExitWays.b;
 
-                if(entryWay == null || exitWay == null)
+                if (entryWay == null || exitWay == null)
                     return;
 
@@ -186,5 +186,5 @@
                 Node exitNode = getNodeInCommon(splitNodes, exitWay);
 
-                if(entryNode == null || exitNode == null)
+                if (entryNode == null || exitNode == null)
                     return;
 
@@ -197,5 +197,5 @@
                 Way curr = parents.get(0);
 
-                while(!curr.lastNode().equals(exitNode)) {
+                while (!curr.lastNode().equals(exitNode)) {
                     c.addMember(i + offset++, new RelationMember(null, curr));
                     parents = curr.lastNode().getParentWays();
@@ -211,7 +211,7 @@
 
     private Node getNodeInCommon(List<Node> nodes, Way way) {
-        if(nodes.contains(way.lastNode()))
+        if (nodes.contains(way.lastNode()))
             return way.lastNode();
-        else if(nodes.contains(way.firstNode()))
+        else if (nodes.contains(way.firstNode()))
             return way.firstNode();
 
@@ -227,9 +227,9 @@
 
         RelationMember before = r.getMember(position-1);
-        if(before.isWay())
+        if (before.isWay())
             ret.a = before.getWay();
 
         RelationMember after = r.getMember(position);
-        if(after.isWay())
+        if (after.isWay())
             ret.b = after.getWay();
 
@@ -245,9 +245,9 @@
         splitNodes.removeIf(n -> {
             List<Way> parents = n.getParentWays();
-            if(parents.size() == 1)
+            if (parents.size() == 1)
                 return true;
             parents.remove(roundabout);
-            for(Way parent: parents) {
-                if(!getRouteParents(parent).isEmpty()) {
+            for (Way parent: parents) {
+                if (!getRouteParents(parent).isEmpty()) {
                         return false;
                 }
@@ -276,8 +276,8 @@
         Map<Relation, List<Integer>> savedPositions = new HashMap<>();
 
-        for(Relation curr : getPTRouteParents(roundabout)) {
-            for(int j = 0; j < curr.getMembersCount(); j++) {
-                if(curr.getMember(j).getUniqueId() == roundabout.getUniqueId()) {
-                    if(!savedPositions.containsKey(curr))
+        for (Relation curr : getPTRouteParents(roundabout)) {
+            for (int j = 0; j < curr.getMembersCount(); j++) {
+                if (curr.getMember(j).getUniqueId() == roundabout.getUniqueId()) {
+                    if (!savedPositions.containsKey(curr))
                         savedPositions.put(curr, new ArrayList<>());
                     List<Integer> positions = savedPositions.get(curr);
@@ -291,5 +291,5 @@
 
     private List<Relation> getPTRouteParents(Way roundabout) {
-        List <Relation> referrers = OsmPrimitive.getFilteredList(
+        List<Relation> referrers = OsmPrimitive.getFilteredList(
                 roundabout.getReferrers(), Relation.class);
         referrers.removeIf(r -> !RouteUtils.isPTRoute(r));
@@ -298,5 +298,5 @@
 
     private List<Relation> getRouteParents(Way roundabout) {
-        List <Relation> referrers = OsmPrimitive.getFilteredList(
+        List<Relation> referrers = OsmPrimitive.getFilteredList(
                 roundabout.getReferrers(), Relation.class);
         referrers.removeIf(r -> !RouteUtils.isRoute(r));
@@ -311,7 +311,7 @@
             return;
         OsmPrimitive selected = selection.iterator().next();
-        if(selected.getType() != OsmPrimitiveType.WAY)
+        if (selected.getType() != OsmPrimitiveType.WAY)
             return;
-        if(((Way)selected).isClosed()
+        if (((Way) selected).isClosed()
                 && (selected.hasTag("junction", "roundabout")
                         || selected.hasTag("oneway", "yes"))) {
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteSegment.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteSegment.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteSegment.java	(revision 33429)
@@ -187,7 +187,4 @@
     public boolean equalsRouteSegment(PTRouteSegment other) {
 
-//      if(!firstStop.equalsStop(firstStop) || !lastStop.equalsStop(other.lastStop))
-//          return false;
-
         List<Way> thisWays = new ArrayList<>();
         for (PTWay ptway : this.ptways) {
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java	(revision 33429)
@@ -126,6 +126,5 @@
     }
 
-    public void setPrimitives(List<OsmPrimitive> primitives)
-    {
+    public void setPrimitives(List<OsmPrimitive> primitives) {
         this.primitives.clear();
         this.primitives.addAll(primitives);
@@ -267,5 +266,5 @@
             event.scheduleRemoval(Collections.singleton(this));
 
-        if(event.getRemovedLayer() == this) {
+        if (event.getRemovedLayer() == this) {
             PTAssistantLayerManager.PTLM.resetLayer();
             PTAssistantPlugin.clearHighlightedRelations();
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java	(revision 33429)
@@ -46,6 +46,7 @@
             getLayer().setPrimitives(routes);
             PTAssistantPlugin.clearHighlightedRelations();
-            for(OsmPrimitive primitive : routes)
+            for (OsmPrimitive primitive : routes) {
                 PTAssistantPlugin.addHighlightedRelation((Relation) primitive);
+            }
         }
     }
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantPaintVisitor.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantPaintVisitor.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantPaintVisitor.java	(revision 33429)
@@ -67,12 +67,6 @@
                 } else if (rm.isRelation()) {
                     visit(rm.getRelation());
-                } //else {
-                    // if the relation has members that do not fit with the
-                    // PT_Assistant data model, do nothing
-                //}
-            } //else {
-                // if the relation has members that do not fit with the
-                // PT_Assistant data model, do nothing
-            //}
+                }
+            }
         }
 
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java	(revision 33429)
@@ -19,5 +19,5 @@
 public final class RouteUtils {
 
-    private final static String ptVersionTag = "public_transport:version";
+    private static final String ptVersionTag = "public_transport:version";
     private RouteUtils() {
         // private constructor for util classes
@@ -35,5 +35,5 @@
     public static boolean isVersionTwoPTRoute(Relation r) {
 
-        if(!isPTRoute(r)) {
+        if (!isPTRoute(r)) {
             return false;
         }
@@ -48,9 +48,9 @@
     public static boolean isVersionOnePTRoute(Relation r) {
 
-        if(!isPTRoute(r)) {
-            return false;
-        }
-
-        if(r.get(ptVersionTag) == null) {
+        if (!isPTRoute(r)) {
+            return false;
+        }
+
+        if (r.get(ptVersionTag) == null) {
             return true;
         }
@@ -227,5 +227,5 @@
                 "tertiary_link", "living_street", "bus_guideway", "road"};
 
-        if(way.hasTag("highway", acceptedHighwayTags)
+        if (way.hasTag("highway", acceptedHighwayTags)
                 || way.hasTag("cycleway", "share_busway")
                 || way.hasTag("cycleway", "shared_lane")) {
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java	(revision 33429)
@@ -73,5 +73,6 @@
                 Way referringWay = (Way) referrer;
                 if (RouteUtils.isWaySuitableForPublicTransport(referringWay)) {
-                    Builder builder = TestError.builder(this.test, Severity.WARNING, PTAssistantValidatorTest.ERROR_CODE_PLATFORM_PART_OF_HIGHWAY);
+                    Builder builder = TestError.builder(this.test, Severity.WARNING,
+                            PTAssistantValidatorTest.ERROR_CODE_PLATFORM_PART_OF_HIGHWAY);
                     builder.message(tr("PT: Platform should not be part of a way"));
                     builder.primitives(primitives);
@@ -120,5 +121,6 @@
         Node problematicNode = (Node) testError.getPrimitives().iterator().next();
 
-        final int[] userSelection = { JOptionPane.YES_OPTION };
+        final int[] userSelection = {
+                JOptionPane.YES_OPTION };
         final TestError errorParameter = testError;
         if (SwingUtilities.isEventDispatchThread()) {
@@ -167,5 +169,6 @@
         AutoScaleAction.zoomTo(primitives);
 
-        String[] options = { tr("Yes"), tr("No") };
+        String[] options = {
+                tr("Yes"), tr("No") };
         String message;
         if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_SOLITARY_STOP_POSITION) {
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java	(revision 33429)
@@ -347,5 +347,5 @@
 
         //At this point, there are 3 variants:
-        if(routeCheckerErrors.isEmpty()) {
+        if (routeCheckerErrors.isEmpty()) {
              if (!routeChecker.getHasGap()) {
                  //There are no errors => route is correct
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 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java	(revision 33429)
@@ -74,5 +74,5 @@
                 TestError e = builder.build();
                 this.errors.add(e);
-            } else if(numOfGapsAfterSort < numOfGaps) {
+            } else if (numOfGapsAfterSort < numOfGaps) {
                 Builder builder = TestError.builder(this.test, Severity.WARNING, PTAssistantValidatorTest.ERROR_CODE_PARTIAL_SORTING);
                 builder.message(tr("PT: Route gaps can decrease by sorting members. Further validations will be required"));
@@ -100,5 +100,5 @@
         for (int i = 0; i < links.size(); i++) {
             final WayConnectionType link = links.get(i);
-            if(!(i == 0 || link.linkPrev)
+            if (!(i == 0 || link.linkPrev)
                     || !(i == links.size() - 1
                     || link.linkNext)
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java	(revision 33429)
@@ -871,7 +871,9 @@
         final Collection<OsmPrimitive> waysToZoom = new ArrayList<>();
 
-        for (List<PTWay> variants : fixVariants)
-            for(PTWay variant : variants)
+        for (List<PTWay> variants : fixVariants) {
+            for (PTWay variant : variants) {
                 waysToZoom.add(variant.getWay());
+            }
+        }
 
         if (SwingUtilities.isEventDispatchThread()) {
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java	(revision 33429)
@@ -92,5 +92,5 @@
         assertEquals(4, sw2.size());
         sw2.forEach(w -> {
-            if(w.firstNode().getUniqueId() == 2158181809L && w.lastNode().getUniqueId() == 2158181798L)
+            if (w.firstNode().getUniqueId() == 2158181809L && w.lastNode().getUniqueId() == 2158181798L)
                 assertEquals(8, w.getReferrers().size());
             else if (w.firstNode().getUniqueId() == 2158181798L && w.lastNode().getUniqueId() == 2158181789L)
@@ -110,5 +110,5 @@
         assertEquals(4, sw3.size());
         sw3.forEach(w -> {
-            if(w.firstNode().getUniqueId() == 280697532L && w.lastNode().getUniqueId() == 280697452L)
+            if (w.firstNode().getUniqueId() == 280697532L && w.lastNode().getUniqueId() == 280697452L)
                 assertEquals(0, w.getReferrers().size());
             else if (w.firstNode().getUniqueId() == 280697452L && w.lastNode().getUniqueId() == 280697591L)
@@ -139,23 +139,23 @@
 
         sw4.forEach(w -> {
-            if(w.firstNode().equals(entry11) && w.lastNode().equals(exit22))
+            if (w.firstNode().equals(entry11) && w.lastNode().equals(exit22))
                 assertEquals(2, w.getReferrers().size());
-            else if(w.firstNode().equals(exit22) && w.lastNode().equals(entry21))
+            else if (w.firstNode().equals(exit22) && w.lastNode().equals(entry21))
                 assertEquals(1, w.getReferrers().size());
-            else if(w.firstNode().equals(entry21) && w.lastNode().equals(exit11))
+            else if (w.firstNode().equals(entry21) && w.lastNode().equals(exit11))
                 assertEquals(2, w.getReferrers().size());
-            else if(w.firstNode().equals(exit11) && w.lastNode().equals(entry12))
+            else if (w.firstNode().equals(exit11) && w.lastNode().equals(entry12))
                 assertEquals(1, w.getReferrers().size());
-            else if(w.firstNode().equals(entry12) && w.lastNode().equals(entry3))
+            else if (w.firstNode().equals(entry12) && w.lastNode().equals(entry3))
                 assertEquals(2, w.getReferrers().size());
-            else if(w.firstNode().equals(entry3) && w.lastNode().equals(exit21))
+            else if (w.firstNode().equals(entry3) && w.lastNode().equals(exit21))
                 assertEquals(3, w.getReferrers().size());
-            else if(w.firstNode().equals(exit21) && w.lastNode().equals(entry22))
+            else if (w.firstNode().equals(exit21) && w.lastNode().equals(entry22))
                 assertEquals(2, w.getReferrers().size());
-            else if(w.firstNode().equals(entry22) && w.lastNode().equals(exit3))
+            else if (w.firstNode().equals(entry22) && w.lastNode().equals(exit3))
                 assertEquals(3, w.getReferrers().size());
-            else if(w.firstNode().equals(exit3) && w.lastNode().equals(exit12))
+            else if (w.firstNode().equals(exit3) && w.lastNode().equals(exit12))
                 assertEquals(2, w.getReferrers().size());
-            else if(w.firstNode().equals(exit12) && w.lastNode().equals(entry11))
+            else if (w.firstNode().equals(exit12) && w.lastNode().equals(entry11))
                 assertEquals(1, w.getReferrers().size());
             else
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java	(revision 33429)
@@ -35,6 +35,4 @@
         // test with a [correct] stop_position:
         PTStop ptstop1 = manager.getPTStop(447358573L);
-//        PTWay ptway1 = assigner.get(ptstop1);
-//        Way way1 = ptway1.getWays().get(0);
         Way way1 = assigner.get(ptstop1);
         assertEquals(way1.getId(), 26956744L);
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentCheckerTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentCheckerTest.java	(revision 33428)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentCheckerTest.java	(revision 33429)
@@ -17,6 +17,4 @@
     @Test
     public void test() {
-
-
         File file = new File(AbstractTest.PATH_TO_SEGMENT_TEST);
         DataSet ds = ImportUtils.importOsmFile(file, "testLayer");