Changeset 33408 in osm for applications/editors/josm/plugins/pt_assistant

Timestamp:

2017-06-22T18:15:31+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/AddStopPositionAction.java (modified) (6 diffs)
• actions/EdgeSelectionAction.java (modified) (1 diff)
• actions/SplitRoundaboutAction.java (modified) (1 diff)
• gui/PTAssistantLayerManager.java (modified) (4 diffs)

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant.actions;
 
@@ -50 +51 @@
 
     private static Cursor getCursor() {
-        try {
-            return ImageProvider.getCursor("crosshair", "bus");
-        } catch (Exception e) {
-            Main.error(e);
-        }
-        return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR);
+        Cursor cursor = ImageProvider.getCursor("crosshair", "bus");
+        if(cursor == null)
+                cursor = Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR);
+        return cursor;
     }
 
@@ -73 +72 @@
 
     @Override
-    public void mouseMoved (MouseEvent e) {
+    public void mouseMoved(MouseEvent e) {
 
         //while the mouse is moving, surroundings are checked
@@ -88 +87 @@
                                 Main.map.mapView.getNearestWaySegments(e.getPoint(), OsmPrimitive::isSelectable);
 
-                if(wss.size() > 0) {
+                if(!wss.isEmpty()) {
                         for(WaySegment ws : wss) {
                                 newHighlights.add(ws.way);
@@ -101 +100 @@
 
     @Override
-    public void mouseClicked (MouseEvent e) {
+    public void mouseClicked(MouseEvent e) {
 
         Boolean newNode = false;
@@ -150 +149 @@
     private void updateHighlights()
     {
-        if(oldHighlights.size() > 0 || newHighlights.size() > 0) {
+        if(oldHighlights.isEmpty() && newHighlights.isEmpty()) {
+                return;
+        }
 
-                for(OsmPrimitive osm : oldHighlights) {
-                        osm.setHighlighted(false);
-                }
+                for(OsmPrimitive osm : oldHighlights) {
+                osm.setHighlighted(false);
+        }
 
-                for(OsmPrimitive osm : newHighlights) {
-                        osm.setHighlighted(true);
-                }
+        for(OsmPrimitive osm : newHighlights) {
+                osm.setHighlighted(true);
+        }
 
-                Main.getLayerManager().getEditLayer().invalidate();
+                Main.getLayerManager().getEditLayer().invalidate();
 
-                oldHighlights.clear();
-                oldHighlights.addAll(newHighlights);
-                newHighlights.clear();
-        }
+        oldHighlights.clear();
+        oldHighlights.addAll(newHighlights);
+        newHighlights.clear();
     }
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant.actions;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant.actions;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant.gui;
 
@@ -11 +12 @@
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 
-public class PTAssistantLayerManager implements SelectionChangedListener{
+public class PTAssistantLayerManager implements SelectionChangedListener {
 
-        public static PTAssistantLayerManager PTLM = new PTAssistantLayerManager();
-    private PTAssistantLayer layer;
+        public final static PTAssistantLayerManager PTLM = new PTAssistantLayerManager();
+        private PTAssistantLayer layer;
 
     public PTAssistantLayer getLayer() {
@@ -23 +24 @@
     }
 
-    public void resetLayer()
-    {
+    public void resetLayer() {
         layer = null;
     }
@@ -37 +37 @@
 
         for (OsmPrimitive primitive : newSelection) {
-            if (primitive.getType().equals(OsmPrimitiveType.RELATION)) {
-                if (RouteUtils.isTwoDirectionRoute((Relation) primitive)) {
+            if (primitive.getType().equals(OsmPrimitiveType.RELATION)
+                        && RouteUtils.isTwoDirectionRoute((Relation) primitive)) {
                     routes.add(primitive);
-                }
             }
         }