Changeset 33418 in osm for applications/editors

Timestamp:

2017-06-28T18:11:42+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] fixes from sonar

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant

Files:

• actions/EdgeSelectionAction.java (modified) (1 diff)
• actions/SplitRoundaboutAction.java (modified) (1 diff)
• gui/PTAssistantLayer.java (modified) (1 diff)
• gui/PTAssistantLayerManager.java (modified) (1 diff)
• utils/RouteUtils.java (modified) (3 diffs)
• validation/RouteChecker.java (modified) (1 diff)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java

@@ -33 +33 @@
     private static final long serialVersionUID = 2414977774504904238L;
 
-    private transient  Set<Way> highlighted;
+    private transient Set<Way> highlighted;
 
     private Cursor selectionCursor;

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java

@@ -91 +91 @@
     }
 
-    private void continueAfterDownload(Way roundabout)
-    {
+    private void continueAfterDownload(Way roundabout) {
         //make the roundabout round, if requested
         if(Main.pref.getBoolean("pt_assistant.roundabout-splitter.alignalways") ||

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java

@@ -263 +263 @@
         }
 
-        if (event.getRemovedLayer() instanceof OsmDataLayer && event.getSource().getLayersOfType(OsmDataLayer.class).size() < 1)
+        if (event.getRemovedLayer() instanceof OsmDataLayer
+                && event.getSource().getLayersOfType(OsmDataLayer.class).isEmpty())
             event.scheduleRemoval(Collections.singleton(this));
 

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java

@@ -14 +14 @@
 public class PTAssistantLayerManager implements SelectionChangedListener {
 
-    public final static PTAssistantLayerManager PTLM = new PTAssistantLayerManager();
+    public static final PTAssistantLayerManager PTLM = new PTAssistantLayerManager();
     private PTAssistantLayer layer;
 

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java

@@ -65 +65 @@
         }
 
-        String [] acceptedRouteTags = new String[] {
+        String[] acceptedRouteTags = new String[] {
                 "bus", "trolleybus", "share_taxi",
                 "tram", "light_rail", "subway", "train"};
@@ -217 +217 @@
     public static boolean isWaySuitableForBuses(Way way) {
 
-        String [] acceptedHighwayTags = new String [] {
+        String[] acceptedHighwayTags = new String[] {
                 "motorway", "trunk", "primary", "secondary", "tertiary",
-                "unclassified" , "road", "residential", "service",
+                "unclassified", "road", "residential", "service",
                 "motorway_link", "trunk_link", "primary_link", "secondary_link",
                 "tertiary_link", "living_street", "bus_guideway", "road"};
@@ -241 +241 @@
     public static boolean isWaySuitableForPublicTransport(Way way) {
 
-        String [] acceptedRailwayTags = new String [] {
+        String[] acceptedRailwayTags = new String[] {
                 "tram", "subway", "light_rail", "rail"};
 

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java

@@ -100 +100 @@
         for (int i = 0; i < links.size(); i++) {
             final WayConnectionType link = links.get(i);
-            if(!(i == 0 || link.linkPrev) || !(i == links.size() - 1 || link.linkNext)
-                    || link.direction == null || WayConnectionType.Direction.NONE.equals(link.direction)) {
+            if(!(i == 0 || link.linkPrev)
+                    || !(i == links.size() - 1
+                    || link.linkNext)
+                    || link.direction == null
+                    || WayConnectionType.Direction.NONE.equals(link.direction)) {
                 numberOfGaps++;
                 i++;