Changeset 8318 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2015-05-03T18:34:33+02:00 (9 years ago)

Author:

Don-vip

Message:

fix various Sonar issues:

• squid:S1068: Unused private fields should be removed
• squid:S1155: Collection.isEmpty() should be used to test for emptiness
• squid:S1185: Overriding methods should do more than simply call the same method in the super class
• squid:S1694: An abstract class should have both abstract and concrete methods
• squid:S1905: Redundant casts should not be used
• squid:S2065: Fields in non-serializable classes should not be "transient"
• squid:S2583: Conditions should not unconditionally evaluate to "TRUE" or to "FALSE"
• squid:ModifiersOrderCheck: Modifiers should be declared in the correct order

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• ImproveWayAccuracyAction.java (modified) (1 diff)
• SelectAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -612 +612 @@
             startImproving(wayList.get(0));
             return;
-        } else if (nodeList.size() > 0) {
+        } else if (nodeList.size() == 1) {
             // Starting improving the only way of the single selected node
-            if (nodeList.size() == 1) {
-                List<OsmPrimitive> r = nodeList.get(0).getReferrers();
-                if (r.size() == 1 && (r.get(0) instanceof Way)) {
-                    startImproving((Way) r.get(0));
-                    return;
-                }
+            List<OsmPrimitive> r = nodeList.get(0).getReferrers();
+            if (r.size() == 1 && (r.get(0) instanceof Way)) {
+                startImproving((Way) r.get(0));
+                return;
             }
         }

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -519 +519 @@
             // highlight it and adjust the cursor accordingly.
             final boolean canMerge = ctrl && !getCurrentDataSet().getSelectedNodes().isEmpty();
-            final OsmPrimitive p = canMerge ? (OsmPrimitive)findNodeToMergeTo(e.getPoint()) : null;
+            final OsmPrimitive p = canMerge ? findNodeToMergeTo(e.getPoint()) : null;
             boolean needsRepaint = removeHighlighting();
             if(p != null) {