You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2015/07/09 21:50:30 UTC

svn commit: r1690160 - /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/

Author: juanpablo
Date: Thu Jul  9 19:50:30 2015
New Revision: 1690160

URL: http://svn.apache.org/r1690160
Log:
StringBuffer -> StringBuilder

Modified:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Groups.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/InsertPage.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/TableOfContents.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java Thu Jul  9 19:50:30 2015
@@ -371,7 +371,7 @@ public abstract class AbstractReferralPl
         if( links == null || links.isEmpty() )
             return "";
 
-        StringBuffer output = new StringBuffer();
+        StringBuilder output = new StringBuilder();
 
         Iterator it     = links.iterator();
         int      count  = 0;

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Groups.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Groups.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Groups.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Groups.java Thu Jul  9 19:50:30 2015
@@ -57,7 +57,7 @@ public class Groups
         Principal[] groups = groupMgr.getRoles();
         Arrays.sort( groups, COMPARATOR );
 
-        StringBuffer s = new StringBuffer();
+        StringBuilder s = new StringBuilder();
         
         for ( int i = 0; i < groups.length; i++ )
         {

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java Thu Jul  9 19:50:30 2015
@@ -136,7 +136,7 @@ public class Image
             throw new PluginException( "Attachment info failed: "+e.getMessage() );
         }
 
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
 
         result.append( "<table border=\"0\" class=\""+cssclass+"\"" );
         //if( align != null ) result.append(" align=\""+align+"\"");

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/InsertPage.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/InsertPage.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/InsertPage.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/InsertPage.java Thu Jul  9 19:50:30 2015
@@ -79,7 +79,7 @@ public class InsertPage
     {
         WikiEngine engine = context.getEngine();
 
-        StringBuffer res = new StringBuffer();
+        StringBuilder res = new StringBuilder();
 
         String clazz        = params.get( PARAM_CLASS );
         String includedPage = params.get( PARAM_PAGENAME );

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java Thu Jul  9 19:50:30 2015
@@ -47,7 +47,7 @@ public class ListLocksPlugin
     public String execute( WikiContext context, Map<String, String> params )
         throws PluginException
     {
-        StringBuffer result = new StringBuffer();
+    	StringBuilder result = new StringBuilder();
 
         PageManager mgr = context.getEngine().getPageManager();
         List<PageLock> locks = mgr.getActiveLocks();

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java Thu Jul  9 19:50:30 2015
@@ -77,7 +77,7 @@ public class ReferringPagesPlugin
         String pageName = params.get( PARAM_PAGE );
         ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
         
-        StringBuffer result = new StringBuffer( 256 );
+        StringBuilder result = new StringBuilder( 256 );
         
         if( pageName == null )
         {
@@ -135,7 +135,7 @@ public class ReferringPagesPlugin
             {
                 if( m_show.equals( PARAM_SHOW_VALUE_COUNT ) )
                 {
-                    result = new StringBuffer();
+                    result = new StringBuilder();
                     result.append( links.size() );
                     if( m_lastModified )
                     {

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java Thu Jul  9 19:50:30 2015
@@ -64,7 +64,7 @@ public class SessionsPlugin
         if ( "users".equals( prop ) )
         {
             Principal[] principals = WikiSession.userPrincipals( engine );
-            StringBuffer s = new StringBuffer();
+            StringBuilder s = new StringBuilder();
             for ( int i = 0; i < principals.length; i++ )
             {
                 s.append(principals[i].getName() + ", ");
@@ -101,11 +101,11 @@ public class SessionsPlugin
             }
             //
             //
-            StringBuffer s = new StringBuffer();
-            Iterator entries = distinctPrincipals.entrySet().iterator();
+            StringBuilder s = new StringBuilder();
+            Iterator<Map.Entry<String, Integer>> entries = distinctPrincipals.entrySet().iterator();
             while (entries.hasNext())
             {
-                Map.Entry entry = (Map.Entry)entries.next();
+                Map.Entry<String, Integer> entry = entries.next();
                 s.append( entry.getKey().toString() + "(" + entry.getValue().toString() + "), " );
             }
             // remove the last comma and blank :

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/TableOfContents.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/TableOfContents.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/TableOfContents.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/TableOfContents.java Thu Jul  9 19:50:30 2015
@@ -162,7 +162,7 @@ public class TableOfContents
             return "<a href=\"#section-TOC\" class=\"toc\">"+rb.getString("tableofcontents.title")+"</a>";
         }
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append("<div class=\"toc\">\n");
         sb.append("<div class=\"collapsebox\">\n");

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java Thu Jul  9 19:50:30 2015
@@ -19,7 +19,15 @@
 package org.apache.wiki.plugin;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
 import org.apache.wiki.WikiContext;
@@ -69,7 +77,7 @@ public class WeblogArchivePlugin impleme
                                                 context.getURL( WikiContext.VIEW, weblogName,
                                                                 "weblog.startDate='ddMMyy'&amp;weblog.days=%d")+"'");
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append( "<div class=\"weblogarchive\">\n" );
         

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java Thu Jul  9 19:50:30 2015
@@ -19,10 +19,18 @@
 package org.apache.wiki.plugin;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.ResourceBundle;
 
 import org.apache.log4j.Logger;
-import org.apache.wiki.*;
+import org.apache.wiki.PageLock;
+import org.apache.wiki.PageManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.exceptions.ProviderException;
 import org.apache.wiki.api.plugin.WikiPlugin;
@@ -98,7 +106,7 @@ public class WeblogEntryPlugin implement
         }
         WikiEngine engine = context.getEngine();
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         String entryText = params.get(PARAM_ENTRYTEXT);
         if (entryText == null) {

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java?rev=1690160&r1=1690159&r2=1690160&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java Thu Jul  9 19:50:30 2015
@@ -21,12 +21,24 @@ package org.apache.wiki.plugin;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
-import org.apache.wiki.*;
+import org.apache.wiki.PageManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.WikiProvider;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.exceptions.ProviderException;
 import org.apache.wiki.api.plugin.ParserStagePlugin;
@@ -250,7 +262,7 @@ public class WeblogPlugin
         stopTime.set( Calendar.MINUTE, 59 );
         stopTime.set( Calendar.SECOND, 59 );
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         try
         {
@@ -295,7 +307,7 @@ public class WeblogPlugin
      *  @param entry
      *  @throws ProviderException
      */
-    private void addEntryHTML(WikiContext context, DateFormat entryFormat, boolean hasComments, StringBuffer buffer, WikiPage entry) 
+    private void addEntryHTML(WikiContext context, DateFormat entryFormat, boolean hasComments, StringBuilder buffer, WikiPage entry) 
         throws ProviderException
     {
         WikiEngine engine = context.getEngine();