Index: trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java	(revision 8308)
+++ trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java	(revision 8318)
@@ -286,5 +286,5 @@
                     neighbors.add(nodes.get(i+1));
                 }
-            if(neighbors.size() == 0)
+            if(neighbors.isEmpty())
                 continue;
             else if(neighbors.size() == 2)
Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 8308)
+++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 8318)
@@ -121,5 +121,5 @@
                 }
             }
-            if (tmpNodes.size() < 1) {
+            if (tmpNodes.isEmpty()) {
                 if (selection.size() > 1) {
                     errMsg =  tr("None of these nodes are glued to anything else.");
@@ -262,5 +262,5 @@
      */
     private boolean checkSelection2(Collection<? extends OsmPrimitive> selection) {
-        if (selection.size() < 1)
+        if (selection.isEmpty())
             return false;
 
@@ -286,5 +286,5 @@
         }
 
-        if (selectedNodes.size() < 1) {
+        if (selectedNodes.isEmpty()) {
             selectedNodes.addAll(selectedWay.getNodes());
         }
Index: trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java	(revision 8308)
+++ trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java	(revision 8318)
@@ -36,5 +36,5 @@
         }
         NoteLayer layer;
-        if (noteLayers != null && noteLayers.size() > 0) {
+        if (noteLayers != null && !noteLayers.isEmpty()) {
             layer = noteLayers.get(0);
         } else {
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java	(revision 8308)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java	(revision 8318)
@@ -114,5 +114,5 @@
             }
             NoteLayer layer;
-            if (noteLayers != null && noteLayers.size() > 0) {
+            if (noteLayers != null && !noteLayers.isEmpty()) {
                 layer = noteLayers.get(0);
                 layer.getNoteData().addNotes(notesData);
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java	(revision 8308)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java	(revision 8318)
@@ -2,5 +2,5 @@
 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,5 +8,5 @@
 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,8 +29,4 @@
     }
 
-    public boolean acceptsUrl(String url) {
-        return super.acceptsUrl(url);
-    }
-
     @Override
     public String getTitle() {
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java	(revision 8308)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java	(revision 8318)
@@ -612,12 +612,10 @@
             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;
             }
         }
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 8308)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 8318)
@@ -519,5 +519,5 @@
             // 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) {