diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
index e17420034f..9b6d23c25c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
@@ -217,14 +217,12 @@ public String policyRoleTable()
         // Write the table header
         s.append( "<table class=\"wikitable\" border=\"1\">\n" );
         s.append( "  <colgroup span=\"1\" width=\"33%\"/>\n" );
-        s.append( "  <colgroup span=\"" + pageActionsLength * rolesLength + "\" width=\"" + colWidth
-                + "\" align=\"center\"/>\n" );
+        s.append( "  <colgroup span=\"" ).append( pageActionsLength * rolesLength ).append( "\" width=\"" ).append( colWidth ).append( "\" align=\"center\"/>\n" );
         s.append( "  <tr>\n" );
         s.append( "    <th rowspan=\"2\" valign=\"bottom\">Permission</th>\n" );
         for( int i = 0; i < rolesLength; i++ )
         {
-            s.append( "    <th colspan=\"" + pageActionsLength + "\" title=\"" + roles[i].getClass().getName() + "\">"
-                    + roles[i].getName() + "</th>\n" );
+            s.append( "    <th colspan=\"" ).append( pageActionsLength ).append( "\" title=\"" ).append( roles[i].getClass().getName() ).append( "\">" ).append( roles[i].getName() ).append( "</th>\n" );
         }
         s.append( "  </tr>\n" );
 
@@ -235,7 +233,7 @@ public String policyRoleTable()
             for( final String pageAction : pageActions )
             {
                 final String action = pageAction.substring( 0, 1 );
-                s.append( "    <th title=\"" + pageAction + "\">" + action + "</th>\n" );
+                s.append( "    <th title=\"" ).append( pageAction ).append( "\">" ).append( action ).append( "</th>\n" );
             }
         }
         s.append( "  </tr>\n" );
