Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 8374)
+++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 8375)
@@ -171,11 +171,9 @@
 
         boolean __add_content(T o) {
-            boolean ret = false;
             // The split_lock will keep two concurrent calls from overwriting content
             if (content == null) {
                 content = new ArrayList<>();
             }
-            ret = content.add(o);
-            return ret;
+            return content.add(o);
         }
 
@@ -229,7 +227,6 @@
             QBLevel<T> next = this;
             QBLevel<T> sibling = next.next_sibling();
-            // Walk back up the tree to find the
-            // next sibling node.  It may be either
-            // a leaf or branch.
+            // Walk back up the tree to find the next sibling node.
+            // It may be either a leaf or branch.
             while (sibling == null) {
                 next = next.parent;
@@ -239,6 +236,5 @@
                 sibling = next.next_sibling();
             }
-            next = sibling;
-            return next;
+            return sibling;
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 8374)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 8375)
@@ -595,6 +595,5 @@
         public int getRowCount() {
             int count = Math.max(getMyEntries().size(), getMergedEntries().size());
-            count = Math.max(count, getTheirEntries().size());
-            return count;
+            return Math.max(count, getTheirEntries().size());
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 8374)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 8375)
@@ -286,8 +286,6 @@
 
     protected int getChunkSize() {
-        int chunkSize;
         try {
-            chunkSize = Integer.parseInt(tfChunkSize.getText().trim());
-            return chunkSize;
+            return Integer.parseInt(tfChunkSize.getText().trim());
         } catch(NumberFormatException e) {
             return UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE;
Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 8374)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 8375)
@@ -74,6 +74,5 @@
             time_left_str += "0";
         }
-        time_left_str += Integer.toString(seconds_left);
-        return time_left_str;
+        return time_left_str + Integer.toString(seconds_left);
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 8374)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 8375)
@@ -152,6 +152,5 @@
             result += "</font>";
         }
-        result += "&nbsp;</html>";
-        return result;
+        return result + "&nbsp;</html>";
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/TextTagParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/TextTagParser.java	(revision 8374)
+++ trunk/src/org/openstreetmap/josm/tools/TextTagParser.java	(revision 8375)
@@ -227,7 +227,5 @@
         // Free format
         // a 1 "b" 2 c=3 d 4 e "5"
-        TextAnalyzer parser = new TextAnalyzer(buf);
-        tags = parser.getFreeParsedTags();
-        return tags;
+        return new TextAnalyzer(buf).getFreeParsedTags();
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/XmlParsingException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/XmlParsingException.java	(revision 8374)
+++ trunk/src/org/openstreetmap/josm/tools/XmlParsingException.java	(revision 8375)
@@ -61,6 +61,5 @@
             msg = getClass().getName();
         }
-        msg = msg + " " + tr("(at line {0}, column {1})", lineNumber, columnNumber);
-        return msg;
+        return msg + " " + tr("(at line {0}, column {1})", lineNumber, columnNumber);
     }