Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(revision 10304)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(revision 10305)
@@ -84,6 +84,7 @@
     @Override
     public String acceptsDocumentationSummary() {
-        StringBuilder buff = new StringBuilder(128).append("<tr><td>");
-        buff.append(getTitle())
+        StringBuilder buff = new StringBuilder(128)
+            .append("<tr><td>")
+            .append(getTitle())
             .append(":</td><td>");
         String[] patterns = getPatterns();
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 10304)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 10305)
@@ -273,6 +273,7 @@
     @Override
     public String toString() {
-        StringBuilder buff = new StringBuilder(256).append("Headers  : ");
-        buff.append(overviewHeaderCount)
+        return new StringBuilder(256)
+            .append("Headers  : ")
+            .append(overviewHeaderCount)
             .append("\nSub Hdrs : ")
             .append(subGridHeaderCount)
@@ -294,6 +295,6 @@
             .append(toSemiMajorAxis)
             .append("\nTo Min Ax: ")
-            .append(toSemiMinorAxis);
-        return buff.toString();
+            .append(toSemiMinorAxis)
+            .toString();
     }
 
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 10304)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 10305)
@@ -295,6 +295,7 @@
      */
     public String getDetails() {
-        StringBuilder buff = new StringBuilder(256).append("Sub Grid : ");
-        buff.append(subGridName)
+        return new StringBuilder(256)
+            .append("Sub Grid : ")
+            .append(subGridName)
             .append("\nParent   : ")
             .append(parentSubGridName)
@@ -316,6 +317,6 @@
             .append(lonInterval)
             .append("\nNode Cnt : ")
-            .append(nodeCount);
-        return buff.toString();
+            .append(nodeCount)
+            .toString();
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java	(revision 10304)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java	(revision 10305)
@@ -183,5 +183,4 @@
     */
     protected static String buildListOfEditorsText(Iterable<OsmPrimitive> primitives) {
-        final StringBuilder s = new StringBuilder();
         final Map<String, Integer> editCountByUser = new TreeMap<>(Collator.getInstance(Locale.getDefault()));
 
@@ -200,7 +199,8 @@
 
         // Print the count in sorted order
-        s.append(trn("{0} user last edited the selection:", "{0} users last edited the selection:",
-                editCountByUser.size(), editCountByUser.size()));
-        s.append("\n\n");
+        final StringBuilder s = new StringBuilder(48)
+            .append(trn("{0} user last edited the selection:", "{0} users last edited the selection:",
+                editCountByUser.size(), editCountByUser.size()))
+            .append("\n\n");
         for (Map.Entry<String, Integer> entry : editCountByUser.entrySet()) {
             final String username = entry.getKey();
Index: trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java	(revision 10304)
+++ trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java	(revision 10305)
@@ -85,17 +85,17 @@
 
     private void updatePanel(SaveLayerInfo info) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("<html>");
-        sb.append(tr("Select which actions to perform for this layer, if you click the leftmost button."));
+        StringBuilder sb = new StringBuilder(128)
+            .append("<html>")
+            .append(tr("Select which actions to perform for this layer, if you click the leftmost button."));
         removeAll();
         if (info != null) {
             if (info.isUploadable()) {
-                sb.append("<br/>");
-                sb.append(tr("Check \"Upload\" to upload the changes to the OSM server."));
+                sb.append("<br/>")
+                  .append(tr("Check \"Upload\" to upload the changes to the OSM server."));
                 add(checkBoxes[0], GBC.eol().fill(GBC.HORIZONTAL));
             }
             if (info.isSavable()) {
-                sb.append("<br/>");
-                sb.append(tr("Check \"Save\" to save the layer to the file specified on the left."));
+                sb.append("<br/>")
+                  .append(tr("Check \"Save\" to save the layer to the file specified on the left."));
                 add(checkBoxes[1], GBC.eol().fill(GBC.HORIZONTAL));
             }
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java	(revision 10304)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java	(revision 10305)
@@ -374,12 +374,11 @@
         NodeElement that = (NodeElement) obj;
         return Objects.equals(mapImage, that.mapImage) &&
-                Objects.equals(mapImageAngle, that.mapImageAngle) &&
-                Objects.equals(symbol, that.symbol);
+               Objects.equals(mapImageAngle, that.mapImageAngle) &&
+               Objects.equals(symbol, that.symbol);
     }
 
     @Override
     public String toString() {
-        StringBuilder s = new StringBuilder(64).append("NodeElemStyle{");
-        s.append(super.toString());
+        StringBuilder s = new StringBuilder(64).append("NodeElemStyle{").append(super.toString());
         if (mapImage != null) {
             s.append(" icon=[" + mapImage + ']');
Index: trunk/src/org/openstreetmap/josm/io/NMEAImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/NMEAImporter.java	(revision 10304)
+++ trunk/src/org/openstreetmap/josm/io/NMEAImporter.java	(revision 10305)
@@ -68,6 +68,6 @@
 
     private static void showNmeaInfobox(boolean success, NmeaReader r) {
-        final StringBuilder msg = new StringBuilder(160).append("<html>");
-        msg.append(tr("Coordinates imported: {0}", r.getNumberOfCoordinates())).append("<br>")
+        final StringBuilder msg = new StringBuilder(160).append("<html>")
+           .append(tr("Coordinates imported: {0}", r.getNumberOfCoordinates())).append("<br>")
            .append(tr("Malformed sentences: {0}", r.getParserMalformed())).append("<br>")
            .append(tr("Checksum errors: {0}", r.getParserChecksumErrors())).append("<br>");
Index: trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java	(revision 10304)
+++ trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java	(revision 10305)
@@ -210,7 +210,7 @@
                 str.append(e);
             } else {
-                str.append("\n    ... (");
-                str.append(value.size());
-                str.append(" entries)");
+                str.append("\n    ... (")
+                   .append(value.size())
+                   .append(" entries)");
                 break;
             }
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java	(revision 10304)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java	(revision 10305)
@@ -26,5 +26,5 @@
     @Override
     public String toString() {
-        return condition.toString() + " '" + text + '\'';
+        return condition + " '" + text + '\'';
     }
 }