@@ -243,7 +241,7 @@ public String policyRoleTable()
         // Write page permission tests first
         for( final String page : pages ) {
             s.append( "  <tr>\n" );
-            s.append( "    <td>PagePermission \"" + wiki + ":" + page + "\"</td>\n" );
+            s.append( "    <td>PagePermission \"" ).append( wiki ).append( ":" ).append( page ).append( "\"</td>\n" );
             for( final Principal role : roles ) {
                 for( final String pageAction : pageActions ) {
                     final Permission permission = PermissionFactory.getPagePermission( wiki + ":" + page, pageAction );
@@ -256,7 +254,7 @@ public String policyRoleTable()
         // Now do the group tests
         for( final String group : groups ) {
             s.append( "  <tr>\n" );
-            s.append( "    <td>GroupPermission \"" + wiki + ":" + group + "\"</td>\n" );
+            s.append( "    <td>GroupPermission \"" ).append( wiki ).append( ":" ).append( group ).append( "\"</td>\n" );
             for( final Principal role : roles ) {
                 for( final String groupAction : groupActions ) {
                     Permission permission = null;
@@ -274,7 +272,7 @@ public String policyRoleTable()
         final String[] wikiPerms = new String[] { "createGroups", "createPages", "login", "editPreferences", "editProfile" };
         for( final String wikiPerm : wikiPerms ) {
             s.append( "  <tr>\n" );
-            s.append( "    <td>WikiPermission \"" + wiki + "\",\"" + wikiPerm + "\"</td>\n" );
+            s.append( "    <td>WikiPermission \"" ).append( wiki ).append( "\",\"" ).append( wikiPerm ).append( "\"</td>\n" );
             for( final Principal role : roles ) {
                 final Permission permission = new WikiPermission( wiki, wikiPerm );
                 s.append( printPermissionTest( permission, role, pageActionsLength ) );
@@ -284,7 +282,7 @@ public String policyRoleTable()
 
         // Lastly, check for AllPermission
         s.append( "  <tr>\n" );
-        s.append( "    <td>AllPermission \"" + wiki + "\"</td>\n" );
+        s.append( "    <td>AllPermission \"" ).append( wiki ).append( "\"</td>\n" );
         for( final Principal role : roles )
         {
             final Permission permission = new AllPermission( wiki );
@@ -306,11 +304,11 @@ public String policyRoleTable()
     private String printPermissionTest( final Permission permission, final Principal principal, final int cols ) {
     	final StringBuilder s = new StringBuilder();
         if( permission == null ) {
-            s.append( "    <td colspan=\"" + cols + "\" align=\"center\" title=\"N/A\">" );
+            s.append( "    <td colspan=\"" ).append( cols ).append( "\" align=\"center\" title=\"N/A\">" );
             s.append( "&nbsp;</td>\n" );
         } else {
             final boolean allowed = verifyStaticPermission( principal, permission );
-            s.append( "    <td colspan=\"" + cols + "\" align=\"center\" title=\"" );
+            s.append( "    <td colspan=\"" ).append( cols ).append( "\" align=\"center\" title=\"" );
             s.append( allowed ? "ALLOW: " : "DENY: " );
             s.append( permission.getClass().getName() );
             s.append( " &quot;" );
@@ -361,12 +359,12 @@ public String containerRoleTable() throws WikiException {
         s.append( "  <tr>\n" );
         s.append( "    <th rowspan=\"2\">Action</th>\n" );
         s.append( "    <th rowspan=\"2\">Page</th>\n" );
-        s.append( "    <th colspan=\"" + roles.length + 1 + "\">Roles</th>\n" );
+        s.append( "    <th colspan=\"" ).append( roles.length ).append( 1 ).append( "\">Roles</th>\n" );
         s.append( "  </tr>\n" );
         s.append( "  <tr>\n" );
         s.append( "    <th>Anonymous</th>\n" );
         for( final Principal role : roles ) {
-            s.append( "    <th>" + role.getName() + "</th>\n" );
+            s.append( "    <th>" ).append( role.getName() ).append( "</th>\n" );
         }
         s.append( "</tr>\n" );
         s.append( "</thead>\n" );
@@ -380,8 +378,8 @@ public String containerRoleTable() throws WikiException {
             // Print whether the page is constrained for each role
             final boolean allowsAnonymous = !wca.isConstrained( jsp, Role.ALL );
             s.append( "  <tr>\n" );
-            s.append( "    <td>" + action + "</td>\n" );
-            s.append( "    <td>" + jsp + "</td>\n" );
+            s.append( "    <td>" ).append( action ).append( "</td>\n" );
+            s.append( "    <td>" ).append( jsp ).append( "</td>\n" );
             s.append( "    <td title=\"" );
             s.append( allowsAnonymous ? "ALLOW: " : "DENY: " );
             s.append( jsp );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
index c13e631a1d..f9202384af 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
@@ -847,7 +847,7 @@ private static Change getChange( final Context context, final String newText ) {
 
         //  And author as well
         if( page.getAuthor() != null ) {
-            change.append( "\r\n" + page.getAuthor() );
+            change.append( "\r\n" ).append( page.getAuthor() );
         }
 
         ch.m_change = change.toString();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
index ee4cebba2a..3c8e6fcc73 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
@@ -2273,7 +2273,7 @@ private String cleanupSuspectData( final String s )
             final char c = s.charAt(i);
 
             if( Verifier.isXMLCharacter( c ) ) sb.append( c );
-            else sb.append( "0x"+Integer.toString(c,16).toUpperCase() );
+            else sb.append( "0x" ).append( Integer.toString( c, 16 ).toUpperCase() );
         }
 
         return sb.toString();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
index 33e9a29dca..41a599180c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
@@ -371,7 +371,7 @@ protected String wikitizeCollection( final Collection< String > links, final Str
             output.append( m_before );
 
             // Make a Wiki markup link. See TranslatorReader.
-            output.append( "[" + m_engine.getManager( RenderingManager.class ).beautifyTitle(value) + "|" + value + "]" );
+            output.append( "[" ).append( m_engine.getManager( RenderingManager.class ).beautifyTitle( value ) ).append( "|" ).append( value ).append( "]" );
             count++;
         }
 
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java
index ca353faf44..a025581a3f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java
@@ -136,32 +136,32 @@ public String execute( final Context context, final Map<String, String> params )
         result.append( "<table border=\"0\" class=\"imageplugin\"" );
 
         if( title != null ) {
-            result.append( " title=\"" + title + "\"" );
+            result.append( " title=\"" ).append( title ).append( "\"" );
         }
 
         if( align != null ) {
             if( align.equals( "center" ) ) {
                 result.append( " style=\"margin-left: auto; margin-right: auto; text-align:center; vertical-align:middle;\"" );
             } else {
-                result.append( " style=\"float:" + align + ";\"" );
+                result.append( " style=\"float:" ).append( align ).append( ";\"" );
             }
         }
 
         result.append( ">\n" );
 
         if( caption != null ) {
-            result.append( "<caption>" + caption + "</caption>\n" );
+            result.append( "<caption>" ).append( caption ).append( "</caption>\n" );
         }
 
         // move css class and style to the container of the image, so it doesn't affect the caption
         result.append( "<tr><td" );
 
         if( cssclass != null ) {
-            result.append(" class=\""+cssclass+"\"");
+            result.append( " class=\"" ).append( cssclass ).append( "\"" );
         }
 
         if( style != null ) {
-            result.append(" style=\""+style);
+            result.append( " style=\"" ).append( style );
 
             // Make sure that we add a ";" to the end of the style string
             if( result.charAt( result.length()-1 ) != ';' ) result.append(";");
@@ -172,26 +172,26 @@ public String execute( final Context context, final Map<String, String> params )
         result.append( ">" );
 
         if( link != null ) {
-            result.append("<a href=\""+link+"\"");
+            result.append( "<a href=\"" ).append( link ).append( "\"" );
             if( target != null ) {
-                result.append(" target=\""+target+"\"");
+                result.append( " target=\"" ).append( target ).append( "\"" );
             }
             result.append(">");
         }
 
-        result.append( "<img src=\""+src+"\"" );
+        result.append( "<img src=\"" ).append( src ).append( "\"" );
 
         if( ht != null ) {
-            result.append(" height=\""+ht+"\"");
+            result.append( " height=\"" ).append( ht ).append( "\"" );
         }
         if( wt != null ) {
-            result.append(" width=\""+wt+"\"");
+            result.append( " width=\"" ).append( wt ).append( "\"" );
         }
         if( alt != null ) {
-            result.append(" alt=\""+alt+"\"");
+            result.append( " alt=\"" ).append( alt ).append( "\"" );
         }
         if( border != null ) {
-            result.append(" border=\""+border+"\"");
+            result.append( " border=\"" ).append( border ).append( "\"" );
         }
         // if( map != null )    result.append(" map=\""+map+"\"");
 
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
index 00a1e853cb..b8e717990d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
@@ -182,8 +182,8 @@ public String execute( final Context context, final Map<String, String> params )
 
                 res.append("<div class=\"inserted-page ");
                 if( clazz != null ) res.append( clazz );
-                if( !style.equals(DEFAULT_STYLE) ) res.append("\" style=\""+style );
-                if( showOnce ) res.append("\" data-once=\""+cookieName );
+                if( !style.equals(DEFAULT_STYLE) ) res.append( "\" style=\"" ).append( style );
+                if( showOnce ) res.append( "\" data-once=\"" ).append( cookieName );
                 res.append("\" >");
 
                 res.append( engine.getManager( RenderingManager.class ).textToHTML( includedContext, pageData ) );
@@ -200,8 +200,8 @@ public String execute( final Context context, final Map<String, String> params )
                 if( defaultstr != null ) {
                     res.append( defaultstr );
                 } else {
-                    res.append( "There is no page called '" + includedPage + "'.  Would you like to " );
-                    res.append( "<a href=\"" + context.getURL( ContextEnum.PAGE_EDIT.getRequestContext(), includedPage ) + "\">create it?</a>" );
+                    res.append( "There is no page called '" ).append( includedPage ).append( "'.  Would you like to " );
+                    res.append( "<a href=\"" ).append( context.getURL( ContextEnum.PAGE_EDIT.getRequestContext(), includedPage ) ).append( "\">create it?</a>" );
                 }
             }
         } else {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
index 91288d3646..c58884f351 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
@@ -49,21 +49,19 @@ public String execute( final Context context, final Map< String, String > params
         final ResourceBundle rb = Preferences.getBundle( context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
         result.append("<table class=\"wikitable\">\n");
         result.append("<tr>\n");
-        result.append( "<th>" + rb.getString( "plugin.listlocks.page" ) + "</th><th>" + rb.getString( "plugin.listlocks.locked.by" )
-                       + "</th><th>" + rb.getString( "plugin.listlocks.acquired" ) + "</th><th>"
-                       + rb.getString( "plugin.listlocks.expires" ) + "</th>\n" );
+        result.append( "<th>" ).append( rb.getString( "plugin.listlocks.page" ) ).append( "</th><th>" ).append( rb.getString( "plugin.listlocks.locked.by" ) ).append( "</th><th>" ).append( rb.getString( "plugin.listlocks.acquired" ) ).append( "</th><th>" ).append( rb.getString( "plugin.listlocks.expires" ) ).append( "</th>\n" );
         result.append("</tr>");
 
         if( locks.size() == 0 ) {
-            result.append( "<tr><td colspan=\"4\" class=\"odd\">" + rb.getString( "plugin.listlocks.no.locks.exist" ) + "</td></tr>\n" );
+            result.append( "<tr><td colspan=\"4\" class=\"odd\">" ).append( rb.getString( "plugin.listlocks.no.locks.exist" ) ).append( "</td></tr>\n" );
         } else {
             int rowNum = 1;
             for( final PageLock lock : locks ) {
                 result.append( rowNum % 2 != 0 ? "<tr class=\"odd\">" : "<tr>" );
-                result.append( "<td>" + lock.getPage() + "</td>" );
-                result.append( "<td>" + lock.getLocker() + "</td>" );
-                result.append( "<td>" + Preferences.renderDate( context, lock.getAcquisitionTime(), Preferences.TimeFormat.DATETIME ) + "</td>" );
-                result.append( "<td>" + Preferences.renderDate( context, lock.getExpiryTime(), Preferences.TimeFormat.DATETIME ) + "</td>" );
+                result.append( "<td>" ).append( lock.getPage() ).append( "</td>" );
+                result.append( "<td>" ).append( lock.getLocker() ).append( "</td>" );
+                result.append( "<td>" ).append( Preferences.renderDate( context, lock.getAcquisitionTime(), Preferences.TimeFormat.DATETIME ) ).append( "</td>" );
+                result.append( "<td>" ).append( Preferences.renderDate( context, lock.getExpiryTime(), Preferences.TimeFormat.DATETIME ) ).append( "</td>" );
                 result.append( "</tr>\n" );
                 rowNum++;
             }
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
index 607be49bc1..25c7e4ad66 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
@@ -145,9 +145,12 @@ public String execute( final Context context, final Map<String, String> params )
                              ( m_formatSort ? " sort" : "" ) + "]";
 
         m_result.append( "<div class=\"ReferredPagesPlugin\">\n" );
-        m_result.append( "<a class=\"wikipage\" href=\""+ href +
-                         "\" title=\"" + TextUtil.replaceEntities( title ) +
-                         "\">" + TextUtil.replaceEntities( rootname ) + "</a>\n" );
+        m_result.append( "<a class=\"wikipage\" href=\"" )
+                .append( href ).append( "\" title=\"" )
+                .append( TextUtil.replaceEntities( title ) )
+                .append( "\">" )
+                .append( TextUtil.replaceEntities( rootname ) )
+                .append( "</a>\n" );
         m_exists.add( rootname );
 
         // pre compile all needed patterns
@@ -235,7 +238,7 @@ private void handleLinks( final Context context, final Collection<String> links,
                     }
 
                     //See https://www.w3.org/wiki/HTML_lists  for proper nesting of UL and LI
-                    m_result.append( "<li> " + TextUtil.replaceEntities(link) + "\n" );
+                    m_result.append( "<li> " ).append( TextUtil.replaceEntities( link ) ).append( "\n" );
                     getReferredPages( context, link, depth );  // added recursive call - on general request
                     m_result.append( "\n</li>\n" );
                 }
@@ -246,7 +249,7 @@ private void handleLinks( final Context context, final Collection<String> links,
                 }
 
                 final String href = context.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), link );
-                m_result.append( "<li><a class=\"wikipage\" href=\"" + href + "\">" + TextUtil.replaceEntities(link) + "</a>\n" );
+                m_result.append( "<li><a class=\"wikipage\" href=\"" ).append( href ).append( "\">" ).append( TextUtil.replaceEntities( link ) ).append( "</a>\n" );
                 m_exists.add( link );
                 getReferredPages( context, link, depth );
                 m_result.append( "\n</li>\n" );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
index 3283723e64..aca7edefa3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
@@ -84,7 +84,7 @@ public String execute( final Context context, final Map<String, String> params)
             final Object[] args = { "" + ( result.size() - items ) };
             extras = MessageFormat.format( extras, args );
 
-            resultHTML.append( "<br/>" + extras + "<br/>" );
+            resultHTML.append( "<br/>" ).append( extras ).append( "<br/>" );
         }
         return resultHTML.toString();
     }
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
index 28aa978d7e..ae1f850f5a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
@@ -121,25 +121,25 @@ public void headingAdded( final Context context, final Heading hd ) {
 
         final String sectref = "#section-"+pageName+"-"+titleSection;
 
-        m_buf.append( "<a class=\"wikipage\" href=\"" + sectref + "\">" );
+        m_buf.append( "<a class=\"wikipage\" href=\"" ).append( sectref ).append( "\">" );
         if (m_usingNumberedList)
         {
             switch( hd.m_level )
             {
             case Heading.HEADING_SMALL:
-                m_buf.append(m_prefix + m_level1Index + "." + m_level2Index + "."+ m_level3Index +" ");
+                m_buf.append( m_prefix ).append( m_level1Index ).append( "." ).append( m_level2Index ).append( "." ).append( m_level3Index ).append( " " );
                 break;
             case Heading.HEADING_MEDIUM:
-                m_buf.append(m_prefix + m_level1Index + "." + m_level2Index + " ");
+                m_buf.append( m_prefix ).append( m_level1Index ).append( "." ).append( m_level2Index ).append( " " );
                 break;
             case Heading.HEADING_LARGE:
-                m_buf.append(m_prefix + m_level1Index +" ");
+                m_buf.append( m_prefix ).append( m_level1Index ).append( " " );
                 break;
             default:
                 throw new InternalWikiException("Unknown depth in toc! (Please submit a bug report.)");
             }
         }
-        m_buf.append( TextUtil.replaceEntities(hd.m_titleText)+"</a></li>\n" );
+        m_buf.append( TextUtil.replaceEntities( hd.m_titleText ) ).append( "</a></li>\n" );
 
         m_lastLevel = hd.m_level;
     }
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
index 158f21d0fd..8311b1aac8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
@@ -327,7 +327,7 @@ private void addEntryHTML( final Context context, final DateFormat entryFormat,
             }
             buffer.append(html.substring(0, cutoff));
             if (hasBeenCutOff) {
-                buffer.append(" <a href=\""+entryCtx.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), entry.getName())+"\">"+rb.getString("weblogentryplugin.more")+"</a>\n");
+                buffer.append( " <a href=\"" ).append( entryCtx.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), entry.getName() ) ).append( "\">" ).append( rb.getString( "weblogentryplugin.more" ) ).append( "</a>\n" );
             }
         } else {
             buffer.append(html);
@@ -350,7 +350,7 @@ private void addEntryHTML( final Context context, final DateFormat entryFormat,
         }
 
         buffer.append( MessageFormat.format( rb.getString( "weblogentryplugin.postedby" ), author ) );
-        buffer.append( "<a href=\"" + entryCtx.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), entry.getName() ) + "\">" + rb.getString("weblogentryplugin.permalink") + "</a>" );
+        buffer.append( "<a href=\"" ).append( entryCtx.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), entry.getName() ) ).append( "\">" ).append( rb.getString( "weblogentryplugin.permalink" ) ).append( "</a>" );
         final String commentPageName = TextUtil.replaceString( entry.getName(), "blogentry", "comments" );
 
         if( hasComments ) {
@@ -363,10 +363,7 @@ private void addEntryHTML( final Context context, final DateFormat entryFormat,
 
             final String addcomment = rb.getString("weblogentryplugin.addcomment");
 
-            buffer.append( "<a href=\""+
-                           entryCtx.getURL( ContextEnum.PAGE_COMMENT.getRequestContext(), commentPageName, "nc=" + numComments ) + "\">" +
-                           MessageFormat.format( addcomment, numComments ) +
-                           "</a>" );
+            buffer.append( "<a href=\"" ).append( entryCtx.getURL( ContextEnum.PAGE_COMMENT.getRequestContext(), commentPageName, "nc=" + numComments ) ).append( "\">" ).append( MessageFormat.format( addcomment, numComments ) ).append( "</a>" );
         }
 
         buffer.append("</div>\n");
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
index 036068a067..6a3b2d3fd0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
@@ -137,7 +137,7 @@ public int doWikiStartTag()
 
         pagination.append( "<div class='pagination'>");
 
-        pagination.append( LocaleSupport.getLocalizedMessage(pageContext, m_fmtkey )+ " " );
+        pagination.append( LocaleSupport.getLocalizedMessage( pageContext, m_fmtkey ) ).append( " " );
 
         int cursor = 0;
         int cursormax = m_total;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
index 2bf39b32af..92fdccea80 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
@@ -133,7 +133,7 @@ public int doWikiStartTag() throws JspTagException
 
         final StringBuilder sb = new StringBuilder(32);
 
-        sb.append( "<div id=\""+ getId() + "\"" );
+        sb.append( "<div id=\"" ).append( getId() ).append( "\"" );
 
         if( !parent.validateDefaultTab( getId()) )
         {
@@ -180,16 +180,16 @@ else if( parent.isStateGenerateTabMenu() )
                 sb.append( " class=\"activetab\"" );
             }
 
-            sb.append( " id=\"menu-" + getId() + "\"" );
+            sb.append( " id=\"menu-" ).append( getId() ).append( "\"" );
 
             if( m_url != null )
             {
-                sb.append( " href='"+m_url+"'" );
+                sb.append( " href='" ).append( m_url ).append( "'" );
             }
 
             if( handleAccesskey() )
             {
-                sb.append( " accesskey=\"" + m_accesskey + "\"" );
+                sb.append( " accesskey=\"" ).append( m_accesskey ).append( "\"" );
             }
 
             sb.append( " >" );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java
index 0a065fd1c7..105dc1d850 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java
@@ -73,20 +73,20 @@ public String doGet( final Context context ) {
         for( int i = 0; i < attributes.length; i++ ) {
             sb.append( "<div class='block'>\n" );
 
-            sb.append( "<label>" + StringUtils.capitalize( attributes[ i ].getName() ) + "</label>\n" );
+            sb.append( "<label>" ).append( StringUtils.capitalize( attributes[i].getName() ) ).append( "</label>\n" );
 
             try {
                 final Object value = getAttribute( attributes[ i ].getName() );
                 if( attributes[ i ].isWritable() ) {
-                    sb.append( "<input type='text' name='question' size='30' value='" + value + "' />\n" );
+                    sb.append( "<input type='text' name='question' size='30' value='" ).append( value ).append( "' />\n" );
                 } else {
-                    sb.append( "<input type='text' class='readonly' readonly='true' size='30' value='" + value + "' />\n" );
+                    sb.append( "<input type='text' class='readonly' readonly='true' size='30' value='" ).append( value ).append( "' />\n" );
                 }
             } catch( final Exception e ) {
-                sb.append( "Exception: " + e.getMessage() );
+                sb.append( "Exception: " ).append( e.getMessage() );
             }
 
-            sb.append( "<div class='description'>" + attributes[ i ].getDescription() + "</div>\n" );
+            sb.append( "<div class='description'>" ).append( attributes[i].getDescription() ).append( "</div>\n" );
 
             sb.append( "</div>\n" );
         }
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/FileUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/FileUtil.java
index a961e96e63..f9dc0b6baa 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/FileUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/FileUtil.java
@@ -113,12 +113,12 @@ public static String runSimpleCommand( final String command, final String direct
             String line;
 
             while( (line = stdout.readLine()) != null ) {
-                result.append( line+"\n");
+                result.append( line ).append( "\n" );
             }
 
             final StringBuilder error = new StringBuilder();
             while( (line = stderr.readLine()) != null ) {
-                error.append( line+"\n");
+                error.append( line ).append( "\n" );
             }
 
             if( error.length() > 0 ) {
@@ -269,7 +269,7 @@ public static String getThrowingMethod(final Throwable t )
             sb.append( trace[0].isNativeMethod() ? "native method" : "" );
             sb.append( trace[0].getClassName() );
             sb.append(".");
-            sb.append(trace[0].getMethodName()+"(), line "+trace[0].getLineNumber());
+            sb.append( trace[0].getMethodName() ).append( "(), line " ).append( trace[0].getLineNumber() );
         }
         return sb.toString();
     }