You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/06/30 12:37:23 UTC

[maven-jxr] 02/05: Replace StringBuffer with StringBuilder

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git

commit 3d229c5315f883c450d6bc8a979765a37d512859
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Jun 30 12:25:08 2018 +0200

    Replace StringBuffer with StringBuilder
---
 .../org/apache/maven/jxr/DirectoryIndexer.java     |  2 +-
 .../src/main/java/org/apache/maven/jxr/JXR.java    |  4 +-
 .../org/apache/maven/jxr/JavaCodeTransform.java    | 53 +++++++---------------
 3 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java b/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
index 62c6698..09ae069 100644
--- a/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
+++ b/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
@@ -297,7 +297,7 @@ public class DirectoryIndexer
             writer = new OutputStreamWriter( new FileOutputStream( file ), getOutputEncoding() );
 
             // template file
-            StringBuffer templateFile = new StringBuffer();
+            StringBuilder templateFile = new StringBuilder();
             File templateDirFile = new File( getTemplateDir() );
             if ( !templateDirFile.isAbsolute() )
             {
diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java b/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
index 4f44958..9fb9be0 100644
--- a/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
+++ b/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
@@ -348,8 +348,8 @@ public class JXR
     private static String getRelativeLink( String fromDir, String toDir )
         throws IOException
     {
-        StringBuffer toLink = new StringBuffer();   // up from fromDir
-        StringBuffer fromLink = new StringBuffer(); // down into toDir
+        StringBuilder toLink = new StringBuilder();   // up from fromDir
+        StringBuilder fromLink = new StringBuilder(); // down into toDir
 
         // create a List of toDir's parent directories
         List<File> parents = new LinkedList<File>();
diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java b/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
index d4d2311..28debad 100644
--- a/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
+++ b/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
@@ -503,7 +503,7 @@ public class JavaCodeTransform
      */
     public final String getPackageRoot()
     {
-        StringBuffer buff = new StringBuffer();
+        StringBuilder buff = new StringBuilder();
 
         JavaFile jf = null;
 
@@ -634,7 +634,7 @@ public class JavaCodeTransform
      */
     public final String xrLine( String line, String packageName, ClassType classType )
     {
-        StringBuffer buff = new StringBuffer( line );
+        StringBuilder buff = new StringBuilder( line );
 
         String link = null;
         String find = null;
@@ -712,12 +712,12 @@ public class JavaCodeTransform
         {
             return "";
         }
-        line = replace( line, "&", "&amp;" );
-        line = replace( line, "<", "&lt;" );
-        line = replace( line, ">", "&gt;" );
-        line = replace( line, "\\\\", "&#92;&#92;" );
-        line = replace( line, "\\\"", "\\&quot;" );
-        line = replace( line, "'\"'", "'&quot;'" );
+        line = line.replace( "&", "&amp;" )
+                    .replace( "<", "&lt;" )
+                    .replace( ">", "&gt;" )
+                    .replace( "\\\\", "&#92;&#92;" )
+                    .replace( "\\\"", "\\&quot;" )
+                    .replace( "'\"'", "'&quot;'" );
         return ongoingMultiLineCommentFilter( line );
     }
 
@@ -789,7 +789,7 @@ public class JavaCodeTransform
         int index = line.indexOf( "//" );
         if ( ( index >= 0 ) && !isInsideString( line, index ) )
         {
-            return new StringBuffer( beginMultiLineCommentFilter( line.substring( 0, index ) ) ).append( COMMENT_START ).append( line.substring( index ) ).append( COMMENT_END ).toString();
+            return new StringBuilder( beginMultiLineCommentFilter( line.substring( 0, index ) ) ).append( COMMENT_START ).append( line.substring( index ) ).append( COMMENT_END ).toString();
         }
 
         return beginMultiLineCommentFilter( line );
@@ -852,7 +852,7 @@ public class JavaCodeTransform
         {
             return "";
         }
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if ( line.indexOf( "\"" ) <= -1 )
         {
             return keywordFilter( line );
@@ -902,10 +902,10 @@ public class JavaCodeTransform
         {
             return "";
         }
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         int i = 0;
         char ch;
-        StringBuffer temp = new StringBuffer();
+        StringBuilder temp = new StringBuilder();
         while ( i < line.length() )
         {
             temp.setLength( 0 );
@@ -928,7 +928,7 @@ public class JavaCodeTransform
             }
             else if ( reservedWords.containsKey( tempString ) )
             {
-                StringBuffer newLine = new StringBuffer( line.substring( 0, i - tempString.length() ) );
+                StringBuilder newLine = new StringBuilder( line.substring( 0, i - tempString.length() ) );
                 newLine.append( RESERVED_WORD_START );
                 newLine.append( tempString );
                 newLine.append( RESERVED_WORD_END );
@@ -947,27 +947,6 @@ public class JavaCodeTransform
     }
 
     /**
-     * Replace... I made it use a <code>StringBuffer</code>... hope it still works :)
-     *
-     * @param line String
-     * @param oldString String
-     * @param newString String
-     * @return String
-     */
-    private String replace( String line, String oldString, String newString )
-    {
-        int i = 0;
-        while ( ( i = line.indexOf( oldString, i ) ) >= 0 )
-        {
-            line =
-                ( new StringBuffer().append( line.substring( 0, i ) ).append( newString ).append( line.substring( i
-                    + oldString.length() ) ) ).toString();
-            i += newString.length();
-        }
-        return line;
-    }
-
-    /**
      * Checks to see if some position in a line is between String start and ending characters. Not yet used in code or
      * fully working :)
      *
@@ -1093,14 +1072,14 @@ public class JavaCodeTransform
      */
     private String getFileOverview()
     {
-        StringBuffer overview = new StringBuffer();
+        StringBuilder overview = new StringBuilder();
 
         // only add the header if javadocs are present
         if ( javadocLinkDir != null )
         {
             overview.append( "<div id=\"overview\">" );
             // get the URI to get Javadoc info.
-            StringBuffer javadocURI = new StringBuffer().append( javadocLinkDir );
+            StringBuilder javadocURI = new StringBuilder().append( javadocLinkDir );
 
             try
             {
@@ -1281,7 +1260,7 @@ public class JavaCodeTransform
      */
     private String getHREF( String dest, ClassType jc )
     {
-        StringBuffer href = new StringBuffer();
+        StringBuilder href = new StringBuilder();
 
         // find out how to go back to the root
         href.append( this.getPackageRoot() );