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

Timestamp:

2015-05-03T18:34:33+02:00 (10 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

Files:

• AlignInLineAction.java (modified) (1 diff)
• UnGlueAction.java (modified) (3 diffs)
• UploadNotesAction.java (modified) (1 diff)
• downloadtasks/DownloadNotesTask.java (modified) (1 diff)
• downloadtasks/DownloadNotesUrlIdTask.java (modified) (3 diffs)
• mapmode/ImproveWayAccuracyAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java ¶

@@ -286 +286 @@
                     neighbors.add(nodes.get(i+1));
                 }
-            if(neighbors.size() == 0)
+            if(neighbors.isEmpty())
                 continue;
             else if(neighbors.size() == 2)

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java ¶

@@ -121 +121 @@
                 }
             }
-            if (tmpNodes.size() < 1) {
+            if (tmpNodes.isEmpty()) {
                 if (selection.size() > 1) {
                     errMsg =  tr("None of these nodes are glued to anything else.");
@@ -262 +262 @@
      */
     private boolean checkSelection2(Collection<? extends OsmPrimitive> selection) {
-        if (selection.size() < 1)
+        if (selection.isEmpty())
             return false;
 
@@ -286 +286 @@
         }
 
-        if (selectedNodes.size() < 1) {
+        if (selectedNodes.isEmpty()) {
             selectedNodes.addAll(selectedWay.getNodes());
         }

trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java ¶

@@ -36 +36 @@
         }
         NoteLayer layer;
-        if (noteLayers != null && noteLayers.size() > 0) {
+        if (noteLayers != null && !noteLayers.isEmpty()) {
             layer = noteLayers.get(0);
         } else {

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java ¶

@@ -114 +114 @@
             }
             NoteLayer layer;
-            if (noteLayers != null && noteLayers.size() > 0) {
+            if (noteLayers != null && !noteLayers.isEmpty()) {
                 layer = noteLayers.get(0);
                 layer.getNoteData().addNotes(notesData);

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java ¶

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.downloadtasks;
 
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.concurrent.Future;
@@ -8 +8 @@
 import java.util.regex.Pattern;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
 public class DownloadNotesUrlIdTask extends DownloadNotesTask {
@@ -29 +29 @@
     }
 
-    public boolean acceptsUrl(String url) {
-        return super.acceptsUrl(url);
-    }
-
     @Override
     public String getTitle() {

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) {